Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt

@@ -0,0 +1,50 @@
+package com.navinfo.omqs.bean
+
+import com.google.gson.annotations.SerializedName
+
+data class EvaluationInfo(
+    @SerializedName("evaluationTaskId")
+    val evaluationTaskId: String = "",//测评任务id
+    @SerializedName("linkPid")
+    val linkPid: String = "",//Link号
+
+    @SerializedName("linkStatus")
+    val linkStatus: String = "",//Link状态
+
+    @SerializedName("markId")
+    val markId: String = "",//Link状态
+
+    @SerializedName("trackPhotoNumber")
+    val trackPhotoNumber: String = "",//轨迹照片编号 多个分号隔开
+
+    @SerializedName("markGeometry")
+    val markGeometry: String = "",//MARK_几何坐标
+
+    @SerializedName("featureName")
+    val featureName: String = "",//问题类型
+
+    @SerializedName("problemType")
+    val problemType: String = "",//问题现象
+
+    @SerializedName("problemPhenomenon")
+    val problemPhenomenon: String = "",//问题现象
+
+    @SerializedName("problemDesc")
+    val problemDesc: String = "",//问题描述
+
+    @SerializedName("problemLink")
+    val problemLink: String = "",//问题环节
+
+    @SerializedName("problemReason")
+    val problemReason: String = "",//问题原因
+
+    @SerializedName("evaluatorName")
+    val evaluatorName: String = "",//测评人名称
+
+    @SerializedName("evaluationDate")
+    val evaluationDate: String = "",//测评日期(yyyy-mm-dd)
+
+    @SerializedName("evaluationWay")
+    val evaluationWay: String = ""//测评方式
+)
+

app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt

@@ -2,6 +2,7 @@ package com.navinfo.omqs.bean
 
 import com.google.gson.annotations.SerializedName
 import com.navinfo.omqs.Constant
+import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import io.realm.RealmList
 import io.realm.RealmObject
@@ -13,7 +14,7 @@ open class TaskBean @JvmOverloads constructor(
     /**
      * 测评任务id
      */
-//    @PrimaryKey
+    @PrimaryKey
     var id: Int = 0,
     /**
      * 测评任务名称
@@ -56,6 +57,12 @@ open class TaskBean @JvmOverloads constructor(
      * 当前下载状态
      */
     var status: Int = FileDownloadStatus.NONE,
+
+    /**
+     * 上传状态
+     */
+    var syncStatus: Int = FileManager.Companion.FileUploadStatus.NONE,
+
     @Ignore
     var message: String = ""
 ) : RealmObject() {