From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/res/values/themes.xml |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 56f7b19..4c093a9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,9 +10,15 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+        <item name="android:statusBarColor" tools:targetApi="l">@color/text_00000000</item>
+        <!-- Customize your theme here.  app鍚姩鍥剧墖卢-->
+        <item name="android:windowBackground">@color/text_00000000</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:navigationBarColor">@color/text_FF000000</item>
+        <!--        <item name="android:windowNoTitle">true</item>-->
+        <!--        <item name="android:windowFullscreen">true</item>-->
     </style>
+
 
     <style name="Theme.PhotovoltaicDebug.NoActionBar">
         <item name="windowActionBar">false</item>
@@ -30,22 +36,26 @@
         <item name="fullscreenTextColor">@color/light_blue_A200</item>
     </style>
 
+    <style name="DefaultFilteringDialog" parent="Custom_Dialog">
+        <!--鏄惁娴幇鍦╝ctivity涔嬩笂-->
+        <item name="android:windowIsFloating">true</item>
+    </style>
+
     <style name="Custom_Dialog">
         <!--鑳屾櫙棰滆壊鍙婂拰閫忔槑绋嬪害-->
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">#00000000</item>
         <!--鏄惁鍘婚櫎鏍囬 鎸嘾ialog寮规鏍囬-->
         <item name="android:windowNoTitle">true</item>
         <!--鏄惁鍘婚櫎杈规 -->
         <item name="android:windowFrame">@null</item>
         <!--鏄惁妯＄硦-->
         <item name="android:backgroundDimEnabled">true</item>
-        <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴�-->
-        <item name="android:backgroundDimAmount">0.6</item>
+        <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴� 0.6-->
+        <item name="android:backgroundDimAmount">0.8</item>
         <!--鏄惁娴幇鍦╝ctivity涔嬩笂-->
         <item name="android:windowIsFloating">false</item>
         <!--鏄剧ず閫氱煡鏍�-->
         <item name="android:windowActionBar">false</item>
-        <!--        <item name="android:windowFullscreen">true</item>-->
 
         <!--        <item name="android:windowIsTranslucent">false</item>:鏄惁鍗婇�忔槑-->
         <!--        <item name="android:windowNoTitle">true</item>:鏄惁鏄剧ずtitle-->
@@ -53,12 +63,22 @@
     </style>
 
     <style name="Custom_List_Dialog" parent="Custom_Dialog">
-        <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴�-->
-
+        <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴� 0.6-->
+        <item name="android:backgroundDimAmount">0</item>
     </style>
 
     <style name="DCloudMPHostActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/uniMPHostWindowAnimation</item>
     </style>
 
+    <style name="AppWelcome" parent="Theme.PhotovoltaicDebug">
+        <!--        &lt;!&ndash;灏嗛《閮ㄧ姸鎬佹爮璁剧疆涓洪�忔槑锛屽苟灏嗙晫闈㈠唴瀹瑰竷灞�涓婅竟鐣屼笂鎻愯嚦鐘舵�佹爮椤堕儴&ndash;&gt;-->
+        <!--        <item name="android:windowTranslucentStatus">true</item>-->
+        <!--        &lt;!&ndash;濡傛灉鏈夊簳閮ㄨ櫄鎷熷鑸爮锛屽垯灏嗗簳閮ㄨ櫄鎷熷鑸爮璁剧疆涓洪�忔槑锛屽苟灏嗙晫闈㈠唴瀹瑰竷灞�涓嬭竟鐣屼笅娌夎嚦铏氭嫙瀵艰埅鏍忓簳閮�&ndash;&gt;-->
+        <!--        <item name="android:windowTranslucentNavigation">true</item>-->
+        <!--缁檞indow绐楀彛璁剧疆鑳屾櫙鍥�-->
+        <item name="android:windowBackground">@drawable/logo_bj</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0