[拆包]修改电池信息界面

app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryInfoActivity.kt

@@ -26,10 +26,10 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
     private val adAdapter = AdAdapter(R.layout.item_ad)
 
     private val batteryInfoList = listOf(
-        BatteryInfoBean(R.drawable.icon_current_average, "37.5℃", "Temperature"),
-        BatteryInfoBean(R.drawable.icon_voltage, "3.6V", "Voltage"),
-        BatteryInfoBean(R.drawable.icon_technology, "Li-Poly", "Technology"),
-        BatteryInfoBean(R.drawable.icon_battery, "0mAh", "Battery Capacity"),
+        BatteryInfoBean(R.drawable.icon_good, "GOOD", "Battery Health"),
+        BatteryInfoBean(R.drawable.icon_mah, "0 mAh / 0 mAh", "Battery Capacity"),
+        BatteryInfoBean(R.drawable.icon_li, "Li-ion", "Battery Type"),
+        BatteryInfoBean(R.drawable.icon_mv, "3818 mV", "Voltage"),
 //        BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
 //        BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
     )
@@ -138,13 +138,10 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
         )
 
 
-        val temperature = Utils.divide(BatteryReceiver.temperature, 10)
-        batteryInfoList[0].tvValue = "$temperature℃"
+        batteryInfoList[1].tvValue = "${remainingCapacity.toInt()} / ${BatteryReceiver.mAh.toInt()} mAh"
 
-        val voltage = Utils.divide(BatteryReceiver.voltage, 1000)
-        batteryInfoList[1].tvValue = "${voltage}V"
-
-        batteryInfoList[3].tvValue = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
+        val voltage = Utils.divide(BatteryReceiver.voltage, 1)
+        batteryInfoList[3].tvValue = "$voltage mV"
 
 
         batteryInfoAdapter.submitList(listOf(batteryInfoList))

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#F7F8FC" />
+    <corners android:radius="@dimen/dp_10" />
+
+</shape>
\ No newline at end of file

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

@@ -17,19 +17,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/dp_16"
-            android:src="@drawable/icon_return_b" />
+            android:src="@drawable/icon_back" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/dp_66"
             android:text="@string/battery_info"
             android:textColor="@color/black"
             android:textSize="20sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/fl_back"
-            app:layout_constraintStart_toEndOf="@id/fl_back"
-            app:layout_constraintTop_toTopOf="@id/fl_back" />
+
+            android:textStyle="bold" />
 
     </FrameLayout>
 
@@ -44,7 +43,6 @@
     </androidx.recyclerview.widget.RecyclerView>
 
     <TextView
-        android:visibility="invisible"
         android:id="@+id/tvBtn"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_45"
@@ -57,6 +55,7 @@
         android:textColor="@color/white"
         android:textSize="@dimen/sp_17"
         android:textStyle="bold"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent" />
 
     <include

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/dp_16"
-    android:layout_marginTop="@dimen/dp_16">
+    android:layout_marginTop="@dimen/dp_40">
 
     <TextView
         android:id="@+id/tv"

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

@@ -5,6 +5,7 @@
     android:layout_height="@dimen/dp_98"
     android:layout_marginHorizontal="@dimen/dp_16"
     android:layout_marginTop="@dimen/dp_16"
+    android:layout_marginBottom="@dimen/dp_20"
     app:cardBackgroundColor="#F0FFFA"
     app:cardCornerRadius="@dimen/dp_10">
 

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

@@ -3,41 +3,43 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tool="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_90"
-    android:layout_marginHorizontal="@dimen/dp_8"
+    android:layout_height="@dimen/dp_112"
+    android:layout_marginHorizontal="@dimen/dp_4"
     android:layout_marginVertical="@dimen/dp_5"
-    android:background="@drawable/bg_ffffff_8"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:background="@drawable/bg_f7f8fc_10"
+    android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv"
-        android:layout_width="@dimen/dp_45"
-        android:layout_height="@dimen/dp_45"
-        android:layout_marginStart="@dimen/dp_15" />
+        android:layout_width="@dimen/dp_30"
+        android:layout_height="@dimen/dp_30"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="@dimen/dp_20" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/dp_8"
-        android:layout_weight="1"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_4"
+        android:layout_marginEnd="@dimen/dp_12"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/tvValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_18"
-            tool:text="3.6v" />
+            android:textColor="#262626"
+            android:textSize="@dimen/sp_16"
+            tool:text="GOOD" />
 
         <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_4"
-            android:textColor="@color/color_666666"
-            android:textSize="@dimen/sp_12"
+            android:textColor="#A0A0A0"
+            android:textSize="@dimen/sp_14"
             tool:text="Voltage" />
 
     </LinearLayout>

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

@@ -56,4 +56,6 @@
     <dimen name="dp_1">1dp</dimen>
     <dimen name="sp_22">22sp</dimen>
     <dimen name="sp_11">11sp</dimen>
+    <dimen name="dp_112">112dp</dimen>
+    <dimen name="dp_66">66dp</dimen>
 </resources>
\ No newline at end of file