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

 Conflicts:

	collect-library/src/main/assets/editormarker.xml

	vtm

app/src/main/assets/omdb_config.json

@@ -170,6 +170,11 @@
             "table": "OMDB_LANE_LINK_LG",
             "code": 5001,
             "name": "车道中心线"
-        }
+        },
+		"5002":{
+			"table": "OMDB_AREA",
+			"code": 5002,
+			"name": "面测试"
+		}
 	}
 }

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

@@ -119,14 +119,28 @@ class ImportPreProcess {
      * 解析车道边线数据二级属性
      * */
     fun unpackingLaneBoundary(renderEntity: RenderEntity) {
+        var shape:JSONObject = JSONObject(mapOf(
+            "lateralOffset" to 0,
+            "markType" to 1,
+            "markColor" to 0,
+            "markMaterial" to 1,
+            "markSeqNum" to 1,
+            "markWidth" to 10,
+            "markingCount" to 1
+        ))
         if (renderEntity.code == 2013&&!renderEntity.properties["shapeList"].isNullOrEmpty()&&renderEntity.properties["shapeList"]!="null") {
             // 解析shapeList，将数组中的属性放会properties
             val shapeList = JSONArray(renderEntity.properties["shapeList"])
-            val shape = shapeList.getJSONObject(0)
-            for (key in shape.keys()) {
-                renderEntity.properties[key] = shape[key].toString()
+            for (i in 0 until shapeList.length()) {
+                shape = shapeList.getJSONObject(i)
+                if (shape.optInt("lateralOffset", 0) == 0) {
+                    break
+                }
             }
         }
+        for (key in shape.keys()) {
+            renderEntity.properties[key] = shape[key].toString()
+        }
     }
 
     /**

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

@@ -112,7 +112,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
                     viewModel.readRealmData()
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint(40.031657799200346, 116.32207834810715))
+                        .animateTo(GeoPoint( 40.034842306317486, 116.31735963074652  ))
                 }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)