diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e001ab0..ab1c27c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
@@ -39,17 +39,43 @@
+
+
+
+
+
+
+
+
? {
+ val ops = mutableListOf()
+ ops.add(CommonTopBar.Option(0, getString(R.string.search)))
+ ops.add(CommonTopBar.Option(1, getString(R.string.export)))
+ return ops
+ }
+
+ override fun getTopBarTitle(): String? {
+ return getString(R.string.query)
+ }
+
+ override fun generateContentView(): View {
+ return mBinding.root
+ }
+
+ override fun initView() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt
new file mode 100644
index 0000000..55e407e
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt
@@ -0,0 +1,24 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class SensorActivity : NoOptionsActivity() {
+
+ private val mBingding by lazy {
+ ActivitySensorBinding.inflate(layoutInflater)
+ }
+
+ override fun getTopBarTitle(): String? {
+ return getString(R.string.sensor)
+ }
+
+ override fun generateContentView(): View {
+ return mBingding.root
+ }
+
+ override fun initView() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorDataActivity.kt
new file mode 100644
index 0000000..6526cf8
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorDataActivity.kt
@@ -0,0 +1,23 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivitySensorDataBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class SensorDataActivity : NoOptionsActivity() {
+ private val mBingding by lazy {
+ ActivitySensorDataBinding.inflate(layoutInflater)
+ }
+
+ override fun getTopBarTitle(): String? {
+ return getString(R.string.sensor_data)
+ }
+
+ override fun generateContentView(): View {
+ return mBingding.root
+ }
+
+ override fun initView() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
new file mode 100644
index 0000000..79e7304
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
@@ -0,0 +1,23 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivitySensorSettingBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class SensorSettingActivity : NoOptionsActivity() {
+ private val mBingding by lazy {
+ ActivitySensorSettingBinding.inflate(layoutInflater)
+ }
+
+ override fun getTopBarTitle(): String? {
+ return getString(R.string.sensor_setting)
+ }
+
+ override fun generateContentView(): View {
+ return mBingding.root
+ }
+
+ override fun initView() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt
similarity index 55%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
rename to app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt
index 2e920a7..65006f7 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt
@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher
+package com.yinuo.safetywatcher.watcher.ui
import android.content.Intent
import android.view.View
@@ -22,18 +22,30 @@ class SettingActivity : NoOptionsActivity() {
override fun initView() {
mBinding.apply {
- itemTime.setOnClickListener { }
- itemLight.setOnClickListener { }
- itemQuery.setOnClickListener { }
+ itemTime.setOnClickListener {
+ startActivity(Intent(this@SettingActivity, TimeSettingActivity::class.java))
+ }
+ itemLight.setOnClickListener {
+ startActivity(Intent(this@SettingActivity, LightSettingActivity::class.java))
+ }
+ itemQuery.setOnClickListener {
+ startActivity(Intent(this@SettingActivity, QueryDataActivity::class.java))
+ }
itemWraning.setOnClickListener {
startActivity(Intent(this@SettingActivity, WarnDataActivity::class.java))
}
- itemSensor.setOnClickListener { }
+ itemSensor.setOnClickListener {
+ startActivity(Intent(this@SettingActivity, SensorActivity::class.java))
+ }
itemCloud.setOnClickListener {
startActivity(Intent(this@SettingActivity, CloudActivity::class.java))
}
- itemNet.setOnClickListener { }
- itemRecovery.setOnClickListener { }
+ itemNet.setOnClickListener {
+
+ }
+ itemRecovery.setOnClickListener {
+
+ }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt
new file mode 100644
index 0000000..eeedfff
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt
@@ -0,0 +1,25 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
+import com.yinuo.safetywatcher.databinding.ActivityTimeSettingBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class TimeSettingActivity : NoOptionsActivity() {
+
+ private val mBingding by lazy {
+ ActivityTimeSettingBinding.inflate(layoutInflater)
+ }
+
+ override fun getTopBarTitle(): String? {
+ return getString(R.string.time_setting)
+ }
+
+ override fun generateContentView(): View {
+ return mBingding.root
+ }
+
+ override fun initView() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
similarity index 91%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt
rename to app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
index dece239..0894718 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/WarnDataActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
@@ -1,6 +1,5 @@
-package com.yinuo.safetywatcher.watcher
+package com.yinuo.safetywatcher.watcher.ui
-import android.util.Log
import android.view.View
import com.yinuo.safetywatcher.R
import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
@@ -14,7 +13,6 @@ class WarnDataActivity : BaseActivity() {
}
override fun onOptionClick(type: Int, target: View) {
- Log.i("cyy", "type = $type")
if (0 == type) {
} else if (1 == type) {
diff --git a/app/src/main/res/layout/activity_light_setting.xml b/app/src/main/res/layout/activity_light_setting.xml
new file mode 100644
index 0000000..d829e29
--- /dev/null
+++ b/app/src/main/res/layout/activity_light_setting.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_query_data.xml b/app/src/main/res/layout/activity_query_data.xml
new file mode 100644
index 0000000..41d2ef1
--- /dev/null
+++ b/app/src/main/res/layout/activity_query_data.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sensor.xml b/app/src/main/res/layout/activity_sensor.xml
new file mode 100644
index 0000000..d829e29
--- /dev/null
+++ b/app/src/main/res/layout/activity_sensor.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sensor_data.xml b/app/src/main/res/layout/activity_sensor_data.xml
new file mode 100644
index 0000000..d829e29
--- /dev/null
+++ b/app/src/main/res/layout/activity_sensor_data.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sensor_setting.xml b/app/src/main/res/layout/activity_sensor_setting.xml
new file mode 100644
index 0000000..d829e29
--- /dev/null
+++ b/app/src/main/res/layout/activity_sensor_setting.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_time_setting.xml b/app/src/main/res/layout/activity_time_setting.xml
new file mode 100644
index 0000000..d829e29
--- /dev/null
+++ b/app/src/main/res/layout/activity_time_setting.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ 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
index fa3958d..6856ab9 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_back.png 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
index 2160d54..5fefb01 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_cloud.png and b/app/src/main/res/mipmap-hdpi/ic_cloud.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 5507303..6f67f21 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 4e526c9..78a6b7a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 8fab6a3..8bac0f2 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_net.png b/app/src/main/res/mipmap-hdpi/ic_net.png
index d653c22..9026622 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_net.png and b/app/src/main/res/mipmap-hdpi/ic_net.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_query.png b/app/src/main/res/mipmap-hdpi/ic_query.png
index e5317a9..e91b196 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_query.png and b/app/src/main/res/mipmap-hdpi/ic_query.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_recovery.png b/app/src/main/res/mipmap-hdpi/ic_recovery.png
index f1e7dca..14b96ef 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_recovery.png and b/app/src/main/res/mipmap-hdpi/ic_recovery.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_sensor.png b/app/src/main/res/mipmap-hdpi/ic_sensor.png
index 3a3a65b..0310b31 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_sensor.png and b/app/src/main/res/mipmap-hdpi/ic_sensor.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_setting.png b/app/src/main/res/mipmap-hdpi/ic_setting.png
index 0c426eb..1b29f36 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_setting.png and b/app/src/main/res/mipmap-hdpi/ic_setting.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_sun.png b/app/src/main/res/mipmap-hdpi/ic_sun.png
index 66f2211..6839692 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_sun.png 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
index 687efef..c371ed3 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_time.png and b/app/src/main/res/mipmap-hdpi/ic_time.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_wraning.png b/app/src/main/res/mipmap-hdpi/ic_wraning.png
index 76f27cc..9440834 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_wraning.png and b/app/src/main/res/mipmap-hdpi/ic_wraning.png differ
diff --git a/app/src/main/res/mipmap-hdpi/op_bg.png b/app/src/main/res/mipmap-hdpi/op_bg.png
index 00fea8b..6976d27 100644
Binary files a/app/src/main/res/mipmap-hdpi/op_bg.png and b/app/src/main/res/mipmap-hdpi/op_bg.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_back.png b/app/src/main/res/mipmap-mdpi/ic_back.png
deleted file mode 100644
index ece60d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_cloud.png b/app/src/main/res/mipmap-mdpi/ic_cloud.png
deleted file mode 100644
index d24ff45..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_cloud.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 6bc7fcd..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 2c38c71..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 1eecc0e..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_net.png b/app/src/main/res/mipmap-mdpi/ic_net.png
deleted file mode 100644
index fa984fc..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_net.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_query.png b/app/src/main/res/mipmap-mdpi/ic_query.png
deleted file mode 100644
index 8c6753e..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_query.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_recovery.png b/app/src/main/res/mipmap-mdpi/ic_recovery.png
deleted file mode 100644
index c68610c..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_recovery.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_sensor.png b/app/src/main/res/mipmap-mdpi/ic_sensor.png
deleted file mode 100644
index 8be6b0c..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_sensor.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_setting.png b/app/src/main/res/mipmap-mdpi/ic_setting.png
deleted file mode 100644
index e6be287..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_setting.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_sun.png b/app/src/main/res/mipmap-mdpi/ic_sun.png
deleted file mode 100644
index 52b5f0f..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_sun.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_time.png b/app/src/main/res/mipmap-mdpi/ic_time.png
deleted file mode 100644
index 9af20a0..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_time.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_wraning.png b/app/src/main/res/mipmap-mdpi/ic_wraning.png
deleted file mode 100644
index a07b84e..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_wraning.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/op_bg.png b/app/src/main/res/mipmap-mdpi/op_bg.png
deleted file mode 100644
index 380e884..0000000
Binary files a/app/src/main/res/mipmap-mdpi/op_bg.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_back.png b/app/src/main/res/mipmap-xhdpi/ic_back.png
deleted file mode 100644
index 742fdd1..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_cloud.png b/app/src/main/res/mipmap-xhdpi/ic_cloud.png
deleted file mode 100644
index a077e22..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_cloud.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index ec87dce..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 072467e..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 05ca079..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_net.png b/app/src/main/res/mipmap-xhdpi/ic_net.png
deleted file mode 100644
index 233dcc9..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_net.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_query.png b/app/src/main/res/mipmap-xhdpi/ic_query.png
deleted file mode 100644
index 0a6ce7c..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_query.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_recovery.png b/app/src/main/res/mipmap-xhdpi/ic_recovery.png
deleted file mode 100644
index 8b31f4f..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_recovery.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_sensor.png b/app/src/main/res/mipmap-xhdpi/ic_sensor.png
deleted file mode 100644
index 6c1b36c..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_sensor.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_setting.png b/app/src/main/res/mipmap-xhdpi/ic_setting.png
deleted file mode 100644
index 3d60d34..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_setting.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_sun.png b/app/src/main/res/mipmap-xhdpi/ic_sun.png
deleted file mode 100644
index 212c577..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_sun.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_time.png b/app/src/main/res/mipmap-xhdpi/ic_time.png
deleted file mode 100644
index a309793..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_time.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_wraning.png b/app/src/main/res/mipmap-xhdpi/ic_wraning.png
deleted file mode 100644
index 704d4ae..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_wraning.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/op_bg.png b/app/src/main/res/mipmap-xhdpi/op_bg.png
deleted file mode 100644
index 6c79453..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/op_bg.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_back.png b/app/src/main/res/mipmap-xxhdpi/ic_back.png
deleted file mode 100644
index 6856ab9..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cloud.png b/app/src/main/res/mipmap-xxhdpi/ic_cloud.png
deleted file mode 100644
index 5fefb01..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_cloud.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6f67f21..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 78a6b7a..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 8bac0f2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_net.png b/app/src/main/res/mipmap-xxhdpi/ic_net.png
deleted file mode 100644
index 9026622..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_net.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_query.png b/app/src/main/res/mipmap-xxhdpi/ic_query.png
deleted file mode 100644
index e91b196..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_query.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_recovery.png b/app/src/main/res/mipmap-xxhdpi/ic_recovery.png
deleted file mode 100644
index 14b96ef..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_recovery.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sensor.png b/app/src/main/res/mipmap-xxhdpi/ic_sensor.png
deleted file mode 100644
index 0310b31..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_sensor.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting.png b/app/src/main/res/mipmap-xxhdpi/ic_setting.png
deleted file mode 100644
index 1b29f36..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_setting.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sun.png b/app/src/main/res/mipmap-xxhdpi/ic_sun.png
deleted file mode 100644
index 6839692..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_sun.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_time.png b/app/src/main/res/mipmap-xxhdpi/ic_time.png
deleted file mode 100644
index c371ed3..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_time.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_wraning.png b/app/src/main/res/mipmap-xxhdpi/ic_wraning.png
deleted file mode 100644
index 9440834..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_wraning.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/op_bg.png b/app/src/main/res/mipmap-xxhdpi/op_bg.png
deleted file mode 100644
index 6976d27..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/op_bg.png and /dev/null differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 898e5de..d752ae9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
查询数据
报警数据
传感器
+ 传感器数据详情
+ 传感器设置
云平台
网络参数设置
传感器回复出厂设置