From 00d0ef8438f9e3b1f0aa77d2511468fe33580e23 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 29 May 2023 14:38:34 +0800
Subject: [PATCH] =?UTF-8?q?desc:setting=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml             |   3 +-
 app/src/main/res/layout/activity_base.xml    |   3 +-
 app/src/main/res/layout/activity_setting.xml | 203 ++++++++++++++++++-
 app/src/main/res/values/colors.xml           |   1 +
 app/src/main/res/values/dimens.xml           |   4 +
 app/src/main/res/values/strings.xml          |   8 +
 6 files changed, 213 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ebd5a88..9159622 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
         </activity>
         <activity
             android:name=".watcher.SettingActivity"
-            android:exported="false"/>
+            android:exported="false"
+            android:screenOrientation="landscape"/>
         <activity
             android:name=".MainActivity"
             android:exported="false"
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
index 7f5cde8..6e6d85a 100644
--- a/app/src/main/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -3,7 +3,8 @@
     android:id="@+id/container"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/_303852">
 
     <com.yinuo.safetywatcher.watcher.view.CommonTopBar
         android:id="@+id/topBar"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index b242cee..c6db30d 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -6,25 +6,214 @@
     android:orientation="vertical"
     tools:ignore="MissingDefaultResource">
 
+    <LinearLayout
+        android:id="@+id/item_time"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_time" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/time_setting"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_light"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_sun" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/light_setting"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
     <LinearLayout
         android:id="@+id/item_query"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/_88dp"
+        android:layout_height="@dimen/_108dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/_66dp">
+        android:paddingStart="@dimen/_121dp">
 
         <ImageView
-            android:layout_width="@dimen/_29dp"
-            android:layout_height="@dimen/_29dp"
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
             android:src="@mipmap/ic_query" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/_13dp"
-            android:text="@string/query"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/query_data"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_wraning"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_wraning" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/warn_data"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_sensor"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_sensor" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/sensor"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_cloud"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_cloud" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/cloud"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_net"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_net" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/nei_setting"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_2dp"
+        android:background="@color/_242f4d" />
+
+    <LinearLayout
+        android:id="@+id/item_recovery"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/_121dp">
+
+        <ImageView
+            android:layout_width="@dimen/_32dp"
+            android:layout_height="@dimen/_32dp"
+            android:src="@mipmap/ic_recovery" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_21dp"
+            android:text="@string/recovery_setting"
             android:textColor="@color/white"
-            android:textSize="@dimen/_30dp" />
+            android:textSize="@dimen/_36dp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7fb04ba..22c0abb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,5 @@
 
     <color name="_242f4d">#242F4D</color>
     <color name="_242f4d_30">#4C242F4D</color>
+    <color name="_303852">#303852</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b6d06c1..b5c1d12 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,4 +20,8 @@
     <dimen name="_31dp">31px</dimen>
     <dimen name="_23dp">23px</dimen>
     <dimen name="_40dp">40px</dimen>
+    <dimen name="_108dp">108px</dimen>
+    <dimen name="_32dp">32px</dimen>
+    <dimen name="_121dp">121px</dimen>
+    <dimen name="_2dp">2px</dimen>
 </resources>
\ 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 1b69d07..a81bd2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,14 @@
     <string name="wraning">报警记录</string>
     <string name="recovery">报警重置</string>
     <string name="camera">摄像头</string>
+    <string name="time_setting">时间设置</string>
+    <string name="light_setting">背光设置</string>
+    <string name="query_data">查询数据</string>
+    <string name="warn_data">报警数据</string>
+    <string name="sensor">传感器</string>
+    <string name="cloud">云平台</string>
+    <string name="nei_setting">网络参数设置</string>
+    <string name="recovery_setting">传感器回复出厂设置</string>
 
 
     <string-array name="excel_column">