From 142ae7720a01920112de40bb7c775a872d5829f4 Mon Sep 17 00:00:00 2001 From: Rue Ji Date: Thu, 29 Jan 2026 18:15:10 +0800 Subject: [PATCH] =?UTF-8?q?UI=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 11 ++++++ .../Fault/DoingFaultDetailActivity.java | 2 +- .../Fault/NewFaultDetailActivity.java | 2 +- .../fragment/mainfragment/MainFragment.java | 2 +- .../fragment/promFragment/ProMFragment.java | 2 +- .../jspatrol/NFC/NFCEquListActivity.java | 2 +- .../jspatrol/Patrol/PatrolDetailActivity.java | 2 +- .../Patrol/PatrolEquDetailActivity.java | 2 +- .../Patrol/PatrolPointDetailActivity.java | 2 +- .../Patrol/patrolList/PatrolListActivity.java | 2 +- .../jspatrol/Webv/GuideMenuActivity.java | 2 +- .../Webv/GuideMenuLandscapeActivity.java | 2 +- .../jspatrol/Webv/MonitorScreenActivity.java | 2 +- .../jspatrol/Webv/WebStatementActivity.java | 2 +- .../main/res/drawable/bg_blue_status_sel.xml | 2 +- .../main/res/drawable/bg_little_blue_all.xml | 2 +- app/src/main/res/drawable/bg_main_header.xml | 4 +-- .../res/drawable/bg_patrol_task_detail.xml | 2 +- app/src/main/res/drawable/bg_title.xml | 2 +- .../res/drawable/ic_checkbox_checked_teal.xml | 2 +- .../res/drawable/ic_home_curve_scheme.xml | 2 +- .../res/drawable/ic_home_device_query.xml | 2 +- .../res/drawable/ic_home_factory_report.xml | 2 +- .../res/drawable/ic_home_fault_report.xml | 2 +- .../res/drawable/ic_home_history_alarm.xml | 2 +- .../res/drawable/ic_home_monitor_screen.xml | 2 +- .../main/res/drawable/ic_home_multi_curve.xml | 2 +- app/src/main/res/drawable/ic_home_patrol.xml | 2 +- .../main/res/drawable/ic_tab_fault_full.xml | 2 +- .../main/res/drawable/ic_tab_main_full.xml | 2 +- app/src/main/res/drawable/ic_tab_pro_full.xml | 2 +- .../main/res/drawable/ic_tab_self_full.xml | 2 +- .../res/drawable/shape_bg_little_blue.xml | 2 +- .../res/drawable/shape_bg_little_green.xml | 2 +- app/src/main/res/values/colors.xml | 33 +++++++++--------- jssw.jks | Bin 0 -> 2708 bytes 36 files changed, 62 insertions(+), 50 deletions(-) create mode 100644 jssw.jks diff --git a/app/build.gradle b/app/build.gradle index 6b8a08f..ff721e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,19 @@ android { abiFilters "armeabi", 'armeabi-v7a', 'arm64-v8a' } } + + signingConfigs { + release { + storeFile file("../jssw.jks") + storePassword "password123" + keyAlias "jssw" + keyPassword "password123" + } + } + buildTypes { release { + signingConfig signingConfigs.release minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java b/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java index 9ac15d5..c4d4136 100644 --- a/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java +++ b/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java @@ -464,7 +464,7 @@ public class DoingFaultDetailActivity extends AppCompatActivity implements View. } }); pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE); - pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688")); + pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9")); pDialog.setTitleText("数据上传中..."); pDialog.setCancelable(true); pDialog.setCanceledOnTouchOutside(true); diff --git a/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java b/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java index 96aba2c..d8329e6 100644 --- a/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java +++ b/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java @@ -306,7 +306,7 @@ public class NewFaultDetailActivity extends AppCompatActivity implements View.On } }); pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE); - pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688")); + pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9")); pDialog.setTitleText("数据上传中..."); pDialog.setCancelable(true); pDialog.setCanceledOnTouchOutside(true); diff --git a/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java b/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java index 09cb685..384db7a 100644 --- a/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java +++ b/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java @@ -418,7 +418,7 @@ public class MainFragment extends BaseFragmentView - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_little_blue_all.xml b/app/src/main/res/drawable/bg_little_blue_all.xml index a6a4ad2..7d8f9ba 100644 --- a/app/src/main/res/drawable/bg_little_blue_all.xml +++ b/app/src/main/res/drawable/bg_little_blue_all.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_main_header.xml b/app/src/main/res/drawable/bg_main_header.xml index 3587c69..a7b3e4d 100644 --- a/app/src/main/res/drawable/bg_main_header.xml +++ b/app/src/main/res/drawable/bg_main_header.xml @@ -2,8 +2,8 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_patrol_task_detail.xml b/app/src/main/res/drawable/bg_patrol_task_detail.xml index 277dc39..2897152 100644 --- a/app/src/main/res/drawable/bg_patrol_task_detail.xml +++ b/app/src/main/res/drawable/bg_patrol_task_detail.xml @@ -1,7 +1,7 @@ - + 0 1 0 diff --git a/app/src/main/res/drawable/bg_title.xml b/app/src/main/res/drawable/bg_title.xml index cdd83d7..08fbb42 100644 --- a/app/src/main/res/drawable/bg_title.xml +++ b/app/src/main/res/drawable/bg_title.xml @@ -1,6 +1,6 @@ - + 0 1 0 diff --git a/app/src/main/res/drawable/ic_checkbox_checked_teal.xml b/app/src/main/res/drawable/ic_checkbox_checked_teal.xml index e64c504..98a4080 100644 --- a/app/src/main/res/drawable/ic_checkbox_checked_teal.xml +++ b/app/src/main/res/drawable/ic_checkbox_checked_teal.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_curve_scheme.xml b/app/src/main/res/drawable/ic_home_curve_scheme.xml index 74b67b8..61ddd8f 100644 --- a/app/src/main/res/drawable/ic_home_curve_scheme.xml +++ b/app/src/main/res/drawable/ic_home_curve_scheme.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_device_query.xml b/app/src/main/res/drawable/ic_home_device_query.xml index b377e4c..8402dff 100644 --- a/app/src/main/res/drawable/ic_home_device_query.xml +++ b/app/src/main/res/drawable/ic_home_device_query.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_factory_report.xml b/app/src/main/res/drawable/ic_home_factory_report.xml index dc9ad10..3763a4e 100644 --- a/app/src/main/res/drawable/ic_home_factory_report.xml +++ b/app/src/main/res/drawable/ic_home_factory_report.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_fault_report.xml b/app/src/main/res/drawable/ic_home_fault_report.xml index 53898dd..f27c849 100644 --- a/app/src/main/res/drawable/ic_home_fault_report.xml +++ b/app/src/main/res/drawable/ic_home_fault_report.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_history_alarm.xml b/app/src/main/res/drawable/ic_home_history_alarm.xml index ff14af8..b31fa65 100644 --- a/app/src/main/res/drawable/ic_home_history_alarm.xml +++ b/app/src/main/res/drawable/ic_home_history_alarm.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_monitor_screen.xml b/app/src/main/res/drawable/ic_home_monitor_screen.xml index 9c0e643..11407d7 100644 --- a/app/src/main/res/drawable/ic_home_monitor_screen.xml +++ b/app/src/main/res/drawable/ic_home_monitor_screen.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_multi_curve.xml b/app/src/main/res/drawable/ic_home_multi_curve.xml index 0ea02ca..63e2155 100644 --- a/app/src/main/res/drawable/ic_home_multi_curve.xml +++ b/app/src/main/res/drawable/ic_home_multi_curve.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_patrol.xml b/app/src/main/res/drawable/ic_home_patrol.xml index 6442ea3..9845765 100644 --- a/app/src/main/res/drawable/ic_home_patrol.xml +++ b/app/src/main/res/drawable/ic_home_patrol.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_tab_fault_full.xml b/app/src/main/res/drawable/ic_tab_fault_full.xml index 23311e1..7cd8830 100644 --- a/app/src/main/res/drawable/ic_tab_fault_full.xml +++ b/app/src/main/res/drawable/ic_tab_fault_full.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_tab_main_full.xml b/app/src/main/res/drawable/ic_tab_main_full.xml index 5758158..64ee043 100644 --- a/app/src/main/res/drawable/ic_tab_main_full.xml +++ b/app/src/main/res/drawable/ic_tab_main_full.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_tab_pro_full.xml b/app/src/main/res/drawable/ic_tab_pro_full.xml index dc9ad10..3763a4e 100644 --- a/app/src/main/res/drawable/ic_tab_pro_full.xml +++ b/app/src/main/res/drawable/ic_tab_pro_full.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_tab_self_full.xml b/app/src/main/res/drawable/ic_tab_self_full.xml index 9a62b24..af4b1d1 100644 --- a/app/src/main/res/drawable/ic_tab_self_full.xml +++ b/app/src/main/res/drawable/ic_tab_self_full.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_bg_little_blue.xml b/app/src/main/res/drawable/shape_bg_little_blue.xml index 348243f..19a2f5d 100644 --- a/app/src/main/res/drawable/shape_bg_little_blue.xml +++ b/app/src/main/res/drawable/shape_bg_little_blue.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_bg_little_green.xml b/app/src/main/res/drawable/shape_bg_little_green.xml index 5f5a1dd..dbf8b0f 100644 --- a/app/src/main/res/drawable/shape_bg_little_green.xml +++ b/app/src/main/res/drawable/shape_bg_little_green.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 022d71c..fd66423 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,12 +1,12 @@ - #009688 + #00A0E9 #000000 #D81B60 #ffffff #000000 - #009688 + #00A0E9 #FFFFFF #A8A8A8 @@ -58,21 +58,21 @@ #E0796C #FF8400 - #009688 - #009688 + #00A0E9 + #00A0E9 #7fffffff - #66009688 + #6600A0E9 #cc01b4ed - #009688 - #009688 - #00796B + #00A0E9 + #00A0E9 + #008AC9 - #009688 + #00A0E9 #FF797979 - #009688 - #009688 + #00A0E9 + #00A0E9 #FFBCBDC0 #FF6FDDFF #FFFF6565 @@ -83,14 +83,15 @@ #F6F6F6 #D4DAE0 - #009688 - #009688 + #00A0E9 + #00A0E9 #E5E5E5 #F9F9F9 - #009688 - #00796B - #E0F2F1 + #00A0E9 + #008AC9 + #7BC143 + #E1F5FE diff --git a/jssw.jks b/jssw.jks new file mode 100644 index 0000000000000000000000000000000000000000..f1011474b90c9c50374bb3729ab3516d4fa2a27a GIT binary patch literal 2708 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