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

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

@@ -66,9 +66,9 @@ class MainActivity : BaseActivity() {
         mapController.locationLayerHandler.startLocation()
         //启动轨迹存储
         mapController.locationLayerHandler.setNiLocationListener(NiLocationListener {
-            ToastUtils.showLong("定位${it.longitude}")
-            binding.viewModel!!.addSaveTrace(it)
-            binding.viewModel!!.startSaveTraceThread(this)
+            //ToastUtils.showLong("定位${it.longitude}")
+            binding!!.viewModel!!.addSaveTrace(it)
+            binding!!.viewModel!!.startSaveTraceThread(this)
         })
         //显示轨迹图层
 //        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")

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

@@ -7,7 +7,6 @@ import android.util.Log
 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
@@ -62,7 +61,7 @@ class MainViewModel @Inject constructor(
 
         Log.e("qj", LibVlcUtil.hasCompatibleCPU(context).toString())
 
-        ToastUtils.showShort("点击了相机")
+        //ToastUtils.showShort("点击了相机")
 
         if (mCameraDialog == null) {
             mCameraDialog = CommonDialog(