diff --git a/app/src/main/java/com/casic/detector/bean/TaskBean.java b/app/src/main/java/com/casic/detector/bean/TaskBean.java index 7ada7a5..f398288 100644 --- a/app/src/main/java/com/casic/detector/bean/TaskBean.java +++ b/app/src/main/java/com/casic/detector/bean/TaskBean.java @@ -11,14 +11,37 @@ @Id(autoincrement = true) private Long id;//主键ID + /** + * { + * "id": 5703, + * "isChecked": 0, + * "isNormal": 1, + * "latitude": 30.56693088, + * "longitude": 104.2848611, + * "markerId": 26, + * "markerIdReal": "0008798066", + * "taskCode": "20240418195448", + * "taskId": "346" + * } + */ + private String scanner; private String desc; + + /** + * 真实任务ID + */ private String taskId; + /** * 用 {@link TaskModel.MessageModel.TaskDetailInfosModel#id} 存 - * */ + */ private String taskCode; private String markerId; + + /** + * 探测仪扫描出来的ID + */ private String markerRealId; private String lng; private String lat; diff --git a/app/src/main/java/com/casic/detector/bean/TaskBean.java b/app/src/main/java/com/casic/detector/bean/TaskBean.java index 7ada7a5..f398288 100644 --- a/app/src/main/java/com/casic/detector/bean/TaskBean.java +++ b/app/src/main/java/com/casic/detector/bean/TaskBean.java @@ -11,14 +11,37 @@ @Id(autoincrement = true) private Long id;//主键ID + /** + * { + * "id": 5703, + * "isChecked": 0, + * "isNormal": 1, + * "latitude": 30.56693088, + * "longitude": 104.2848611, + * "markerId": 26, + * "markerIdReal": "0008798066", + * "taskCode": "20240418195448", + * "taskId": "346" + * } + */ + private String scanner; private String desc; + + /** + * 真实任务ID + */ private String taskId; + /** * 用 {@link TaskModel.MessageModel.TaskDetailInfosModel#id} 存 - * */ + */ private String taskCode; private String markerId; + + /** + * 探测仪扫描出来的ID + */ private String markerRealId; private String lng; private String lat; diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt index 0f617b0..446f2f8 100644 --- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt @@ -56,18 +56,11 @@ .list() } - fun countTaskById(id: String): Int { - val count = taskBeanDao.queryBuilder() - .where(TaskBeanDao.Properties.Id.eq(id)) - .count() - return count.toInt() - } - fun clearTasks() { taskBeanDao.deleteAll() } - fun insertTaskInformation( + fun insertTask( scanner: String, desc: String, taskId: String, diff --git a/app/src/main/java/com/casic/detector/bean/TaskBean.java b/app/src/main/java/com/casic/detector/bean/TaskBean.java index 7ada7a5..f398288 100644 --- a/app/src/main/java/com/casic/detector/bean/TaskBean.java +++ b/app/src/main/java/com/casic/detector/bean/TaskBean.java @@ -11,14 +11,37 @@ @Id(autoincrement = true) private Long id;//主键ID + /** + * { + * "id": 5703, + * "isChecked": 0, + * "isNormal": 1, + * "latitude": 30.56693088, + * "longitude": 104.2848611, + * "markerId": 26, + * "markerIdReal": "0008798066", + * "taskCode": "20240418195448", + * "taskId": "346" + * } + */ + private String scanner; private String desc; + + /** + * 真实任务ID + */ private String taskId; + /** * 用 {@link TaskModel.MessageModel.TaskDetailInfosModel#id} 存 - * */ + */ private String taskCode; private String markerId; + + /** + * 探测仪扫描出来的ID + */ private String markerRealId; private String lng; private String lat; diff --git a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt index 0f617b0..446f2f8 100644 --- a/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/detector/utils/DataBaseManager.kt @@ -56,18 +56,11 @@ .list() } - fun countTaskById(id: String): Int { - val count = taskBeanDao.queryBuilder() - .where(TaskBeanDao.Properties.Id.eq(id)) - .count() - return count.toInt() - } - fun clearTasks() { taskBeanDao.deleteAll() } - fun insertTaskInformation( + fun insertTask( scanner: String, desc: String, taskId: String, 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 42c9dfe..e0dc287 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -1,6 +1,7 @@ package com.casic.detector.vm import android.content.Context +import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState @@ -19,6 +20,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues class TaskViewModel : BaseViewModel() { + + private val kTag = "TaskViewModel" private val gson by lazy { Gson() } val markerFileResult = MutableLiveData() val taskResult = MutableLiveData() @@ -163,6 +166,8 @@ val element = JsonParser.parseString(response) val jsonObject = element.asJsonObject executeTaskResult.value = jsonObject.get("success").asString + } else { + Log.d(kTag, "uploadTask: 仅执行工单,不删除本地工单数据") } } else { loadState.value = LoadState.Fail @@ -190,16 +195,11 @@ }) 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(context) + "${taskDetailId}上传成功".show(context) } }, { it.printStackTrace() - loadState.value = LoadState.Fail }) } \ No newline at end of file