diff --git a/app/build.gradle b/app/build.gradle index f53f7e1..92a997c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -16,13 +18,27 @@ buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.casic.app.smartwell" + //因为多渠道已经有包名了，此处注释掉 +// applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 versionCode 1 versionName "1.0.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + + // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 + flavorDimensions "versionCode" + } + + /** + * 多渠道打包 + * 1、applicationId = 软件-包名 + * */ + productFlavors { + gz { + applicationId "com.casic.gz.smartwell" + } } buildTypes { @@ -48,7 +64,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + outputFileName = "GZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -59,6 +75,12 @@ } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 diff --git a/app/build.gradle b/app/build.gradle index f53f7e1..92a997c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -16,13 +18,27 @@ buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.casic.app.smartwell" + //因为多渠道已经有包名了，此处注释掉 +// applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 versionCode 1 versionName "1.0.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + + // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 + flavorDimensions "versionCode" + } + + /** + * 多渠道打包 + * 1、applicationId = 软件-包名 + * */ + productFlavors { + gz { + applicationId "com.casic.gz.smartwell" + } } buildTypes { @@ -48,7 +64,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + outputFileName = "GZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -59,6 +75,12 @@ } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..e32de19 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -69,6 +69,7 @@ //窨井类型转换 fun String.valueToType(): String { return when (this) { + "" -> "全部" "1" -> "雨水井" "2" -> "污水井" "3" -> "燃气井" @@ -78,7 +79,16 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" + "12" -> "检修井" + "13" -> "人孔" + "14" -> "消防栓" + "15" -> "阀门井" + "16" -> "支架" + "17" -> "起始井" + "18" -> "雨篦" + "19" -> "窨井" else -> { "未知类型" } diff --git a/app/build.gradle b/app/build.gradle index f53f7e1..92a997c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -16,13 +18,27 @@ buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.casic.app.smartwell" + //因为多渠道已经有包名了，此处注释掉 +// applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 versionCode 1 versionName "1.0.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + + // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 + flavorDimensions "versionCode" + } + + /** + * 多渠道打包 + * 1、applicationId = 软件-包名 + * */ + productFlavors { + gz { + applicationId "com.casic.gz.smartwell" + } } buildTypes { @@ -48,7 +64,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + outputFileName = "GZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -59,6 +75,12 @@ } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..e32de19 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -69,6 +69,7 @@ //窨井类型转换 fun String.valueToType(): String { return when (this) { + "" -> "全部" "1" -> "雨水井" "2" -> "污水井" "3" -> "燃气井" @@ -78,7 +79,16 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" + "12" -> "检修井" + "13" -> "人孔" + "14" -> "消防栓" + "15" -> "阀门井" + "16" -> "支架" + "17" -> "起始井" + "18" -> "雨篦" + "19" -> "窨井" else -> { "未知类型" } 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 313af78..0b28ef4 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 @@ -96,7 +96,7 @@ //代码设置底部拉升距离 val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false + bottomSheetBehavior.isFitToContents = true bottomSheetBehavior.halfExpandedRatio = 0.23f bottomSheetBehavior.isHideable = false bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) @@ -346,7 +346,15 @@ } wellStateView.text = String.format("布/撤防状态: $bfztName") deepView.text = String.format("窨井深度: ${well.deep}m") - locationView.text = String.format("详细位置: ${well.position}") + val temp = StringBuilder() + if (well.position!!.length > 16) { + temp.append(well.position.substring(0, 14)) + .append("\r\n") + .append(well.position.substring(16)) + } else { + temp.append(well.position) + } + locationView.text = String.format("详细位置: $temp") return infoWindow } } diff --git a/app/build.gradle b/app/build.gradle index f53f7e1..92a997c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import java.text.SimpleDateFormat + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -16,13 +18,27 @@ buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.casic.app.smartwell" + //因为多渠道已经有包名了，此处注释掉 +// applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 versionCode 1 versionName "1.0.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + + // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 + flavorDimensions "versionCode" + } + + /** + * 多渠道打包 + * 1、applicationId = 软件-包名 + * */ + productFlavors { + gz { + applicationId "com.casic.gz.smartwell" + } } buildTypes { @@ -48,7 +64,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = defaultConfig.versionName + ".apk" + outputFileName = "GZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -59,6 +75,12 @@ } } +static def getBuildDate() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMM", Locale.CHINA) + return dateFormat.format(System.currentTimeMillis()) +} + + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..e32de19 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -69,6 +69,7 @@ //窨井类型转换 fun String.valueToType(): String { return when (this) { + "" -> "全部" "1" -> "雨水井" "2" -> "污水井" "3" -> "燃气井" @@ -78,7 +79,16 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" + "12" -> "检修井" + "13" -> "人孔" + "14" -> "消防栓" + "15" -> "阀门井" + "16" -> "支架" + "17" -> "起始井" + "18" -> "雨篦" + "19" -> "窨井" else -> { "未知类型" } 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 313af78..0b28ef4 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 @@ -96,7 +96,7 @@ //代码设置底部拉升距离 val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false + bottomSheetBehavior.isFitToContents = true bottomSheetBehavior.halfExpandedRatio = 0.23f bottomSheetBehavior.isHideable = false bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) @@ -346,7 +346,15 @@ } wellStateView.text = String.format("布/撤防状态: $bfztName") deepView.text = String.format("窨井深度: ${well.deep}m") - locationView.text = String.format("详细位置: ${well.position}") + val temp = StringBuilder() + if (well.position!!.length > 16) { + temp.append(well.position.substring(0, 14)) + .append("\r\n") + .append(well.position.substring(16)) + } else { + temp.append(well.position) + } + locationView.text = String.format("详细位置: $temp") return infoWindow } } 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 5005bc9..14d1f61 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 @@ -15,7 +15,7 @@ ) const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 + const val RADIUS_SIZE = 80 //相距多少米才聚合，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val PUSH_REGISTER = 2022082901 @@ -23,7 +23,7 @@ const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" - const val DEFAULT_SERVER = "http://111.198.10.15:11308" + const val DEFAULT_SERVER = "http://113.194.84.170:59001" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider"