解决代码冲突

app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

@@ -160,9 +160,10 @@ class TaskUploadScope(
 
                     val linkStatus = hadLinkDvoBean.linkStatus
 
-                    var s: String = "%.3f".format(hadLinkDvoBean.linkLength)//保留一位小数(且支持四舍五入)
+                    var s: String = "%.3f".format(hadLinkDvoBean.length)//保留一位小数(且支持四舍五入)
 
-                    val objects = realm.where(QsRecordBean::class.java).equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).findAll()
+                    val objects = realm.where(QsRecordBean::class.java)
+                        .equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).findAll()
 
                     if (objects != null && objects.size > 0) {
                         val copyList = realm.copyFromRealm(objects)

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

@@ -364,7 +364,6 @@ class EvaluationResultViewModel @Inject constructor(
      */
 
     fun initData(id: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 
         viewModelScope.launch(Dispatchers.IO) {
 
@@ -404,12 +403,10 @@ class EvaluationResultViewModel @Inject constructor(
             }
         }
     }
-    }
 
     /**
      * 查询问题类型列表
      */
-    @RequiresApi(Build.VERSION_CODES.N)
     fun getChatMsgEntityList() {
         val chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
         liveDataQsRecordBean.value?.attachmentBeanList?.forEach {

collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt

@@ -32,5 +32,9 @@ open class HadLinkDvoBean @JvmOverloads constructor(
     /**
      * 详细属性
      */
-    var linkInfo: LinkInfoBean? = null
+    var linkInfo: LinkInfoBean? = null,
+    /**
+     * 长度（米）
+     */
+    var length: Double = 0.000,
 ) : RealmObject()

collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkInfoBean.kt

@@ -18,10 +18,7 @@ open class LinkInfoBean @JvmOverloads constructor(
      * 数据的等级
      */
     var dataLevel: Int = 0,
-    /**
-     * 长度（米）
-     */
-    var length: Double = 0.000,
+
     /**
      * 备注信息
      */