diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e93801b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e93801b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e93801b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..7ee117f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e93801b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..7ee117f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..7088420 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e7957e4..760aedd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 6 - versionName "1.0.6" + versionCode 7 + versionName "1.0.7" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1a6908..d00eda9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" + android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/assets/h5/HelpCenterH5.html b/app/src/main/assets/h5/HelpCenterH5.html index baf5d4c..9ceee4f 100644 --- a/app/src/main/assets/h5/HelpCenterH5.html +++ b/app/src/main/assets/h5/HelpCenterH5.html @@ -8,14 +8,14 @@

1、告警处理的流程是怎样的？

  当井盖发生开盖报警时，会向所属单位的用户推送报警信息，点击推送信息即可快速进入应用首页。
-   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击闸井编号可跳转到【闸井详情】页面查看闸井信息及地图位置。
+   进入【待处理】工单页面后，点击待处理工单项可进入【工单详情】页面，查看告警信息，点击点位编号可跳转到【点位详情】页面查看点位信息及地图位置。
  现场确认井盖状态正常后，在【工单详情】中的处理按钮即可结束工单并取消报警。 -

2、如何查看闸井详情？

-   首页点击【闸井管理】进入闸井列表，用户可根据闸井类型或关键字筛选自己想要了解的闸井信息，点击进行查看，或在工单详情中点击闸井编号也可以进入闸井详情。 +

2、如何查看点位详情？

+   首页点击【点位管理】进入点位列表，用户可根据点位类型或关键字筛选自己想要了解的点位信息，点击进行查看，或在工单详情中点击点位编号也可以进入点位详情。

3、如何查看关联设备的监控信息？

-   当有单个关联设备时，闸井详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，闸井详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。 +   当有单个关联设备时，点位详情页内可直接查看该设备监控信息及最近一次的监控数值当有多个关联设备时，点位详情页内点击【监控内容】进入下一页，可查看多个监控信息及最近一次的监控数值。

4、井盖的撤防入口在哪里？

-   首页点击【布防撤防】，用户可查看自己责任片区的闸井信息并进行布防/撤防操作。闸井撤防后报警信息将不再推送，此操作需慎重。 +   首页点击【布防撤防】，用户可查看自己责任片区的点位信息并进行布防/撤防操作。点位撤防后报警信息将不再推送，此操作需慎重。

5、如何查看工单详情？

  点击首页，可在快捷口根据工单状态进入工单列表，查看工单的详细信息，也可底部菜单选【工单】，进入工单列表，查看工单的详细信息。

6、地图无法正常显示或报找不到许可文件错误怎么办？

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..121f95c --- /dev/null +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index f9a8fe3..605dba4 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index df3426a..b209398 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -34,14 +34,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 5dcd0a0..c163f99 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -33,14 +33,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index ba7eae6..b87e44a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -27,14 +27,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index d76d9b9..cf84af3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -36,14 +36,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { "报警值：未知" } else { "报警值：" + rowsBean.alarmValue } holder.alarmValueView.text = alarmValue - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") holder.currentStateView.text = String.format( "${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}" ) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 6f1d122..ab72c5e 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -36,10 +36,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index c35b4b1..a2a94d0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -38,10 +38,10 @@ rowsBean.deep.toString() + "m" } holder.wellDepthView.text = String.format("深：${deep}") - holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.wellTypeView.text = String.format("井类型：${rowsBean.wellTypeName}") + holder.wellCodeView.text = String.format("点位编号：${rowsBean.wellCode}") + holder.wellTypeView.text = String.format("点位类型：${rowsBean.wellTypeName}") holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") - holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.wellLocationView.text = String.format("点位置：${rowsBean.position}") //绑定事件 holder.itemView.setOnClickListener { listener?.onClicked(position) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 84386be..7d7b57c 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -286,16 +286,16 @@ if (clickedLatLng.latitude == well.latGaode!!.toDouble() && clickedLatLng.longitude == well.lngGaode!!.toDouble() ) { - wellNameView.text = String.format("窨井名称: ${well.wellName}") - wellCodeView.text = String.format("窨井编号: ${well.wellCode}") - wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}") + wellNameView.text = String.format("点位名称: ${well.wellName}") + wellCodeView.text = String.format("点位编号: ${well.wellCode}") + wellTypeView.text = String.format("点位类型: ${well.wellType.valueToType()}") val bfztName = if (well.bfzt == "1") { "已布防" } else { "已撤防" } wellStateView.text = String.format("布/撤防状态: $bfztName") - deepView.text = String.format("窨井深度: ${well.deep}m") + deepView.text = String.format("点位深度: ${well.deep}m") locationView.text = String.format("详细位置: ${well.position}") return infoWindow } @@ -324,7 +324,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "点位经纬度异常，无法开启导航".show(requireContext()) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index ff4017e..1a9aeca 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -78,7 +78,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 0b33cb3..d811ab5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -165,7 +165,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 5558f37..7b050da 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -166,7 +166,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -272,7 +272,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择点位当前情况".show(this) return@setOnClickListener } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 5a1bab3..21222b5 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -99,7 +99,7 @@ locationTipsView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -143,7 +143,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "点位ID异常，无法导航".show(context) return@setOnClickListener } wellViewModel.obtainWellDetail(wellId) @@ -154,7 +154,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) } else { RouteOnMap.startNavigation( this, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 802d9dc..25d2ab3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -34,7 +34,7 @@ ImmersionBar.with(this).statusBarDarkFont(false).init() ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - titleView.text = "窨井详情" + titleView.text = "点位详情" leftBackView.visibility = View.VISIBLE leftBackView.setOnClickListener { finish() } } @@ -81,7 +81,7 @@ tipsImageView.setOnClickListener { AlertMessageDialog.Builder() .setContext(this) - .setTitle("窨井完整位置") + .setTitle("点位完整位置") .setMessage(wellPosition) .setPositiveButton("知道了") .setOnDialogButtonClickListener(object : @@ -125,7 +125,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "点位经纬度异常，无法开启导航".show(this) return@setOnClickListener } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 2d6fbc4..38f6e0b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -163,7 +163,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -174,7 +174,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 043ccf4..8799e63 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -53,7 +53,7 @@ wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { - emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { + emptyView!!.showEmptyPage("抱歉，该点位下无设备，或设备已离线") { wellViewModel.obtainMonitorResult(wellId) } } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 9463e79..b6fa48f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -200,7 +200,7 @@ override fun onClicked(position: Int) { val wellId = dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } navigatePageTo(wellId) @@ -213,7 +213,7 @@ val detailModel = dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(context) + "点位编号异常，无法查看详情".show(context) return } val bfzt = if (detailModel.bfztName == "布防") { @@ -229,7 +229,7 @@ AlertControlDialog.Builder() .setContext(context) .setTitle("操作提示") - .setMessage("确定将该井${tips}吗") + .setMessage("确定将该点位${tips}吗") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -249,7 +249,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(context) + "点位经纬度异常，无法开启导航".show(context) return } RouteOnMap.startNavigation( diff --git a/app/src/main/res/layout/activity_order_search.xml b/app/src/main/res/layout/activity_order_search.xml index ee8c287..9a78a59 100644 --- a/app/src/main/res/layout/activity_order_search.xml +++ b/app/src/main/res/layout/activity_order_search.xml @@ -29,7 +29,7 @@ + android:text="点位编号" /> + android:src="@mipmap/splash_text" + android:visibility="invisible" /> + android:text="点位编号" /> + android:text="点位名称" /> + android:text="点位类型" /> + android:text="点位深（米）" /> + android:text="点位编号" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cdb1e29 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1629a72 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..e76a101 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..0676d53 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..237c56f --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..022ada7 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6c7f802 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d384fa1 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..9f82b1b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e93801b --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 96ea16c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..7ee117f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..7088420 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file