From 557f401aa757594a5f84795ef32a29acbd801f34 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Thu, 23 Nov 2023 10:13:44 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=B0=94=E6=B3=B5=E8=BD=AC=E9=80=9F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 + .../watcher/ui/SettingActivity.kt | 3 + .../watcher/ui/SpeedSettingActivity.kt | 61 +++ app/src/main/res/layout/activity_setting.xml | 506 +++++++++--------- .../res/layout/activity_speed_setting.xml | 63 +++ app/src/main/res/values/strings.xml | 1 + 6 files changed, 399 insertions(+), 239 deletions(-) create mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SpeedSettingActivity.kt create mode 100644 app/src/main/res/layout/activity_speed_setting.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5ff7689..99c1af4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -98,6 +98,10 @@ android:name=".watcher.ui.LightSettingActivity" android:exported="false" android:screenOrientation="landscape" /> + - + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical" + tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - - - - + + + + + + + + - + + + + + + + + - - - - - - + + + + + + + + - + + + + + + + + - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - + + + + + + + + - - - - - + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_speed_setting.xml b/app/src/main/res/layout/activity_speed_setting.xml new file mode 100644 index 0000000..5bde66d --- /dev/null +++ b/app/src/main/res/layout/activity_speed_setting.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + \ 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 c67409f..067fd35 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,6 +11,7 @@ 报警数据 历史视频 传感器 + 气泵转速设置 传感器数据详情 传感器设置 传感器阈值设置