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 0000000..f101147 Binary files /dev/null and b/jssw.jks differ