diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index e1c9dce..0e53715 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -178,6 +178,8 @@ slowSoundResourceId = soundPool.load(this, R.raw.ring4, 1) fastSoundResourceId = soundPool.load(this, R.raw.ring2, 1) + "登录成功".show(this) + //地图初始化 initMapConfig(savedInstanceState) @@ -461,7 +463,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ArrayList(ids)) + taskViewModel.uploadTaskMarker(context, this, ArrayList(ids)) } } }).build().show() @@ -476,7 +478,7 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.createFreeTask(userId, value) + taskViewModel.createFreeTask(context, userId, value) //调高串口电位 gpioManager.setGpioHigh("18") @@ -528,8 +530,7 @@ aMap.addMarker( MarkerOptions().position( LatLng( - bean.lat.toDouble(), - bean.lng.toDouble() + bean.lat.toDouble(), bean.lng.toDouble() ) ).icon(BitmapDescriptorFactory.fromResource(R.mipmap.label_blue1)) ) @@ -792,7 +793,7 @@ private fun uploadTask(taskId: String?, state: String) { if (isNetworkConnected()) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.uploadTask(userId, taskId, state) + taskViewModel.uploadTask(this, userId, taskId, state) } else { "网络连接已断开，请检查".show(this) } @@ -812,7 +813,9 @@ /** * 后台设计如此，都传companyId * */ - taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) + taskViewModel.getMarkerFile( + context, companyId.toString(), companyId.toString() + ) } else { "网络连接已断开，请检查".show(context) } @@ -828,7 +831,7 @@ private fun downloadTask() { if (isNetworkConnected()) { val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") - taskViewModel.getTask(userName.toString()) + taskViewModel.getTask(this, userName.toString()) } else { "网络连接已断开，请检查".show(this) } @@ -856,6 +859,7 @@ ) taskViewModel.installLabel( + this, companyId, labelBean.objectType, labelBean.pipelineType, @@ -1132,6 +1136,7 @@ isInstallMarker = true taskViewModel.installLabel( + context, companyId, binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(), binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(), @@ -1636,7 +1641,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } @@ -1774,7 +1779,8 @@ } } withContext(Dispatchers.Main) { - binding.radarScanView.renderPointData(dataPoints, + binding.radarScanView.renderPointData( + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { @@ -1791,8 +1797,7 @@ binding.distancePgBar.progress = progress.toInt() } } - } - ) + }) } } } @@ -1891,7 +1896,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index e1c9dce..0e53715 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -178,6 +178,8 @@ slowSoundResourceId = soundPool.load(this, R.raw.ring4, 1) fastSoundResourceId = soundPool.load(this, R.raw.ring2, 1) + "登录成功".show(this) + //地图初始化 initMapConfig(savedInstanceState) @@ -461,7 +463,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ArrayList(ids)) + taskViewModel.uploadTaskMarker(context, this, ArrayList(ids)) } } }).build().show() @@ -476,7 +478,7 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.createFreeTask(userId, value) + taskViewModel.createFreeTask(context, userId, value) //调高串口电位 gpioManager.setGpioHigh("18") @@ -528,8 +530,7 @@ aMap.addMarker( MarkerOptions().position( LatLng( - bean.lat.toDouble(), - bean.lng.toDouble() + bean.lat.toDouble(), bean.lng.toDouble() ) ).icon(BitmapDescriptorFactory.fromResource(R.mipmap.label_blue1)) ) @@ -792,7 +793,7 @@ private fun uploadTask(taskId: String?, state: String) { if (isNetworkConnected()) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.uploadTask(userId, taskId, state) + taskViewModel.uploadTask(this, userId, taskId, state) } else { "网络连接已断开，请检查".show(this) } @@ -812,7 +813,9 @@ /** * 后台设计如此，都传companyId * */ - taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) + taskViewModel.getMarkerFile( + context, companyId.toString(), companyId.toString() + ) } else { "网络连接已断开，请检查".show(context) } @@ -828,7 +831,7 @@ private fun downloadTask() { if (isNetworkConnected()) { val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") - taskViewModel.getTask(userName.toString()) + taskViewModel.getTask(this, userName.toString()) } else { "网络连接已断开，请检查".show(this) } @@ -856,6 +859,7 @@ ) taskViewModel.installLabel( + this, companyId, labelBean.objectType, labelBean.pipelineType, @@ -1132,6 +1136,7 @@ isInstallMarker = true taskViewModel.installLabel( + context, companyId, binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(), binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(), @@ -1636,7 +1641,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } @@ -1774,7 +1779,8 @@ } } withContext(Dispatchers.Main) { - binding.radarScanView.renderPointData(dataPoints, + binding.radarScanView.renderPointData( + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { @@ -1791,8 +1797,7 @@ binding.distancePgBar.progress = progress.toInt() } } - } - ) + }) } } } @@ -1891,7 +1896,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 79c973d..579bb7c 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -128,7 +128,7 @@ eventModel.latitude = binding.latView.text.toString().toDouble() eventModel.longitude = binding.lngView.text.toString().toDouble() - taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths) + taskViewModel.uploadEvent(this, taskId, eventModel.toJson(), realPaths) } } diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index e1c9dce..0e53715 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -178,6 +178,8 @@ slowSoundResourceId = soundPool.load(this, R.raw.ring4, 1) fastSoundResourceId = soundPool.load(this, R.raw.ring2, 1) + "登录成功".show(this) + //地图初始化 initMapConfig(savedInstanceState) @@ -461,7 +463,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ArrayList(ids)) + taskViewModel.uploadTaskMarker(context, this, ArrayList(ids)) } } }).build().show() @@ -476,7 +478,7 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.createFreeTask(userId, value) + taskViewModel.createFreeTask(context, userId, value) //调高串口电位 gpioManager.setGpioHigh("18") @@ -528,8 +530,7 @@ aMap.addMarker( MarkerOptions().position( LatLng( - bean.lat.toDouble(), - bean.lng.toDouble() + bean.lat.toDouble(), bean.lng.toDouble() ) ).icon(BitmapDescriptorFactory.fromResource(R.mipmap.label_blue1)) ) @@ -792,7 +793,7 @@ private fun uploadTask(taskId: String?, state: String) { if (isNetworkConnected()) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.uploadTask(userId, taskId, state) + taskViewModel.uploadTask(this, userId, taskId, state) } else { "网络连接已断开，请检查".show(this) } @@ -812,7 +813,9 @@ /** * 后台设计如此，都传companyId * */ - taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) + taskViewModel.getMarkerFile( + context, companyId.toString(), companyId.toString() + ) } else { "网络连接已断开，请检查".show(context) } @@ -828,7 +831,7 @@ private fun downloadTask() { if (isNetworkConnected()) { val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") - taskViewModel.getTask(userName.toString()) + taskViewModel.getTask(this, userName.toString()) } else { "网络连接已断开，请检查".show(this) } @@ -856,6 +859,7 @@ ) taskViewModel.installLabel( + this, companyId, labelBean.objectType, labelBean.pipelineType, @@ -1132,6 +1136,7 @@ isInstallMarker = true taskViewModel.installLabel( + context, companyId, binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(), binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(), @@ -1636,7 +1641,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } @@ -1774,7 +1779,8 @@ } } withContext(Dispatchers.Main) { - binding.radarScanView.renderPointData(dataPoints, + binding.radarScanView.renderPointData( + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { @@ -1791,8 +1797,7 @@ binding.distancePgBar.progress = progress.toInt() } } - } - ) + }) } } } @@ -1891,7 +1896,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 79c973d..579bb7c 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -128,7 +128,7 @@ eventModel.latitude = binding.latView.text.toString().toDouble() eventModel.longitude = binding.lngView.text.toString().toDouble() - taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths) + taskViewModel.uploadEvent(this, taskId, eventModel.toJson(), realPaths) } } diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index 5bb6eef..58f75c4 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -1,7 +1,7 @@ package com.casic.detector.vm +import android.content.Context import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.MarkerFileModel @@ -20,66 +20,66 @@ class TaskViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val markerFileResult = MutableLiveData() val taskResult = MutableLiveData() val freeTaskResult = MutableLiveData() val uploadTaskMarkerResult = MutableLiveData() val executeTaskResult = MutableLiveData() - fun createFreeTask(patrollerId: String, description: String) = launch({ + fun createFreeTask(context: Context, patrollerId: String, description: String) = launch({ val response = RetrofitServiceManager.createFreeTask(patrollerId, description) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject freeTaskResult.value = jsonObject.get("taskId").asInt.toString() } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun uploadTaskMarker(taskId: String, models: ArrayList) = launch({ + fun uploadTaskMarker(context: Context, taskId: String, models: ArrayList) = launch({ val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject uploadTaskMarkerResult.value = jsonObject.get("success").asString } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getMarkerFile(userId: String, companyId: String) = launch({ + fun getMarkerFile(context: Context, userId: String, companyId: String) = launch({ val response = RetrofitServiceManager.getMarkerFile(userId, companyId) if (response.getResponseState()) { markerFileResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getTask(userName: String) = launch({ + fun getTask(context: Context, userName: String) = launch({ val response = RetrofitServiceManager.getTask(userName) if (response.getResponseState()) { taskResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) fun installLabel( + context: Context, companyId: String, recordType: String, markerObjectType: String, @@ -142,20 +142,20 @@ loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadTask(userId: String, taskId: String?, state: String) = launch({ + fun uploadTask(context: Context, userId: String, taskId: String?, state: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadTask(userId, taskId, state) if (response.getResponseState()) { loadState.value = LoadState.Success if (state == "2") { - "工单${taskId}已提交！".show(BaseApplication.get()) + "工单${taskId}已提交！".show(context) //删除本地数据库 DataBaseManager.get.deleteTaskById(taskId) SaveKeyValues.putValue(LocaleConstant.TASK_ID, "") @@ -166,35 +166,36 @@ } } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadEvent(taskId: String, event: String, realPaths: ArrayList) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) - if (response.getResponseState()) { - loadState.value = LoadState.Success - } else { + fun uploadEvent(context: Context, taskId: String, event: String, realPaths: ArrayList) = + launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) + if (response.getResponseState()) { + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + }, { + it.printStackTrace() loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) - } - }, { - it.printStackTrace() - loadState.value = LoadState.Fail - }) + }) - fun uploadMarker(taskDetailId: String) = launch({ + fun uploadMarker(context: Context, taskDetailId: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadMarker(taskDetailId) if (response.getResponseState()) { loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index e1c9dce..0e53715 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -178,6 +178,8 @@ slowSoundResourceId = soundPool.load(this, R.raw.ring4, 1) fastSoundResourceId = soundPool.load(this, R.raw.ring2, 1) + "登录成功".show(this) + //地图初始化 initMapConfig(savedInstanceState) @@ -461,7 +463,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ArrayList(ids)) + taskViewModel.uploadTaskMarker(context, this, ArrayList(ids)) } } }).build().show() @@ -476,7 +478,7 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.createFreeTask(userId, value) + taskViewModel.createFreeTask(context, userId, value) //调高串口电位 gpioManager.setGpioHigh("18") @@ -528,8 +530,7 @@ aMap.addMarker( MarkerOptions().position( LatLng( - bean.lat.toDouble(), - bean.lng.toDouble() + bean.lat.toDouble(), bean.lng.toDouble() ) ).icon(BitmapDescriptorFactory.fromResource(R.mipmap.label_blue1)) ) @@ -792,7 +793,7 @@ private fun uploadTask(taskId: String?, state: String) { if (isNetworkConnected()) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.uploadTask(userId, taskId, state) + taskViewModel.uploadTask(this, userId, taskId, state) } else { "网络连接已断开，请检查".show(this) } @@ -812,7 +813,9 @@ /** * 后台设计如此，都传companyId * */ - taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) + taskViewModel.getMarkerFile( + context, companyId.toString(), companyId.toString() + ) } else { "网络连接已断开，请检查".show(context) } @@ -828,7 +831,7 @@ private fun downloadTask() { if (isNetworkConnected()) { val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") - taskViewModel.getTask(userName.toString()) + taskViewModel.getTask(this, userName.toString()) } else { "网络连接已断开，请检查".show(this) } @@ -856,6 +859,7 @@ ) taskViewModel.installLabel( + this, companyId, labelBean.objectType, labelBean.pipelineType, @@ -1132,6 +1136,7 @@ isInstallMarker = true taskViewModel.installLabel( + context, companyId, binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(), binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(), @@ -1636,7 +1641,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } @@ -1774,7 +1779,8 @@ } } withContext(Dispatchers.Main) { - binding.radarScanView.renderPointData(dataPoints, + binding.radarScanView.renderPointData( + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { @@ -1791,8 +1797,7 @@ binding.distancePgBar.progress = progress.toInt() } } - } - ) + }) } } } @@ -1891,7 +1896,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 79c973d..579bb7c 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -128,7 +128,7 @@ eventModel.latitude = binding.latView.text.toString().toDouble() eventModel.longitude = binding.lngView.text.toString().toDouble() - taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths) + taskViewModel.uploadEvent(this, taskId, eventModel.toJson(), realPaths) } } diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index 5bb6eef..58f75c4 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -1,7 +1,7 @@ package com.casic.detector.vm +import android.content.Context import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.MarkerFileModel @@ -20,66 +20,66 @@ class TaskViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val markerFileResult = MutableLiveData() val taskResult = MutableLiveData() val freeTaskResult = MutableLiveData() val uploadTaskMarkerResult = MutableLiveData() val executeTaskResult = MutableLiveData() - fun createFreeTask(patrollerId: String, description: String) = launch({ + fun createFreeTask(context: Context, patrollerId: String, description: String) = launch({ val response = RetrofitServiceManager.createFreeTask(patrollerId, description) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject freeTaskResult.value = jsonObject.get("taskId").asInt.toString() } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun uploadTaskMarker(taskId: String, models: ArrayList) = launch({ + fun uploadTaskMarker(context: Context, taskId: String, models: ArrayList) = launch({ val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject uploadTaskMarkerResult.value = jsonObject.get("success").asString } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getMarkerFile(userId: String, companyId: String) = launch({ + fun getMarkerFile(context: Context, userId: String, companyId: String) = launch({ val response = RetrofitServiceManager.getMarkerFile(userId, companyId) if (response.getResponseState()) { markerFileResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getTask(userName: String) = launch({ + fun getTask(context: Context, userName: String) = launch({ val response = RetrofitServiceManager.getTask(userName) if (response.getResponseState()) { taskResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) fun installLabel( + context: Context, companyId: String, recordType: String, markerObjectType: String, @@ -142,20 +142,20 @@ loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadTask(userId: String, taskId: String?, state: String) = launch({ + fun uploadTask(context: Context, userId: String, taskId: String?, state: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadTask(userId, taskId, state) if (response.getResponseState()) { loadState.value = LoadState.Success if (state == "2") { - "工单${taskId}已提交！".show(BaseApplication.get()) + "工单${taskId}已提交！".show(context) //删除本地数据库 DataBaseManager.get.deleteTaskById(taskId) SaveKeyValues.putValue(LocaleConstant.TASK_ID, "") @@ -166,35 +166,36 @@ } } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadEvent(taskId: String, event: String, realPaths: ArrayList) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) - if (response.getResponseState()) { - loadState.value = LoadState.Success - } else { + fun uploadEvent(context: Context, taskId: String, event: String, realPaths: ArrayList) = + launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) + if (response.getResponseState()) { + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + }, { + it.printStackTrace() loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) - } - }, { - it.printStackTrace() - loadState.value = LoadState.Fail - }) + }) - fun uploadMarker(taskDetailId: String) = launch({ + fun uploadMarker(context: Context, taskDetailId: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadMarker(taskDetailId) if (response.getResponseState()) { loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() diff --git a/app/src/main/java/com/casic/detector/vm/UserViewModel.kt b/app/src/main/java/com/casic/detector/vm/UserViewModel.kt index 9d8ea24..50f914f 100644 --- a/app/src/main/java/com/casic/detector/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/UserViewModel.kt @@ -1,7 +1,7 @@ package com.casic.detector.vm +import android.content.Context import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.LoginResultModel @@ -19,10 +19,9 @@ * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val loginResult = MutableLiveData() - fun login(account: String, password: String) = launch({ + fun login(context: Context, account: String, password: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.login(account, password) if (response.getResponseState()) { @@ -32,14 +31,15 @@ ) } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { + it.printStackTrace() loadState.value = LoadState.Fail - if (BaseApplication.get().isNetworkConnected()) { - "连接服务器失败，IP或端口错误".show(BaseApplication.get()) + if (context.isNetworkConnected()) { + "连接服务器失败，IP或端口错误".show(context) } else { - "网络连接失败".show(BaseApplication.get()) + "网络连接失败".show(context) } }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/extensions/Throwable.kt b/app/src/main/java/com/casic/detector/extensions/Throwable.kt deleted file mode 100644 index 4220061..0000000 --- a/app/src/main/java/com/casic/detector/extensions/Throwable.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.detector.extensions - -import java.net.ConnectException - -fun Throwable.convertChinese(): String { - this.printStackTrace() - return when (this) { - is ConnectException -> "连接失败，请检查网络或者服务器" - else -> "服务器异常，请联系管理员" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index dde848f..12737e9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -67,7 +67,7 @@ SaveKeyValues.putValue(LocaleConstant.SERVER_PORT, serversPort) //登陆 - userViewModel.login(account, password) + userViewModel.login(this, account, password) } } diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index e1c9dce..0e53715 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -178,6 +178,8 @@ slowSoundResourceId = soundPool.load(this, R.raw.ring4, 1) fastSoundResourceId = soundPool.load(this, R.raw.ring2, 1) + "登录成功".show(this) + //地图初始化 initMapConfig(savedInstanceState) @@ -461,7 +463,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ArrayList(ids)) + taskViewModel.uploadTaskMarker(context, this, ArrayList(ids)) } } }).build().show() @@ -476,7 +478,7 @@ .setOnDialogButtonClickListener(object : AlertInputDialog.OnDialogButtonClickListener { override fun onConfirmClick(value: String) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.createFreeTask(userId, value) + taskViewModel.createFreeTask(context, userId, value) //调高串口电位 gpioManager.setGpioHigh("18") @@ -528,8 +530,7 @@ aMap.addMarker( MarkerOptions().position( LatLng( - bean.lat.toDouble(), - bean.lng.toDouble() + bean.lat.toDouble(), bean.lng.toDouble() ) ).icon(BitmapDescriptorFactory.fromResource(R.mipmap.label_blue1)) ) @@ -792,7 +793,7 @@ private fun uploadTask(taskId: String?, state: String) { if (isNetworkConnected()) { val userId = SaveKeyValues.getValue(LocaleConstant.USER_ID, "") as String - taskViewModel.uploadTask(userId, taskId, state) + taskViewModel.uploadTask(this, userId, taskId, state) } else { "网络连接已断开，请检查".show(this) } @@ -812,7 +813,9 @@ /** * 后台设计如此，都传companyId * */ - taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) + taskViewModel.getMarkerFile( + context, companyId.toString(), companyId.toString() + ) } else { "网络连接已断开，请检查".show(context) } @@ -828,7 +831,7 @@ private fun downloadTask() { if (isNetworkConnected()) { val userName = SaveKeyValues.getValue(LocaleConstant.USER_NAME, "") - taskViewModel.getTask(userName.toString()) + taskViewModel.getTask(this, userName.toString()) } else { "网络连接已断开，请检查".show(this) } @@ -856,6 +859,7 @@ ) taskViewModel.installLabel( + this, companyId, labelBean.objectType, labelBean.pipelineType, @@ -1132,6 +1136,7 @@ isInstallMarker = true taskViewModel.installLabel( + context, companyId, binding.objectInclude.objectTypeSpinner.selectedItem.toString().toObjectType(), binding.objectInclude.pipeInclude.markerObjectTypeView.text.toString(), @@ -1636,7 +1641,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } @@ -1774,7 +1779,8 @@ } } withContext(Dispatchers.Main) { - binding.radarScanView.renderPointData(dataPoints, + binding.radarScanView.renderPointData( + dataPoints, object : RadarScanView.OnGetNearestPointCallback { override fun getNearestPoint(point: RadarScanView.DataPoint?) { if (point == null) { @@ -1791,8 +1797,7 @@ binding.distancePgBar.progress = progress.toInt() } } - } - ) + }) } } } @@ -1891,7 +1896,7 @@ /** * 此taskCode是 [com.casic.detector.model.TaskModel.MessageModel.TaskDetailInfosModel] 里面的主键，也就是这个标签在数据库里面的主键 * */ - taskViewModel.uploadMarker(taskCode) + taskViewModel.uploadMarker(context, taskCode) } } } diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 79c973d..579bb7c 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -128,7 +128,7 @@ eventModel.latitude = binding.latView.text.toString().toDouble() eventModel.longitude = binding.lngView.text.toString().toDouble() - taskViewModel.uploadEvent(taskId, eventModel.toJson(), realPaths) + taskViewModel.uploadEvent(this, taskId, eventModel.toJson(), realPaths) } } diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index 5bb6eef..58f75c4 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -1,7 +1,7 @@ package com.casic.detector.vm +import android.content.Context import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.MarkerFileModel @@ -20,66 +20,66 @@ class TaskViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val markerFileResult = MutableLiveData() val taskResult = MutableLiveData() val freeTaskResult = MutableLiveData() val uploadTaskMarkerResult = MutableLiveData() val executeTaskResult = MutableLiveData() - fun createFreeTask(patrollerId: String, description: String) = launch({ + fun createFreeTask(context: Context, patrollerId: String, description: String) = launch({ val response = RetrofitServiceManager.createFreeTask(patrollerId, description) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject freeTaskResult.value = jsonObject.get("taskId").asInt.toString() } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun uploadTaskMarker(taskId: String, models: ArrayList) = launch({ + fun uploadTaskMarker(context: Context, taskId: String, models: ArrayList) = launch({ val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject uploadTaskMarkerResult.value = jsonObject.get("success").asString } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getMarkerFile(userId: String, companyId: String) = launch({ + fun getMarkerFile(context: Context, userId: String, companyId: String) = launch({ val response = RetrofitServiceManager.getMarkerFile(userId, companyId) if (response.getResponseState()) { markerFileResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) - fun getTask(userName: String) = launch({ + fun getTask(context: Context, userName: String) = launch({ val response = RetrofitServiceManager.getTask(userName) if (response.getResponseState()) { taskResult.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() }) fun installLabel( + context: Context, companyId: String, recordType: String, markerObjectType: String, @@ -142,20 +142,20 @@ loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadTask(userId: String, taskId: String?, state: String) = launch({ + fun uploadTask(context: Context, userId: String, taskId: String?, state: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadTask(userId, taskId, state) if (response.getResponseState()) { loadState.value = LoadState.Success if (state == "2") { - "工单${taskId}已提交！".show(BaseApplication.get()) + "工单${taskId}已提交！".show(context) //删除本地数据库 DataBaseManager.get.deleteTaskById(taskId) SaveKeyValues.putValue(LocaleConstant.TASK_ID, "") @@ -166,35 +166,36 @@ } } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() loadState.value = LoadState.Fail }) - fun uploadEvent(taskId: String, event: String, realPaths: ArrayList) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) - if (response.getResponseState()) { - loadState.value = LoadState.Success - } else { + fun uploadEvent(context: Context, taskId: String, event: String, realPaths: ArrayList) = + launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.uploadEvent(taskId, event, realPaths) + if (response.getResponseState()) { + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.getResponseMessage().show(context) + } + }, { + it.printStackTrace() loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) - } - }, { - it.printStackTrace() - loadState.value = LoadState.Fail - }) + }) - fun uploadMarker(taskDetailId: String) = launch({ + fun uploadMarker(context: Context, taskDetailId: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadMarker(taskDetailId) if (response.getResponseState()) { loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { it.printStackTrace() diff --git a/app/src/main/java/com/casic/detector/vm/UserViewModel.kt b/app/src/main/java/com/casic/detector/vm/UserViewModel.kt index 9d8ea24..50f914f 100644 --- a/app/src/main/java/com/casic/detector/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/UserViewModel.kt @@ -1,7 +1,7 @@ package com.casic.detector.vm +import android.content.Context import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.LoginResultModel @@ -19,10 +19,9 @@ * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val loginResult = MutableLiveData() - fun login(account: String, password: String) = launch({ + fun login(context: Context, account: String, password: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.login(account, password) if (response.getResponseState()) { @@ -32,14 +31,15 @@ ) } else { loadState.value = LoadState.Fail - response.getResponseMessage().show(BaseApplication.get()) + response.getResponseMessage().show(context) } }, { + it.printStackTrace() loadState.value = LoadState.Fail - if (BaseApplication.get().isNetworkConnected()) { - "连接服务器失败，IP或端口错误".show(BaseApplication.get()) + if (context.isNetworkConnected()) { + "连接服务器失败，IP或端口错误".show(context) } else { - "网络连接失败".show(BaseApplication.get()) + "网络连接失败".show(context) } }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/vm/VersionViewModel.kt b/app/src/main/java/com/casic/detector/vm/VersionViewModel.kt index 4096ebe..ba4370a 100644 --- a/app/src/main/java/com/casic/detector/vm/VersionViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/VersionViewModel.kt @@ -1,20 +1,16 @@ package com.casic.detector.vm import androidx.lifecycle.MutableLiveData -import com.casic.detector.base.BaseApplication -import com.casic.detector.extensions.convertChinese import com.casic.detector.model.VersionResultModel import com.casic.detector.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.utils.LoadState class VersionViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val versionResult = MutableLiveData() fun getApplicationVersion() = launch({ @@ -25,7 +21,7 @@ ) loadState.value = LoadState.Success }, { + it.printStackTrace() loadState.value = LoadState.Fail - it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file