fix: 合并代码

app/build.gradle

@@ -12,8 +12,8 @@ android {
 
     defaultConfig {
         applicationId "com.navinfo.omqs"
-        minSdk 21
+        minSdk 26
-        targetSdk 21
+        targetSdk 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -73,9 +73,7 @@ android {
 
 
 dependencies {
-
     implementation project(':collect-library')
-
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

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

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

app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java

@@ -34,6 +34,7 @@ import com.navinfo.collect.library.sensor.ISensor.enmConnectionStatus;
 import com.navinfo.collect.library.sensor.ISensor.SensorWorkingMode;
 import com.navinfo.collect.library.garminvirbxe.SensorParams;
 import com.navinfo.collect.library.garminvirbxe.HostBean;
+import com.navinfo.collect.library.system.VLCApplication;
 import com.navinfo.omqs.Constant;
 import com.navinfo.omqs.R;
 import com.navinfo.omqs.ui.activity.map.MainActivity;

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

@@ -55,7 +55,7 @@ class PersonalCenterViewModel @Inject constructor(
 
         for (tableName in listOf<String>("HAD_LINK", "HAD_SPEEDLIMIT", "HAD_SPEEDLIMIT_COND", "HAD_SPEEDLIMIT_VAR")/*listOf<String>("HAD_LINK")*/) {
             importOMDBHelper.getOMDBTableData(tableName).collect {
-                   for (map in it) {
+                for (map in it) {
                     if ("HAD_LINK" == tableName) {
                         // 根据HAD_Link生成json文件
                         val hadLink = HAD_LINK()

collect-library/resources/rendertheme.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:tns="http://opensciencemap.org/rendertheme"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-           targetNamespace="http://opensciencemap.org/rendertheme" xml:lang="en">
+    targetNamespace="http://opensciencemap.org/rendertheme" xml:lang="en">
 
     <!-- attribute types -->
     <xs:simpleType name="cap">
@@ -81,7 +81,7 @@
     <xs:simpleType name="strokeDasharray">
         <xs:restriction base="xs:string">
             <xs:pattern
-                    value="([0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)? *, *)*[0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)?"/>
+                value="([0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)? *, *)*[0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)?"/>
         </xs:restriction>
     </xs:simpleType>
 
@@ -357,9 +357,9 @@
         <xs:attribute name="version" type="xs:positiveInteger" use="required"/>
         <xs:attribute name="map-background" default="#ffffff" type="tns:color" use="optional"/>
         <xs:attribute name="base-stroke-width" default="1" type="tns:nonNegativeFloat"
-                      use="optional"/>
+            use="optional"/>
         <xs:attribute name="base-text-scale" default="1" type="tns:nonNegativeFloat"
-                      use="optional"/>
+            use="optional"/>
     </xs:complexType>
 
     <!-- root element -->