xzzn/jsswapp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI更新

Browse Source
This commit is contained in:
Rue Ji
2026-01-29 18:15:10 +08:00
parent ab5462d122
commit 142ae7720a
36 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.gradle
View File

@ -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'
}

2
app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java
View File

@ -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);

2
app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java
View File

@ -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);

2
app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java
View File

@ -418,7 +418,7 @@ public class MainFragment extends BaseFragmentView<MainFragmentPresenter, MainFr
private void initView(View view) {
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
tab = view.findViewById(R.id.moudle_fg_main_tab);

2
app/src/main/java/com/sipai/jspatrol/Main/fragment/promFragment/ProMFragment.java
View File

@ -181,7 +181,7 @@ public class ProMFragment extends BaseFragmentView<ProMFragmentPresenter, ProMFr
private void initView(View view) {
pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setTitleText("搜索中...");
pDialog.setCancelable(false);
pDialog.setCanceledOnTouchOutside(false);

2
app/src/main/java/com/sipai/jspatrol/NFC/NFCEquListActivity.java
View File

@ -77,7 +77,7 @@ public class NFCEquListActivity extends Activity {
}
});
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);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolDetailActivity.java
View File

@ -247,7 +247,7 @@ public class PatrolDetailActivity extends AppCompatActivity implements View.OnCl
private void initView() {
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setTitleText("数据上传中...");
pDialog.setCancelable(false);
pDialog.setCanceledOnTouchOutside(false);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolEquDetailActivity.java
View File

@ -244,7 +244,7 @@ public class PatrolEquDetailActivity extends AppCompatActivity implements View.O
});
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);

2
app/src/main/java/com/sipai/jspatrol/Patrol/PatrolPointDetailActivity.java
View File

@ -596,7 +596,7 @@ public class PatrolPointDetailActivity extends AppCompatActivity implements Text
}
});
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);

2
app/src/main/java/com/sipai/jspatrol/Patrol/patrolList/PatrolListActivity.java
View File

@ -45,7 +45,7 @@ public class PatrolListActivity extends BaseView<PatrolListPresenter, PatrolList
private void initView() {
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
}

2
app/src/main/java/com/sipai/jspatrol/Webv/GuideMenuActivity.java
View File

@ -86,7 +86,7 @@ public class GuideMenuActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/GuideMenuLandscapeActivity.java
View File

@ -91,7 +91,7 @@ public class GuideMenuLandscapeActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/MonitorScreenActivity.java
View File

@ -95,7 +95,7 @@ public class MonitorScreenActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/java/com/sipai/jspatrol/Webv/WebStatementActivity.java
View File

@ -190,7 +190,7 @@ public class WebStatementActivity extends AppCompatActivity {
}
});
pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE);
pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688"));
pDialog.getProgressHelper().setBarColor(Color.parseColor("#00A0E9"));
pDialog.setCancelable(true);
pDialog.setCanceledOnTouchOutside(true);
progressDialog = new ProgressDialog(this);

2
app/src/main/res/drawable/bg_blue_status_sel.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#009688"/>
<solid android:color="#00A0E9"/>
</shape>

2
app/src/main/res/drawable/bg_little_blue_all.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#E0F2F1"/>
<solid android:color="#E1F5FE"/>
<corners android:radius="4dp" />
</shape>

4
app/src/main/res/drawable/bg_main_header.xml
View File

@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="135"
android:startColor="#009688"
android:endColor="#004D40"
android:startColor="#00A0E9"
android:endColor="#7BC143"
android:type="linear" />
<corners android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
</shape>

2
app/src/main/res/drawable/bg_patrol_task_detail.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#009688" android:endColor="#00796B" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#00A0E9" android:endColor="#008AC9" />
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
<item android:name="android:shadowRadius">0</item>

2
app/src/main/res/drawable/bg_title.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:type="linear" android:useLevel="true" android:startColor="#009688" android:endColor="#00796B" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#00A0E9" android:endColor="#008AC9" />
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
<item android:name="android:shadowRadius">0</item>

2
app/src/main/res/drawable/ic_checkbox_checked_teal.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
</vector>

2
app/src/main/res/drawable/ic_home_curve_scheme.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zm10,16v-2h8v-2h-8v-2h-2v6h2zM7,9v2H3v2h4v2h2V9H7zm14,4v-2H11v2h10zm-6,-4h2V7h4V5h-4V3h-2v6z"/>
</vector>

2
app/src/main/res/drawable/ic_home_device_query.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

2
app/src/main/res/drawable/ic_home_factory_report.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM9,17H7v-7h2v7zm4,0h-2V7h2v10zm4,0h-2v-4h2v4z"/>
</vector>

2
app/src/main/res/drawable/ic_home_fault_report.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M1,21h22L12,2 1,21zm12,-3h-2v-2h2v2zm0,-4h-2v-4h2v4z"/>
</vector>

2
app/src/main/res/drawable/ic_home_history_alarm.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6,-6v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zm-2,1H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
</vector>

2
app/src/main/res/drawable/ic_home_monitor_screen.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M20,3H4c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h6v2H8v2h8v-2h-2v-2h6c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12H4V5h16v10z"/>
</vector>

2
app/src/main/res/drawable/ic_home_multi_curve.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M3.5,18.49l6,-6.01 4,4L22,6.92l-1.41,-1.41 -7.09,7.97 -4,-4L2,16.99z"/>
</vector>

2
app/src/main/res/drawable/ic_home_patrol.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7-7.75 7-13c0-3.87-3.13-7-7-7z M12,11.5c-1.38,0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5,1.12 2.5,2.5-1.12,2.5-2.5,2.5z"/>
</vector>

2
app/src/main/res/drawable/ic_tab_fault_full.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M3,13h2v-2H3v2zm0,4h2v-2H3v2zm0,-8h2V7H3v2zm4,4h14v-2H7v2zm0,4h14v-2H7v2zM7,7v2h14V7H7z"/>
</vector>

2
app/src/main/res/drawable/ic_tab_main_full.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
</vector>

2
app/src/main/res/drawable/ic_tab_pro_full.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM9,17H7v-7h2v7zm4,0h-2V7h2v10zm4,0h-2v-4h2v4z"/>
</vector>

2
app/src/main/res/drawable/ic_tab_self_full.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#009688"
android:fillColor="#00A0E9"
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zm0,2c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

2
app/src/main/res/drawable/shape_bg_little_blue.xml
View File

@ -3,6 +3,6 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="22dp" />
<solid android:color="#E0F2F1"/>
<solid android:color="#E1F5FE"/>
</shape>

2
app/src/main/res/drawable/shape_bg_little_green.xml
View File

@ -3,5 +3,5 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="22dp" />
<solid android:color="#E0F2F1"/>
<solid android:color="#E1F5FE"/>
</shape>

33
app/src/main/res/values/colors.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#009688</color>
<color name="colorPrimary">#00A0E9</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#D81B60</color>
<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name="blue">#009688</color>
<color name="blue">#00A0E9</color>
<color name="app_title_color_second">#FFFFFF</color>
<color name="gray_text">#A8A8A8</color>
@ -58,21 +58,21 @@
<color name="error_red">#E0796C</color>
<color name="error_yellow">#FF8400</color>
<color name="title_blue">#009688</color>
<color name="little_blue">#009688</color>
<color name="title_blue">#00A0E9</color>
<color name="little_blue">#00A0E9</color>
<color name="color_gr_white">#7fffffff</color>
<color name="color_luc_blue">#66009688</color>
<color name="color_luc_blue">#6600A0E9</color>
<color name="color_luc_blue_login">#cc01b4ed</color>
<color name="color_luc_blue_btn">#009688</color>
<color name="btn_normal_unpressed_bg">#009688</color>
<color name="btn_normal_pressed_bg">#00796B</color>
<color name="color_luc_blue_btn">#00A0E9</color>
<color name="btn_normal_unpressed_bg">#00A0E9</color>
<color name="btn_normal_pressed_bg">#008AC9</color>
<color name="pro_task_tab_sel">#009688</color>
<color name="pro_task_tab_sel">#00A0E9</color>
<color name="pro_task_tab_unsel">#FF797979</color>
<color name="task_doing">#009688</color>
<color name="task_top_blue">#009688</color>
<color name="task_doing">#00A0E9</color>
<color name="task_top_blue">#00A0E9</color>
<color name="task_top_gray">#FFBCBDC0</color>
<color name="task_top_little_blue">#FF6FDDFF</color>
<color name="task_top_little_red">#FFFF6565</color>
@ -83,14 +83,15 @@
<color name="bg_main_gray">#F6F6F6</color>
<color name="tab_text_gray">#D4DAE0</color>
<color name="text_blue">#009688</color>
<color name="blue_text">#009688</color>
<color name="text_blue">#00A0E9</color>
<color name="blue_text">#00A0E9</color>
<color name="base_line">#E5E5E5</color>
<color name="ac_bg">#F9F9F9</color>
<!-- 主页专属主题色 (碳谷绿湾) -->
<color name="main_theme_color">#009688</color>
<color name="main_theme_color_dark">#00796B</color>
<color name="main_theme_bg_light">#E0F2F1</color>
<color name="main_theme_color">#00A0E9</color>
<color name="main_theme_color_dark">#008AC9</color>
<color name="main_theme_green">#7BC143</color>
<color name="main_theme_bg_light">#E1F5FE</color>
</resources>

BIN
jssw.jks Normal file
View File

Binary file not shown.