From 999052507afcd53f98d9b8bf0d9d5bfc700f166b Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 8 Jun 2023 10:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=BD=91=E7=BB=9C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E8=B1=A12.=E5=AF=B9=E5=BA=94=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=B8=8A=E6=8A=A5=E9=97=AE=E9=A2=98=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/bean/EvaluationInfo.kt | 6 ++-- ...aultTaskResponse.kt => DefaultResponse.kt} | 2 +- .../navinfo/omqs/http/DefaultUserResponse.kt | 7 ----- .../com/navinfo/omqs/http/NetworkService.kt | 4 +-- .../navinfo/omqs/http/NetworkServiceImpl.kt | 4 +-- .../omqs/http/RetrofitNetworkServiceAPI.kt | 6 ++-- .../omqs/http/taskupload/TaskUploadScope.kt | 29 ++++++++++++------- .../omqs/ui/activity/login/LoginViewModel.kt | 4 +-- .../omqs/ui/activity/map/MainViewModel.kt | 5 ++-- .../ui/fragment/tasklist/TaskListAdapter.kt | 7 ++++- app/src/main/res/layout/adapter_sign.xml | 3 +- .../collect/library/data/entity/TaskBean.kt | 2 ++ 12 files changed, 43 insertions(+), 36 deletions(-) rename app/src/main/java/com/navinfo/omqs/http/{DefaultTaskResponse.kt => DefaultResponse.kt} (78%) delete mode 100644 app/src/main/java/com/navinfo/omqs/http/DefaultUserResponse.kt diff --git a/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt b/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt index f93034a8..7f257d6e 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt @@ -12,7 +12,7 @@ data class EvaluationInfo( val linkPid: String = "",//Link号 @SerializedName("linkStatus") - val linkStatus: Int = 0,//Link状态 + val linkStatus: Int = 0,//Link状态 ；0未测评 1已测评 2原库新增 3现场新增 @SerializedName("markId") val markId: String = "",//Link状态 @@ -27,7 +27,7 @@ data class EvaluationInfo( val featureName: String = "",//问题类型 @SerializedName("problemType") - val problemType: String = "",//问题现象 0错误 1多余 2遗漏 服务字段定义为Integer，使用包装类，对应无值情况为空 + val problemType: Int = 0,//问题现象 0错误 1多余 2遗漏 服务字段定义为Integer，使用包装类，对应无值情况为空 @SerializedName("problemPhenomenon") val problemPhenomenon: String = "",//问题现象 @@ -48,7 +48,7 @@ data class EvaluationInfo( val evaluationDate: String = "",//测评日期(yyyy-mm-dd) @SerializedName("evaluationWay") - val evaluationWay: String = "2",//测评方式 1生产测评 2现场测评 服务字段定义为Integer，使用包装类，对应无值情况为空 + val evaluationWay: Int = 2,//测评方式 1生产测评 2现场测评 服务字段定义为Integer，使用包装类，对应无值情况为空 @SerializedName("roadClassfcation") val roadClassfcation: String = "",//道路种别 diff --git a/app/src/main/java/com/navinfo/omqs/http/DefaultTaskResponse.kt b/app/src/main/java/com/navinfo/omqs/http/DefaultResponse.kt similarity index 78% rename from app/src/main/java/com/navinfo/omqs/http/DefaultTaskResponse.kt rename to app/src/main/java/com/navinfo/omqs/http/DefaultResponse.kt index a51f8098..ac0fba88 100644 --- a/app/src/main/java/com/navinfo/omqs/http/DefaultTaskResponse.kt +++ b/app/src/main/java/com/navinfo/omqs/http/DefaultResponse.kt @@ -1,6 +1,6 @@ package com.navinfo.omqs.http -class DefaultTaskResponse { +class DefaultResponse { var success: Boolean = false var msg: String = "" var obj: T? = null diff --git a/app/src/main/java/com/navinfo/omqs/http/DefaultUserResponse.kt b/app/src/main/java/com/navinfo/omqs/http/DefaultUserResponse.kt deleted file mode 100644 index cea3dcc6..00000000 --- a/app/src/main/java/com/navinfo/omqs/http/DefaultUserResponse.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.navinfo.omqs.http - -class DefaultUserResponse { - var success: Boolean = false - var msg: String = "" - var obj: T? = null -} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/http/NetworkService.kt b/app/src/main/java/com/navinfo/omqs/http/NetworkService.kt index 2698d9b6..5fe4dd2d 100644 --- a/app/src/main/java/com/navinfo/omqs/http/NetworkService.kt +++ b/app/src/main/java/com/navinfo/omqs/http/NetworkService.kt @@ -19,10 +19,10 @@ interface NetworkService { /** * 获取任务列表 */ - suspend fun getTaskList(evaluatorNo:String): NetResult>> + suspend fun getTaskList(evaluatorNo:String): NetResult>> /** * 登录接口 */ - suspend fun loginUser(loginUserBean: LoginUserBean): NetResult> + suspend fun loginUser(loginUserBean: LoginUserBean): NetResult> } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt b/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt index ffa4f2f1..374bd7e6 100644 --- a/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt +++ b/app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt @@ -38,7 +38,7 @@ class NetworkServiceImpl @Inject constructor( } } - override suspend fun getTaskList(evaluatorNo: String): NetResult>> = + override suspend fun getTaskList(evaluatorNo: String): NetResult>> = //在IO线程中运行 withContext(Dispatchers.IO) { return@withContext try { @@ -57,7 +57,7 @@ class NetworkServiceImpl @Inject constructor( } } - override suspend fun loginUser(loginUserBean: LoginUserBean): NetResult> = + override suspend fun loginUser(loginUserBean: LoginUserBean): NetResult> = //在IO线程中运行 withContext(Dispatchers.IO) { return@withContext try { diff --git a/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt b/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt index a2592cdd..67136348 100644 --- a/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt +++ b/app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt @@ -47,7 +47,7 @@ interface RetrofitNetworkServiceAPI { */ @Headers("Content-Type: application/json") @POST("/devcp/loginUser") - suspend fun retrofitLoginUser(@Body loginUserBean: LoginUserBean): Response> + suspend fun retrofitLoginUser(@Body loginUserBean: LoginUserBean): Response> /** * 下载文件 @@ -62,11 +62,11 @@ interface RetrofitNetworkServiceAPI { @GET("/devcp/getEvaluationTask?evaluatType=2") suspend fun retrofitGetTaskList( @Query("evaluatorNo") evaluatorNo: String, - ): Response>> + ): Response>> @Headers("Content-Type: application/json") @POST("/devcp/uploadSceneProblem") - suspend fun postRequest(@Body listEvaluationInfo: List?): Response + suspend fun postRequest(@Body listEvaluationInfo: List?): Response> /** * @FormUrlEncoded 请求格式注解，请求实体是一个From表单，每个键值对需要使用@Field注解 diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt index f2976f61..33fc0704 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt @@ -2,6 +2,7 @@ package com.navinfo.omqs.http.taskupload import android.os.Build import android.util.Log +import android.widget.Toast import androidx.annotation.RequiresApi import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.MutableLiveData @@ -9,6 +10,8 @@ import androidx.lifecycle.Observer import com.navinfo.collect.library.data.entity.QsRecordBean import com.navinfo.omqs.bean.EvaluationInfo import com.navinfo.collect.library.data.entity.TaskBean +import com.navinfo.omqs.bean.SysUserBean +import com.navinfo.omqs.http.DefaultResponse import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus import io.realm.Realm import kotlinx.coroutines.* @@ -68,6 +71,7 @@ class TaskUploadScope( private fun change(status: Int, message: String = "") { if (taskBean.syncStatus != status) { taskBean.syncStatus = status + taskBean.errMsg = message uploadData.postValue(taskBean) //同步中不进行状态记录,只做界面变更显示 if(status!=FileUploadStatus.UPLOADING){ @@ -121,15 +125,15 @@ class TaskUploadScope( if (objects != null&&objects.size>0) { val copyList = realm.copyFromRealm(objects) copyList.forEach { - var problemType = "0" + var problemType = 0 if(it.problemType=="错误"){ - problemType = "0" + problemType = 0 }else if(it.problemType=="多余"){ - problemType = "1" + problemType = 1 }else if(it.problemType=="遗漏"){ - problemType = "2" + problemType = 2 } - var evaluationWay = "2"; + var evaluationWay = 2 /* if(it.evaluationWay=="生产测评"){ evaluationWay = "1" }else if(it.evaluationWay=="现场测评"){ @@ -170,14 +174,14 @@ class TaskUploadScope( trackPhotoNumber = "", markGeometry = "", featureName = "", - problemType = "", + problemType = 0, problemPhenomenon = "", problemDesc = "", problemLink = "", problemReason = "", evaluatorName = "", evaluationDate = "", - evaluationWay = "", + evaluationWay = 2, roadClassfcation = "", roadFunctionGrade = "", noEvaluationreason = "", @@ -193,10 +197,13 @@ class TaskUploadScope( val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object : // Callback { if (result.isSuccessful) { - if (result.code() == 200) { -// taskBean.syncStatus = FileUploadStatus.DONE - // handle the response - change(FileUploadStatus.DONE) + if (result.code() == 200&&result.body()!=null) { + val defaultUserResponse = result.body() as DefaultResponse<*> + if(defaultUserResponse.success){ + change(FileUploadStatus.DONE) + }else{ + change(FileUploadStatus.ERROR,"${defaultUserResponse.msg}") + } } else { // handle the failure change(FileUploadStatus.ERROR) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt index 42665c08..095664d1 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt +++ b/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 + val defaultUserResponse = result.data as DefaultResponse if(defaultUserResponse.success){ if(defaultUserResponse.obj==null|| defaultUserResponse.obj!!.userCode==null){ withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 0e2194cc..6b26f55d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/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 = "" } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt index a574fafa..30032f5b 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt +++ b/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 = diff --git a/app/src/main/res/layout/adapter_sign.xml b/app/src/main/res/layout/adapter_sign.xml index 4b4dacc8..382b591b 100644 --- a/app/src/main/res/layout/adapter_sign.xml +++ b/app/src/main/res/layout/adapter_sign.xml @@ -65,9 +65,8 @@