From 4341935fc8e4a0bdb89786eb3f35e2ada51985ba Mon Sep 17 00:00:00 2001
From: huangwei <983142558@qq.com>
Date: Wed, 21 Aug 2024 20:14:43 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=86=9B=E6=B5=8B]=20=E5=A4=9C=E9=97=B4?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/bingce/controlnetwork/App.java   |  7 +++++++
 .../controlnetwork/newui/mefragment/MeFragment.kt      |  2 --
 .../res/layout/fragment_project_detail_list_layout.xml |  7 ++++++-
 app/src/main/res/layout/fragment_project_list.xml      |  1 -
 app/src/main/res/layout/new_fragment_me.xml            |  1 +
 app/src/main/res/values-night/colors.xml               | 10 ++++++++++
 app/src/main/res/values/color.xml                      |  3 +++
 app/src/main/res/values/styles.xml                     |  2 +-
 8 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/app/src/main/java/com/bingce/controlnetwork/App.java b/app/src/main/java/com/bingce/controlnetwork/App.java
index fc35294..901b971 100644
--- a/app/src/main/java/com/bingce/controlnetwork/App.java
+++ b/app/src/main/java/com/bingce/controlnetwork/App.java
@@ -9,6 +9,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
 
 import com.bingce.AppChannel;
@@ -143,6 +144,12 @@ public class App extends RepositoryBaseApp {
                 .translucent(false)
                 .dark(SettingValueUtil.isThemeDark());
         Colorful.init(this);
+
+        if (SettingValueUtil.isThemeDark()) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
     }
 
     private void restorePrefs() {
diff --git a/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt b/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt
index 1971a05..1004964 100644
--- a/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt
+++ b/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt
@@ -84,8 +84,6 @@ class MeFragment : BaseFragmentBinding<NewFragmentMeBinding>() {
         }
         mBinding.llAbout.setOnClickListener {
             //关于
-            Log.d("hwhw", "ss" + 5 / 0)
-
             startActivity(Intent(requireContext(), AboutActivity::class.java))
         }
         mBinding.llUser.setOnClickListener {
diff --git a/app/src/main/res/layout/fragment_project_detail_list_layout.xml b/app/src/main/res/layout/fragment_project_detail_list_layout.xml
index 7e61924..0f31eb8 100644
--- a/app/src/main/res/layout/fragment_project_detail_list_layout.xml
+++ b/app/src/main/res/layout/fragment_project_detail_list_layout.xml
@@ -16,6 +16,7 @@
         android:elevation="@dimen/default_elevation"
         app:dividerVisible="invisible"
         app:text="@string/control_point"
+        app:text_color="@color/text_color_1"
         app:text_size="@dimen/middle_text" />
 
     <com.bingce.controlnetwork.ui.widget.TextItemWithMore
@@ -27,6 +28,7 @@
         android:elevation="@dimen/default_elevation"
         app:dividerVisible="invisible"
         app:text="@string/unknown_point"
+        app:text_color="@color/text_color_1"
         app:text_size="@dimen/middle_text" />
 
     <LinearLayout
@@ -44,7 +46,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="30dp"
             android:text="@string/surveyor_station_list"
-            android:textSize="@dimen/middle_text" />
+            android:textSize="@dimen/middle_text"
+            app:text_color="@color/text_color_1" />
 
         <LinearLayout
             android:id="@+id/cycle_layout"
@@ -64,6 +67,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical|end"
                 android:maxLines="1"
+                app:text_color="@color/text_color_1"
                 tools:text="" />
 
             <ImageView
@@ -73,6 +77,7 @@
                 android:layout_margin="15dp"
                 android:layout_marginStart="10dp"
                 android:src="@drawable/ic_arrow_to_right_dark" />
+
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_project_list.xml b/app/src/main/res/layout/fragment_project_list.xml
index 13c2748..06c9e11 100644
--- a/app/src/main/res/layout/fragment_project_list.xml
+++ b/app/src/main/res/layout/fragment_project_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!-- A RecyclerView with some commonly used attributes -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/new_fragment_me.xml b/app/src/main/res/layout/new_fragment_me.xml
index b1fde8b..b684587 100644
--- a/app/src/main/res/layout/new_fragment_me.xml
+++ b/app/src/main/res/layout/new_fragment_me.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_content_new"
     android:orientation="vertical"
     android:padding="12dp">
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..657c64e
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="bg_content_new">#444444</color>
+
+    <color name="black">#ffffff</color>
+    <color name="white">#303030</color>
+    <color name="text_color_1">#fff</color>
+    <color name="c_33333333">#33ffffff</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index d5b392f..e0ca120 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -10,4 +10,7 @@
     <color name="text_color_disable">#AAA</color>
     <color name="green_gnss">#00B050</color>
     <color name="yellow_gnss">#FFFF00</color>
+    <color name="c_33333333">#33333333</color>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9d6826b..2efe196 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -37,7 +37,7 @@
             @color/material_drawer_dark_header_selection_text
         </item>
         <!-- 窗口状态栏颜色可以设置为和背景色一致 -->
-        <item name="colorPrimaryDark">@color/white</item>
+<!--        <item name="colorPrimaryDark">@color/white</item>-->
         <!-- 窗口的背景，替代启动时候出现的白屏 -->
         <item name="android:windowBackground">@drawable/bg_splash</item>
     </style>