diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
index 4f88228..b9a601a 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
@@ -1,6 +1,7 @@
package com.yinuo.safetywatcher.watcher
import android.view.View
+import com.yinuo.safetywatcher.R
import com.yinuo.safetywatcher.databinding.ActivitySettingBinding
import com.yinuo.safetywatcher.watcher.base.BaseActivity
@@ -15,5 +16,6 @@ class SettingActivity: BaseActivity() {
}
override fun initView() {
+ setTitle(getString(R.string.setting))
}
}
\ No newline at end of file
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 c98efb8..0ce017b 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
@@ -20,4 +20,8 @@ abstract class BaseActivity : AppCompatActivity() {
open abstract fun generateContentView(): View
abstract fun initView()
+
+ fun setTitle(title: String) {
+ baseBinding.topBar.setTitle(title)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt
index d581b1c..5358f52 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt
@@ -1,9 +1,14 @@
package com.yinuo.safetywatcher.watcher.view
+import android.app.Activity
import android.content.Context
import android.graphics.Color
+import android.opengl.Visibility
import android.util.AttributeSet
+import android.view.LayoutInflater
import android.widget.LinearLayout
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.LayoutTopbarBinding
class CommonTopBar : LinearLayout {
constructor(context: Context?) : this(context, null)
@@ -14,8 +19,26 @@ class CommonTopBar : LinearLayout {
defStyleAttr
)
+ var mBinding: LayoutTopbarBinding? = null
+
init {
//初始化方法
- setBackgroundColor(Color.RED)
+ val root = LayoutInflater.from(context).inflate(R.layout.layout_topbar, this)
+ mBinding = LayoutTopbarBinding.bind(root)
+
+ // 初始化隐藏返回栏
+ mBinding?.backArea?.visibility = GONE
+ mBinding?.backArea?.setOnClickListener {
+ if (context is Activity) {
+ (context as Activity).finish()
+ }
+ }
+ }
+
+
+ open fun setTitle(title: String) {
+ mBinding?.backArea?.visibility = VISIBLE
+ mBinding?.title?.text = title
}
+
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_topbar.xml b/app/src/main/res/layout/layout_topbar.xml
new file mode 100644
index 0000000..16c52ce
--- /dev/null
+++ b/app/src/main/res/layout/layout_topbar.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_back.png b/app/src/main/res/mipmap-hdpi/ic_back.png
new file mode 100644
index 0000000..fa3958d
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_back.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_cloud.png b/app/src/main/res/mipmap-hdpi/ic_cloud.png
new file mode 100644
index 0000000..2160d54
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_cloud.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_net.png b/app/src/main/res/mipmap-hdpi/ic_net.png
new file mode 100644
index 0000000..d653c22
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_net.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_sensor.png b/app/src/main/res/mipmap-hdpi/ic_sensor.png
new file mode 100644
index 0000000..3a3a65b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_sensor.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_sun.png b/app/src/main/res/mipmap-hdpi/ic_sun.png
new file mode 100644
index 0000000..66f2211
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_sun.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_time.png b/app/src/main/res/mipmap-hdpi/ic_time.png
new file mode 100644
index 0000000..687efef
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_time.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_back.png b/app/src/main/res/mipmap-mdpi/ic_back.png
new file mode 100644
index 0000000..ece60d6
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_back.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_cloud.png b/app/src/main/res/mipmap-mdpi/ic_cloud.png
new file mode 100644
index 0000000..d24ff45
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_cloud.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_net.png b/app/src/main/res/mipmap-mdpi/ic_net.png
new file mode 100644
index 0000000..fa984fc
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_net.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_sensor.png b/app/src/main/res/mipmap-mdpi/ic_sensor.png
new file mode 100644
index 0000000..8be6b0c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_sensor.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_sun.png b/app/src/main/res/mipmap-mdpi/ic_sun.png
new file mode 100644
index 0000000..52b5f0f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_sun.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_time.png b/app/src/main/res/mipmap-mdpi/ic_time.png
new file mode 100644
index 0000000..9af20a0
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_time.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_back.png b/app/src/main/res/mipmap-xhdpi/ic_back.png
new file mode 100644
index 0000000..742fdd1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_cloud.png b/app/src/main/res/mipmap-xhdpi/ic_cloud.png
new file mode 100644
index 0000000..a077e22
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_cloud.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_net.png b/app/src/main/res/mipmap-xhdpi/ic_net.png
new file mode 100644
index 0000000..233dcc9
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_net.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_sensor.png b/app/src/main/res/mipmap-xhdpi/ic_sensor.png
new file mode 100644
index 0000000..6c1b36c
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_sensor.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_sun.png b/app/src/main/res/mipmap-xhdpi/ic_sun.png
new file mode 100644
index 0000000..212c577
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_sun.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_time.png b/app/src/main/res/mipmap-xhdpi/ic_time.png
new file mode 100644
index 0000000..a309793
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_time.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_back.png b/app/src/main/res/mipmap-xxhdpi/ic_back.png
new file mode 100644
index 0000000..6856ab9
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_back.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cloud.png b/app/src/main/res/mipmap-xxhdpi/ic_cloud.png
new file mode 100644
index 0000000..5fefb01
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_cloud.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_net.png b/app/src/main/res/mipmap-xxhdpi/ic_net.png
new file mode 100644
index 0000000..9026622
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_net.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sensor.png b/app/src/main/res/mipmap-xxhdpi/ic_sensor.png
new file mode 100644
index 0000000..0310b31
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_sensor.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sun.png b/app/src/main/res/mipmap-xxhdpi/ic_sun.png
new file mode 100644
index 0000000..6839692
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_sun.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_time.png b/app/src/main/res/mipmap-xxhdpi/ic_time.png
new file mode 100644
index 0000000..c371ed3
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_time.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 0327e13..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 68ebe33..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index bacd3e7..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 16cf2af..b6d06c1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
+ 16px
87px
288px
536px
@@ -13,4 +14,10 @@
13px
34px
185px
+ 12px
+ 18px
+ 36px
+ 31px
+ 23px
+ 40px
\ No newline at end of file