diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index cac9ceb..5c90b73 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index cac9ceb..5c90b73 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ 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 index 11f2e8a..1865a0f 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index cac9ceb..5c90b73 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ 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 index 11f2e8a..1865a0f 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ 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 index c6b766d..6b9d36a 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index cac9ceb..5c90b73 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ 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 index 11f2e8a..1865a0f 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ 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 index c6b766d..6b9d36a 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png 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 index 62f8195..1a54144 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png +++ 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 760aedd..ae69465 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 7 - versionName "1.0.7" + versionCode 8 + versionName "1.0.8" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] } @@ -50,7 +50,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = getBuildDate() + ".apk" + outputFileName = getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index ab56607..6dad6f1 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png Binary files differ diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index af9aced..5dbf3eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -28,7 +28,7 @@ const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf) - val HOME_ITEMS = arrayOf("闸井管理", "超时工单", "布防撤防") + val HOME_ITEMS = arrayOf("点位管理", "超时工单", "布防撤防") val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") val OVER_TIME_PAGE_TITLES = arrayOf("超时未接单", "超时未处理") val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 9048c30..221ad4a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -78,7 +78,7 @@ /** * 章丘项目只有如下报警 * */ - if (contentTypeBean.name == "液位超限" || contentTypeBean.name == "噪声超限" || contentTypeBean.name == "燃气报警") { + if (contentTypeBean.name == "井盖开盖报警" || contentTypeBean.name == "浓度超限" || contentTypeBean.name == "液化气报警") { contentModels.add(contentTypeBean) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3225bd6..d6ddbb1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingVertical="@dimen/dp_5" - android:text="闸井监控" + android:text="点位监控" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 52facbf..aeaf297 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ 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 index 2082819..9464450 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ 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 index c2c2e9b..716fac7 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ 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 index 3368877..3937b73 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ 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 index 47c479f..c74c9ac 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ 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 index 90f514e..0ca86a7 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ 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 index 19b6d7c..24b4d79 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index 9c57bb5..6972f9c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ 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 index 1599d7c..ce7c5ff 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ 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 index 77738ab..1caa2bc 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index cac9ceb..5c90b73 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ 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 index 11f2e8a..1865a0f 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ 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 index c6b766d..6b9d36a 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png 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 index 62f8195..1a54144 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png +++ 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 index 182ce3e..cae9319 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ