desc:适配1920*1200屏幕

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt

@@ -67,7 +67,7 @@ abstract class BaseActivity : AppCompatActivity() {
         )
         if (!isHome) {
             val params = contentView.layoutParams as RelativeLayout.LayoutParams
-            params.topMargin = 87
+            params.topMargin = 120
         }
     }
 

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt

@@ -61,7 +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()
+            mBinding?.batteryTxt?.text = "${level.toString()}%"
         }
     }
 

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

@@ -9,7 +9,7 @@
     <com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
         android:id="@+id/topBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/_87dp"/>
+        android:layout_height="@dimen/_120dp"/>
 
     <RelativeLayout
         android:id="@+id/area_sound"

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

@@ -29,7 +29,7 @@
         android:layout_height="@dimen/_536dp"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/_21dp"
-        android:layout_marginTop="@dimen/_185dp"
+        android:layout_marginTop="@dimen/_260dp"
         android:background="@color/_242f4d_30"
         android:orientation="vertical"
         android:paddingTop="@dimen/_68dp">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/_87dp"
+    android:layout_height="@dimen/_120dp"
     android:background="@color/_242f4d"
     android:gravity="center_vertical"
     android:orientation="horizontal">
@@ -51,9 +51,11 @@
         android:textColor="@color/white"
         android:textSize="@dimen/_30dp" />
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_marginStart="@dimen/_40dp">
 
         <ImageView
@@ -63,13 +65,15 @@
             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:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_6dp"
+            android:textColor="@color/white"
             android:gravity="center"
+            android:textSize="@dimen/_23dp"
             android:text="60"/>
 
-    </RelativeLayout>
+    </LinearLayout>
 
     <ImageView
         android:id="@+id/wifi"

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

@@ -7,7 +7,7 @@
     <color name="white">#ffffff</color>
     <color name="white_20">#33ffffff</color>
     <color name="white_30">#4Cffffff</color>
-    <color name="colorTheme">#242F4D</color>
+    <color name="colorTheme">#1ED5CA</color>
     <color name="black_overlay">#66000000</color>
 
 

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

@@ -60,4 +60,5 @@
     <dimen name="_320dp">320px</dimen>
     <dimen name="_1920dp">1920px</dimen>
     <dimen name="_1080dp">1080px</dimen>
+    <dimen name="_120dp">120px</dimen>
 </resources>

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

@@ -7,6 +7,7 @@
         <item name="colorPrimaryDark">@color/colorTheme</item><!--状态栏颜色-->
         <item name="colorAccent">@color/colorTheme</item><!--控制各个控件被选中时的颜色-->
         <item name="toolbarStyle">@style/toolbar</item>
+        <item name="android:windowFullscreen">true</item>
         <item name="android:windowBackground">@null</item>
     </style>