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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -1,21 +1,18 @@
 package com.navinfo.omqs.ui.activity.map
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import com.blankj.utilcode.util.ToastUtils
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.viewModelScope
 import androidx.navigation.findNavController
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.NiLocationListener
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityMainBinding
-import com.navinfo.omqs.db.TraceDataBase
 import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.system.SystemConstant
 import com.navinfo.omqs.ui.activity.BaseActivity
@@ -50,7 +47,8 @@ class MainActivity : BaseActivity() {
             this,
             binding.mainActivityMap,
             null,
-            Constant.MAP_PATH
+            Constant.MAP_PATH,
+            Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite"
         )
         //关联生命周期
         binding.lifecycleOwner = this
@@ -78,6 +76,7 @@ class MainActivity : BaseActivity() {
         })
         //显示轨迹图层
 //        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")
+        mapController.layerManagerHandler.showNiLocationLayer()
     }
 
     override fun onPause() {
@@ -108,6 +107,8 @@ class MainActivity : BaseActivity() {
      */
     fun openCamera() {
         binding.viewModel!!.onClickCameraButton(this)
+        //显示轨迹图层
+        //binding!!.viewModel!!.onClickCameraButton(this)
     }
 
     /**

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

@@ -8,6 +8,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.findNavController
 import com.blankj.utilcode.util.ToastUtils
+import com.navinfo.collect.library.data.dao.impl.TraceDataBase
 import com.navinfo.collect.library.data.entity.NiLocation
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.OnQsRecordItemClickListener
@@ -15,12 +16,12 @@ import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
-import com.navinfo.omqs.db.TraceDataBase
 import com.navinfo.omqs.system.SystemConstant
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.RealmSet
+import org.oscim.core.GeoPoint
 import org.videolan.libvlc.LibVlcUtil
 import javax.inject.Inject
 
@@ -105,10 +106,7 @@ class MainViewModel @Inject constructor(
                     if (niLocationList != null && niLocationList.size > 0) {
 
                         var niLocation = niLocationList[0]
-                        var doubleArray = doubleArrayOf()
-                        doubleArray[0] = niLocation.longitude
-                        doubleArray[1] = niLocation.latitude
-                        val geometry = GeometryTools.createGeometry(doubleArray)
+                        val geometry = GeometryTools.createGeometry(GeoPoint(niLocation.latitude,niLocation.longitude))
                         val tileX = RealmSet<Int>()
                         GeometryToolsKt.getTileXByGeometry(geometry.toString(), tileX)
                         val tileY = RealmSet<Int>()