From d46f5f422379ad2ec96730c39057d10f7004a22f Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Fri, 21 Apr 2023 14:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE=E6=8D=95?=
 =?UTF-8?q?=E6=8D=89=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/ui/activity/PermissionsActivity.kt   | 8 +++-----
 .../com/navinfo/omqs/ui/activity/map/MainViewModel.kt     | 2 --
 .../evaluationresult/EvaluationResultViewModel.kt         | 5 ++++-
 collect-library/build.gradle                              | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
index 51e671ec..36ec694e 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
@@ -29,13 +29,11 @@ open class PermissionsActivity : BaseActivity() {
         //定位权限
         permissionList.add(Permission.ACCESS_FINE_LOCATION)
         permissionList.add(Permission.ACCESS_COARSE_LOCATION)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-//            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
         //android10
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
-            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
+//            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
         }
-/*        XXPermissions.with(this)
+        XXPermissions.with(this)
             // 申请单个权限
             .permission(permissionList)
             // 设置权限请求拦截器（局部设置）
@@ -75,7 +73,7 @@ open class PermissionsActivity : BaseActivity() {
                         onPermissionsDenied()
                     }
                 }
-            })*/
+            })
     }
 
     /**
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 2e5836a5..47687450 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
@@ -5,7 +5,6 @@ import android.content.DialogInterface
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.navinfo.collect.library.data.entity.NiLocation
 import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.data.entity.NiLocation
 import com.navinfo.collect.library.map.NIMapController
@@ -21,7 +20,6 @@ import com.navinfo.omqs.ui.manager.TakePhotoManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.RealmSet
 import org.videolan.libvlc.LibVlcUtil
-import java.util.*
 import javax.inject.Inject
 
 /**
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
index b0ed0936..dd1bef32 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -85,8 +85,10 @@ class EvaluationResultViewModel @Inject constructor(
      *  //获取问题分类列表
      */
     fun getClassTypeList() {
+        Log.e("jingo", "getClassTypeList S")
         viewModelScope.launch(Dispatchers.IO) {
             val list = roomAppDatabase.getScProblemTypeDao().findClassTypeList()
+            Log.e("jingo", "getClassTypeList ${list?.size}")
             list?.let {
                 if (list.isNotEmpty()) {
                     //通知页面更新
@@ -94,13 +96,14 @@ class EvaluationResultViewModel @Inject constructor(
                     val classType = it[0]
                     //如果右侧栏没数据，给个默认值
                     if (liveDataQsRecordBean.value!!.classType.isEmpty()) {
+                        Log.e("jingo", "getClassTypeList $classType")
                         liveDataQsRecordBean.value!!.classType = classType
                     }
                     getProblemList(classType)
                 }
             }
         }
-
+        Log.e("jingo", "getClassTypeList E")
     }
 
     /**
diff --git a/collect-library/build.gradle b/collect-library/build.gradle
index c125ed9d..42dd53e5 100644
--- a/collect-library/build.gradle
+++ b/collect-library/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     implementation "com.badlogicgames.gdx:gdx:1.11.0"
     implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0"
     implementation "com.caverock:androidsvg:1.4"
-    implementation "org.mapsforge:vtm-jts:$vtmVersion"
+    api "org.mapsforge:vtm-jts:$vtmVersion"
     implementation 'org.locationtech.jts:jts-core:1.19.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
     implementation 'com.squareup.okio:okio:3.3.0'