diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
index 71bb403..a16a272 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
+++ b/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
}
}
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 a902201..922d5c4 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,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()}%"
}
}
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
index 4718487..5f96f6b 100644
--- a/app/src/main/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -9,7 +9,7 @@
+ android:layout_height="@dimen/_120dp"/>
diff --git a/app/src/main/res/layout/layout_topbar.xml b/app/src/main/res/layout/layout_topbar.xml
index 27c6685..0311bb4 100644
--- a/app/src/main/res/layout/layout_topbar.xml
+++ b/app/src/main/res/layout/layout_topbar.xml
@@ -1,7 +1,7 @@
@@ -51,9 +51,11 @@
android:textColor="@color/white"
android:textSize="@dimen/_30dp" />
-
-
+
#ffffff
#33ffffff
#4Cffffff
- #242F4D
+ #1ED5CA
#66000000
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 62fac6e..2583067 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -60,4 +60,5 @@
320px
1920px
1080px
+ 120px
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 70e8928..45a6703 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
- @color/colorTheme
- @color/colorTheme
- @style/toolbar
+ - true
- @null