fix: 解决冲突

2023-04-27 13:37:20 +08:00
parent c4ee38d703 92a9f9d6c4
commit cb0275cee3
16 changed files with 277 additions and 108 deletions
--- 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
@@ -67,8 +67,8 @@ class MainActivity : BaseActivity() {
        //启动轨迹存储
        mapController.locationLayerHandler.setNiLocationListener(NiLocationListener {
            ToastUtils.showLong("定位${it.longitude}")
-            binding!!.viewModel!!.addSaveTrace(it)
-            binding!!.viewModel!!.startSaveTraceThread(this)
+            binding.viewModel!!.addSaveTrace(it)
+            binding.viewModel!!.startSaveTraceThread(this)
        })
        //显示轨迹图层
 //        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")