diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ab1c27c..6452a95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -74,7 +74,10 @@ android:name=".watcher.ui.LightSettingActivity" android:exported="false" android:screenOrientation="landscape"/> - + } } 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 index 762cbfa..c4abdd9 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt @@ -21,7 +21,12 @@ class SensorSettingActivity : NoOptionsActivity() { override fun initView() { mBinding.tvWarnSetting.setOnClickListener { -// startActivity(Intent(this@SensorSettingActivity, )) + startActivity( + Intent( + this@SensorSettingActivity, + SensorThresholdSetActivity::class.java + ) + ) } } } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt new file mode 100644 index 0000000..1381343 --- /dev/null +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.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.ActivitySensorThresholdBinding +import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity + +class SensorThresholdSetActivity : NoOptionsActivity() { + private val mBinding by lazy { + ActivitySensorThresholdBinding.inflate(layoutInflater) + } + + override fun getTopBarTitle(): String? { + return getString(R.string.sensor_threshold_setting) + } + + override fun generateContentView(): View { + return mBinding.root + } + + override fun initView() { + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index bd4cb7e..fe62559 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -129,4 +129,15 @@ android:layout_marginStart="@dimen/_13dp" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sensor_threshold.xml b/app/src/main/res/layout/activity_sensor_threshold.xml new file mode 100644 index 0000000..d829e29 --- /dev/null +++ b/app/src/main/res/layout/activity_sensor_threshold.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a26e219..7f368d1 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -45,4 +45,5 @@ 38px 20px 17px + 300px \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 15700b6..26489ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,6 +12,7 @@ 传感器 传感器数据详情 传感器设置 + 传感器阈值设置 云平台 网络参数设置 恢复出厂设置