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 89b88868..cb8bb99c 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 @@ -33,7 +33,7 @@ open class PermissionsActivity : BaseActivity() { if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) { permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION) } -/* XXPermissions.with(this) + XXPermissions.with(this) // 申请单个权限 .permission(permissionList) // 设置权限请求拦截器(局部设置) @@ -73,7 +73,7 @@ open class PermissionsActivity : BaseActivity() { onPermissionsDenied() } } - })*/ + }) } /** diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 8312a50d..de396030 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -6,6 +6,7 @@ import androidx.core.view.WindowCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.lifecycleScope import androidx.navigation.findNavController +import com.blankj.utilcode.util.ToastUtils import com.navinfo.collect.library.map.NIMapController import com.navinfo.collect.library.map.handler.NiLocationListener import com.navinfo.omqs.Constant @@ -63,6 +64,7 @@ class MainActivity : BaseActivity() { mapController.locationLayerHandler.startLocation() //启动轨迹存储 mapController.locationLayerHandler.setNiLocationListener(NiLocationListener { + ToastUtils.showLong("定位${it.longitude}") binding!!.viewModel!!.addSaveTrace(it) binding!!.viewModel!!.startSaveTraceThread(this) }) @@ -97,7 +99,7 @@ class MainActivity : BaseActivity() { */ fun openCamera() { //显示轨迹图层 - //binding!!.viewModel!!.onClickCameraButton(this) + binding!!.viewModel!!.onClickCameraButton(this) } /** diff --git a/collect-library/build.gradle b/collect-library/build.gradle index 678f5019..0f34cd56 100644 --- a/collect-library/build.gradle +++ b/collect-library/build.gradle @@ -18,10 +18,6 @@ android { compileSdk 30 defaultConfig { - minSdk 23 - targetSdk 30 - versionCode 1 - versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -132,7 +128,7 @@ dependencies { androidTestImplementation "android.arch.persistence.room:testing:1.1.1" api 'com.tencent.wcdb:wcdb-android:1.1-19' - + //api 'de.mrmaffen:libvlc-android:2.1.12@aar' // // 协程核心库 // implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' // // 协程Android支持库 diff --git a/collect-library/libs/armeabi-v7a/libvlcjni.so b/collect-library/libs/armeabi-v7a/libvlcjni.so index 37d9ae53..22f5d45e 100644 Binary files a/collect-library/libs/armeabi-v7a/libvlcjni.so and b/collect-library/libs/armeabi-v7a/libvlcjni.so differ diff --git a/collect-library/libs/armeabi/libvlcjni.so b/collect-library/libs/armeabi/libvlcjni.so index 37d9ae53..22f5d45e 100644 Binary files a/collect-library/libs/armeabi/libvlcjni.so and b/collect-library/libs/armeabi/libvlcjni.so differ diff --git a/collect-library/libs/dom4j-1.6.1.jar b/collect-library/libs/dom4j-1.6.1.jar new file mode 100644 index 00000000..c8c4dbb9 Binary files /dev/null and b/collect-library/libs/dom4j-1.6.1.jar differ diff --git a/collect-library/libs/dom4j-2.1.3.jar b/collect-library/libs/dom4j-2.1.3.jar deleted file mode 100644 index 9a4f5d27..00000000 Binary files a/collect-library/libs/dom4j-2.1.3.jar and /dev/null differ diff --git a/collect-library/src/main/AndroidManifest.xml b/collect-library/src/main/AndroidManifest.xml index 476a70ac..a899eb5f 100644 --- a/collect-library/src/main/AndroidManifest.xml +++ b/collect-library/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ + diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt index 5c65013b..8b576f98 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt @@ -100,7 +100,7 @@ class LocationLayerHandler(context: AppCompatActivity, mapView: NIMapView) : Bas // locationOption.setOpenAutoNotifyMode() //设置打开自动回调位置模式,该开关打开后,期间只要定位SDK检测到位置变化就会主动回调给开发者 locationOption.setOpenAutoNotifyMode( - 1000, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT + 5, 1, LocationClientOption.LOC_SENSITIVITY_HIGHT ) //需将配置好的LocationClientOption对象,通过setLocOption方法传递给LocationClient对象使用 locationClient.locOption = locationOption diff --git a/fastmap.keystore b/fastmap.keystore new file mode 100644 index 00000000..4e42fd8c Binary files /dev/null and b/fastmap.keystore differ