重构网络返回对象2.对应服务上报问题接口变更

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

@@ -12,7 +12,7 @@ import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.LoginUserBean
 import com.navinfo.omqs.bean.SysUserBean
 import com.navinfo.omqs.db.RoomAppDatabase
-import com.navinfo.omqs.http.DefaultUserResponse
+import com.navinfo.omqs.http.DefaultResponse
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.tools.FileManager
@@ -119,7 +119,7 @@ class LoginViewModel @Inject constructor(
             is NetResult.Success<*> ->{
                 if (result.data!=null) {
                     try {
-                        val defaultUserResponse = result.data as DefaultUserResponse<SysUserBean>
+                        val defaultUserResponse = result.data as DefaultResponse<SysUserBean>
                         if(defaultUserResponse.success){
                             if(defaultUserResponse.obj==null|| defaultUserResponse.obj!!.userCode==null){
                                 withContext(Dispatchers.Main) {

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -292,9 +292,10 @@ class MainViewModel @Inject constructor(
                     }
                     linkIdCache = linkId ?: ""
                     Log.e("jingo", "自动捕捉数据 共${signList.size}条")
-                } else {
-                    mapController.lineHandler.removeLine()
                 }
+            }else{
+                mapController.lineHandler.removeLine()
+                linkIdCache = ""
             }
         }
     }

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.lifecycle.Observer
 import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.R
@@ -56,7 +57,7 @@ class TaskListAdapter(
             val taskBean = data[it.tag as Int]
             Log.e("jingo", "开始上传 ${taskBean.syncStatus}")
             when (taskBean.syncStatus) {
-                FileUploadStatus.NONE, FileUploadStatus.ERROR, FileUploadStatus.WAITING -> {
+                FileUploadStatus.NONE, FileUploadStatus.UPLOADING,FileUploadStatus.ERROR, FileUploadStatus.WAITING -> {
                     uploadManager.start(taskBean.id)
                 }
             }
@@ -251,6 +252,10 @@ class TaskListAdapter(
                 } else {
                     binding.taskProgressText.text = "0%"
                 }
+                val errMsg = taskBean.errMsg
+                if(errMsg!=null&&errMsg.isNotEmpty()){
+                    Toast.makeText(binding.taskProgressText.context,errMsg,Toast.LENGTH_LONG)
+                }
             }
             FileDownloadStatus.IMPORT -> {
                 if (binding.taskProgressText.visibility != View.VISIBLE) binding.taskProgressText.visibility =