替换样式代码

app/src/main/res/values/colors.xml

@@ -11,4 +11,43 @@
     <color name="red_30p">#4CF44336</color>
     <color name="blue">#2196F3</color>
     <color name="grey">#9E9E9E</color>
+
+
+
+    <!--  ============ 标准颜色 ============ -->
+    <!--主题色 - 用于TabBar、突出文字、按钮和icon-->
+    <color name="platform_main_theme">#fdbd00</color>
+    <!--辅助色 1 - 主色系浅色-->
+    <color name="platform_main_theme_light">#FFEC8C</color>
+    <!--辅助色 2 - 主色系亮色-->
+    <color name="platform_main_theme_bright">#fffae0</color>
+
+    <!--  ============ 背景颜色 ============ -->
+    <!--    标签背景色-->
+    <color name="platform_tag_bg_color">#F7F7F7</color>
+    <!--    大面积背景颜色-->
+    <color name="platform_big_bg_color">#F0F0F0</color>
+    <!--    分割线颜色-->
+    <color name="platform_dividing_line_color">#EBEBEB</color>
+    <!--    主题色渐变背景颜色 -->
+    <color name="platform_main_gradient_start_color">#FFDB26</color>
+    <color name="platform_main_gradient_end_color">#FFD814</color>
+
+    <!--  ============ 文字颜色 ============ -->
+    <!--    一级类目，标题、点缀文字颜色-->
+    <color name="platform_text_dark_color">#242424</color>
+    <!--    二级类目文字颜色-->
+    <color name="platform_text_light_color">#666666</color>
+    <!--    三级次要文字颜色-->
+    <color name="platform_text_bright_color">#999999</color>
+    <!--    四级编辑框提示文字颜色-->
+    <color name="platform_text_hint_color">#BFBFBF</color>
+
+    <!--  ============ 按钮颜色 ============ -->
+    <!--确认文字按钮颜色  - 亮色模式下与深色模式相反-->
+    <color name="platform_but_text_color">#242424</color>
+    <!--按钮字体颜色 - 亮色模式下与深色模式近似-->
+    <color name="platform_but_text_color_unselected">#555555</color>
+    <color name="platform_but_text_color_selected">#242424</color>
+
 </resources>

config.gradle

@@ -270,7 +270,7 @@ ext {
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
             "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16.9@aar", //flutter aar
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.17.0@aar", //flutter aar
             "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

m-dynamic/src/main/res/values/colors.xml

@@ -4,11 +4,8 @@
     <color name="dynamic_colorPrimary">#3F51B5</color>
     <color name="dynamic_colorPrimaryDark">#303F9F</color>
     <color name="dynamic_colorAccent">#FF4081</color>
-
     <color name="dynamic_msg_system_press">#fff7f7f7</color>
-    <!-- google color-->
 
-    <!--app主要颜色-->
     <color name="dynamic_white">#ffffff</color>
     <color name="dynamic_default_text_color">#555555</color>
     <color name="dynamic_default_text_color_hint">#333333</color>
@@ -17,26 +14,10 @@
     <color name="dynamic_thx_red_color">#EB5835</color>
     <color name="dynamic_f5f5f5">#f5f5f5</color>
     <color name="dynamic_fffaec">#fffaec</color>
-
-    <!--最后删除-->
-
-    <!--云信　ｂｅｇｉｎ-->
     <color name="dynamic_black">#000000</color>
     <color name="dynamic_gray7">#c5c4c4</color>
     <color name="dynamic_GreyWhite">#F7F7F7</color>
-
-    <!-- main bg color -->
-
-    <!-- session -->
-
-    <!-- image picker -->
-
-    <!-- contact -->
-
-
     <color name="dynamic_text_gray">#B6B6B6</color>
-
-
     <color name="dynamic_title_bottom_line_bg">#DDDDDD</color>
     <color name="dynamic_defult_bg">#f3f3f3</color>
 
@@ -50,7 +31,6 @@
     <!--动态顶部title背景变色-->
     <color name="dynamic_trend_transparent">#00ffffff</color>
     <color name="dynamic_trend_gray">#f3f3f3</color>
-
     <!--消息已读-->
 
 

m-user/src/main/res/color/user_mine_text_with_draw_color.xml

@@ -4,7 +4,7 @@
 
     <item android:color="#c8c8c8" android:state_enabled="false"></item>
 
-    <item android:color="#1BD75E" android:state_enabled="true"></item>
+    <item android:color="@color/platform_main_theme" android:state_enabled="true"></item>
 
 
 </selector>
\ No newline at end of file

m-user/src/main/res/layout/user_mine_activity_choose_account.xml

@@ -44,7 +44,7 @@
         android:text="添加"
         android:textColor="@color/white"
         android:textSize="16sp"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="4dp" />
 
 </LinearLayout>

m-user/src/main/res/layout/user_mine_activity_edit_account.xml

@@ -96,7 +96,7 @@
         android:text="保存"
         android:textColor="@color/white"
         android:textSize="16sp"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="4dp" />
 
 

m-user/src/main/res/layout/user_mine_activity_phonechange.xml

@@ -113,7 +113,7 @@
             android:textColor="@color/white"
             android:textSize="16sp"
             app:pa_round_btn_active_bg="@color/white"
-            app:pa_round_btn_bg="#1BD75E"
+            app:pa_round_btn_bg="@color/platform_main_theme"
             app:pa_round_btn_radio_size="5dp" />
 
 

m-user/src/main/res/layout/user_mine_activity_pwdcheck.xml

@@ -63,6 +63,6 @@
         android:textColor="@color/white"
         android:textSize="16sp"
         app:pa_round_btn_active_bg="@color/white"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="5dp" />
 </LinearLayout>
\ No newline at end of file

m-user/src/main/res/layout/user_mine_activity_with_draw.xml

@@ -121,7 +121,7 @@
                     android:paddingLeft="15dp"
                     android:paddingTop="15dp"
                     android:text="全部提现"
-                    android:textColor="@color/platform_color_1DA1F2"
+                    android:textColor="@color/platform_main_theme"
                     android:textSize="17sp" />
             </LinearLayout>
 
@@ -267,7 +267,7 @@
         android:text="确认提现"
         android:textColor="@color/white"
         android:textSize="16sp"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="4dp" />
 
 

m-user/src/main/res/layout/user_mine_activity_with_draw_success.xml

@@ -49,7 +49,7 @@
         android:text="返回"
         android:textColor="@color/white"
         android:textSize="16sp"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="4dp" />
 </LinearLayout>
 

m-user/src/main/res/layout/user_mine_fragment_add_ali_account.xml

@@ -88,7 +88,7 @@
         android:text="保存"
         android:textColor="@color/white"
         android:textSize="16sp"
-        app:pa_round_btn_bg="#1BD75E"
+        app:pa_round_btn_bg="@color/platform_main_theme"
         app:pa_round_btn_radio_size="4dp" />
 
 </LinearLayout>

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/PayActivity.kt

@@ -13,6 +13,7 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import com.ydl.ydlcommon.base.BaseActivity
+import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
@@ -52,6 +53,10 @@ import java.text.DecimalFormat
  */
 class PayActivity : BaseActivity() {
 
+    override fun getStatusViewOptions(): StatusBarOptions {
+        return StatusBarOptions(true, statusBarDarkMode = true)
+    }
+
     companion object {
         /**
          * 入参

ydl-pay/src/main/res/layout/activity_pay.xml

@@ -385,7 +385,7 @@
                 android:includeFontPadding="false"
                 android:textColor="@color/white"
                 android:textSize="17sp"
-                app:pa_round_btn_bg="#1BD75E"/>
+                app:pa_round_btn_bg="@color/platform_main_theme"/>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file

ydl-platform/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!--透明度
-    100% — FF
-    99% — FC
-    98% — FA
-    97% — F7
-    96% — F5
-    95% — F2
-    94% — F0
-    93% — ED
-    92% — EB
-    91% — E8
-    90% — E6
-    89% — E3
-    88% — E0
-    87% — DE
-    86% — DB
-    85% — D9
-    84% — D6
-    83% — D4
-    82% — D1
-    81% — CF
-    80% — CC
-    79% — C9
-    78% — C7
-    77% — C4
-    76% — C2
-    75% — BF
-    74% — BD
-    73% — BA
-    72% — B8
-    71% — B5
-    70% — B3
-    69% — B0
-    68% — AD
-    67% — AB
-    66% — A8
-    65% — A6
-    64% — A3
-    63% — A1
-    62% — 9E
-    61% — 9C
-    60% — 99
-    59% — 96
-    58% — 94
-    57% — 91
-    56% — 8F
-    55% — 8C
-    54% — 8A
-    53% — 87
-    52% — 85
-    51% — 82
-    50% — 80
-    49% — 7D
-    48% — 7A
-    47% — 78
-    46% — 75
-    45% — 73
-    44% — 70
-    43% — 6E
-    42% — 6B
-    41% — 69
-    40% — 66
-    39% — 63
-    38% — 61
-    37% — 5E
-    36% — 5C
-    35% — 59
-    34% — 57
-    33% — 54
-    32% — 52
-    31% — 4F
-    30% — 4D
-    29% — 4A
-    28% — 47
-    27% — 45
-    26% — 42
-    25% — 40
-    24% — 3D
-    23% — 3B
-    22% — 38
-    21% — 36
-    20% — 33
-    19% — 30
-    18% — 2E
-    17% — 2B
-    16% — 29
-    15% — 26
-    14% — 24
-    13% — 21
-    12% — 1F
-    11% — 1C
-    10% — 1A
-    9% — 17
-    8% — 14
-    7% — 12
-    6% — 0F
-    5% — 0D
-    4% — 0A
-    3% — 08
-    2% — 05
-    1% — 03
-    0% — 00-->
+<resources>
 
     <color name="platform_color_1DA1F2">#1DA1F2</color>
     <color name="platform_new_divide_color">#f0f0f0</color>
@@ -192,19 +90,24 @@
 
     <!--  ============ 背景颜色 ============ -->
     <!--    标签背景色-->
+    <color name="platform_tag_bg_color">#F7F7F7</color>
     <!--    大面积背景颜色-->
     <color name="platform_big_bg_color">#F0F0F0</color>
     <!--    分割线颜色-->
+    <color name="platform_dividing_line_color">#EBEBEB</color>
     <!--    主题色渐变背景颜色 -->
     <color name="platform_main_gradient_start_color">#1DA1F2</color>
     <color name="platform_main_gradient_end_color">#23B2FA</color>
 
     <!--  ============ 文字颜色 ============ -->
     <!--    一级类目，标题、点缀文字颜色-->
+    <color name="platform_text_dark_color">#242424</color>
     <!--    二级类目文字颜色-->
     <color name="platform_text_light_color">#666666</color>
     <!--    三级次要文字颜色-->
+    <color name="platform_text_bright_color">#999999</color>
     <!--    四级编辑框提示文字颜色-->
+    <color name="platform_text_hint_color">#BFBFBF</color>
 
     <!--  ============ 按钮颜色 ============ -->
     <!--确认文字按钮颜色  - 亮色模式下与深色模式相反-->
@@ -213,4 +116,8 @@
     <color name="platform_but_text_color_unselected">#242424</color>
     <color name="platform_but_text_color_selected">#1da1f2</color>
 
+    <color name="consultant_confirm_text_color">#242424</color>
+    <color name="consultant_filter_content_text_color_un">#555555</color>
+    <color name="consultant_filter_content_text_color_en">#242424</color>
+
 </resources>