desc:activitys

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".watcher.HomeActivity"
+            android:name=".watcher.ui.HomeActivity"
             android:exported="true"
             android:screenOrientation="landscape">
             <intent-filter>
@@ -39,17 +39,43 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".watcher.SettingActivity"
+            android:name=".watcher.ui.SettingActivity"
             android:exported="false"
             android:screenOrientation="landscape"/>
         <activity
-            android:name=".watcher.CloudActivity"
+            android:name=".watcher.ui.CloudActivity"
             android:exported="false"
             android:screenOrientation="landscape"/>
         <activity
-            android:name=".watcher.WarnDataActivity"
+            android:name=".watcher.ui.WarnDataActivity"
             android:exported="false"
             android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.SensorActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.SensorDataActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.SensorSettingActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.QueryDataActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.TimeSettingActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:name=".watcher.ui.LightSettingActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"/>
+
+
         <activity
             android:name=".MainActivity"
             android:exported="false"

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

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher
+package com.yinuo.safetywatcher.watcher.ui
 
 import android.view.View
 import com.yinuo.safetywatcher.R

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

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher
+package com.yinuo.safetywatcher.watcher.ui
 
 import android.content.Intent
 import android.os.Build

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.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.ActivityLightSettingBinding
+import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class LightSettingActivity : NoOptionsActivity() {
+
+    private val mBingding by lazy {
+        ActivityLightSettingBinding.inflate(layoutInflater)
+    }
+
+    override fun getTopBarTitle(): String? {
+        return getString(R.string.light_setting)
+    }
+
+    override fun generateContentView(): View {
+        return mBingding.root
+    }
+
+    override fun initView() {
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivityQueryDataBinding
+import com.yinuo.safetywatcher.watcher.base.BaseActivity
+import com.yinuo.safetywatcher.watcher.view.CommonTopBar
+
+class QueryDataActivity : BaseActivity() {
+
+    private val mBinding by lazy {
+        ActivityQueryDataBinding.inflate(layoutInflater)
+    }
+
+    override fun onOptionClick(type: Int, target: View) {
+        if (0 == type) {
+
+        } else if (1 == type) {
+
+        }
+    }
+
+    override fun getOptions(): List<CommonTopBar.Option>? {
+        val ops = mutableListOf<CommonTopBar.Option>()
+        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() {
+    }
+}

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() {
+    }
+}

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() {
+    }
+}

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() {
+    }
+}

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 { }
+            itemTime.setOnClickListener {
-            itemLight.setOnClickListener { }
+                startActivity(Intent(this@SettingActivity, TimeSettingActivity::class.java))
-            itemQuery.setOnClickListener { }
+            }
+            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 { }
+            itemNet.setOnClickListener {
-            itemRecovery.setOnClickListener { }
+
+            }
+            itemRecovery.setOnClickListener {
+
+            }
         }
     }
 }

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() {
+    }
+}

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) {

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,6 @@
+<?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="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -10,6 +10,8 @@
     <string name="query_data">查询数据</string>
     <string name="warn_data">报警数据</string>
     <string name="sensor">传感器</string>
+    <string name="sensor_data">传感器数据详情</string>
+    <string name="sensor_setting">传感器设置</string>
     <string name="cloud">云平台</string>
     <string name="nei_setting">网络参数设置</string>
     <string name="recovery_setting">传感器回复出厂设置</string>