diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index 09e5b3a..0b8affe 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -64,8 +64,6 @@ SaveKeyValues.getValue(Constant.OPEN_WARNING, false) as Boolean private val isAutoRecord = SaveKeyValues.getValue(Constant.AUTO_RECORD, false) as Boolean - private var isInspectionCompleted = - SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -300,16 +298,14 @@ } private fun selectInspectMode() { - if (isInspectionCompleted) { + val isCompleted = SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean + if (isCompleted) { InputDialog.Builder().setContext(this).setTitle("请输入巡检标签") .setHintText("如:xxx区间巡检").setNegativeButton("放弃").setPositiveButton("开始巡检") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { override fun onConfirmClick(input: String) { val currentTimeMillis = System.currentTimeMillis() - //设置标题和时间 - inspectNameView.text = input val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) - inspectTimeView.text = completeDate model = NewInspectionModel( currentTimeMillis.id(), input, completeDate, @@ -327,14 +323,26 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) - model = NewInspectionModel( - modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, - modelCache.startLng, modelCache.startLat, 0.0, 0.0, - modelCache.routes, modelCache.user - ) - "欢迎回来,继续未完成巡检".show(this) + if (currentInspection == "") { + AlertView( + "提示", "没有巡检记录,请新建巡检任务", null, arrayOf("去新建"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + finish() + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) + } + }.show() + } else { + val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) + model = NewInspectionModel( + modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, + modelCache.startLng, modelCache.startLat, 0.0, 0.0, + modelCache.routes, modelCache.user + ) + } startInspection() + "欢迎回来,继续未完成巡检".show(this) } } @@ -342,6 +350,10 @@ * 开始巡检,获取坐标 * */ private fun startInspection() { + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + //设置标题和时间 + inspectNameView.text = model.name + inspectTimeView.text = model.startTime aMap.addOnMyLocationChangeListener { // Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") // 保存最新的一次位置,sp不支持保存double diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt index 09e5b3a..0b8affe 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt @@ -64,8 +64,6 @@ SaveKeyValues.getValue(Constant.OPEN_WARNING, false) as Boolean private val isAutoRecord = SaveKeyValues.getValue(Constant.AUTO_RECORD, false) as Boolean - private var isInspectionCompleted = - SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -300,16 +298,14 @@ } private fun selectInspectMode() { - if (isInspectionCompleted) { + val isCompleted = SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean + if (isCompleted) { InputDialog.Builder().setContext(this).setTitle("请输入巡检标签") .setHintText("如:xxx区间巡检").setNegativeButton("放弃").setPositiveButton("开始巡检") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { override fun onConfirmClick(input: String) { val currentTimeMillis = System.currentTimeMillis() - //设置标题和时间 - inspectNameView.text = input val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) - inspectTimeView.text = completeDate model = NewInspectionModel( currentTimeMillis.id(), input, completeDate, @@ -327,14 +323,26 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) - model = NewInspectionModel( - modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, - modelCache.startLng, modelCache.startLat, 0.0, 0.0, - modelCache.routes, modelCache.user - ) - "欢迎回来,继续未完成巡检".show(this) + if (currentInspection == "") { + AlertView( + "提示", "没有巡检记录,请新建巡检任务", null, arrayOf("去新建"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + finish() + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) + } + }.show() + } else { + val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) + model = NewInspectionModel( + modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, + modelCache.startLng, modelCache.startLat, 0.0, 0.0, + modelCache.routes, modelCache.user + ) + } startInspection() + "欢迎回来,继续未完成巡检".show(this) } } @@ -342,6 +350,10 @@ * 开始巡检,获取坐标 * */ private fun startInspection() { + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + //设置标题和时间 + inspectNameView.text = model.name + inspectTimeView.text = model.startTime aMap.addOnMyLocationChangeListener { // Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") // 保存最新的一次位置,sp不支持保存double diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeMapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeMapActivity.kt index 554fc72..7291e94 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeMapActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeMapActivity.kt @@ -54,8 +54,6 @@ SaveKeyValues.getValue(Constant.OPEN_WARNING, false) as Boolean private val isAutoRecord = SaveKeyValues.getValue(Constant.AUTO_RECORD, false) as Boolean - private var isInspectionCompleted = - SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean private var gson: Gson = Gson() private var isBluetoothOn = true private var blueToothBeans: MutableList = ArrayList()//搜索展示列表 @@ -249,16 +247,14 @@ } private fun selectInspectMode() { - if (isInspectionCompleted) { + val isCompleted = SaveKeyValues.getValue(Constant.INSPECTION_COMPLETED, true) as Boolean + if (isCompleted) { InputDialog.Builder().setContext(this).setTitle("请输入巡检标签") .setHintText("如:xxx区间巡检").setNegativeButton("放弃").setPositiveButton("开始巡检") .setOnDialogClickListener(object : InputDialog.OnDialogButtonClickListener { override fun onConfirmClick(input: String) { val currentTimeMillis = System.currentTimeMillis() - //设置标题和时间 - inspectNameView.text = input val completeDate = TimeOrDateUtil.timestampToCompleteDate(currentTimeMillis) - inspectTimeView.text = completeDate model = NewInspectionModel( currentTimeMillis.id(), input, completeDate, @@ -276,14 +272,26 @@ .build().show() } else { val currentInspection = SaveKeyValues.getValue(Constant.INSPECTION_OBJECT, "") as String - val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) - model = NewInspectionModel( - modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, - modelCache.startLng, modelCache.startLat, 0.0, 0.0, - modelCache.routes, modelCache.user - ) - "欢迎回来,继续未完成巡检".show(this) + if (currentInspection == "") { + AlertView( + "提示", "没有巡检记录,请新建巡检任务", null, arrayOf("去新建"), + null, this, AlertView.Style.Alert + ) { _, position -> + if (position == 0) { + finish() + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, true) + } + }.show() + } else { + val modelCache = gson.fromJson(currentInspection, NewInspectionModel::class.java) + model = NewInspectionModel( + modelCache.id, modelCache.name, modelCache.startTime, "", modelCache.date, + modelCache.startLng, modelCache.startLat, 0.0, 0.0, + modelCache.routes, modelCache.user + ) + } startInspection() + "欢迎回来,继续未完成巡检".show(this) } } @@ -291,6 +299,10 @@ * 开始巡检,获取坐标 * */ private fun startInspection() { + SaveKeyValues.putValue(Constant.INSPECTION_COMPLETED, false) + //设置标题和时间 + inspectNameView.text = model.name + inspectTimeView.text = model.startTime aMap.addOnMyLocationChangeListener { // Log.d(Tag, "位置信息: [${it.longitude},${it.latitude}]") // 保存最新的一次位置,sp不支持保存double