1.新增一键定位功能

2.g30隐藏直播按钮，g40显示直播按钮
3.map页雷达按钮增加显示蓝牙连接状态

app/src/main/res/drawable/shape_light_yellow_circle_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="oval">
+            <solid android:color="@color/light_yellow_color" />
+            <stroke android:width="@dimen/dp_1" android:color="@color/white" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/shape_yellow_circle_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false">
+    <item android:state_enabled="true" android:state_pressed="false">
         <shape android:shape="oval">
             <solid android:color="@color/yellow_color30" />
             <stroke android:width="@dimen/dp_1" android:color="@color/white" />
@@ -12,4 +12,10 @@
             <stroke android:width="@dimen/dp_1" android:color="@color/white" />
         </shape>
     </item>
+    <item android:state_enabled="false">
+        <shape android:shape="oval">
+            <solid android:color="@color/light_yellow_color" />
+            <stroke android:width="@dimen/dp_1" android:color="@color/white" />
+        </shape>
+    </item>
 </selector>

app/src/main/res/layout/fragment_map_v3.xml

@@ -66,30 +66,46 @@
             android:visibility="invisible" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/home_map_bluetooth_btn"
-            style="@style/map_image_white_btn_style"
+            android:id="@+id/iv_home_map_refresh_location"
+            style="@style/map_image_yellow_btn_style"
             android:layout_above="@id/il_home_map_pet_location"
             android:layout_alignEnd="@id/rv_home_map_device_state"
-            android:layout_marginBottom="@dimen/dp_8"
-            android:padding="@dimen/dp_8"
-            android:src="@drawable/icon_map_bluetooth" />
+            android:layout_marginBottom="@dimen/dp_18"
+            android:tint="@color/grey_color" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/home_map_refresh_btn"
             style="@style/map_image_yellow_btn_style"
-            android:layout_above="@id/home_map_bluetooth_btn"
-            android:layout_alignEnd="@id/home_map_bluetooth_btn"
+            android:layout_above="@id/iv_home_map_refresh_location"
+            android:layout_alignEnd="@id/iv_home_map_refresh_location"
             android:layout_marginBottom="@dimen/dp_8" />
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/home_map_bluetooth_btn"
+            style="@style/map_image_white_btn_style"
+            android:layout_alignBottom="@id/iv_home_map_refresh_location"
+            android:padding="@dimen/dp_8"
+            android:src="@drawable/icon_map_bluetooth" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_home_map_ble_con_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/home_map_bluetooth_btn"
+            android:layout_alignEnd="@id/home_map_bluetooth_btn"
+            android:src="@drawable/icon_map_offline" />
+
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/home_map_live_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/home_map_refresh_btn"
+            android:layout_above="@id/home_map_bluetooth_btn"
+            android:layout_marginBottom="@dimen/dp_8"
             android:background="@drawable/shape38_gray_alpha_circle_bg"
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_14"
-            android:paddingVertical="@dimen/dp_16">
+            android:paddingVertical="@dimen/dp_16"
+            android:visibility="gone">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_home_map_live_image"

app/src/main/res/values/colors.xml

@@ -375,4 +375,5 @@
     <color name="blue_color">#26A8FF</color>
     <color name="line_stroke_color">#077B4A</color>
     <color name="rote_line_color">#00C478</color>
+    <color name="light_yellow_color">#F9FFE8</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -1058,7 +1058,6 @@
     <string name="txt_tracker_offline">Tracker Offline. Unable to proceed.</string>
     <string name="txt_tracker_live">Live stream in progress. Settings unavailable.</string>
     <string name="txt_abnormity">Operation failed. Please try again.</string>
-
     <string name="txt_per_day">/day</string>
     <string name="txt_renewal_day">Renewal: $%s/%s day on %s</string>
     <string name="txt_day_unit">/day x%s</string>
@@ -1069,5 +1068,8 @@
     <string name="txt_auto_subscription_years">(Renew at $%s/%s years thereafter)</string>
     <string name="txt_auto_subscription_months">(Renew at $%s/%s months thereafter)</string>
     <string name="txt_tone">Tone</string>
+    <string name="txt_locate_works">Locate works on cellular only</string>
+    <string name="txt_pet_close">Pet is close, try Radar</string>
+
 
 </resources>