From 367102bbc7a3a4bdb90fd8ffabc95bff6eb35a7d Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 十一月 2024 21:33:57 +0800
Subject: [PATCH] 2024年11月28日21:33:55

---
 app/src/main/res/drawable-xhdpi/logo_bj.png                                  |    0 
 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java                 |   19 ++-
 app/src/main/res/layout/activity_contact_us.xml                              |   24 ++-
 app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java |    4 
 app/src/main/res/layout/activity_start.xml                                   |    7 
 app/src/main/res/drawable/logo.png                                           |    0 
 app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java          |   14 -
 app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java                |    3 
 app/src/main/res/layout/dialog_list.xml                                      |    2 
 app/src/main/res/values/colors.xml                                           |    1 
 app/src/main/res/layout/dialog_update_confirm_cancel.xml                     |   58 ++++----
 app/src/main/res/drawable/bj_ccffff_13.xml                                   |    5 
 app/src/main/res/drawable/l.png                                              |    0 
 app/src/main/res/layout/activity_as_regards.xml                              |  150 ++++++++++++++++++++----
 app/src/main/res/layout/activity_home_login.xml                              |   52 ++++----
 app/src/main/res/layout/activity_web.xml                                     |    3 
 app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java          |    3 
 app/src/main/res/drawable/start_icon.png                                     |    0 
 app/src/main/res/layout/diaog_list_line.xml                                  |   12 -
 app/src/main/res/drawable/language_pull_down.png                             |    0 
 app/src/main/res/drawable/unselected.png                                     |    0 
 21 files changed, 226 insertions(+), 131 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index d279dff..cb74ac7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -368,12 +368,17 @@
         String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
         String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
         boolean isEnabled = account.length() > 0 && password.length() > 0;
+        if (isEnabled) {
+            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+        } else {
+            viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_66FFFFFF));
+        }
         viewBinding.homeLoginTv.setEnabled(isEnabled);
         if (password.length() < 6 || password.length() > 16) {
             return;
         }
         //绗﹀悎瀵嗙爜瑙勫垯鍚庨殣钘忛敊璇彁绀猴紱
-        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
         viewBinding.homeLoginPasswordTextErrorTv.setText("");
 
     }
@@ -485,14 +490,14 @@
                     public void updateDrawState(@NonNull TextPaint ds) {
                         super.updateDrawState(ds);
                         //璁剧疆瀛椾綋棰滆壊
-                        ds.setColor(getResources().getColor(R.color.text_245EC3, null));
+                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                         // 鍘绘帀涓嬪垝绾�
-                        ds.setUnderlineText(false);
+                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
 
 
                 }, startIndex1, endIndex1, 0);
-                spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex1, endIndex1, 0);
+//                spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex1, endIndex1, 0);
 
                 spannable.setSpan(new ClickableSpan() {
                     @Override
@@ -508,14 +513,14 @@
                     public void updateDrawState(@NonNull TextPaint ds) {
                         super.updateDrawState(ds);
                         //璁剧疆瀛椾綋棰滆壊
-                        ds.setColor(getResources().getColor(R.color.text_245EC3, null));
+                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                         // 鍘绘帀涓嬪垝绾�
-                        ds.setUnderlineText(false);
+                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
 
 
                 }, startIndex2, endIndex2, 0);
-                spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex2, endIndex2, 0);
+//                spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex2, endIndex2, 0);
 
 
             }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index e55f75d..14befed 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -43,8 +43,7 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-        setNotificationBarBackgroundColor(CustomColor.white);
-        setStatusBarTextColor();
+        setStatusBarTranslucent();
         //鍒濆鍖�
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -77,14 +76,14 @@
             //娴嬭瘯鐜
             content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.html";
         }
-        Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
+        Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "0", Color.BLACK, Color.WHITE);
         viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap);
 
     }
 
 
     private void initEvent() {
-        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+        viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
@@ -131,11 +130,8 @@
     }
 
     private void initView() {
-        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_regard);
-        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
-        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
+        viewBinding.topTitleTv.setText(R.string.me_regard);
+        viewBinding.topBackLl.setVisibility(View.VISIBLE);
         String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
         viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
index 3c53264..7e08ff6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
@@ -114,10 +114,7 @@
 
     private void initView() {
         viewBinding.toolbarTopRl.topTitleTv.setText(R.string.contact_us);
-        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index 6c159fc..68e3fbe 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
@@ -59,10 +59,7 @@
         } else {
             viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
         }
-        viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
-        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
 
         if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
             //涓枃
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
index 7538bf5..b8f3464 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
@@ -40,9 +40,9 @@
     public void onBindViewHolder(@NonNull ListDialogAdapter.MyViewHolder holder, int position) {
         LanguageAdapter.ItemData itemData = this.mList.get(position);
         holder.list_item_title_tv.setText(itemData.getTitle());
-        holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_E6000000));
+        holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_66FFFFFF));
         if (itemData.isState()) {
-            holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_38C494));
+            holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_E6FFFFFF));
         }
         if (position == this.mList.size() - 1) {
             holder.list_item_line_v.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable-xhdpi/logo_bj.png b/app/src/main/res/drawable-xhdpi/logo_bj.png
index 986ffc1..943e3b3 100644
--- a/app/src/main/res/drawable-xhdpi/logo_bj.png
+++ b/app/src/main/res/drawable-xhdpi/logo_bj.png
Binary files differ
diff --git a/app/src/main/res/drawable/bj_ccffff_13.xml b/app/src/main/res/drawable/bj_ccffff_13.xml
new file mode 100644
index 0000000..3056fd2
--- /dev/null
+++ b/app/src/main/res/drawable/bj_ccffff_13.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_13" />
+    <solid android:color="#20FFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/l.png b/app/src/main/res/drawable/l.png
new file mode 100644
index 0000000..77621c0
--- /dev/null
+++ b/app/src/main/res/drawable/l.png
Binary files differ
diff --git a/app/src/main/res/drawable/language_pull_down.png b/app/src/main/res/drawable/language_pull_down.png
index 39e37ac..855ed62 100644
--- a/app/src/main/res/drawable/language_pull_down.png
+++ b/app/src/main/res/drawable/language_pull_down.png
Binary files differ
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
index 7345314..7001a05 100644
--- a/app/src/main/res/drawable/logo.png
+++ b/app/src/main/res/drawable/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable/start_icon.png b/app/src/main/res/drawable/start_icon.png
index 37420f4..d6abacd 100644
--- a/app/src/main/res/drawable/start_icon.png
+++ b/app/src/main/res/drawable/start_icon.png
Binary files differ
diff --git a/app/src/main/res/drawable/unselected.png b/app/src/main/res/drawable/unselected.png
index 0f40c2e..087fe97 100644
--- a/app/src/main/res/drawable/unselected.png
+++ b/app/src/main/res/drawable/unselected.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index ca00d89..0d49555 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -4,12 +4,81 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFECECEC"
+    android:background="@drawable/bj"
     tools:context=".ui.me.AsRegardsActivity">
 
-    <include
-        android:id="@+id/toolbar_top_rl"
-        layout="@layout/toolbar_top_view_44" />
+    <RelativeLayout
+        android:id="@+id/top_bar_view"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_54"
+        android:layout_marginTop="@dimen/dp_44"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <RelativeLayout
+            android:id="@+id/top_content_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_44"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal">
+            <!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
+            <LinearLayout
+                android:id="@+id/top_back_ll"
+                android:layout_width="@dimen/dp_56"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/top_left_iv"
+                    android:layout_width="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_30"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/back" />
+            </LinearLayout>
+
+            <!--2.鏍囬鏂囨湰-->
+            <TextView
+                android:id="@+id/top_title_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="@dimen/dp_60"
+                android:layout_marginRight="@dimen/dp_60"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text=""
+                android:textColor="@color/text_E6FFFFFF"
+                android:textSize="@dimen/text_18" />
+
+            <!--3.鏇村鎸夐挳 榛樿闅愯棌-->
+            <LinearLayout
+                android:id="@+id/top_more_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:src="@drawable/add"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/top_more_iv"
+                    android:layout_width="@dimen/dp_28"
+                    android:layout_height="@dimen/dp_28"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerInside" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </RelativeLayout>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="0dp"
@@ -19,7 +88,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
+        app:layout_constraintTop_toBottomOf="@+id/top_bar_view">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -41,20 +110,28 @@
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginTop="@dimen/dp_12"
                 android:text="@string/app_version_number"
-                android:textColor="@color/text_030D1C"
+                android:textColor="@color/text_E6FFFFFF"
                 android:textSize="@dimen/text_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" />
 
-            <ImageView
-                android:id="@+id/as_regards_qr_code_iv"
-                android:layout_width="168dp"
-                android:layout_height="168dp"
-                android:layout_marginTop="@dimen/dp_34"
+            <RelativeLayout
+                android:id="@+id/qr_code_box"
+                android:layout_width="180dp"
+                android:layout_height="180dp"
+                android:layout_marginTop="34dp"
+                android:background="@drawable/code_box"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" />
+                app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv">
+
+                <ImageView
+                    android:id="@+id/as_regards_qr_code_iv"
+                    android:layout_width="168dp"
+                    android:layout_height="168dp"
+                    android:layout_centerInParent="true" />
+            </RelativeLayout>
 
             <TextView
                 android:id="@+id/as_regards_download_app_tv"
@@ -62,18 +139,18 @@
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginTop="@dimen/dp_12"
                 android:text="@string/app_scan_code_download"
-                android:textColor="@color/text_030D1C"
+                android:textColor="@color/text_E6FFFFFF"
                 android:textSize="@dimen/text_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" />
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_box" />
             <!--鐗堟湰鏇存柊-->
             <RelativeLayout
                 android:id="@+id/as_regards_version_updating_rl"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_57"
                 android:layout_marginTop="@dimen/dp_29"
-                android:background="@color/text_FFFFFFFF"
+                android:background="@color/text_FF333738"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv">
@@ -85,8 +162,8 @@
                     android:layout_centerVertical="true"
                     android:layout_marginStart="@dimen/dp_16"
                     android:text="@string/app_version_upgrade"
-                    android:textColor="@color/text_030D1C"
-                    android:textSize="@dimen/text_15"
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14"
 
                     />
 
@@ -113,8 +190,14 @@
                     android:layout_marginEnd="@dimen/dp_9"
                     android:layout_toStartOf="@+id/as_regards_version_updating_ll"
                     android:text="@string/app_new_version"
-                    android:textColor="@color/text_7C8590"
-                    android:textSize="@dimen/text_15" />
+                    android:textColor="@color/text_66FFFFFF"
+                    android:textSize="@dimen/text_14" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/text_1AFFFFFF" />
 
             </RelativeLayout>
             <!--鏈嶅姟鍗忚-->
@@ -122,7 +205,7 @@
                 android:id="@+id/service_agreement_rl"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_57"
-                android:background="@color/text_FFFFFFFF"
+                android:background="@color/text_FF333738"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl">
@@ -134,8 +217,8 @@
                     android:layout_centerVertical="true"
                     android:layout_marginStart="@dimen/dp_16"
                     android:text="@string/app_service_agreement"
-                    android:textColor="@color/text_030D1C"
-                    android:textSize="@dimen/text_15"
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14"
 
                     />
 
@@ -154,14 +237,18 @@
                         android:src="@drawable/next" />
                 </LinearLayout>
 
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/text_1AFFFFFF" />
             </RelativeLayout>
             <!--闅愮鏀跨瓥-->
             <RelativeLayout
                 android:id="@+id/privacy_policy_rl"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_57"
-                android:background="@color/text_FFFFFFFF"
+                android:background="@color/text_FF333738"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl">
@@ -173,8 +260,8 @@
                     android:layout_centerVertical="true"
                     android:layout_marginStart="@dimen/dp_16"
                     android:text="@string/app_privacy_policy"
-                    android:textColor="@color/text_030D1C"
-                    android:textSize="@dimen/text_15"
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14"
 
                     />
 
@@ -193,6 +280,11 @@
                         android:src="@drawable/next" />
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/text_1AFFFFFF" />
 
             </RelativeLayout>
             <!--鑱旂郴鎴戜滑-->
@@ -200,7 +292,7 @@
                 android:id="@+id/contact_us_rl"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_57"
-                android:background="@color/text_FFFFFFFF"
+                android:background="@color/text_FF333738"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl">
@@ -212,8 +304,8 @@
                     android:layout_centerVertical="true"
                     android:layout_marginStart="@dimen/dp_16"
                     android:text="@string/contact_us"
-                    android:textColor="@color/text_030D1C"
-                    android:textSize="@dimen/text_15"
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14"
 
                     />
 
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index c1e6a4f..ac04e3f 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFECECEC"
+    android:background="@color/text_FF161616"
     tools:context=".ui.me.ContactUsActivity">
 
     <include
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_57"
         android:layout_marginTop="@dimen/dp_12"
-        android:background="@color/text_FFFFFFFF"
+        android:background="@color/text_FF333738"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
@@ -28,8 +28,8 @@
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/dp_16"
             android:text="@string/wechat_id"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_16"
+            android:textColor="@color/text_E6FFFFFF"
+            android:textSize="@dimen/text_14"
 
             />
 
@@ -40,8 +40,14 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="@dimen/dp_16"
-            android:textColor="@color/text_E6000000"
-            android:textSize="@dimen/text_16" />
+            android:textColor="@color/text_66FFFFFF"
+            android:textSize="@dimen/text_14" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/text_1AFFFFFF" />
 
     </RelativeLayout>
 
@@ -49,7 +55,7 @@
         android:id="@+id/idemail_address_rl"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_57"
-        android:background="@color/text_FFFFFFFF"
+        android:background="@color/text_FF333738"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/wechat_id_rl">
@@ -61,7 +67,7 @@
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/dp_16"
             android:text="@string/email_address"
-            android:textColor="@color/text_E6000000"
+            android:textColor="@color/text_E6FFFFFF"
             android:textSize="@dimen/text_16" />
 
         <TextView
@@ -71,7 +77,7 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="@dimen/dp_16"
-            android:textColor="@color/text_E6000000"
+            android:textColor="@color/text_66FFFFFF"
             android:textSize="@dimen/text_16" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index cb5cdd9..a842118 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -5,7 +5,7 @@
     android:id="@+id/home_login_parent_cl"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFFFFFFF"
+    android:background="@drawable/logo_bj"
     tools:context="com.hdl.photovoltaic.ui.LoginActivity">
 
     <androidx.core.widget.NestedScrollView
@@ -19,14 +19,6 @@
             android:layout_height="match_parent">
 
 
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="612dp"
-                android:background="@drawable/logo_bj"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
             <LinearLayout
                 android:id="@+id/home_login_language_ll"
                 android:layout_width="wrap_content"
@@ -38,13 +30,22 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
+                <ImageView
+                    android:layout_width="13dp"
+                    android:layout_height="13dp"
+                    android:src="@drawable/l" />
+
+                <View
+                    android:layout_width="@dimen/dp_4"
+                    android:layout_height="match_parent" />
+
                 <TextView
                     android:id="@+id/home_login_language_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/language_pull_down"
                     android:text="@string/home_login_chinese"
-                    android:textColor="@color/text_FF000000"
+                    android:textColor="@color/text_E6FFFFFF"
                     android:textSize="@dimen/text_14" />
 
 
@@ -86,7 +87,7 @@
                 android:layout_height="@dimen/dp_39"
                 android:layout_marginTop="@dimen/dp_40"
                 android:text="@string/app_name"
-                android:textColor="@color/text_E6000000"
+                android:textColor="@color/text_E6FFFFFF"
                 android:textSize="@dimen/text_28"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
@@ -115,7 +116,7 @@
                     android:layout_height="@dimen/dp_20"
                     android:layout_marginStart="@dimen/dp_6"
                     android:text="@string/home_login_an_installer"
-                    android:textColor="@color/text_FF000000"
+                    android:textColor="@color/text_E6FFFFFF"
                     android:textSize="@dimen/text_14"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv"
@@ -137,9 +138,9 @@
                 android:inputType="text"
                 android:lines="1"
                 android:maxLines="1"
-                android:textColor="@color/text_FF000000"
-                android:textColorHint="@color/text_25000000"
-                android:textSize="@dimen/text_16"
+                android:textColor="@color/text_E6FFFFFF"
+                android:textColorHint="@color/text_66FFFFFF"
+                android:textSize="@dimen/text_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" />
@@ -160,7 +161,7 @@
                 android:layout_height="0.5dp"
                 android:layout_marginStart="@dimen/dp_20"
                 android:layout_marginEnd="@dimen/dp_20"
-                android:background="@color/text_E1E1E1"
+                android:background="#FF5A5A5A"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" />
@@ -191,9 +192,9 @@
                 android:inputType="textPassword"
                 android:lines="1"
                 android:maxLines="1"
-                android:textColor="@color/text_FF000000"
-                android:textColorHint="@color/text_25000000"
-                android:textSize="@dimen/text_16"
+                android:textColor="@color/text_E6FFFFFF"
+                android:textColorHint="@color/text_66FFFFFF"
+                android:textSize="@dimen/text_14"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" />
@@ -212,7 +213,7 @@
                 android:id="@+id/home_login_line2_v"
                 android:layout_width="0dp"
                 android:layout_height="0.5dp"
-                android:background="@color/text_E1E1E1"
+                android:background="#FF5A5A5A"
                 app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v"
                 app:layout_constraintStart_toStartOf="@+id/home_login_line1_v"
                 app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" />
@@ -234,19 +235,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_20"
                 android:text="@string/home_login_register"
-                android:textColor="@color/text_245EC3"
+                android:textColor="@color/text_E6FFFFFF"
                 android:textSize="@dimen/text_14"
                 app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
                 app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
             <!--蹇樿瀵嗙爜-->
             <TextView
                 android:id="@+id/home_login_forget_password_tv"
-
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginTop="@dimen/dp_24"
                 android:text="@string/home_login_forget_password"
-                android:textColor="@color/text_245EC3"
+                android:textColor="@color/text_E6FFFFFF"
                 android:textSize="@dimen/text_14"
                 app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
                 app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
@@ -256,11 +256,11 @@
                 android:layout_width="0dp"
                 android:layout_height="52dp"
                 android:layout_marginTop="44dp"
-                android:background="@drawable/yesandnocheck"
+                android:background="@drawable/bj_ccffff_13"
                 android:enabled="false"
                 android:gravity="center"
                 android:text="@string/home_login_logoin"
-                android:textColor="@color/text_FFFFFFFF"
+                android:textColor="@color/text_66FFFFFF"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
                 app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
@@ -311,7 +311,7 @@
                     android:singleLine="false"
                     android:tag="click"
                     android:text="@string/home_login_consent_service_agreement"
-                    android:textColor="@color/text_FF000000"
+                    android:textColor="@color/text_66FFFFFF"
                     android:textSize="@dimen/text_14" />
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
index b52af99..afcda3d 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFFFFFFF"
+    android:background="@color/text_FF161616"
     tools:context="com.hdl.photovoltaic.ui.StartActivity">
 
     <!--    <TextView-->
@@ -26,9 +26,8 @@
 
     <ImageView
         android:id="@+id/as_regards_icon_iv"
-        android:layout_width="106.5dp"
-        android:layout_height="106.5dp"
-        android:layout_marginTop="@dimen/dp_29"
+        android:layout_width="72dp"
+        android:layout_height="43dp"
         android:src="@drawable/start_icon"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 6ec132a..2a30f99 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/app/src/main/res/layout/activity_web.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFECECEC"
+    android:background="@color/text_FF161616"
     tools:context=".ui.me.WebActivity">
 
     <include
@@ -15,6 +15,7 @@
         android:id="@+id/content_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:background="@color/text_FF161616"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index 5be0d55..ac9844a 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/app/src/main/res/layout/dialog_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/dialog_parent"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/ffffff_8"
+    android:background="@drawable/bj_ff333738"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
diff --git a/app/src/main/res/layout/dialog_update_confirm_cancel.xml b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
index af3226c..b7edf77 100644
--- a/app/src/main/res/layout/dialog_update_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_48"
         android:layout_marginBottom="@dimen/dp_20"
-        android:background="@drawable/loading_confirmation_bj"
+        android:background="@drawable/bj_ff333738"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -26,8 +26,8 @@
             android:layout_marginTop="@dimen/dp_24"
             android:layout_marginEnd="@dimen/dp_20"
             android:text="@string/app_discover_new_version"
-            android:textColor="@color/text_030D1C"
-            android:textSize="@dimen/text_18"
+            android:textColor="@color/text_E6FFFFFF"
+            android:textSize="@dimen/text_14"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -44,7 +44,7 @@
             android:layout_marginBottom="@dimen/dp_0"
             android:singleLine="false"
             android:tag="click"
-            android:textColor="@color/text_030D1C"
+            android:textColor="@color/text_66FFFFFF"
             app:layout_constraintBottom_toTopOf="@+id/loading_confirmation_content2_tv"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
             android:layout_marginBottom="@dimen/dp_34"
             android:singleLine="false"
             android:tag="click"
-            android:textColor="@color/text_030D1C"
+            android:textColor="@color/text_66FFFFFF"
             app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -75,57 +75,57 @@
         <LinearLayout
             android:id="@+id/dialog_confirm_bottom_line_ly"
             android:layout_width="0dp"
-            android:layout_height="@dimen/dp_52"
-            android:layout_marginTop="@dimen/dp_16"
+            android:layout_height="@dimen/dp_41"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
             android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content2_tv">
-
-            <View
-                android:layout_width="@dimen/dp_16"
-                android:layout_height="match_parent" />
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <LinearLayout
                 android:id="@+id/dialog_cancel_ly"
-                android:layout_width="@dimen/dp_120"
+                android:layout_width="@dimen/dp_0"
                 android:layout_height="match_parent"
-                android:background="@drawable/fillet_line_00000000">
+                android:layout_weight="1"
+                android:background="@drawable/bj_ff555859_23_no"
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/dialog_cancel_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="@string/loading_cancel"
-                    android:textColor="@color/text_FF245EC3"
-                    android:textSize="@dimen/text_18" />
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14" />
 
 
             </LinearLayout>
 
             <View
-                android:layout_width="@dimen/dp_8"
+                android:layout_width="9.5dp"
                 android:layout_height="match_parent" />
 
             <LinearLayout
                 android:id="@+id/dialog_confirm_ly"
-                android:layout_width="@dimen/dp_120"
+                android:layout_width="@dimen/dp_0"
                 android:layout_height="match_parent"
-                android:background="@drawable/fillet_line_00000000">
+                android:layout_weight="1"
+                android:background="@drawable/bj_ff555859_23"
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/dialog_confirm_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/checked"
-                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="@string/app_update_now"
-                    android:textColor="@color/text_FFFFFFFF"
-                    android:textSize="@dimen/text_18" />
+                    android:textColor="@color/text_E6FFFFFF"
+                    android:textSize="@dimen/text_14" />
             </LinearLayout>
         </LinearLayout>
+
+
         <!--搴曢儴闂磋窛-->
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/diaog_list_line.xml b/app/src/main/res/layout/diaog_list_line.xml
index ea174b9..5968b7e 100644
--- a/app/src/main/res/layout/diaog_list_line.xml
+++ b/app/src/main/res/layout/diaog_list_line.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="140.5dp"
-    android:layout_height="@dimen/dp_54"
-    >
+    android:layout_height="@dimen/dp_54">
 
     <TextView
         android:id="@+id/list_item_title_tv"
@@ -14,23 +13,20 @@
         android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="@dimen/dp_17"
         android:gravity="center"
-        android:textColor="@color/text_E6000000"
+        android:textColor="@color/text_66FFFFFF"
         android:textSize="@dimen/text_14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
 
         android:id="@+id/list_item_line_v"
         android:layout_width="0dp"
         android:layout_height="0.5dp"
-        android:layout_marginStart="@dimen/dp_16"
-        android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="0.5dp"
-        android:background="@color/text_E1E1E1"
+        android:background="@color/text_1AFFFFFF"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 73ae6f0..0ed004c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -62,5 +62,6 @@
     <color name="text_33FFFFFF">#33FFFFFF</color>
     <color name="text_FF555859">#FF555859</color>
     <color name="text_FF5C5F60">#FF5C5F60</color>
+    <color name="text_FF5A5A5A">#FF5A5A5A</color>
 
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0