xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加地图捕捉数据功能

Browse Source
This commit is contained in:
squallzhjch 2023-04-21 14:22:12 +08:00
parent 5db8bfaade
commit d46f5f4223
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
View File

@ -29,13 +29,11 @@ open class PermissionsActivity : BaseActivity() {
//定位权限 //定位权限
permissionList.add(Permission.ACCESS_FINE_LOCATION) permissionList.add(Permission.ACCESS_FINE_LOCATION)
permissionList.add(Permission.ACCESS_COARSE_LOCATION) permissionList.add(Permission.ACCESS_COARSE_LOCATION)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
// permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
//android10 //android10
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) { 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) .permission(permissionList)
// 设置权限请求拦截器（局部设置） // 设置权限请求拦截器（局部设置）
@ -75,7 +73,7 @@ open class PermissionsActivity : BaseActivity() {
onPermissionsDenied() onPermissionsDenied()
} }
} }
})*/ })
} }
/** /**

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

@ -5,7 +5,6 @@ import android.content.DialogInterface
import android.util.Log import android.util.Log
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.navinfo.collect.library.data.entity.NiLocation
import com.blankj.utilcode.util.ToastUtils import com.blankj.utilcode.util.ToastUtils
import com.navinfo.collect.library.data.entity.NiLocation import com.navinfo.collect.library.data.entity.NiLocation
import com.navinfo.collect.library.map.NIMapController 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 dagger.hilt.android.lifecycle.HiltViewModel
import io.realm.RealmSet import io.realm.RealmSet
import org.videolan.libvlc.LibVlcUtil import org.videolan.libvlc.LibVlcUtil
import java.util.*
import javax.inject.Inject import javax.inject.Inject
/** /**

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

@ -85,8 +85,10 @@ class EvaluationResultViewModel @Inject constructor(
* //获取问题分类列表 * //获取问题分类列表
*/ */
fun getClassTypeList() { fun getClassTypeList() {
Log.e("jingo", "getClassTypeList S")
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
val list = roomAppDatabase.getScProblemTypeDao().findClassTypeList() val list = roomAppDatabase.getScProblemTypeDao().findClassTypeList()
Log.e("jingo", "getClassTypeList ${list?.size}")
list?.let { list?.let {
if (list.isNotEmpty()) { if (list.isNotEmpty()) {
//通知页面更新 //通知页面更新
@ -94,13 +96,14 @@ class EvaluationResultViewModel @Inject constructor(
val classType = it[0] val classType = it[0]
//如果右侧栏没数据，给个默认值 //如果右侧栏没数据，给个默认值
if (liveDataQsRecordBean.value!!.classType.isEmpty()) { if (liveDataQsRecordBean.value!!.classType.isEmpty()) {
Log.e("jingo", "getClassTypeList $classType")
liveDataQsRecordBean.value!!.classType = classType liveDataQsRecordBean.value!!.classType = classType
} }
getProblemList(classType) getProblemList(classType)
} }
} }
} }
Log.e("jingo", "getClassTypeList E")
} }
/** /**

2
collect-library/build.gradle
View File

@ -105,7 +105,7 @@ dependencies {
implementation "com.badlogicgames.gdx:gdx:1.11.0" implementation "com.badlogicgames.gdx:gdx:1.11.0"
implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0" implementation "com.badlogicgames.gdx:gdx-backend-android:1.11.0"
implementation "com.caverock:androidsvg:1.4" 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 'org.locationtech.jts:jts-core:1.19.0'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
implementation 'com.squareup.okio:okio:3.3.0' implementation 'com.squareup.okio:okio:3.3.0'