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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

	vtm

app/src/main/AndroidManifest.xml

@@ -21,11 +21,11 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- 这个权限用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <!-- 访问网络，网络定位需要上网 -->
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- 写入扩展存储，向扩展卡写入数据，用于写入离线定位数据-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <!-- 访问网络，网络定位需要上网 -->
-    <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许访问振动设备 -->
     <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许使用PowerManager的 WakeLocks保持进程在休眠时从屏幕消失 -->

app/src/main/assets/omdb_config.json

@@ -158,7 +158,14 @@
 				"name": "隧道",
 				"zoomMin": 15,
 				"zoomMax": 20,
-				"transformer2Code": ""
+				"transformer": [
+					{
+						"k": "geometry",
+						"v": "~",
+						"klib": "geometry",
+						"vlib": "generateS2EReferencePoint()"
+					}
+				]
 			},
 			"3005":{
 				"table": "OMDB_TRAFFIC_SIGN",
@@ -200,6 +207,13 @@
 				"zoomMin": 18,
 				"zoomMax": 20
 			},
+			"3014":{
+				"table": "OMDB_CROSS_WALK",
+				"code": 3014,
+				"name": "人行横道",
+				"zoomMin": 18,
+				"zoomMax": 20
+			},
 			"3016":{
 				"table": "OMDB_OBJECT_STOPLOCATION",
 				"code": 3016,

app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt

@@ -443,6 +443,8 @@ class ImportPreProcess {
                     referenceEntity.table = renderEntity.table
                     referenceEntity.enable = renderEntity.enable
                     referenceEntity.taskId = renderEntity.taskId
+                    referenceEntity.zoomMin = renderEntity.zoomMin
+                    referenceEntity.zoomMax = renderEntity.zoomMax
                     // 与原数据使用相同的geometry
                     referenceEntity.geometry = renderEntity.geometry.toString()
                     referenceEntity.properties["qi_table"] = renderEntity.table

app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

@@ -14,6 +14,7 @@ import com.navinfo.omqs.bean.SysUserBean
 import com.navinfo.omqs.http.DefaultResponse
 import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus
 import com.navinfo.omqs.util.DateTimeUtil
+import com.navinfo.omqs.util.FileUtils
 import io.realm.Realm
 import kotlinx.coroutines.*
 import java.util.*