From 6c1e229183634610ab6bf35510e3bc7dc8bda24d Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 19 Oct 2023 17:28:39 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E7=94=B5=E9=87=8F=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../watcher/ui/view/CommonTopBar.kt           |  1 +
 app/src/main/res/layout/activity_home.xml     |  5 ++--
 app/src/main/res/layout/layout_topbar.xml     | 25 ++++++++++++++-----
 app/src/main/res/values/dimens.xml            |  2 ++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
index 7e3cfe0..a902201 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
@@ -61,6 +61,7 @@ class CommonTopBar : LinearLayout {
         override fun onLevel(level: Int) {
             Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level")
             mBinding?.battery?.setImageLevel(level)
+            mBinding?.batteryTxt?.text = level.toString()
         }
     }
 
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 99a54f8..1498a72 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -5,8 +5,9 @@
 
     <SurfaceView
         android:id="@+id/surface"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_width="@dimen/_1920dp"
+        android:layout_height="@dimen/_1080dp"
+        android:layout_alignParentBottom="true"/>
 
     <ImageView
         android:id="@+id/error_view"
diff --git a/app/src/main/res/layout/layout_topbar.xml b/app/src/main/res/layout/layout_topbar.xml
index 205ef7a..27c6685 100644
--- a/app/src/main/res/layout/layout_topbar.xml
+++ b/app/src/main/res/layout/layout_topbar.xml
@@ -51,12 +51,25 @@
         android:textColor="@color/white"
         android:textSize="@dimen/_30dp" />
 
-    <ImageView
-        android:id="@+id/battery"
-        android:layout_width="@dimen/_50dp"
-        android:layout_height="@dimen/_27dp"
-        android:layout_marginStart="@dimen/_40dp"
-        android:src="@drawable/battery"/>
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/_40dp">
+
+        <ImageView
+            android:id="@+id/battery"
+            android:layout_width="@dimen/_50dp"
+            android:layout_height="@dimen/_27dp"
+            android:src="@drawable/battery"/>
+        <TextView
+            android:id="@+id/battery_txt"
+            android:layout_width="@dimen/_50dp"
+            android:layout_height="@dimen/_27dp"
+            android:textColor="@color/red"
+            android:gravity="center"
+            android:text="60"/>
+
+    </RelativeLayout>
 
     <ImageView
         android:id="@+id/wifi"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3419dda..62fac6e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -58,4 +58,6 @@
     <dimen name="_28dp">28px</dimen>
     <dimen name="_580dp">580px</dimen>
     <dimen name="_320dp">320px</dimen>
+    <dimen name="_1920dp">1920px</dimen>
+    <dimen name="_1080dp">1080px</dimen>
 </resources>
\ No newline at end of file