diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 1cf75acf..0cf2e923 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -3,32 +3,44 @@ "1012": { "table": "OMDB_CHECKPOINT", "code": 1012, - "name": "检查点" + "name": "检查点", + "zoomMin": 18, + "zoomMax": 23 }, "2001": { "table": "OMDB_RD_LINK", "code": 2001, - "name": "道路线" + "name": "道路线", + "zoomMin": 18, + "zoomMax": 19 }, "2002": { "table": "OMDB_RD_LINK_FUNCTION_CLASS", "code": 2002, - "name": "道路功能等级" + "name": "道路功能等级", + "zoomMin": 18, + "zoomMax": 19 }, "2008": { "table": "OMDB_RD_LINK_KIND", "code": 2008, - "name": "道路种别" + "name": "道路种别", + "zoomMin": 18, + "zoomMax": 19 }, "2010": { "table": "OMDB_LINK_DIRECT", "code": 2010, - "name": "道路方向" + "name": "道路方向", + "zoomMin": 18, + "zoomMax": 19 }, "2011": { "table": "OMDB_LINK_NAME", "code": 2011, "name": "道路名", + "zoomMin": 18, + "zoomMax": 19, "transformer": [ { "k": "geometry", @@ -42,6 +54,8 @@ "table": "OMDB_LANE_MARK_BOUNDARYTYPE", "code": 2013, "name": "车道边界类型", + "zoomMin": 20, + "zoomMax": 23, "transformer": [ { "k": "geometry", @@ -54,17 +68,23 @@ "2019": { "table": "OMDB_LINK_SPEEDLIMIT", "code": 2019, - "name": "常规线限速" + "name": "常规线限速", + "zoomMin": 18, + "zoomMax": 19 }, "2020": { "table": "OMDB_LINK_SPEEDLIMIT_COND", "code": 2020, - "name": "条件线限速" + "name": "条件线限速", + "zoomMin": 18, + "zoomMax": 19 }, "2021": { "table": "OMDB_LINK_SPEEDLIMIT_VAR", "code": 2021, - "name": "可变线限速" + "name": "可变线限速", + "zoomMin": 18, + "zoomMax": 19 }, "2022": { "table": "OMDB_CON_ACCESS", @@ -89,7 +109,9 @@ "2083":{ "table": "OMDB_RDBOUND_BOUNDARYTYPE", "code": 2083, - "name": "道路边界类型" + "name": "道路边界类型", + "zoomMin": 20, + "zoomMax": 23 }, "2201":{ "table": "OMDB_BRIDGE", @@ -100,6 +122,8 @@ "table": "OMDB_TUNNEL", "code": 2202, "name": "隧道", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "geometry", @@ -113,6 +137,8 @@ "table": "OMDB_INTERSECTION", "code": 4001, "name": "路口", + "zoomMin": 18, + "zoomMax": 19, "transformer": [ { "k": "geometry", @@ -126,6 +152,8 @@ "table": "OMDB_SPEEDLIMIT", "code": 4002, "name": "常规点限速", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "maxSpeed", @@ -145,6 +173,8 @@ "table": "OMDB_SPEEDLIMIT_COND", "code": 4003, "name": "条件点限速", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "maxSpeed", @@ -158,6 +188,8 @@ "table": "OMDB_SPEEDLIMIT_VAR", "code": 4004, "name": "可变点限速", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "location", @@ -183,6 +215,8 @@ "table": "OMDB_RESTRICTION", "code": 4006, "name": "普通交限", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "geometry", @@ -220,6 +254,8 @@ "table": "OMDB_ELECTRONICEYE", "code": 4010, "name": "电子眼", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ { "k": "geometry", @@ -251,6 +287,8 @@ "table": "OMDB_TRAFFICLIGHT", "code": 4022, "name": "交通灯", + "zoomMin": 18, + "zoomMax": 23, "transformer": [ ] }, @@ -258,24 +296,26 @@ "table": "OMDB_LANEINFO", "code": 4601, "name": "车信", + "zoomMin": 18, + "zoomMax": 19, "transformer": [ { "k": "geometry", "v": "~", "klib": "geometry", - "vlib": "translateBack()" + "vlib": "translateRight(direct=3)" }, { "k": "geometry", "v": "~", "klib": "geometry", - "vlib": "translateRight()" + "vlib": "unpackingLaneInfo()" }, { "k": "geometry", "v": "~", "klib": "geometry", - "vlib": "generateDirectReferenceLine()" + "vlib": "generateS2EReferenceLine()" } ] }, @@ -283,6 +323,8 @@ "table": "OMDB_LANE_LINK_LG", "code": 5001, "name": "车道中心线", + "zoomMin": 20, + "zoomMax": 23, "transformer": [ { "k": "geometry", diff --git a/app/src/main/java/com/navinfo/omqs/Constant.kt b/app/src/main/java/com/navinfo/omqs/Constant.kt index 5db3b683..30e53f7a 100644 --- a/app/src/main/java/com/navinfo/omqs/Constant.kt +++ b/app/src/main/java/com/navinfo/omqs/Constant.kt @@ -64,6 +64,11 @@ class Constant { const val DEBUG = true + /** + * 地图最多缩放级别23 + */ + const val MAX_ZOOM = 23 + /** * 是否自动定位 */ diff --git a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt index 5c6683b2..4cbbb603 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt @@ -115,6 +115,8 @@ class ImportConfig { class TableInfo { val table: String = "" val code: Int = 0 + val zoomMin: Int = 18 + val zoomMax: Int = 23 val name: String = "" var checked : Boolean = true var transformer: MutableList = mutableListOf() diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index 64ac2675..2cd3cb7f 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -5,10 +5,6 @@ import android.database.Cursor.* import android.os.Build import android.util.Log import androidx.annotation.RequiresApi -import androidx.core.database.getBlobOrNull -import androidx.core.database.getFloatOrNull -import androidx.core.database.getIntOrNull -import androidx.core.database.getStringOrNull import com.blankj.utilcode.util.FileIOUtils import com.blankj.utilcode.util.ZipUtils import com.google.gson.Gson @@ -16,8 +12,6 @@ import com.google.gson.reflect.TypeToken import com.navinfo.collect.library.data.entity.RenderEntity import com.navinfo.omqs.Constant import com.navinfo.omqs.bean.ImportConfig -import com.navinfo.omqs.bean.Transform -import com.navinfo.omqs.hilt.ImportOMDBHiltFactory import com.navinfo.omqs.hilt.OMDBDataBaseHiltFactory import dagger.assisted.Assisted import dagger.assisted.AssistedInject @@ -127,7 +121,7 @@ class ImportOMDBHelper @AssistedInject constructor( * @param omdbZipFile omdb数据抽取生成的Zip文件 * @param configFile 对应的配置文件 * */ - suspend fun importOmdbZipFile(omdbZipFile: File): Flow = withContext(Dispatchers.IO) { + suspend fun importOmdbZipFile(omdbZipFile: File, taskId: Int): Flow = withContext(Dispatchers.IO) { val unZipFolder = File(omdbZipFile.parentFile, "result") flow { if (unZipFolder.exists()) { @@ -159,6 +153,8 @@ class ImportOMDBHelper @AssistedInject constructor( map["qi_table"] = currentConfig.table map["qi_name"] = currentConfig.name map["qi_code"] = if (currentConfig.code == 0) currentConfig.code else currentEntry.key + map["qi_zoomMin"] = currentConfig.zoomMin + map["qi_zoomMax"] = currentConfig.zoomMax // 先查询这个mesh下有没有数据，如果有则跳过即可 // val meshEntity = Realm.getDefaultInstance().where(RenderEntity::class.java).equalTo("properties['mesh']", map["mesh"].toString()).findFirst() @@ -166,6 +162,10 @@ class ImportOMDBHelper @AssistedInject constructor( renderEntity.code = map["qi_code"].toString().toInt() renderEntity.name = map["qi_name"].toString() renderEntity.table = map["qi_table"].toString() + renderEntity.taskId = taskId + renderEntity.zoomMin = map["qi_zoomMin"].toString().toInt() + renderEntity.zoomMax = map["qi_zoomMax"].toString().toInt() + // 其他数据插入到Properties中 renderEntity.geometry = map["geometry"].toString() for ((key, value) in map) { diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index d75f3e4a..cd06a105 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -16,6 +16,7 @@ import org.oscim.core.GeoPoint class ImportPreProcess { val code2NameMap = Code2NameMap() lateinit var cacheRdLink: Map + val defaultTranslateDistance = 3.0 fun checkCircleRoad(renderEntity: RenderEntity): Boolean { val linkInId = renderEntity.properties["linkIn"] @@ -50,9 +51,9 @@ class ImportPreProcess { } if (Geometry.TYPENAME_POINT == geometry?.geometryType) { // angle为与正北方向的顺时针夹角 var angle = if(renderEntity?.properties?.get("angle") == null) 0.0 else renderEntity?.properties?.get("angle")?.toDouble()!! - if (isReverse) { - angle += 180 - } +// if (isReverse) { +// angle += 180 +// } // angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角 angle=(450-angle)%360 radian = Math.toRadians(angle) @@ -65,20 +66,26 @@ class ImportPreProcess { val p2: Coordinate = coordinates.get(coordinates.size - 1) // 计算线段的方向 radian = Angle.angle(p1, p2) - point = p2 + point = p1 } // 计算偏移距离 - val dx: Double = GeometryTools.convertDistanceToDegree(3.0, geometry?.coordinate?.y!!) * Math.cos(radian) - val dy: Double = GeometryTools.convertDistanceToDegree(3.0, geometry?.coordinate?.y!!) * Math.sin(radian) + val dx: Double = GeometryTools.convertDistanceToDegree(defaultTranslateDistance, geometry?.coordinate?.y!!) * Math.cos(radian) + val dy: Double = GeometryTools.convertDistanceToDegree(defaultTranslateDistance, geometry?.coordinate?.y!!) * Math.sin(radian) // 计算偏移后的点 val coord = Coordinate(point.getX() + dy, point.getY() - dx) - // 将这个点记录在数据中 - val geometryTranslate: Geometry = GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y)) - renderEntity.geometry = geometryTranslate.toString() + // 记录偏移后的点位或线数据，如果数据为线时，记录的偏移后数据为倒数第二个点右移后，方向与线的最后两个点平行同向的单位向量 + if (Geometry.TYPENAME_POINT == geometry?.geometryType) { + val geometryTranslate: Geometry = GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y)) + renderEntity.geometry = geometryTranslate.toString() + } else { + val coorEnd = Coordinate(coord.x+dx, coord.y+dy) + val geometryTranslate: Geometry = GeometryTools.createLineString(arrayOf(coord, coorEnd)) + renderEntity.geometry = geometryTranslate.toString() + } } /** @@ -145,6 +152,10 @@ class ImportPreProcess { startEndReference.renderEntityId = renderEntity.id startEndReference.name = "${renderEntity.name}参考线" startEndReference.table = renderEntity.table + startEndReference.zoomMin = renderEntity.zoomMin + startEndReference.zoomMax = renderEntity.zoomMax + startEndReference.taskId = renderEntity.taskId + // 起终点坐标组成的线 startEndReference.geometry = GeometryTools.createLineString(arrayOf(pointStart, pointEnd)).toString() startEndReference.properties["qi_table"] = renderEntity.table @@ -163,6 +174,10 @@ class ImportPreProcess { startReference.renderEntityId = renderEntity.id startReference.name = "${renderEntity.name}参考线" startReference.table = renderEntity.table + startReference.zoomMin = renderEntity.zoomMin + startReference.zoomMax = renderEntity.zoomMax + startReference.taskId = renderEntity.taskId + // 起点坐标 startReference.geometry = GeometryTools.createGeometry(GeoPoint(pointStart.y,pointStart.x)).toString() startReference.properties["qi_table"] = renderEntity.table @@ -173,6 +188,10 @@ class ImportPreProcess { endReference.renderEntityId = renderEntity.id endReference.name = "${renderEntity.name}参考线" endReference.table = renderEntity.table + endReference.zoomMin = renderEntity.zoomMin + endReference.zoomMax = renderEntity.zoomMax + endReference.taskId = renderEntity.taskId + // 终点坐标 endReference.geometry = GeometryTools.createGeometry(GeoPoint(pointEnd.y,pointEnd.x)).toString() endReference.properties["qi_table"] = renderEntity.table @@ -226,6 +245,9 @@ class ImportPreProcess { angleReference.renderEntityId = renderEntity.id angleReference.name = "${renderEntity.name}参考方向" angleReference.table = renderEntity.table + angleReference.zoomMin = renderEntity.zoomMin + angleReference.zoomMax = renderEntity.zoomMax + angleReference.taskId = renderEntity.taskId // 与原有方向指向平行的线 angleReference.geometry = GeometryTools.createLineString(arrayOf(point, coorEnd)).toString() angleReference.properties["qi_table"] = renderEntity.table @@ -282,7 +304,40 @@ class ImportPreProcess { } } + /** + * 解析车信数据二级属性 + * */ + fun unpackingLaneInfo(renderEntity: RenderEntity) { + if (renderEntity.code == 4601) { + if (!renderEntity.properties["laneinfoGroup"].isNullOrEmpty()&&renderEntity.properties["laneinfoGroup"]!="null") { + // 解析laneinfoGroup，将数组中的属性放会properties + val laneinfoGroup = JSONArray(renderEntity.properties["laneinfoGroup"].toString().replace("{", "[").replace("}", "]")) + // 分别获取两个数组中的数据，取第一个作为主数据，另外两个作为辅助渲染数据 + val laneInfoDirectArray = JSONArray(laneinfoGroup[0].toString()) + val laneInfoTypeArray = JSONArray(laneinfoGroup[1].toString()) + for (i in 0 until laneInfoDirectArray.length()) { + // 根据后续的数据生成辅助表数据 + val referenceEntity = ReferenceEntity() + referenceEntity.renderEntityId = renderEntity.id + referenceEntity.name = "${renderEntity.name}参考方向" + referenceEntity.table = renderEntity.table + referenceEntity.zoomMin = renderEntity.zoomMin + referenceEntity.zoomMax = renderEntity.zoomMax + referenceEntity.taskId = renderEntity.taskId + + // 与原数据使用相同的geometry + referenceEntity.geometry = renderEntity.geometry.toString() + referenceEntity.properties["qi_table"] = renderEntity.table + referenceEntity.properties["currentDirect"] = laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_") + referenceEntity.properties["currentType"] = laneInfoTypeArray[i].toString().split(",").distinct().joinToString("_") + referenceEntity.properties["symbol"] = "assets:omdb/4601/bus/1301_"+referenceEntity.properties["currentDirect"]+".svg" + Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString()) + Realm.getDefaultInstance().insert(referenceEntity) + } + } + } + } /** * 生成默认道路名数据 @@ -339,6 +394,9 @@ class ImportPreProcess { angleReference.geometry = renderEntity.geometry angleReference.properties["qi_table"] = renderEntity.table angleReference.properties["width"] = "3" + angleReference.zoomMin = renderEntity.zoomMin + angleReference.zoomMax = renderEntity.zoomMax + angleReference.taskId = renderEntity.taskId Realm.getDefaultInstance().insert(angleReference) } @@ -356,6 +414,9 @@ class ImportPreProcess { intersectionReference.renderEntityId = renderEntity.id intersectionReference.name = "${renderEntity.name}参考点" intersectionReference.table = renderEntity.table + intersectionReference.zoomMin = renderEntity.zoomMin + intersectionReference.zoomMax = renderEntity.zoomMax + intersectionReference.taskId = renderEntity.taskId // 与原有方向指向平行的线 intersectionReference.geometry = GeometryTools.createGeometry(nodeJSONObject["geometry"].toString()).toString() intersectionReference.properties["qi_table"] = renderEntity.table diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt index 53e1d6da..a405fcc8 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt @@ -71,7 +71,7 @@ class TaskDownloadScope( downloadJob = launch() { FileManager.checkOMDBFileInfo(taskBean) if (taskBean.status == FileDownloadStatus.IMPORT) { - importData() + importData(taskId = taskBean.id) } else { download() } @@ -119,7 +119,7 @@ class TaskDownloadScope( /** * 导入数据 */ - private suspend fun importData(file: File? = null) { + private suspend fun importData(file: File? = null, taskId: Int?=0) { try { Log.e("jingo", "importData SSS") change(FileDownloadStatus.IMPORTING) @@ -130,15 +130,17 @@ class TaskDownloadScope( downloadManager.context, fileNew ) - importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile).collect { - Log.e("jingo", "数据安装 $it") - if (it == "finish") { - change(FileDownloadStatus.DONE) - withContext(Dispatchers.Main) { - downloadManager.mapController.mMapView.updateMap(true) + if (taskId != null) { + importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile,taskId).collect { + Log.e("jingo", "数据安装 $it") + if (it == "finish") { + change(FileDownloadStatus.DONE) + withContext(Dispatchers.Main) { + downloadManager.mapController.mMapView.updateMap(true) + } + } else { + change(FileDownloadStatus.IMPORTING, it) } - } else { - change(FileDownloadStatus.IMPORTING, it) } } } catch (e: Exception) { @@ -177,7 +179,7 @@ class TaskDownloadScope( startPosition = 0 } if (fileTemp.length() > 0 && taskBean.fileSize > 0 && fileTemp.length() == taskBean.fileSize) { - importData(fileTemp) + importData(fileTemp,taskBean.id) return } @@ -218,7 +220,7 @@ class TaskDownloadScope( randomAccessFile?.close() inputStream = null randomAccessFile = null - importData() + importData(taskId = taskBean.id) } else { change(FileDownloadStatus.PAUSE) } diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 80e6f008..5d08ab26 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -20,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.navinfo.collect.library.map.NIMapController +import com.navinfo.collect.library.map.NIMapOptions import com.navinfo.omqs.Constant import com.navinfo.omqs.R import com.navinfo.omqs.bean.ImportConfig @@ -167,7 +168,7 @@ class MainActivity : BaseActivity() { viewModel.speakMode = SpeakMode(this) // 在mapController初始化前获取当前OMDB图层显隐 viewModel.refreshOMDBLayer(LayerConfigUtils.getLayerConfigList()) - mapController.mMapView.vtmMap.viewport().maxZoomLevel = 25 + mapController.mMapView.vtmMap.viewport().maxZoomLevel = Constant.MAX_ZOOM //关联生命周期 binding.lifecycleOwner = this //给xml转递对象 diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index afedf335..692866c6 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -123,10 +123,10 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? } R.id.personal_center_menu_test -> { viewModel.readRealmData() - //108.90107116103331 34.29568928574205 + //116.25017070328308 40.061730653134696 // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint( 34.29568928574205, 108.90107116103331)) + .animateTo(GeoPoint( 40.061730653134696, 116.25017070328308)) } // R.id.personal_center_menu_task_list -> { // findNavController().navigate(R.id.TaskManagerFragment) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt index aebf7569..04093b8f 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt @@ -1,8 +1,9 @@ package com.navinfo.omqs.ui.fragment.personalcenter import android.net.Uri +import android.os.Build import android.util.Log -import androidx.appcompat.app.AppCompatActivity +import androidx.annotation.RequiresApi import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -16,17 +17,13 @@ import com.navinfo.omqs.bean.ScRootCauseAnalysisBean import com.navinfo.omqs.db.ImportOMDBHelper import com.navinfo.omqs.db.RealmOperateHelper import com.navinfo.omqs.db.RoomAppDatabase -import com.navinfo.omqs.tools.MetadataUtils import com.navinfo.omqs.tools.MetadataUtils.Companion.ScProblemTypeTitle import com.navinfo.omqs.tools.MetadataUtils.Companion.ScRootCauseAnalysisTitle import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.apache.commons.io.input.BOMInputStream import java.io.* -import java.nio.charset.Charset -import java.text.Normalizer import java.util.* import javax.inject.Inject @@ -43,6 +40,7 @@ class PersonalCenterViewModel @Inject constructor( /** * 导入OMDB数据 * */ + @RequiresApi(Build.VERSION_CODES.N) suspend fun obtainOMDBZipData(importOMDBHelper: ImportOMDBHelper) { Log.d("OMQSApplication", "开始生成数据") // Realm.getDefaultInstance().beginTransaction() @@ -164,11 +162,13 @@ class PersonalCenterViewModel @Inject constructor( /** * 导入OMDB数据 * */ - fun importOMDBData(importOMDBHelper: ImportOMDBHelper) { + fun importOMDBData(importOMDBHelper: ImportOMDBHelper,taskId:Int?=0) { viewModelScope.launch(Dispatchers.IO) { Log.d("OMQSApplication", "开始导入数据") - importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile).collect { - Log.d("importOMDBData", it) + if (taskId != null) { + importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, taskId).collect { + Log.d("importOMDBData", it) + } } Log.d("OMQSApplication", "导入数据完成") } diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 04a8b27d..9fb51e19 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1479,133 +1479,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -1644,130 +1530,75 @@ - + - - - - - + - - - - - + - + - - - - - + - - - - + + + 0 + - - + + - + - + - - + + @@ -1797,22 +1628,22 @@ - + - + - + - + - + @@ -1824,12 +1655,12 @@ - + - + @@ -1847,22 +1678,22 @@ - - + - + + - + @@ -1878,11 +1709,7 @@ - - - - - + @@ -1893,8 +1720,9 @@ + - + @@ -1902,13 +1730,412 @@ + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg new file mode 100644 index 00000000..11c4ad4a --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg @@ -0,0 +1,16 @@ + + + + 1301_1_o + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg new file mode 100644 index 00000000..7fad797e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg @@ -0,0 +1,15 @@ + + + + 1301_1_a + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg new file mode 100644 index 00000000..ef978302 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg @@ -0,0 +1,16 @@ + + + + 1301_1_g + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg new file mode 100644 index 00000000..7a4eaa39 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_1_h + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg new file mode 100644 index 00000000..b083effc --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg @@ -0,0 +1,21 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg new file mode 100644 index 00000000..f1783eb2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_1_j + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg new file mode 100644 index 00000000..41817043 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg @@ -0,0 +1,17 @@ + + + + 编组 13 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg new file mode 100644 index 00000000..1ae6c322 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_3 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg new file mode 100644 index 00000000..dbb3b0a8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg @@ -0,0 +1,16 @@ + + + + 1301_1_f + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg new file mode 100644 index 00000000..95890b21 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_1_i + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg new file mode 100644 index 00000000..a5f97b40 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_1_4 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg new file mode 100644 index 00000000..7746a04e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_5 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg new file mode 100644 index 00000000..e102cc2e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg @@ -0,0 +1,16 @@ + + + + 1301_1_e + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg new file mode 100644 index 00000000..2ea27c43 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg @@ -0,0 +1,16 @@ + + + + 1301_1_t + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg new file mode 100644 index 00000000..79506a9e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg @@ -0,0 +1,16 @@ + + + + 1301_1_x + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg new file mode 100644 index 00000000..a168c5fe --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg @@ -0,0 +1,18 @@ + + + + 提示前方可自行或右后方掉头 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg new file mode 100644 index 00000000..ec913bb4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg @@ -0,0 +1,16 @@ + + + + 1301_1_b + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg new file mode 100644 index 00000000..2239d079 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_1_k + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg new file mode 100644 index 00000000..20da2578 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg @@ -0,0 +1,18 @@ + + + + 1301_1_m + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg new file mode 100644 index 00000000..1eba8f6b --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_1_l + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg new file mode 100644 index 00000000..d5171f4b --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg @@ -0,0 +1,17 @@ + + + + 1301_1_u + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg new file mode 100644 index 00000000..51a11221 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_y + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg new file mode 100644 index 00000000..d2da475a --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg @@ -0,0 +1,16 @@ + + + + 1301_1_c + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg new file mode 100644 index 00000000..c2ccda33 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_1_n + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg new file mode 100644 index 00000000..54be427f --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_1_v + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg new file mode 100644 index 00000000..cff1424a --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_z + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg new file mode 100644 index 00000000..ec270561 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg @@ -0,0 +1,15 @@ + + + + 1301_1_d + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg new file mode 100644 index 00000000..8d88db55 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg @@ -0,0 +1,17 @@ + + + + 1301_1_w + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg new file mode 100644 index 00000000..3dda5a65 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_0 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg new file mode 100644 index 00000000..c3bdba5f --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg @@ -0,0 +1,16 @@ + + + + 1301_1_r + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg new file mode 100644 index 00000000..e230cdf6 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg @@ -0,0 +1,17 @@ + + + + 1301_1_1 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg new file mode 100644 index 00000000..0452c08c --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg @@ -0,0 +1,16 @@ + + + + 1301_1_s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg new file mode 100644 index 00000000..6c966615 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg @@ -0,0 +1,17 @@ + + + + 提示右后方掉头 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg new file mode 100644 index 00000000..31181865 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg @@ -0,0 +1,16 @@ + + + + 1301_2_o + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg new file mode 100644 index 00000000..2432424e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg @@ -0,0 +1,15 @@ + + + + 1301_2_a + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg new file mode 100644 index 00000000..54900d75 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg @@ -0,0 +1,16 @@ + + + + 1301_2_g + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg new file mode 100644 index 00000000..824e6503 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_2_h + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg new file mode 100644 index 00000000..9aae9284 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg @@ -0,0 +1,21 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg new file mode 100644 index 00000000..6e952eab --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_2_j + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg new file mode 100644 index 00000000..028e0281 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg @@ -0,0 +1,17 @@ + + + + 1301_2_2 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg new file mode 100644 index 00000000..d79bb956 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_3 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg new file mode 100644 index 00000000..9c121433 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg @@ -0,0 +1,16 @@ + + + + 1301_2_f + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg new file mode 100644 index 00000000..b25a0cad --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_2_i + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg new file mode 100644 index 00000000..e6b10741 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_2_4 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg new file mode 100644 index 00000000..3ff7e8b5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_5 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg new file mode 100644 index 00000000..32b6d317 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg @@ -0,0 +1,16 @@ + + + + 1301_2_e + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg new file mode 100644 index 00000000..acb3d7ff --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg @@ -0,0 +1,16 @@ + + + + 1301_2_t + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg new file mode 100644 index 00000000..0ec4d847 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg @@ -0,0 +1,16 @@ + + + + 1301_2_x + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg new file mode 100644 index 00000000..e707aec2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg @@ -0,0 +1,18 @@ + + + + 提示前方可自行或右后方掉头复制 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg new file mode 100644 index 00000000..ad77a66d --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg @@ -0,0 +1,16 @@ + + + + 1301_2_b + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg new file mode 100644 index 00000000..f8f2c938 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_2_k + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg new file mode 100644 index 00000000..d073873d --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg @@ -0,0 +1,18 @@ + + + + 1301_2_m + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg new file mode 100644 index 00000000..3f2f9707 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_2_l + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg new file mode 100644 index 00000000..d843eb38 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg @@ -0,0 +1,17 @@ + + + + 1301_2_u + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg new file mode 100644 index 00000000..bdb8fff7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_y + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg new file mode 100644 index 00000000..df172c9c --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg @@ -0,0 +1,16 @@ + + + + 1301_2_c + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg new file mode 100644 index 00000000..acb9ae05 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_2_n + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg new file mode 100644 index 00000000..069cbd0b --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_2_v + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg new file mode 100644 index 00000000..79d5c087 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_z + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg new file mode 100644 index 00000000..b6e1d0db --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg @@ -0,0 +1,15 @@ + + + + 1301_2_d + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg new file mode 100644 index 00000000..81af0ab8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg @@ -0,0 +1,17 @@ + + + + 1301_2_w + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg new file mode 100644 index 00000000..57990202 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_0 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg new file mode 100644 index 00000000..aba27872 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg @@ -0,0 +1,16 @@ + + + + 1301_2_r + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg new file mode 100644 index 00000000..572458f7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg @@ -0,0 +1,17 @@ + + + + 1301_2_1 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg new file mode 100644 index 00000000..b33898a2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg @@ -0,0 +1,16 @@ + + + + 1301_2_s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg new file mode 100644 index 00000000..eed6f75f --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg @@ -0,0 +1,17 @@ + + + + 提示右后方掉头复制 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg new file mode 100644 index 00000000..eee46b0a --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg @@ -0,0 +1,15 @@ + + + + 1301_0_a + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg new file mode 100644 index 00000000..a17714ac --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg @@ -0,0 +1,16 @@ + + + + 1301_0_g + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg new file mode 100644 index 00000000..15b4e042 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_0_h + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg new file mode 100644 index 00000000..7e376960 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg @@ -0,0 +1,21 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg new file mode 100644 index 00000000..54172a31 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_0_j + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg new file mode 100644 index 00000000..389ab0ab --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg @@ -0,0 +1,17 @@ + + + + 1301_0_2 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg new file mode 100644 index 00000000..a42e748c --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_3 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg new file mode 100644 index 00000000..98d227b3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg @@ -0,0 +1,16 @@ + + + + 1301_0_f + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg new file mode 100644 index 00000000..a790d632 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_0_i + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg new file mode 100644 index 00000000..91980137 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_0_4 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg new file mode 100644 index 00000000..a8eb644b --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_5 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg new file mode 100644 index 00000000..002e5954 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg @@ -0,0 +1,16 @@ + + + + 1301_0_e + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg new file mode 100644 index 00000000..a57d2197 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg @@ -0,0 +1,16 @@ + + + + 1301_0_t + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg new file mode 100644 index 00000000..44e65ef4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg @@ -0,0 +1,16 @@ + + + + 1301_0_x + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg new file mode 100644 index 00000000..9e84d3c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg @@ -0,0 +1,18 @@ + + + + 提示前方可自行或右后方掉头复制 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg new file mode 100644 index 00000000..5301bd45 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg @@ -0,0 +1,16 @@ + + + + 1301_0_b + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg new file mode 100644 index 00000000..a12e77c3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg @@ -0,0 +1,17 @@ + + + + 1301_0_k + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg new file mode 100644 index 00000000..c65f71cb --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg @@ -0,0 +1,18 @@ + + + + 1301_0_m + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg new file mode 100644 index 00000000..84f7e390 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg @@ -0,0 +1,17 @@ + + + + 1301_0_l + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg new file mode 100644 index 00000000..8b28100c --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg @@ -0,0 +1,17 @@ + + + + 1301_0_u + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg new file mode 100644 index 00000000..11521180 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_y + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg new file mode 100644 index 00000000..aa94ed6e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg @@ -0,0 +1,16 @@ + + + + 1301_0_c + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg new file mode 100644 index 00000000..178daa1f --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg @@ -0,0 +1,17 @@ + + + + 1301_0_n + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg new file mode 100644 index 00000000..0a722d82 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg @@ -0,0 +1,17 @@ + + + + 1301_0_v + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg new file mode 100644 index 00000000..70057c1c --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_z + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg new file mode 100644 index 00000000..8e5aeea7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg @@ -0,0 +1,15 @@ + + + + 1301_0_d + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg new file mode 100644 index 00000000..8dbbcd42 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg @@ -0,0 +1,17 @@ + + + + 1301_0_w + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg new file mode 100644 index 00000000..1d34c49d --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_0 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg new file mode 100644 index 00000000..ab0df392 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg @@ -0,0 +1,16 @@ + + + + 1301_0_r + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg new file mode 100644 index 00000000..4fcaeb4e --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg @@ -0,0 +1,17 @@ + + + + 1301_0_1 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg new file mode 100644 index 00000000..b1061c69 --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg @@ -0,0 +1,16 @@ + + + + 1301_0_s + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg new file mode 100644 index 00000000..ab543afa --- /dev/null +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg @@ -0,0 +1,17 @@ + + + + 提示右后方掉头复制 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt index 5697cd25..78fb98a7 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt @@ -23,6 +23,9 @@ open class ReferenceEntity() : RealmObject() { lateinit var name: String //要素名 lateinit var table: String //要素表名 var code: Int = 0 // 要素编码 + var zoomMin: Int = 18 //显示最小级别 + var zoomMax: Int = 23 //显示最大级别 + var taskId: Int = 0 //任务ID var geometry: String = "" // 要素渲染参考的geometry，该数据可能会在导入预处理环节被修改，原始geometry会保存在properties的geometry字段下 get() { wkt = GeometryTools.createGeometry(field) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index f0cbe8f5..2d2c0f81 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -59,6 +59,9 @@ open class RenderEntity() : RealmObject(), Parcelable { var properties: RealmDictionary = RealmDictionary() var tileX: RealmSet = RealmSet() // x方向的tile编码 var tileY: RealmSet = RealmSet() // y方向的tile编码 + var taskId: Int = 0 //任务ID + var zoomMin: Int = 18 //显示最小级别 + var zoomMax: Int = 23 //显示最大级别 constructor(name: String) : this() { this.name = name diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java index f07e6217..b98aa4a3 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java @@ -177,11 +177,11 @@ public final class NIMapView extends RelativeLayout { } -// public NIMapView(Context context, NIMapOptions options) { -// this(context, null, 0); -// this.options = options; -// initOptions(); -// } +/* public NIMapView(Context context, NIMapOptions options) { + this(context, null, 0); + this.options = options; + initOptions(); + }*/ /** * 地图的单击事件监听 diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java index 65fb92fc..9e377480 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java @@ -64,7 +64,7 @@ public class OMDBDataDecoder extends TileDecoder { } @RequiresApi(api = Build.VERSION_CODES.N) - public boolean decode(Tile tile, ITileDataSink sink, List listResult) { + public boolean decode(int zoomLevel,Tile tile, ITileDataSink sink, List listResult) { mTileDataSink = sink; mTileScale = 1 << tile.zoomLevel; mTileX = tile.tileX / mTileScale; @@ -74,10 +74,11 @@ public class OMDBDataDecoder extends TileDecoder { listResult.stream().iterator().forEachRemaining(new Consumer() { @Override public void accept(RenderEntity renderEntity) { -// Log.d("RealmDBTileDataSource", renderEntity.getGeometry()); - Map properties= new HashMap<>(renderEntity.getProperties().size()); - properties.putAll(renderEntity.getProperties()); - parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); + if(zoomLevel>=renderEntity.getZoomMin()&&zoomLevel<=renderEntity.getZoomMax()){ + Map properties= new HashMap<>(renderEntity.getProperties().size()); + properties.putAll(renderEntity.getProperties()); + parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); + } } }); return true; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java index 917f632e..652d9694 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java @@ -48,7 +48,7 @@ public class OMDBReferenceDataSource implements ITileDataSource { } List listResult = realmQuery/*.distinct("id")*/.findAll(); if (!listResult.isEmpty()) { - mThreadLocalDecoders.get().decode(tile, mapDataSink, listResult); + mThreadLocalDecoders.get().decode(tile.zoomLevel,tile, mapDataSink, listResult); } mapDataSink.completed(QueryResult.SUCCESS); // Log.d("RealmDBTileDataSource", "tile:"+tile.getBoundingBox().toString()); diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java index d859fde9..0596ffb5 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java @@ -60,7 +60,7 @@ public class OMDBReferenceDecoder extends TileDecoder { } @RequiresApi(api = Build.VERSION_CODES.N) - public boolean decode(Tile tile, ITileDataSink sink, List listResult) { + public boolean decode(int mapLevel,Tile tile, ITileDataSink sink, List listResult) { mTileDataSink = sink; mTileScale = 1 << tile.zoomLevel; mTileX = tile.tileX / mTileScale; @@ -70,10 +70,11 @@ public class OMDBReferenceDecoder extends TileDecoder { listResult.stream().iterator().forEachRemaining(new Consumer() { @Override public void accept(ReferenceEntity renderEntity) { -// Log.d("RealmDBTileDataSource", renderEntity.getGeometry()); - Map properties= new HashMap<>(renderEntity.getProperties().size()); - properties.putAll(renderEntity.getProperties()); - parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); + if(mapLevel>=renderEntity.getZoomMin()&&mapLevel<=renderEntity.getZoomMax()){ + Map properties= new HashMap<>(renderEntity.getProperties().size()); + properties.putAll(renderEntity.getProperties()); + parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); + } } }); return true; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java index eb42d21b..1a0aea1c 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java @@ -50,7 +50,8 @@ public class OMDBTileDataSource implements ITileDataSource { } List listResult = realmQuery/*.distinct("id")*/.findAll(); if (!listResult.isEmpty()) { - mThreadLocalDecoders.get().decode(tile, mapDataSink, listResult); + Log.e("qj","查询数据=="+listResult.size()+"==地图级别"+tile.zoomLevel); + mThreadLocalDecoders.get().decode(tile.zoomLevel,tile, mapDataSink, listResult); } mapDataSink.completed(QueryResult.SUCCESS); // Log.d("RealmDBTileDataSource", "tile:"+tile.getBoundingBox().toString()); diff --git a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java index 8b4011f0..a228f9bd 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java @@ -30,7 +30,7 @@ public class Constant { } public static String[] HAD_LAYER_INVISIABLE_ARRAY; public static final int OVER_ZOOM = 21; - public static final int MAX_ZOOM = 25; + public static final int MAX_ZOOM = 23; public static final int OMDB_MIN_ZOOM = 18; /** diff --git a/vtm b/vtm index dd13e533..d7552c34 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323 +Subproject commit d7552c34ffdff6724b5e4ddcec461f81f1e0b669