1.增加led开关灯加载效果

2.修复蓝牙连接，充电还能开灯的bug
3.修复雷达页面，位置不更新bug
4.修复雷达页面，被分享和wifi内能开灯的bug
5.修复直播页面，wifi内能开灯的bug

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white_color1" />
+    <corners android:radius="@dimen/dp_32" />
+</shape>
+

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

@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="@dimen/dp_1"
-        android:color="@color/white_gray_color1" />
-    <corners android:radius="@dimen/dp_44" />
-</shape>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <stroke android:width="@dimen/dp_1" android:color="@color/white_gray_color1" />
+            <corners android:radius="@dimen/dp_44" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/grey_color" />
+            <stroke android:width="@dimen/dp_1" android:color="@color/white_gray_color1" />
+            <corners android:radius="@dimen/dp_44" />
+        </shape>
+    </item>
+</selector>
 

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

@@ -74,17 +74,46 @@
             </RelativeLayout>
 
 
-            <com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView
-                android:id="@+id/led_light_open_and_close"
-                style="@style/my_QMUICommonListItemView_style"
-                android:layout_marginTop="@dimen/dp_22"
-                app:qmui_accessory_type="switcher" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_58"
+                android:layout_marginTop="@dimen/dp_22">
 
-            <com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView
-                android:id="@+id/led_light_mode"
-                style="@style/my_QMUICommonListItemView_style"
-                android:layout_marginTop="@dimen/dp_10"
-                app:qmui_accessory_type="chevron" />
+                <com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView
+                    android:id="@+id/led_light_open_and_close"
+                    style="@style/my_QMUICommonListItemView_style"
+                    app:qmui_accessory_type="switcher" />
+
+                <include
+                    android:id="@+id/il_led_light_btn_state"
+                    layout="@layout/layout_led_btn_state"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/dp_20"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_58"
+                android:layout_marginTop="@dimen/dp_10">
+
+                <com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView
+                    android:id="@+id/led_light_mode"
+                    style="@style/my_QMUICommonListItemView_style"
+                    app:qmui_accessory_type="chevron" />
+
+                <com.qmuiteam.qmui.widget.QMUILoadingView
+                    android:id="@+id/lv_led_light_mode_loading"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:visibility="gone"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/dp_36" />
+            </RelativeLayout>
 
 
             <RelativeLayout

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

@@ -39,4 +39,13 @@
         android:textColor="@color/blue_color1"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_bold_font" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_home_pet_btn_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_2"
+        android:src="@drawable/icon_refresh"
+        android:tint="@color/grey_color"
+        android:visibility="gone" />
 </androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -10,9 +10,9 @@
     android:paddingVertical="@dimen/dp_8">
 
     <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_device_light_switch_title"
         style="@style/my_TextView_style_v2"
         android:layout_width="0dp"
-        android:id="@+id/tv_device_light_switch_title"
         android:layout_weight="1"
         android:drawableStart="@drawable/icon_light_svg"
         android:text="@string/txt_light"
@@ -22,4 +22,9 @@
     <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/cb_device_light_switch"
         style="@style/my_checkbox_switch_style" />
+
+    <include
+        android:id="@+id/il_device_light_btn_state"
+        layout="@layout/layout_led_btn_state"
+        android:visibility="gone" />
 </androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape32_grey_color_bg"
+    android:paddingHorizontal="@dimen/dp_16"
+    android:paddingVertical="@dimen/dp_4">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_led_btn_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_refresh"
+        android:tint="@color/grey_color" />
+</LinearLayout>

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

@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/dp_10"
-    android:background="@color/white">
+    android:background="@color/white"
+    android:paddingTop="@dimen/dp_10">
 
     <com.abbidot.tracker.widget.TypefaceTextView
         android:id="@+id/tv_live_v2_direction_title"
@@ -31,7 +31,6 @@
         android:layout_marginEnd="@dimen/dp_30"
         android:layout_marginBottom="@dimen/dp_32" />
 
-
     <com.abbidot.tracker.widget.TypefaceTextView
         android:id="@+id/tv_live_v2_speed"
         style="@style/my_TextView_style_v2"
@@ -100,9 +99,9 @@
         android:layout_above="@id/tv_live_v2_distance"
         android:layout_centerHorizontal="true"
         android:text="距离"
-        android:visibility="gone"
         android:textColor="@color/select_color3"
         android:textSize="@dimen/textSize12"
+        android:visibility="gone"
         app:typeface="@string/roboto_regular_font" />
 
     <com.abbidot.tracker.widget.TypefaceRoundButton

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

@@ -1073,4 +1073,6 @@
     <string name="txt_load_more_pull_text">Pull to load more</string>
     <string name="txt_load_more_release_text">Release to load</string>
 
+    <string name="txt_fully_charged">Fully charged</string>
+
 </resources>