From 180aee45c230fe8b61526ed52acbcc479e822dc5 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Thu, 27 Oct 2022 16:27:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2ui?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/nav/setup/NavSetUpFragment.java        |  24 +++-
 .../res/layout/main_nav_fragment_set_up.xml   | 124 ++++++++++++++++--
 app/src/main/res/values/setup_styles.xml      |  48 +++++++
 app/src/main/res/values/strings.xml           |  13 ++
 4 files changed, 194 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/values/setup_styles.xml

diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java
index 9d499c1..74e92fe 100644
--- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java
+++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java
@@ -6,13 +6,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.ViewModelProvider;
 
+import cc.niushuai.project.devcontrol.base.ui.BaseFragment;
 import cc.niushuai.project.devcontrol.databinding.MainNavFragmentSetUpBinding;
 
-
-public class NavSetUpFragment extends Fragment {
+public class NavSetUpFragment extends BaseFragment {
 
     private MainNavFragmentSetUpBinding navFragmentSetUpBinding;
 
@@ -20,18 +22,26 @@ public class NavSetUpFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        navFragmentSetUpBinding = MainNavFragmentSetUpBinding.inflate(inflater, container, false);
+        navFragmentSetUpBinding = MainNavFragmentSetUpBinding.inflate(getLayoutInflater());
 
-        NavSetUpViewModel navSetUpViewModel = new ViewModelProvider(this).get(NavSetUpViewModel.class);
         View rootView = navFragmentSetUpBinding.getRoot();
 
-        TextView textView = navFragmentSetUpBinding.navSetupFragmentTextview;
-
-        navSetUpViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        this.init();
+        this.addListener();
 
+        rootView.requestLayout();
         return rootView;
     }
 
+    private void addListener() {
+
+    }
+
+    private void init() {
+
+    }
+
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
diff --git a/app/src/main/res/layout/main_nav_fragment_set_up.xml b/app/src/main/res/layout/main_nav_fragment_set_up.xml
index aeac68d..8f01d42 100644
--- a/app/src/main/res/layout/main_nav_fragment_set_up.xml
+++ b/app/src/main/res/layout/main_nav_fragment_set_up.xml
@@ -6,15 +6,123 @@
     android:layout_height="match_parent"
     tools:context=".ui.nav.setup.NavSetUpFragment">
 
-    <TextView
-        android:id="@+id/nav_setup_fragment_textview"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment"
-        android:textAlignment="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginTop="10dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <!--通用-->
+            <LinearLayout
+                android:id="@+id/setup_ll_general"
+                style="@style/SetupTitleLL">
+
+                <TextView
+                    style="@style/SetupTitle"
+                    android:text="@string/setup_general" />
+            </LinearLayout>
+
+            <!--备份-->
+            <LinearLayout
+                android:id="@+id/setup_ll_general_backup"
+                style="@style/SetupTextLL"
+                android:layout_below="@id/setup_ll_general">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    style="@style/SetupIcon"
+                    app:srcCompat="@drawable/ic_backup" />
+
+                <TextView
+                    android:id="@+id/setup_general_backup"
+                    style="@style/SetupText"
+                    android:text="@string/setup_general_backup" />
+
+            </LinearLayout>
+
+            <!--恢复-->
+            <LinearLayout
+                android:id="@+id/setup_ll_general_restore"
+                style="@style/SetupTextLL"
+                android:layout_below="@id/setup_ll_general_backup">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    style="@style/SetupIcon"
+                    app:srcCompat="@drawable/ic_restore" />
+
+                <TextView
+                    android:id="@+id/setup_general_restore"
+                    style="@style/SetupText"
+                    android:text="@string/setup_general_restore" />
+
+            </LinearLayout>
+
+            <!--日志-->
+            <LinearLayout
+                android:id="@+id/setup_ll_log"
+                style="@style/SetupTitleLL"
+                android:layout_below="@id/setup_ll_general_restore">
+
+                <TextView
+                    style="@style/SetupTitle"
+                    android:text="@string/setup_log" />
+            </LinearLayout>
+
+            <!--总开关-->
+            <LinearLayout
+                android:id="@+id/setup_ll_log_switch"
+                style="@style/SetupTextLL"
+                android:layout_below="@id/setup_ll_log">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    style="@style/SetupIcon"
+                    app:srcCompat="@drawable/ic_lock" />
+
+                <TextView
+                    android:id="@+id/setup_log_switch"
+                    style="@style/SetupText"
+                    android:text="@string/setup_log_switch" />
+
+            </LinearLayout>
+
+            <!--总开关-->
+            <LinearLayout
+                android:id="@+id/setup_ll_log_level"
+                style="@style/SetupTextLL"
+                android:layout_below="@id/setup_ll_log_switch">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    style="@style/SetupIcon"
+                    app:srcCompat="@drawable/ic_level" />
+
+                <TextView
+                    android:id="@+id/setup_log_level"
+                    style="@style/SetupText"
+                    android:text="@string/setup_log_level" />
+
+            </LinearLayout>
+
+            <!--总开关-->
+            <LinearLayout
+                android:id="@+id/setup_ll_log_keep_day"
+                style="@style/SetupTextLL"
+                android:layout_below="@id/setup_ll_log_level">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    style="@style/SetupIcon"
+                    app:srcCompat="@drawable/ic_log_keep_day" />
+
+                <TextView
+                    android:id="@+id/setup_log_keep_day"
+                    style="@style/SetupText"
+                    android:text="@string/setup_log_keep_day" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </ScrollView>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/setup_styles.xml b/app/src/main/res/values/setup_styles.xml
new file mode 100644
index 0000000..e30ddd9
--- /dev/null
+++ b/app/src/main/res/values/setup_styles.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--不可点击的title外层布局-->
+    <style name="SetupTitleLL">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">25dp</item>
+        <item name="android:background">@color/main_bg_color</item>
+    </style>
+
+    <!--不可点击的title-->
+    <style name="SetupTitle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">12dp</item>
+        <item name="android:textColor">#FFBB86FC</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+
+    <!--==========================================================================-->
+    <!--==========================================================================-->
+    <!--==========================================================================-->
+
+    <!--可点击的tv外层布局-->
+    <style name="SetupTextLL">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:orientation">horizontal</item>
+    </style>
+
+    <!--可点击的文本-->
+    <style name="SetupText">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">16dp</item>.
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_marginLeft">5dp</item>
+    </style>
+
+    <!--icon-->
+    <style name="SetupIcon">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+</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 ccd079a..71e2bf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,19 @@
     <string name="test_btn_2">btn 2</string>
     <string name="test_btn_3">btn 3</string>
     <!--测试字符串 end-->
+
+
+    <!--设置页面 start-->
+    <string name="setup_general">通用</string>
+    <string name="setup_general_backup">备份</string>
+    <string name="setup_general_restore">恢复</string>
+    <string name="setup_log">日志</string>
+    <string name="setup_log_switch">总开关</string>
+    <string name="setup_log_level">日志级别</string>
+    <string name="setup_log_keep_day">保留天数</string>
+    <!--设置页面 end-->
+
+
     <!-- 首页 底部导航栏 start-->
     <string name="title_bottom_nav_menu_device">设备</string>
     <string name="title_bottom_nav_menu_log">日志</string>