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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt

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

@@ -119,12 +119,12 @@ class MainViewModel @Inject constructor(
                             }
                         }
 
-                        TraceDataBase.getDatabase(
-                            context,
-                            Constant.USER_DATA_PATH + "/trace.sqlite"
-                        ).niLocationDao.insert(niLocation)
-                        niLocationList.removeAt(0)
-                        Log.e("qj", "saveTrace")
+                        TraceDataBase.getDatabase(context, Constant.USER_DATA_PATH + "/trace.sqlite").niLocationDao.insert(niLocation)
+
+                        niLocationList.remove(niLocation)
+
+                        Log.e("qj", "saveTrace==${niLocationList.size}")
+
                     }
                     Thread.sleep(30)
                 }