diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt index d3dc633..2983542 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState import java.io.File class UploadImageViewModel : BaseViewModel() { diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt index d3dc633..2983542 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState import java.io.File class UploadImageViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt index bae4f95..c676fe3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt @@ -10,11 +10,11 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 用户相关 VM diff --git a/app/build.gradle b/app/build.gradle index 5ad9504..2e5823b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1060 - versionName "1.0.6" + versionCode 1070 + versionName "1.0.7" } buildTypes { @@ -70,7 +70,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt index ec3a4ea..30b8f28 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ArrayList.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.callback.OnDistanceSearchListener import java.text.DecimalFormat - /** * ArrayList扩展方法 */ diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt index c14b14a..85e268c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/String.kt @@ -12,7 +12,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.util.* +import java.util.Locale /** * String扩展方法 @@ -42,6 +42,17 @@ return errorModel.message.toString() } +fun String.toDeviceModel(): String { + return if (this.startsWith("33")) { + "BIRMM-LMT2000" + } else if (this.startsWith("36")) { + "BIRMM-LMT1000" + } else if (this.startsWith("39")) { + "BIRMM-LMT500" + } else { + this + } +} fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt new file mode 100644 index 0000000..21e65af --- /dev/null +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ViewGroup.kt @@ -0,0 +1,31 @@ +package com.casic.birmm.inspect.extensions + +import android.app.Activity +import android.view.ViewGroup +import androidx.annotation.ColorRes +import androidx.fragment.app.Fragment +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getStatusBarHeight + +fun ViewGroup.initImmersionBar(activity: Activity, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(activity) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(activity)) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = activity.getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} + +fun ViewGroup.initImmersionBar(fragment: Fragment, isDarkFont: Boolean, @ColorRes color: Int) { + ImmersionBar.with(fragment) + .statusBarDarkFont(isDarkFont) + .statusBarColorInt(color.convertColor(fragment.requireContext())) + .init() + //根据不同设备状态栏高度设置statusBarView高度 + val statusBarHeight = fragment.requireContext().getStatusBarHeight() + this.setPadding(0, statusBarHeight, 0, 0) + this.requestLayout() +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e5252c1..d8b726f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -30,8 +30,8 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -53,8 +53,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -315,7 +316,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -481,7 +483,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -626,13 +630,16 @@ super.onResume() binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String - if (code == "") { - binding.deviceStatusView.text = "设备编号: 未连接" + if (code.isEmpty()) { + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt index 1ba60fb..07d1cc3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt @@ -10,7 +10,6 @@ import com.casic.birmm.inspect.databinding.FragmentQueryEventBinding import com.casic.birmm.inspect.extensions.combineImagePath import com.casic.birmm.inspect.model.EventListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.EventDetailActivity import com.casic.birmm.inspect.vm.EventViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -19,8 +18,9 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryEventFragment : KotlinBaseFragment(), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt index d3dc633..2983542 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState import java.io.File class UploadImageViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt index bae4f95..c676fe3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt @@ -10,11 +10,11 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 用户相关 VM diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 9d060f4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -1,5 +1,6 @@ + android:src="@drawable/ic_title_left" /> (), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt index d3dc633..2983542 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState import java.io.File class UploadImageViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt index bae4f95..c676fe3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt @@ -10,11 +10,11 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 用户相关 VM diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 9d060f4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -1,5 +1,6 @@ + android:src="@drawable/ic_title_left" /> - - + android:orientation="vertical"> - + - + + + - + android:orientation="horizontal"> + + + + + + (), Handler.Callback { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index c0a4ba8..6c63b1b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -9,7 +9,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding import com.casic.birmm.inspect.model.InspectListModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -17,8 +16,9 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog class QueryInspectionFragment : KotlinBaseFragment(), diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt index c4cd2e6..fda2067 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/SettingPageFragment.kt @@ -22,7 +22,6 @@ import com.casic.birmm.inspect.model.UserInfoModel import com.casic.birmm.inspect.utils.AuthenticationHelper import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.SoundPoolHelper import com.casic.birmm.inspect.view.HelpCenterActivity @@ -38,9 +37,10 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -100,7 +100,7 @@ AuthenticationHelper.removeToken() requireContext().navigatePageTo() //清除所有Activity - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 1739dd0..98e3fa3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,10 +12,9 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "INSPECTION_LOCAL_BEAN". - */ +*/ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -46,16 +45,14 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -74,9 +71,7 @@ "\"USER\" TEXT);"); // 14: user } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -85,57 +80,57 @@ @Override protected final void bindValues(DatabaseStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -145,57 +140,57 @@ @Override protected final void bindValues(SQLiteStatement stmt, InspectionLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(3, deviceCode); } - + String inspectionTitle = entity.getInspectionTitle(); if (inspectionTitle != null) { stmt.bindString(4, inspectionTitle); } - + String startTime = entity.getStartTime(); if (startTime != null) { stmt.bindString(5, startTime); } - + String endTime = entity.getEndTime(); if (endTime != null) { stmt.bindString(6, endTime); } - + String date = entity.getDate(); if (date != null) { stmt.bindString(7, date); } stmt.bindDouble(8, entity.getStartLng()); stmt.bindDouble(9, entity.getStartLat()); - + String startAddress = entity.getStartAddress(); if (startAddress != null) { stmt.bindString(10, startAddress); } stmt.bindDouble(11, entity.getEndLng()); stmt.bindDouble(12, entity.getEndLat()); - + String endAddress = entity.getEndAddress(); if (endAddress != null) { stmt.bindString(13, endAddress); } stmt.bindDouble(14, entity.getDistance()); - + String user = entity.getUser(); if (user != null) { stmt.bindString(15, user); @@ -205,30 +200,30 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { InspectionLocalBean entity = new InspectionLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date - cursor.getDouble(offset + 7), // startLng - cursor.getDouble(offset + 8), // startLat - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress - cursor.getDouble(offset + 10), // endLng - cursor.getDouble(offset + 11), // endLat - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress - cursor.getDouble(offset + 13), // distance - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // inspectionId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // deviceCode + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // inspectionTitle + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // startTime + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // endTime + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // date + cursor.getDouble(offset + 7), // startLng + cursor.getDouble(offset + 8), // startLat + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // startAddress + cursor.getDouble(offset + 10), // endLng + cursor.getDouble(offset + 11), // endLat + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // endAddress + cursor.getDouble(offset + 13), // distance + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14) // user ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -246,17 +241,17 @@ entity.setEndAddress(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); - } - + } + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -272,5 +267,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index a5ba495..378954b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -27,10 +27,10 @@ import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel import com.casic.birmm.inspect.extensions.toDeviceCode +import com.casic.birmm.inspect.extensions.toDeviceModel import com.casic.birmm.inspect.model.NewInspectionModel import com.casic.birmm.inspect.single.view.NewEventActivity import com.casic.birmm.inspect.utils.DataBaseManager -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.LocationHub import com.casic.birmm.inspect.utils.SoundPoolHelper @@ -48,6 +48,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.extensions.timestampToDate +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertInputDialog @@ -175,7 +176,7 @@ currentTimeMillis.id(), value, startTime, "", currentTimeMillis.timestampToDate(), 0.0, 0.0, "", 0.0, 0.0, "", - ArrayList(), "智巡宝" + ArrayList(), "智巡宝" ) //按钮状态 @@ -271,7 +272,8 @@ binding.currentValueView.text = "--" binding.settingsValueView.text = "--" binding.maxValueView.text = "--" - binding.deviceStatusView.text = "设备编号：未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" "设备已断开连接".show(requireContext()) //清除缓存 @@ -434,7 +436,9 @@ } withContext(Dispatchers.Main) { connectedDeviceCode = data.toDeviceCode() - binding.deviceStatusView.text = "设备编号: $connectedDeviceCode" + binding.deviceModelView.text = + "产品型号: ${connectedDeviceCode.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $connectedDeviceCode" SaveKeyValues.putValue( LocaleConstant.DEVICE_CODE, connectedDeviceCode ) @@ -580,12 +584,15 @@ binding.mapView.onResume() val code = SaveKeyValues.getValue(LocaleConstant.DEVICE_CODE, "") as String if (code.isEmpty()) { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } else { if (code.isDigitsOnly()) { - binding.deviceStatusView.text = "设备编号: $code" + binding.deviceModelView.text = "产品型号: ${code.toDeviceModel()}" + binding.deviceCodeView.text = "设备编号: $code" } else { - binding.deviceStatusView.text = "设备编号: 未连接" + binding.deviceModelView.text = "产品型号：未连接" + binding.deviceCodeView.text = "设备编号：未连接" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt index 2d44afd..2eb2fb2 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/SettingPageFragment.kt @@ -21,7 +21,7 @@ import com.pengxh.kt.lite.extensions.getStatusBarHeight import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -82,7 +82,7 @@ override fun onConfirmClick() { //执行退出登录操作 requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() } }).build().show() } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index 0a45620..2b69e33 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -13,15 +13,15 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 0ac3a5d..e3fa099 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -13,13 +13,13 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt index 36f4c37..f102943 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt @@ -17,8 +17,8 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionRouteActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ private lateinit var inspectionId: String override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) inspectionId = intent.getStringExtra(Constant.INTENT_PARAM)!! //根据id查询详情 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index 3a2b3d8..cf891cd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index b33be8d..60d5096 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -18,12 +18,13 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -48,7 +49,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" @@ -68,8 +69,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) - imageAdapter.setupImage(realPaths) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -103,7 +104,7 @@ override fun onItemLongClick(view: View?, position: Int) { realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) @@ -125,7 +126,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -141,7 +142,7 @@ lat = latitude, data = data, images = realPaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter() + description = binding.eventEditTextView.text.toString() ) "保存成功".show(this) finish() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt deleted file mode 100644 index 2a5f531..0000000 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LoadingDialogHub.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.birmm.inspect.utils - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object LoadingDialogHub { - - private lateinit var loadingDialog: QMUITipDialog - - fun show(activity: Activity, message: String) { - loadingDialog = QMUITipDialog - .Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismiss() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt index 16ace0a..1481d08 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/BigImageActivity.kt @@ -1,7 +1,6 @@ package com.casic.birmm.inspect.view import android.content.Context -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -12,10 +11,10 @@ import com.bumptech.glide.Glide import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityBigImageBinding +import com.casic.birmm.inspect.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil class BigImageActivity : KotlinBaseActivity() { @@ -24,7 +23,8 @@ } override fun setupTopBarLayout() { - ImmerseStatusBarUtil.setColor(this, Color.BLACK) + binding.rootView.initImmersionBar(this, false, R.color.black) + binding.leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 653a448..577f94d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -13,9 +13,8 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager - class EventDetailActivity : KotlinBaseActivity() { @@ -39,7 +38,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index 01fd81b..23769e7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,8 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager - +import com.pengxh.kt.lite.utils.ActivityStackManager class HelpCenterActivity : KotlinBaseActivity() { override fun initViewBinding(): ActivityHelpCenterBinding { @@ -29,7 +28,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index fc37bd7..c498c6b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -6,7 +6,6 @@ import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.model.InspectEventModel -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -15,9 +14,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionEventActivity : KotlinBaseActivity() { @@ -37,7 +37,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) val id = intent.getStringExtra(Constant.INTENT_PARAM)!! diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt index f949d8d..d470719 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt @@ -14,15 +14,15 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding import com.casic.birmm.inspect.extensions.initLayoutImmersionBar -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.vm.InspectionViewModel import com.casic.birmm.inspect.vm.RouteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub class InspectionRouteActivity : KotlinBaseActivity() { @@ -45,7 +45,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] routeViewModel = ViewModelProvider(this)[RouteViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt index a02545c..9710a3c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/LoginActivity.kt @@ -7,7 +7,6 @@ import com.casic.birmm.inspect.R import com.casic.birmm.inspect.databinding.ActivityLoginBinding import com.casic.birmm.inspect.utils.AuthenticationHelper -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.utils.RSAUtils import com.casic.birmm.inspect.vm.AuthenticateViewModel @@ -17,9 +16,10 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertInputDialog class LoginActivity : KotlinBaseActivity() { @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_NAME, user.data.name)//保存用户对象 SaveKeyValues.putValue(LocaleConstant.USER_OBJECT, user.toJson())//保存用户对象 - PageNavigationManager.finishAllActivity() + ActivityStackManager.finishAllActivity() navigatePageTo() } } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 33066be..219ae27 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,7 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class MainActivity : KotlinBaseActivity() { @@ -30,7 +30,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index 6800480..844fa20 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -17,7 +17,6 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.casic.birmm.inspect.extensions.reformat import com.casic.birmm.inspect.utils.GlideLoadEngine -import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.utils.LocaleConstant import com.casic.birmm.inspect.vm.EventViewModel import com.casic.birmm.inspect.vm.UploadImageViewModel @@ -28,15 +27,17 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.filterSpaceOrEnter +import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.LoadState +import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File import java.util.UUID @@ -69,7 +70,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) weakReferenceHandler = WeakReferenceHandler(this) @@ -95,7 +96,8 @@ binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate() //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3, 13f) + val viewWidth = getScreenWidth() - 40.dp2px(this) + imageAdapter = EditableImageAdapter(this, realPaths, viewWidth, 3, 3) binding.addImageView.adapter = imageAdapter } @@ -130,7 +132,7 @@ imagePaths.removeAt(position) realPaths.removeAt(position) selectedResult.removeAt(position) - imageAdapter.deleteImage(position) + imageAdapter.notifyDataSetChanged() } }) uploadImageViewModel.uploadResult.observe(this) { @@ -162,7 +164,7 @@ } type = "报警事件" - data = inspectValue.filterSpaceOrEnter().toInt() + data = inspectValue.toInt() } else { type = "自定义事件" } @@ -177,7 +179,7 @@ lat = latitude, data = data, images = imagePaths.reformat(), - description = binding.eventEditTextView.text.toString().filterSpaceOrEnter(), + description = binding.eventEditTextView.text.toString(), user = userName ) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 1769fbb..874257c 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,7 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.utils.PageNavigationManager +import com.pengxh.kt.lite.utils.ActivityStackManager class UserDetailActivity : KotlinBaseActivity() { @@ -32,7 +32,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - PageNavigationManager.addActivity(this) + ActivityStackManager.addActivity(this) userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt index 3a9ae79..658f065 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/AuthenticateViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * PublicKey VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt index 3b38f1b..52319a0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/EventViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 事件相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt index e80864d..e9d5408 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/InspectionViewModel.kt @@ -10,10 +10,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 巡检相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt index 812bfe5..0ddfccd 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/RouteViewModel.kt @@ -9,9 +9,9 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel /** * 路径点相关 VM diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt index d3dc633..2983542 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UploadImageViewModel.kt @@ -8,10 +8,10 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState import java.io.File class UploadImageViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt index bae4f95..c676fe3 100644 --- a/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/birmm/inspect/vm/UserViewModel.kt @@ -10,11 +10,11 @@ import com.casic.birmm.inspect.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.base.BaseViewModel import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.utils.LoadState /** * 用户相关 VM diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 9d060f4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -1,5 +1,6 @@ + android:src="@drawable/ic_title_left" /> - - + android:orientation="vertical"> - + - + + + - + android:orientation="horizontal"> + + + + + + - - + android:orientation="vertical"> - + - + + + - + android:orientation="horizontal"> + + + + + +