diff --git a/app/build.gradle b/app/build.gradle index 9df9c38..c69c4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 2 - versionName "1.0.0.1" + versionCode 1 + versionName "1.0.0.0-beta" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] diff --git a/app/build.gradle b/app/build.gradle index 9df9c38..c69c4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 2 - versionName "1.0.0.1" + versionCode 1 + versionName "1.0.0.0-beta" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index fa94eb7..cdffb37 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -195,15 +195,15 @@ } fun String.toChineseGrade(): String { - if (this.isBlank()) { - return "级别未知" + if (this.isBlank() || this.isEmpty()) { + return "EE" } return when (this) { "0" -> "A" "1" -> "B" "2" -> "C" "3" -> "D" - else -> "未知" + else -> "EE" } } diff --git a/app/build.gradle b/app/build.gradle index 9df9c38..c69c4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 2 - versionName "1.0.0.1" + versionCode 1 + versionName "1.0.0.0-beta" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index fa94eb7..cdffb37 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -195,15 +195,15 @@ } fun String.toChineseGrade(): String { - if (this.isBlank()) { - return "级别未知" + if (this.isBlank() || this.isEmpty()) { + return "EE" } return when (this) { "0" -> "A" "1" -> "B" "2" -> "C" "3" -> "D" - else -> "未知" + else -> "EE" } } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index a345e50..5f06e94 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -65,9 +65,9 @@ * ============================================================================================= * */ const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" - const val SERVER_BASE_URL = "http://111.198.10.15:21609" + const val SERVER_BASE_URL = "http://222.187.140.114:8896" const val FILE_SERVER_CONFIG = "fileServerConfig" - const val File_SERVER_URL = "http://111.198.10.15:21408" + const val File_SERVER_URL = "http://222.187.140.114:5902" const val ACCOUNT = "account" const val PASSWORD = "password" const val USER_ID = "userId" diff --git a/app/build.gradle b/app/build.gradle index 9df9c38..c69c4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 2 - versionName "1.0.0.1" + versionCode 1 + versionName "1.0.0.0-beta" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index fa94eb7..cdffb37 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -195,15 +195,15 @@ } fun String.toChineseGrade(): String { - if (this.isBlank()) { - return "级别未知" + if (this.isBlank() || this.isEmpty()) { + return "EE" } return when (this) { "0" -> "A" "1" -> "B" "2" -> "C" "3" -> "D" - else -> "未知" + else -> "EE" } } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index a345e50..5f06e94 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -65,9 +65,9 @@ * ============================================================================================= * */ const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" - const val SERVER_BASE_URL = "http://111.198.10.15:21609" + const val SERVER_BASE_URL = "http://222.187.140.114:8896" const val FILE_SERVER_CONFIG = "fileServerConfig" - const val File_SERVER_URL = "http://111.198.10.15:21408" + const val File_SERVER_URL = "http://222.187.140.114:5902" const val ACCOUNT = "account" const val PASSWORD = "password" const val USER_ID = "userId" diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 9a2559e..acf463d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -153,13 +153,37 @@ "3" -> R.color.textColor_D.convertColor(context) else -> R.color.gray.convertColor(context) } + + val companySize = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + "规模未知" + } else { + item.companySizeName + } + + val scaleColor = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + R.color.mainBackground.convertColor(context) + } else { + R.color.themeColor.convertColor(context) + } + + val scaleTextColor = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + R.color.gray.convertColor(context) + } else { + R.color.white.convertColor(context) + } + viewHolder.setBackgroundColor(R.id.agreementLevelView, color) .setTextColor(R.id.agreementLevelView, textColor) .setText(R.id.agreementLevelView, item.grade.toChineseGrade()) .setText(R.id.customerNameView, item.customerName) - .setText(R.id.scaleView, item.companySizeName) - .setText(R.id.overallView, "公司规模:${item.evaluationName}") - .setText(R.id.fullAddressView, "公司地址:${item.fullAddress}") + .setText(R.id.scaleView, companySize) + .setTextColor(R.id.scaleView, scaleTextColor) + .setBackgroundColor(R.id.scaleView, scaleColor) + .setText(R.id.overallView, "分类:${item.evaluationName}") + .setText(R.id.fullAddressView, "地址:${item.fullAddress}") } } customerRecyclerView.addItemDecoration( diff --git a/app/build.gradle b/app/build.gradle index 9df9c38..c69c4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 2 - versionName "1.0.0.1" + versionCode 1 + versionName "1.0.0.0-beta" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index fa94eb7..cdffb37 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -195,15 +195,15 @@ } fun String.toChineseGrade(): String { - if (this.isBlank()) { - return "级别未知" + if (this.isBlank() || this.isEmpty()) { + return "EE" } return when (this) { "0" -> "A" "1" -> "B" "2" -> "C" "3" -> "D" - else -> "未知" + else -> "EE" } } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt index a345e50..5f06e94 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/LocaleConstant.kt @@ -65,9 +65,9 @@ * ============================================================================================= * */ const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" - const val SERVER_BASE_URL = "http://111.198.10.15:21609" + const val SERVER_BASE_URL = "http://222.187.140.114:8896" const val FILE_SERVER_CONFIG = "fileServerConfig" - const val File_SERVER_URL = "http://111.198.10.15:21408" + const val File_SERVER_URL = "http://222.187.140.114:5902" const val ACCOUNT = "account" const val PASSWORD = "password" const val USER_ID = "userId" diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 9a2559e..acf463d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -153,13 +153,37 @@ "3" -> R.color.textColor_D.convertColor(context) else -> R.color.gray.convertColor(context) } + + val companySize = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + "规模未知" + } else { + item.companySizeName + } + + val scaleColor = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + R.color.mainBackground.convertColor(context) + } else { + R.color.themeColor.convertColor(context) + } + + val scaleTextColor = + if (item.companySizeName.isEmpty() || item.companySizeName.isBlank()) { + R.color.gray.convertColor(context) + } else { + R.color.white.convertColor(context) + } + viewHolder.setBackgroundColor(R.id.agreementLevelView, color) .setTextColor(R.id.agreementLevelView, textColor) .setText(R.id.agreementLevelView, item.grade.toChineseGrade()) .setText(R.id.customerNameView, item.customerName) - .setText(R.id.scaleView, item.companySizeName) - .setText(R.id.overallView, "公司规模:${item.evaluationName}") - .setText(R.id.fullAddressView, "公司地址:${item.fullAddress}") + .setText(R.id.scaleView, companySize) + .setTextColor(R.id.scaleView, scaleTextColor) + .setBackgroundColor(R.id.scaleView, scaleColor) + .setText(R.id.overallView, "分类:${item.evaluationName}") + .setText(R.id.fullAddressView, "地址:${item.fullAddress}") } } customerRecyclerView.addItemDecoration( diff --git a/app/src/main/res/layout/item_file_rv_l.xml b/app/src/main/res/layout/item_file_rv_l.xml index f287a8d..674aa76 100644 --- a/app/src/main/res/layout/item_file_rv_l.xml +++ b/app/src/main/res/layout/item_file_rv_l.xml @@ -25,6 +25,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginHorizontal="@dimen/dp_5" + android:singleLine="true" android:text="测量设备" android:textColor="@color/black" android:textSize="@dimen/sp_16" />