xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qiji4215 2023-10-09 14:21:32 +08:00
commit 673d8b900d
56 changed files with 275 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,24 +52,33 @@ class ImportPreProcess {
// 获取当前renderEntity的geometry
val geometry = renderEntity.wkt
var radian = 0.0 // geometry的角度，如果是点，获取angle，如果是线，获取最后两个点的方向
var point = Coordinate(geometry?.coordinate)
var isReverse = false // 是否为逆向
if (direction.isNotEmpty()) {
val paramDirections = direction.split("=")
if (paramDirections.size >= 2 && renderEntity.properties[paramDirections[0].trim()] == paramDirections[1].trim()) {
isReverse = true;
}
}
// 如果是正向，则取最后一个点作为渲染图标的位置
var point = geometry!!.coordinates[geometry!!.coordinates.size-1]
if (isReverse){
// 逆向的话取第一个点作为渲染图标的位置
point = geometry.coordinates[0]
}
// 如果数据属性中存在angle，则使用该值，否则需要根据line中的数据进行计算
if (renderEntity?.properties?.get(
"angle"
) != null
) {
// 带有angle字段的数据，也有可能是线，需要判断是否需要根据指定字段判断数据是否为逆向
var angle = renderEntity?.properties?.get("angle")?.toDouble()!!
// angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角
angle = ((450 - angle) % 360)
radian = Math.toRadians(angle)
} else {
var isReverse = false // 是否为逆向
if (direction.isNotEmpty()) {
val paramDirections = direction.split("=")
if (paramDirections.size >= 2 && renderEntity.properties[paramDirections[0].trim()] == paramDirections[1].trim()) {
isReverse = true;
}
}
if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) {
var coordinates = geometry.coordinates
if (isReverse) {
@ -79,7 +88,7 @@ class ImportPreProcess {
val p2: Coordinate = coordinates.get(coordinates.size - 1)
// 计算线段的方向
radian = Angle.angle(p1, p2)
point = p1
point = p2
}
}
@ -97,7 +106,7 @@ class ImportPreProcess {
val coord =
Coordinate(point.getX() + dy, point.getY() - dx)
// 记录偏移后的点位或线数据，如果数据为线时，记录的偏移后数据为倒数第二个点右移后，方向与线的最后两个点平行同向的单位向量
// 记录偏移后的点位或线数据，如果数据为线时，记录的偏移后数据为最后一个点右移后，方向与线的最后两个点平行同向的单位向量
if (Geometry.TYPENAME_POINT == geometry?.geometryType) {
val geometryTranslate: Geometry =
GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))

46
app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
View File

@ -39,6 +39,7 @@ class RealmOperateHelper() {
* */
@RequiresApi(Build.VERSION_CODES.N)
suspend fun queryLink(
realm: Realm,
point: GeoPoint,
buffer: Double = DEFAULT_BUFFER,
bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE,
@ -63,9 +64,9 @@ class RealmOperateHelper() {
val yStart = tileYSet.stream().min(Comparator.naturalOrder()).orElse(null)
val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
// 查询realm中对应tile号的数据
val realm = getSelectTaskRealmInstance()
// val realm = getSelectTaskRealmInstance()
val realmList =
getSelectTaskRealmTools(RenderEntity::class.java, false)
getSelectTaskRealmTools(realm, RenderEntity::class.java, false)
.equalTo("table", DataCodeEnum.OMDB_LINK_DIRECT.name)
.greaterThanOrEqualTo("tileX", xStart)
.lessThanOrEqualTo("tileX", xEnd)
@ -74,7 +75,7 @@ class RealmOperateHelper() {
.findAll()
// 将获取到的数据和查询的polygon做相交，只返回相交的数据
val dataList = realm.copyFromRealm(realmList)
realm.close()
// realm.close()
val queryResult = dataList?.stream()?.filter {
polygon.intersects(it.wkt)
@ -132,7 +133,7 @@ class RealmOperateHelper() {
val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
// 查询realm中对应tile号的数据
val realm = getSelectTaskRealmInstance()
val realmList = getSelectTaskRealmTools(RenderEntity::class.java, true)
val realmList = getSelectTaskRealmTools(realm, RenderEntity::class.java, true)
.equalTo("table", table)
.greaterThanOrEqualTo("tileX", xStart)
.lessThanOrEqualTo("tileX", xEnd)
@ -228,12 +229,14 @@ class RealmOperateHelper() {
return qsRecordBean
}
suspend fun queryLinkToMutableRenderEntityList(linkPid: String): MutableList<RenderEntity>? {
suspend fun queryLinkToMutableRenderEntityList(
realm: Realm,
linkPid: String
): MutableList<RenderEntity>? {
val resultList = mutableListOf<RenderEntity>()
// val realm = getSelectTaskRealmInstance()
val realm = getSelectTaskRealmInstance()
val realmR = getSelectTaskRealmTools(RenderEntity::class.java, true)
val realmR = getSelectTaskRealmTools(realm, RenderEntity::class.java, true)
.equalTo("properties['${LinkTable.linkPid}']", linkPid).findAll()
val dataList = realm.copyFromRealm(realmR)
@ -242,7 +245,7 @@ class RealmOperateHelper() {
resultList.add(it)
}
realm.close()
// realm.close()
return resultList
}
@ -280,7 +283,7 @@ class RealmOperateHelper() {
val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
val realm = getSelectTaskRealmInstance()
var realmList = mutableListOf<RenderEntity>()
val realmQuery = getSelectTaskRealmTools(RenderEntity::class.java, false)
val realmQuery = getSelectTaskRealmTools(realm, RenderEntity::class.java, false)
.greaterThanOrEqualTo("tileX", xStart)
.lessThanOrEqualTo("tileX", xEnd)
.greaterThanOrEqualTo("tileY", yStart)
@ -299,10 +302,12 @@ class RealmOperateHelper() {
}
// 将获取到的数据和查询的polygon做相交，只返回相交的数据
val queryResult = realmList?.stream()?.filter {
if(Constant.MapCatchLine){
polygon.intersects(it.wkt) && it.wkt?.geometryType?.uppercase().equals("LINESTRING")||it.wkt?.geometryType?.uppercase().equals("POLYGON")
}else{
polygon.intersects(it.wkt) && it.wkt?.geometryType?.uppercase().equals("POINT")||it.wkt?.geometryType?.uppercase().equals("POLYGON")
if (Constant.MapCatchLine) {
polygon.intersects(it.wkt) && it.wkt?.geometryType?.uppercase()
.equals("LINESTRING") || it.wkt?.geometryType?.uppercase().equals("POLYGON")
} else {
polygon.intersects(it.wkt) && it.wkt?.geometryType?.uppercase()
.equals("POINT") || it.wkt?.geometryType?.uppercase().equals("POLYGON")
}
}?.toList()
queryResult?.let {
@ -323,15 +328,13 @@ class RealmOperateHelper() {
* @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL
* @param sort 是否需要排序
* */
suspend fun queryLinkByLinkPid(linkPid: String): MutableList<RenderEntity> {
suspend fun queryLinkByLinkPid(realm: Realm,linkPid: String): MutableList<RenderEntity> {
val result = mutableListOf<RenderEntity>()
val realm = getSelectTaskRealmInstance()
val realmList = getSelectTaskRealmTools(RenderEntity::class.java, false)
val realmList = getSelectTaskRealmTools(realm, RenderEntity::class.java, false)
.notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
.equalTo("properties['${LinkTable.linkPid}']", linkPid)
.findAll()
result.addAll(realm.copyFromRealm(realmList))
realm.close()
return result
}
@ -426,19 +429,20 @@ class RealmOperateHelper() {
fun <E : RealmModel> getSelectTaskRealmTools(
realm: Realm,
clazz: Class<E>,
enableSql: Boolean
): RealmQuery<E> {
var realmQuery = getSelectTaskRealmInstance().where(clazz)
val realmQuery = realm.where(clazz)
if (MapParamUtils.getDataLayerEnum() != null) {
if (enableSql) {
var sql =
" enable${MapParamUtils.getDataLayerEnum().sql}"
getSelectTaskRealmInstance().where(clazz).rawPredicate(sql)
realm.where(clazz).rawPredicate(sql)
}
}
if(clazz.name==RenderEntity::class.jvmName){
if (clazz.name == RenderEntity::class.jvmName) {
// 筛选不显示的数据
if (com.navinfo.collect.library.system.Constant.HAD_LAYER_INVISIABLE_ARRAY != null && com.navinfo.collect.library.system.Constant.HAD_LAYER_INVISIABLE_ARRAY.size > 0) {
realmQuery.beginGroup()

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

@ -50,17 +50,11 @@ import io.realm.Realm
import io.realm.RealmConfiguration
import io.realm.RealmSet
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.withContext
import org.locationtech.jts.geom.Envelope
import org.locationtech.jts.geom.Geometry
import org.locationtech.jts.geom.LineString
import org.locationtech.spatial4j.shape.Rectangle
import org.oscim.core.GeoPoint
import org.oscim.core.MapPosition
import org.oscim.map.Map
@ -637,7 +631,7 @@ class MainViewModel @Inject constructor(
private suspend fun captureItem(point: GeoPoint) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
var buffer = 3.2
if(mapController.mMapView.mapLevel>=18){
if (mapController.mMapView.mapLevel >= 18) {
buffer = 2.0
}
val itemList = realmOperateHelper.queryElement(
@ -677,9 +671,9 @@ class MainViewModel @Inject constructor(
val topSignList = mutableListOf<SignBean>()
mapController.lineHandler.linksLayer.clear()
if (linkIdCache != route.linkId) {
val realm = realmOperateHelper.getSelectTaskRealmInstance()
mapController.lineHandler.showLine(route.pointList)
var elementList = realmOperateHelper.queryLinkByLinkPid(route.linkId)
val elementList = realmOperateHelper.queryLinkByLinkPid(realm, route.linkId)
for (element in elementList) {
when (element.code) {
@ -749,6 +743,7 @@ class MainViewModel @Inject constructor(
speakMode?.speakText(speechText)
}
linkIdCache = route.linkId ?: ""
realm.close()
}
}
} catch (e: Exception) {
@ -769,8 +764,8 @@ class MainViewModel @Inject constructor(
captureLinkState = true
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val linkList = realmOperateHelper.queryLink(point = point)
val realm = realmOperateHelper.getSelectTaskRealmInstance()
val linkList = realmOperateHelper.queryLink(realm, point = point)
var hisRoadName = false
@ -807,7 +802,8 @@ class MainViewModel @Inject constructor(
val newLineString = GeometryTools.createLineString(linePoints)
linkId?.let {
var elementList = realmOperateHelper.queryLinkByLinkPid(it)
val elementList = realmOperateHelper.queryLinkByLinkPid(realm, it)
Log.e("jingo", "捕捉到数据 ${elementList.size} 个")
for (element in elementList) {
if (element.code == DataCodeEnum.OMDB_LINK_NAME.code) {
hisRoadName = true
@ -824,7 +820,10 @@ class MainViewModel @Inject constructor(
newLineString,
element
)
// Log.e("jingo", "捕捉到的数据code ${element.code}")
Log.e(
"jingo",
"捕捉到的数据code ${DataCodeEnum.findTableNameByCode(element.code)}"
)
when (element.code) {
DataCodeEnum.OMDB_MULTI_DIGITIZED.code,//上下线分离
DataCodeEnum.OMDB_CON_ACCESS.code,//全封闭
@ -887,10 +886,10 @@ class MainViewModel @Inject constructor(
}
val realm = realmOperateHelper.getSelectTaskRealmInstance()
// val realm = realmOperateHelper.getSelectTaskRealmInstance()
val entityList = realmOperateHelper.getSelectTaskRealmTools(
RenderEntity::class.java, true
realm, RenderEntity::class.java, true
).and().equalTo("table", DataCodeEnum.OMDB_RESTRICTION.name).and()
.equalTo(
"properties['linkIn']", it
@ -901,7 +900,7 @@ class MainViewModel @Inject constructor(
val outLink = outList[i].properties["linkOut"]
val linkOutEntity =
realmOperateHelper.getSelectTaskRealmTools(
RenderEntity::class.java,
realm, RenderEntity::class.java,
true
)
.equalTo("table", DataCodeEnum.OMDB_RD_LINK_KIND.name)
@ -919,8 +918,8 @@ class MainViewModel @Inject constructor(
mapController.lineHandler.linksLayer.addLine(
link.geometry, Color.BLUE
)
realm.close()
}
}
liveDataTopSignList.postValue(topSignList.distinctBy { it.name }
@ -941,6 +940,7 @@ class MainViewModel @Inject constructor(
if (!hisRoadName) {
liveDataRoadName.postValue(null)
}
realm.close()
}
} catch (e: Exception) {

5
app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
View File

@ -218,7 +218,7 @@ class EvaluationResultViewModel @Inject constructor(
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
liveDataQsRecordBean.value?.let {
val realm = realmOperateHelper.getSelectTaskRealmInstance()
val taskLink =
realmOperateHelper.captureTaskLink(point)
if (taskLink != null) {
@ -226,7 +226,7 @@ class EvaluationResultViewModel @Inject constructor(
mapController.lineHandler.showLine(taskLink.geometry)
return
} else {
val linkList = realmOperateHelper.queryLink(point = point)
val linkList = realmOperateHelper.queryLink(realm,point = point)
if (linkList.isNotEmpty()) {
it.linkId = linkList[0].properties[LinkTable.linkPid] ?: ""
mapController.lineHandler.showLine(linkList[0].geometry)
@ -235,6 +235,7 @@ class EvaluationResultViewModel @Inject constructor(
}
it.linkId = ""
mapController.lineHandler.removeLine()
realm.close()
}
}
}

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

@ -178,7 +178,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
// 定位到指定位置
niMapController.mMapView.vtmMap.animator()
// .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 ))
.animateTo(GeoPoint(40.50704534740206, 115.80404946472662))
.animateTo(GeoPoint(40.07245537956604, 116.239638575623))
}
R.id.personal_center_menu_open_all_layer -> {

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

@ -275,7 +275,7 @@ class PersonalCenterViewModel @Inject constructor(
liveDataMessage.postValue("元数据表导入成功")
roomAppDatabase.getScRootCauseAnalysisDao().insertOrUpdateList(list2)
}
if(list3.isNotEmpty()){
if (list3.isNotEmpty()) {
liveDataMessage.postValue("标牌对照表导入成功")
roomAppDatabase.getScWarningCodeDao().insertList(list3)
}
@ -295,7 +295,9 @@ class PersonalCenterViewModel @Inject constructor(
fun readRealmData() {
viewModelScope.launch(Dispatchers.IO) {
// val result = realmOperateHelper.queryLink(GeometryTools.createPoint(115.685817,28.62759))
val result = realmOperateHelper.queryLinkByLinkPid("84206617008217069")
val realm = realmOperateHelper.getSelectTaskRealmInstance()
val result = realmOperateHelper.queryLinkByLinkPid(realm, "84206617008217069")
realm.close()
Log.d("xiaoyan", result.toString())
}
}

6
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt
View File

@ -76,6 +76,11 @@ class TaskFragment : BaseFragment() {
binding.taskAddLink.isSelected = it
}
viewModel.liveDataAddLinkDialog.observe(viewLifecycleOwner){
viewModel.addTaskLink(requireContext(),it)
}
//注意：使用滑动菜单不能开启滑动删除，否则只有滑动删除没有滑动菜单
val mSwipeMenuCreator = SwipeMenuCreator { _, rightMenu, _ ->
//添加菜单自动添加至尾部
@ -110,6 +115,7 @@ class TaskFragment : BaseFragment() {
viewModel.liveDataTaskLinks.observe(viewLifecycleOwner) {
adapter.resetSelect()
adapter.refreshData(it)
// adapter.setSelectTag(it.last().linkPid)
}
viewModel.getTaskList(requireContext())
binding.taskSearch.addTextChangedListener(object : TextWatcher {

21
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
View File

@ -128,21 +128,29 @@ class TaskListAdapter(
holder.addObserver(object : OnLifecycleStateListener {
override fun onState(tag: String, state: Lifecycle.State) {
when (state) {
Lifecycle.State.STARTED ->
Lifecycle.State.STARTED -> {
uploadManager.observer(
taskBean.id,
holder,
UploadObserver(taskBean.id, binding)
)
downloadManager.observer(
taskBean.id,
holder,
DownloadObserver(taskBean.id, holder)
)
Lifecycle.State.DESTROYED ->
}
Lifecycle.State.DESTROYED -> {
downloadManager.removeObserver(tag.toInt())
uploadManager.removeObserver(tag.toInt())
}
else -> {}
}
}
})
downloadManager.addTask(taskBean)
uploadManager.addTask(taskBean)
uploadManager.observer(taskBean.id, holder, UploadObserver(taskBean.id, binding))
// uploadManager.observer(taskBean.id, holder, UploadObserver(taskBean.id, binding))
if (taskBean.status == FileDownloadStatus.NONE) {
binding.taskDownloadBtn.setBackgroundColor(Color.WHITE)
binding.taskDownloadBtn.setTextColor(Color.parseColor("#888FB3"))
@ -187,7 +195,6 @@ class TaskListAdapter(
}
}
}
@ -227,8 +234,8 @@ class TaskListAdapter(
binding.taskUploadBtn.stopAnimator()
binding.taskUploadBtn.setText("重新同步")
binding.taskUploadBtn.setProgress(100)
if(!TextUtils.isEmpty(taskBean.errMsg)){
Toast.makeText(binding.root.context,taskBean.errMsg,Toast.LENGTH_LONG).show()
if (!TextUtils.isEmpty(taskBean.errMsg)) {
Toast.makeText(binding.root.context, taskBean.errMsg, Toast.LENGTH_LONG).show()
}
}
@ -359,7 +366,7 @@ class TaskListAdapter(
refreshData(list)
}
fun getSelectTaskPosition():Int{
fun getSelectTaskPosition(): Int {
return selectPosition
}

184
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
View File

@ -88,7 +88,12 @@ class TaskViewModel @Inject constructor(
/**
* 是否开启了道路选择
*/
var liveDataSelectNewLink = MutableLiveData(false)
val liveDataSelectNewLink = MutableLiveData(false)
/**
* 选中link
*/
val liveDataAddLinkDialog = MutableLiveData<RenderEntity>()
init {
sharedPreferences.registerOnSharedPreferenceChangeListener(this)
@ -98,10 +103,11 @@ class TaskViewModel @Inject constructor(
if (tag == TAG) {
if (liveDataSelectNewLink.value == true) {
viewModelScope.launch(Dispatchers.Default) {
val realm = realmOperateHelper.getSelectTaskRealmInstance()
if (currentSelectTaskBean == null) {
liveDataToastMessage.postValue("还没有开启任何任务")
} else {
val links = realmOperateHelper.queryLink(
val links = realmOperateHelper.queryLink(realm,
point = point,
)
if (links.isNotEmpty()) {
@ -111,43 +117,15 @@ class TaskViewModel @Inject constructor(
return@launch
}
}
val hadLinkDvoBean = HadLinkDvoBean(
taskId = currentSelectTaskBean!!.id,
linkPid = l.properties["linkPid"]!!,
geometry = l.geometry,
linkStatus = 2
)
currentSelectTaskBean!!.hadLinkDvoList.add(
hadLinkDvoBean
)
val realm = Realm.getDefaultInstance()
realm.executeTransaction { r ->
r.copyToRealmOrUpdate(hadLinkDvoBean)
r.copyToRealmOrUpdate(currentSelectTaskBean!!)
}
//根据Link数据查询对应数据上要素，对要素进行显示重置
l.properties["linkPid"]?.let {
realmOperateHelper.queryLinkToMutableRenderEntityList(it)
?.forEach { renderEntity ->
if (renderEntity.enable != 1) {
renderEntity.enable = 1
realm.executeTransaction { r ->
r.copyToRealmOrUpdate(renderEntity)
}
}
}
}
liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
mapController.lineHandler.addTaskLink(hadLinkDvoBean)
mapController.layerManagerHandler.updateOMDBVectorTileLayer()
mapController.mMapView.vtmMap.updateMap(true)
realm.close()
liveDataAddLinkDialog.postValue(l)
}
}
realm.close()
}
} else {
viewModelScope.launch(Dispatchers.IO) {
val links = realmOperateHelper.queryLink(
val realm = realmOperateHelper.getSelectTaskRealmInstance()
val links = realmOperateHelper.queryLink(realm,
point = point,
)
if (links.isNotEmpty()) {
@ -160,6 +138,7 @@ class TaskViewModel @Inject constructor(
}
}
}
realm.close()
}
}
}
@ -285,7 +264,7 @@ class TaskViewModel @Inject constructor(
* 设置当前选择的任务，并高亮当前任务的所有link
*/
fun setSelectTaskBean( taskBean: TaskBean) {
fun setSelectTaskBean(taskBean: TaskBean) {
sharedPreferences.edit().putInt(Constant.SELECT_TASK_ID, taskBean.id).apply()
@ -294,15 +273,17 @@ class TaskViewModel @Inject constructor(
liveDataTaskLinks.value = taskBean.hadLinkDvoList
showTaskLinks(taskBean)
MapParamUtils.setTaskId(taskBean.id)
Constant.currentSelectTaskFolder = File(Constant.USER_DATA_PATH +"/${taskBean.id}")
Constant.currentSelectTaskConfig = RealmConfiguration.Builder().directory(Constant.currentSelectTaskFolder).name("OMQS.realm").encryptionKey(Constant.PASSWORD).allowQueriesOnUiThread(true).schemaVersion(2).build()
Constant.currentSelectTaskFolder = File(Constant.USER_DATA_PATH + "/${taskBean.id}")
Constant.currentSelectTaskConfig =
RealmConfiguration.Builder().directory(Constant.currentSelectTaskFolder)
.name("OMQS.realm").encryptionKey(Constant.PASSWORD).allowQueriesOnUiThread(true)
.schemaVersion(2).build()
MapParamUtils.setTaskConfig(Constant.currentSelectTaskConfig)
mapController.layerManagerHandler.updateOMDBVectorTileLayer()
mapController.mMapView.updateMap(true)
}
private fun showTaskLinks(taskBean: TaskBean) {
mapController.lineHandler.removeAllTaskLine()
@ -497,17 +478,17 @@ class TaskViewModel @Inject constructor(
realm.where(QsRecordBean::class.java).equalTo("linkId", hadLinkDvoBean.linkPid)
.and().equalTo("taskId", hadLinkDvoBean.taskId).findAll()
if (objects.isEmpty() && hadLinkDvoBean.reason.isEmpty()) {
if(hadLinkDvoBean.linkStatus==3){
if (hadLinkDvoBean.linkStatus == 3) {
result = 1
realm.close()
return@forEach
}else{
} else {
result = 2
}
}
}
realm.close()
if(result==1){
if (result == 1) {
liveDataTaskUpload.postValue(map)
withContext(Dispatchers.Main) {
val mDialog = FirstDialog(context)
@ -521,7 +502,7 @@ class TaskViewModel @Inject constructor(
mDialog.setCancelVisibility(View.GONE)
mDialog.show()
}
}else if(result==2){
} else if (result == 2) {
liveDataTaskUpload.postValue(map)
withContext(Dispatchers.Main) {
val mDialog = FirstDialog(context)
@ -539,7 +520,7 @@ class TaskViewModel @Inject constructor(
) { _, _ -> mDialog.dismiss() }
mDialog.show()
}
}else{
} else {
map[taskBean] = true
liveDataTaskUpload.postValue(map)
}
@ -562,69 +543,62 @@ class TaskViewModel @Inject constructor(
*/
fun setSelectLink(selected: Boolean) {
liveDataSelectNewLink.value = selected
// //开始捕捉
// if (selected) {
// mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener {
// override fun onMapClick(tag: String, point: GeoPoint) {
// if (tag == TAG) {
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
// viewModelScope.launch(Dispatchers.Default) {
// if (currentSelectTaskBean == null) {
// liveDataToastMessage.postValue("还没有开启任何任务")
// } else {
// val links = realmOperateHelper.queryLink(
// point = point,
// )
// if (links.isNotEmpty()) {
// val l = links[0]
// for (link in currentSelectTaskBean!!.hadLinkDvoList) {
// if (link.linkPid == l.properties["linkPid"]) {
// return@launch
// }
// }
// val hadLinkDvoBean = HadLinkDvoBean(
// taskId = currentSelectTaskBean!!.id,
// linkPid = l.properties["linkPid"]!!,
// geometry = l.geometry,
// linkStatus = 2
// )
// currentSelectTaskBean!!.hadLinkDvoList.add(
// hadLinkDvoBean
// )
// val realm = Realm.getDefaultInstance()
// realm.executeTransaction { r ->
// r.copyToRealmOrUpdate(hadLinkDvoBean)
// r.copyToRealmOrUpdate(currentSelectTaskBean!!)
// }
// //根据Link数据查询对应数据上要素，对要素进行显示重置
// l.properties["linkPid"]?.let {
// realmOperateHelper.queryLinkToMutableRenderEntityList(it)
// ?.forEach { renderEntity ->
// if (renderEntity.enable != 1) {
// renderEntity.enable = 1
// realm.executeTransaction { r ->
// r.copyToRealmOrUpdate(renderEntity)
// }
// }
// }
// }
// liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
// mapController.lineHandler.addTaskLink(hadLinkDvoBean)
// mapController.layerManagerHandler.updateOMDBVectorTileLayer()
// mapController.mMapView.vtmMap.updateMap(true)
// }
// }
// }
// }
// }
// }
// })
// } else {
// mapController.mMapView.removeOnNIMapClickListener(TAG)
// mapController.lineHandler.removeLine()
// }
}
/**
* 添加link
*/
fun addTaskLink(context: Context, data: RenderEntity) {
val mDialog = FirstDialog(context)
mDialog.setTitle("提示")
mDialog.setMessage("是否添加当前link")
mDialog.setPositiveButton(
"确定"
) { dialog, _ ->
dialog.dismiss()
viewModelScope.launch(Dispatchers.IO) {
val hadLinkDvoBean = HadLinkDvoBean(
taskId = currentSelectTaskBean!!.id,
linkPid = data.properties["linkPid"]!!,
geometry = data.geometry,
linkStatus = 2
)
currentSelectTaskBean!!.hadLinkDvoList.add(
hadLinkDvoBean
)
val realm = Realm.getDefaultInstance()
realm.executeTransaction { r ->
r.copyToRealmOrUpdate(hadLinkDvoBean)
r.copyToRealmOrUpdate(currentSelectTaskBean!!)
}
//根据Link数据查询对应数据上要素，对要素进行显示重置
data.properties["linkPid"]?.let {
realmOperateHelper.queryLinkToMutableRenderEntityList(realm,it)
?.forEach { renderEntity ->
if (renderEntity.enable != 1) {
renderEntity.enable = 1
realm.executeTransaction { r ->
r.copyToRealmOrUpdate(renderEntity)
}
}
}
}
liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
mapController.lineHandler.addTaskLink(hadLinkDvoBean)
mapController.layerManagerHandler.updateOMDBVectorTileLayer()
mapController.mMapView.vtmMap.updateMap(true)
realm.close()
}
}
mDialog.setNegativeButton(
"取消"
) { _, _ ->
mDialog.dismiss()
}
mDialog.show()
}
/**
* 删除评测link
*/
@ -654,7 +628,7 @@ class TaskViewModel @Inject constructor(
//重置数据为隐藏
if (hadLinkDvoBean.linkStatus == 2) {
realmOperateHelper.queryLinkToMutableRenderEntityList(hadLinkDvoBean.linkPid)
realmOperateHelper.queryLinkToMutableRenderEntityList(realm,hadLinkDvoBean.linkPid)
?.forEach { renderEntity ->
if (renderEntity.enable == 1) {
renderEntity.enable = 0

22
app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
View File

@ -707,6 +707,28 @@ class SignUtil {
)
)
}
DataCodeEnum.OMDB_FILL_AREA.code->{
list.add(
TwoItemAdapterItem(
title = "对象号码",
text = "${data.properties["objectPid"]}"
)
)
list.add(
TwoItemAdapterItem(
title = "符合高精", text = when (data.properties["compliant"]) {
"0" -> "否"
"1" -> "是"
else -> ""
}
)
)
list.add(
TwoItemAdapterItem(
title = "关联车道组", text = "${data.properties["lgList"]}"
)
)
}
}
adapter.data = list
return adapter

2
collect-library/src/main/assets/omdb/arrowDirection/1.svg
View File

@ -10,7 +10,7 @@
<g id="工具栏汇总复制" transform="translate(-1387.000000, -616.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="1" transform="translate(5.000000, 0.000000)">
<g id="编组" transform="translate(0.000000, 0.436000)">
<g id="编组" transform="translate(0.000000, 0.436000) scale(0.9)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/10.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1460.000000, -763.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="16" transform="translate(78.000000, 147.000000)">
<g id="16" transform="translate(78.000000, 147.000000) scale(0.9)">
<g id="编组复制-27">
<polygon id="Fill-1" points="11.0061 7.3645 10.9781 29.2045 13.3411 29.2125 13.3601 7.2255"></polygon>
<g id="编组" transform="translate(0.000000, 0.212000)">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1025.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1646.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="7" transform="translate(449.800000, 0.000000)">
<g id="7" transform="translate(449.800000, 0.000000) scale(0.9)">
<g id="编组复制-43复制复制复制复制复制" transform="translate(9.843211, 7.500000)">
<polygon id="Fill-2" points="0.161052941 0.633375 5.8397 2.478375 6.92305294 4.504625 6.18064118 10.064625 9.77164118 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1026.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1435.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="4" transform="translate(238.400000, 0.000000)">
<g id="4" transform="translate(238.400000, 0.000000) scale(0.9)">
<g id="编组复制-43复制复制复制" transform="translate(6.034325, 0.000000)">
<polygon id="Fill-2" points="0.137773684 0.633375 5.70256316 2.478375 6.76419474 4.504625 6.03666842 10.064625 9.55566842 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1027.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1503.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="5" transform="translate(306.200000, 0.000000)">
<g id="5" transform="translate(306.200000, 0.000000) scale(0.9)">
<g id="编组复制-43复制复制复制复制" transform="translate(9.785788, 7.500000)">
<polygon id="Fill-2" points="0.153513636 0.633375 5.79528636 2.478375 6.87160455 4.504625 6.13401364 10.064625 9.70169545 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1028.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1269.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="2" transform="translate(71.800000, 0.000000)">
<g id="2" transform="translate(71.800000, 0.000000) scale(0.9)">
<g id="编组复制-43" transform="translate(24.815793, 0.000000)">
<polygon id="Fill-2" points="0.166772414 0.633375 5.8733931 2.478375 6.96208276 4.504625 6.21601379 10.064625 9.82470345 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1029.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1419.000000, -674.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="15" transform="translate(222.088437, 101.000000)">
<g id="15" transform="translate(222.088437, 101.000000) scale(0.9)">
<g id="编组复制-43复制复制复制复制复制复制复制" transform="translate(24.850791, 7.500000)">
<polygon id="Fill-2" points="0.15921 0.633375 5.82884333 2.478375 6.91047667 4.504625 6.16924333 10.064625 9.75454333 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1032.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1270.000000, -674.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="13" transform="translate(73.088437, 101.000000)">
<g id="13" transform="translate(73.088437, 101.000000) scale(0.9)">
<g id="编组复制-43" transform="translate(19.651875, 0.000000)">
<polygon id="Fill-2" points="0.174875 0.633375 5.921125 2.478375 7.017375 4.504625 6.266125 10.064625 9.899875 1.288375"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/11.svg
View File

@ -10,7 +10,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1748.000000, -701.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="13" transform="translate(366.000000, 85.000000)">
<g id="13" transform="translate(366.000000, 85.000000) scale(0.9)">
<g id="编组复制-35" transform="translate(13.000000, 10.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/12.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1385.000000, -695.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="8" transform="translate(3.000000, 79.000000)">
<g id="8" transform="translate(3.000000, 79.000000) scale(0.9)">
<polygon id="Fill-1" points="11.0061 7.3645 10.9781 29.2045 13.3411 29.2125 13.3601 7.2255"></polygon>
<g id="编组" transform="translate(0.000000, 0.212000)">
<path d="M13.3601,7.0135 C13.2759008,6.77063983 12.7380706,6.13316763 12.0731,5.65380201 C11.5771246,5.29626209 11.0013483,5.08656272 10.5391,4.8721 C9.4571,4.3701 7.5501,4.4241 7.5501,4.4241 L4.4411,4.4361 L7.3961,0.8521 L4.7281,0.7881 L1.0001,5.4501 L4.7211,10.2231 L7.5631,10.1511 L4.3261,6.3451 L7.7621,6.3281 C7.7621,6.3281 9.4401,6.3221 10.6061,7.1411 C11.7721,7.9611 12.0661,9.6071 12.0731,10.0061 C12.0811,10.8041 13.5765637,8.02668382 13.2805637,7.18068382 L13.3601,7.0135 Z" id="Fill-2"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/128.svg
View File

@ -6,7 +6,7 @@
<g id="--" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_1_icon-汇总说明(一)" transform="translate(-2526.000000, -1465.000000)" fill="#FFFFFF">
<g id="编组-5" transform="translate(2487.000000, 1465.000000)">
<g id="右前拉链式通行复制-2" transform="translate(39.000000, 0.000000)">
<g id="右前拉链式通行复制-2" transform="translate(39.000000, 0.000000) scale(0.9)">
<polygon id="path2214_13_复制-2" fill-rule="nonzero" points="5.367 8.80762745 5.367 3.211 9.045 6.338 9.113 3.594 4.504 -5.81756865e-13 -1.22568622e-12 3.598 0.063 6.175 3.526 3.32 3.526 6.83766305"></polygon>
<polygon id="路径-82" points="3.52776176 6 3.52776176 12.532961 14.4994366 17.7430093 18.0169253 23.2219655 21.8460384 29.382849 23.7348365 28.2046389 15.8910586 15.6934344 5.48836024 11.0513987 5.29910909 6"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/13.svg
View File

@ -10,7 +10,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1815.000000, -700.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="14" transform="translate(433.000000, 84.436000)">
<g id="14" transform="translate(433.000000, 84.436000) scale(0.9)">
<g id="编组复制-30" transform="translate(0.000000, 4.564000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/14.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1382.000000, -765.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="15" transform="translate(0.000000, 149.000000)">
<g id="15" transform="translate(0.000000, 149.000000) scale(0.9)">
<g id="编组复制-36">
<polygon id="Fill-1" points="11.0052 7.3645 10.9782 29.2045 13.3402 29.2125 13.3592 7.2255"></polygon>
<g id="编组" transform="translate(0.000000, 0.212000)">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/1536.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1716.000000, -577.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="8" transform="translate(515.600000, 0.000000)">
<g id="8" transform="translate(515.600000, 0.000000) scale(0.9)">
<g id="编组复制-43复制复制复制复制复制复制" transform="translate(22.804065, 3.466667)">
<polygon id="Fill-2" points="0.174875 0.62493 5.921125 2.44533 7.017375 4.44456333 6.266125 9.93043 9.899875 1.27119667"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/16.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1535.000000, -694.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="9" transform="translate(153.000000, 79.000000)">
<g id="9" transform="translate(153.000000, 79.000000) scale(0.9)">
<g id="编组复制-42">
<polygon id="Fill-1" points="0 2.2319 0.684 7.9559 2.907 9.2609 2.306 4.8129 3.183 3.1899 7.78 1.7139 5.483 0.2089"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/17.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1535.000000, -765.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="17" transform="translate(153.000000, 149.000000)">
<g id="17" transform="translate(153.000000, 149.000000) scale(0.9)">
<g id="编组复制-41">
<polygon id="Fill-1" points="1.0061 7.3645 0.9781 29.2045 3.3411 29.2125 3.3601 7.2255"></polygon>
<g id="编组" transform="translate(1.000000, 0.212000)">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/2.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1539.000000, -617.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="3" transform="translate(157.000000, 2.000000)">
<g id="3" transform="translate(157.000000, 2.000000) scale(0.9)">
<polygon id="Fill-1" points="0.0342 28.554 2.0802 28.538 2.0482 9.637 0.0002 8.799"></polygon>
<polygon id="Fill-2" points="7.2369 -0.0003 4.9399 1.5067 9.5369 2.9827 0.0019 8.7987 0.3129 10.8307 10.4139 4.6037 9.8129 9.0517 12.0359 7.7467 12.7199 2.0307 12.7199 2.0227"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/2048.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1877.000000, -577.000000)" fill="#E99A3C">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="10" transform="translate(680.200000, 0.000000)">
<g id="10" transform="translate(680.200000, 0.000000) scale(0.9)">
<g id="8" transform="translate(18.620690, 3.666667)" fill-rule="nonzero">
<polygon id="Fill-1" points="13.689931 5.12447619 13.6551724 32.1644762 16.5885517 32.174381 16.1788966 5.12447619"></polygon>
<g id="编组" transform="translate(0.000000, 0.262476)">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/256.svg
View File

@ -6,7 +6,7 @@
<g id="--" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_1_icon-汇总说明(一)" transform="translate(-2487.000000, -1465.000000)" fill="#FFFFFF">
<g id="编组-5" transform="translate(2487.000000, 1465.000000)">
<g id="左前拉链式通行复制-2" transform="translate(0.000000, 0.000000)">
<g id="左前拉链式通行复制-2" transform="translate(0.000000, 0.000000) scale(0.9)">
<polygon id="path2214_13_复制" fill-rule="nonzero" points="18.367 8.80762745 18.367 3.211 22.045 6.338 22.113 3.594 17.504 -5.81756865e-13 13 3.598 13.063 6.175 16.526 3.32 16.526 6.83766305"></polygon>
<polygon id="路径-83" points="16.5142741 5.61715104 16.5142741 10.7195104 6.92844988 15.479774 -1.00186526e-12 28.1043075 2.03585271 29 8.61530914 17.0797612 18.3915699 12.2198544 18.3915699 5.61715104"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/3.svg
View File

@ -10,7 +10,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1676.000000, -616.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="5" transform="translate(294.000000, 0.000000)">
<g id="5" transform="translate(294.000000, 0.000000) scale(0.9)">
<g id="编组" transform="translate(0.000000, 0.168000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/32.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1603.000000, -694.000000)" fill="#ffffff">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="11" transform="translate(221.841210, 79.000000)">
<g id="11" transform="translate(221.841210, 79.000000) scale(0.9)">
<g id="编组复制-43" transform="translate(4.158790, 0.000000)">
<polygon id="Fill-2" points="3.2369 -0.0003 0.9399 1.5067 5.5369 2.9827 6.4139 4.6037 5.8129 9.0517 8.0359 7.7467 8.7199 2.0307 8.7199 2.0227"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/4.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1604.000000, -617.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="4" transform="translate(222.000000, 2.000000)">
<g id="4" transform="translate(222.000000, 2.000000) scale(0.9)">
<polygon id="Fill-1" points="0 2.2319 0.684 7.9559 2.907 9.2609 2.306 4.8129 12.406 11.0389 12.717 9.0079 3.183 3.1899 7.78 1.7139 5.483 0.2089"></polygon>
<polygon id="Fill-2" points="10.8855 28.826 12.9325 28.81 12.9005 9.909 10.8525 9.071"></polygon>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 1017 B

2
collect-library/src/main/assets/omdb/arrowDirection/4096.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1959.000000, -577.000000)">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="11" transform="translate(762.000000, 0.000000)">
<g id="11" transform="translate(762.000000, 0.000000) scale(0.9)">
<text id="X复制" font-family="PingFangSC-Regular, PingFang SC" font-size="30" font-weight="normal" letter-spacing="-0.1384615" fill="#FBFAB5">
<tspan x="2.03772024" y="32">X</tspan>
</text>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/5.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1462.000000, -620.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="2" transform="translate(79.000000, 5.000000)">
<g id="2" transform="translate(79.000000, 5.000000) scale(0.9)">
<polygon id="Fill-1" points="12.7099 0.0002 8.2059 3.5992 8.2689 6.1762 11.7329 3.3212 11.7199 28.4142 13.5599 28.3752 13.5739 3.2102 17.2499 6.3382 17.3199 3.6292 17.3199 3.5932"></polygon>
<g id="编组" transform="translate(0.000000, 7.415000)">
<path d="M11.9364,9.6313 C11.9574,9.2143 11.7034,7.7683 10.5764,6.9773 C9.4504,6.1853 7.5304,6.3203 7.5304,6.3203 L4.2094,6.3363 L7.3384,10.0133 L4.5974,10.0823 L0.9994,5.4723 L4.6014,0.9673 L7.1794,1.0293 L4.3244,4.4933 L7.3304,4.4813 C7.3304,4.4813 9.1734,4.4293 10.2204,4.9153 C11.2664,5.4003 12.6214,6.5153 12.7664,6.9233 C13.0444,7.7403 11.9114,10.0283 11.9364,9.6313" id="Fill-2"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/513.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1578.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="6" transform="translate(378.000000, 0.000000)">
<g id="6" transform="translate(378.000000, 0.000000) scale(0.9)">
<path d="M18.9616548,15.2840226 C18.5526798,15.4775537 18.1450258,15.791901 17.7386929,16.2270645 L17.7076276,34.8517038 L20.6064457,34.8589808 L20.6297639,14.8589808 C19.9266663,14.9488109 19.3706299,15.0904915 18.9616548,15.2840226 Z" id="Fill-1复制-5"></path>
<polygon id="Fill-1复制-6" transform="translate(19.536878, 11.875000) rotate(-360.000000) translate(-19.536878, -11.875000) " points="19.4761276 0 14.0884003 6.41224396 14.0258094 6.41224396 18.2611276 4.28331984 18.2611276 23.75 20.5193094 23.7174016 20.5193094 4.28331984 25.0479457 6.54765257 25.0479457 6.41224396"></polygon>
<path d="M18.4197214,14.3926289 C16.2961328,13.390241 12.6897126,13.5294277 12.6897126,13.5294277 L5.96930832,13.2949546 L9.03918312,18.2981218 L8.90321198,18.3766248 L1.41023366,11.685914 L8.6520031,7.11678255 L6.16726011,11.0034009 L12.2958074,11.2381269 C12.2958074,11.2381269 15.7583587,11.2010638 17.7304921,11.8215055 C19.7007365,12.4406878 22.257803,13.848425 22.5342784,14.3582815 C23.0646907,15.379059 20.9582597,18.2090661 21.0013287,17.7154468 C21.0366846,17.196881 20.5451792,15.3937874 18.4197214,14.3926289 Z" id="Fill-2复制-2" transform="translate(12.015113, 12.746704) rotate(-330.000000) translate(-12.015113, -12.746704) "></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/514.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1353.000000, -577.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="3" transform="translate(152.600000, 0.000000)">
<g id="3" transform="translate(152.600000, 0.000000) scale(0.9)">
<path d="M19.0049522,17.8200069 C18.6571789,18.0097922 18.310529,18.3180554 17.9650024,18.7447964 L17.9385859,37.0089588 L20.4036057,37.016095 L20.4234344,17.4031918 C19.825553,17.4912832 19.3527256,17.6302216 19.0049522,17.8200069 Z" id="Fill-1复制-3"></path>
<polygon id="Fill-1复制-4" transform="translate(28.499192, 19.368546) rotate(-270.000000) translate(-28.499192, -19.368546) " points="28.4385146 8.80793998 23.0572242 15.1813219 22.9947081 15.1813219 27.2249662 13.0653003 27.2249662 29.9291521 29.4804501 29.8967513 29.4804501 13.0653003 34.0036759 15.3159098 34.0036759 15.1813219"></polygon>
<path d="M18.5647697,11.9585715 C16.4455532,10.9967906 12.8212801,11.1838907 12.8212801,11.1838907 L6.07438649,11.0443467 L9.08915471,15.9481898 L8.95150492,16.027662 L1.51724507,9.51627817 L8.85374633,4.89996476 L6.30466887,8.77626761 L12.4570857,8.92418585 C12.4570857,8.92418585 15.9354521,8.8400169 17.9077868,9.42629614 C19.8782415,10.0113564 22.427288,11.3679034 22.6979869,11.8681373 C23.2167319,12.8699667 21.0621426,15.6965421 21.1121777,15.2079735 C21.1548082,14.6948495 20.6858806,12.9191115 18.5647697,11.9585715 Z" id="Fill-2复制" transform="translate(12.147953, 10.463813) rotate(-330.000000) translate(-12.147953, -10.463813) "></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/515.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1794.000000, -573.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="9" transform="translate(594.400000, 0.000000)">
<g id="9" transform="translate(594.400000, 0.000000) scale(0.9)">
<polygon id="Fill-1复制-11" transform="translate(28.499192, 21.863125) rotate(-270.000000) translate(-28.499192, -21.863125) " points="28.437317 11.3025189 22.949817 17.6759008 22.886067 17.6759008 27.199817 15.5598793 27.199817 32.4237311 29.499817 32.3913303 29.499817 15.5598793 34.112317 17.8104888 34.112317 17.6759008"></polygon>
<polygon id="Fill-1复制-13" transform="translate(19.350416, 17.500000) rotate(-360.000000) translate(-19.350416, -17.500000) " points="19.2889159 -3.83693077e-12 13.8346735 6.41224396 13.7713098 6.41224396 18.0589159 4.28331984 18.0589159 35 20.3449765 34.9674016 20.3449765 4.28331984 24.929522 6.54765257 24.929522 6.41224396"></polygon>
<path d="M18.6225918,14.3598813 C16.484699,13.365752 12.8441419,13.5246475 12.8441419,13.5246475 L6.06276515,13.3253769 L9.13431861,18.327575 L8.99666881,18.4070471 L1.4700785,11.7357423 L8.80332719,7.11379524 L6.2748001,11.0256924 L12.4588384,11.2283806 C12.4588384,11.2283806 15.9536485,11.1726929 17.9407256,11.7845068 C19.925903,12.3950676 22.4991205,13.79348 22.7754302,14.3034322 C23.3052968,15.3245246 21.1642331,18.174527 21.2103396,17.6791539 C21.2487951,17.1587987 20.7623777,15.3527675 18.6225918,14.3598813 Z" id="Fill-2复制-4" transform="translate(12.164938, 12.760421) rotate(-330.000000) translate(-12.164938, -12.760421) "></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/516.svg
View File

@ -5,7 +5,7 @@
<desc>Created with Sketch.</desc>
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1197.000000, -576.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="编组-45" transform="translate(1197.000000, 573.000000) scale(0.9)">
<g id="编组-44">
<path d="M20.1654911,17.7172577 C19.7529096,17.907043 19.3416607,18.2153062 18.9317447,18.6420472 L18.9004054,36.9062096 L21.8247864,36.9133458 L21.8483102,17.3004425 C21.1390124,17.388534 20.5780727,17.5274723 20.1654911,17.7172577 Z" id="Fill-1复制-2"></path>
<polygon id="Fill-1" transform="translate(10.852786, 18.066192) rotate(-90.000000) translate(-10.852786, -18.066192) " points="10.7921089 7.54238214 5.41081861 13.8935571 5.34830248 13.8935571 9.57856054 11.7849085 9.57856054 28.5900012 11.8340444 28.5577133 11.8340444 11.7849085 16.3572702 14.0276761 16.3572702 13.8935571"></polygon>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/517.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1344.000000, -674.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="14" transform="translate(147.088437, 101.000000)">
<g id="14" transform="translate(147.088437, 101.000000) scale(0.9)">
<polygon id="Fill-1复制-14" transform="translate(10.824979, 20.613125) rotate(-90.000000) translate(-10.824979, -20.613125) " points="10.7631038 10.0893155 5.27560378 16.4404905 5.21185378 16.4404905 9.52560378 14.3318418 9.52560378 31.1369345 11.8256038 31.1046466 11.8256038 14.3318418 16.4381038 16.5746094 16.4381038 16.4404905"></polygon>
<polygon id="Fill-1复制-15" transform="translate(20.279509, 17.500000) rotate(-360.000000) translate(-20.279509, -17.500000) " points="20.2182228 -3.83693077e-12 14.7829847 6.41224396 14.7198419 6.41224396 18.9925085 4.28331984 18.9925085 35 21.2706038 34.9674016 21.2706038 4.28331984 25.8391752 6.54765257 25.8391752 6.41224396"></polygon>
<path d="M19.5646291,14.3692368 C17.4308232,13.3727479 13.8000195,13.5260124 13.8000195,13.5260124 L7.03606345,13.3166839 L10.1071373,18.3191588 L9.96996711,18.3983541 L2.45298022,11.7215047 L9.76009199,7.11464782 L7.24407464,11.0193225 L13.4122584,11.2311643 C13.4122584,11.2311643 16.8978517,11.180798 18.8806591,11.7950769 C20.86157,12.408101 23.4301729,13.8091776 23.70653,14.3191025 C24.2365524,15.3401049 22.1053838,18.1843944 22.1506225,17.6895224 C22.1881924,17.1696784 21.7003213,15.3644865 19.5646291,14.3692368 Z" id="Fill-2复制-6" transform="translate(13.122129, 12.756501) rotate(-330.000000) translate(-13.122129, -12.756501) "></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/520.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-1201.000000, -675.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组-45" transform="translate(1197.000000, 573.000000)">
<g id="12" transform="translate(1.000000, 99.000000)">
<g id="12" transform="translate(1.000000, 99.000000) scale(0.9)">
<g id="1">
<path d="M19.1654911,17.7172577 C18.7529096,17.907043 18.3416607,18.2153062 17.9317447,18.6420472 L17.9004054,36.9062096 L20.8247864,36.9133458 L20.8483102,17.3004425 C20.1390124,17.388534 19.5780727,17.5274723 19.1654911,17.7172577 Z" id="Fill-1复制-7"></path>
<path d="M18.5068305,11.9688694 C16.3917009,11.0047289 12.7771811,11.1861979 12.7771811,11.1861979 L6.04770828,11.036596 L9.06199689,15.9407161 L8.92482671,16.0199113 L1.50017028,9.50298298 L8.81053462,4.90175973 L6.2739669,8.77084008 L12.4105292,8.92791196 C12.4105292,8.92791196 15.8796788,8.84906434 17.8477438,9.43780865 C19.8139319,10.0253322 22.3583639,11.3845434 22.6291101,11.88475 C22.6993851,12.020416 23.1399061,11.9265708 23.1245388,12.1162293 C23.026436,13.3269837 21.0099756,15.6412527 21.052484,15.2192843 C21.0942289,14.7066716 20.6238476,12.9317729 18.5068305,11.9688694 Z" id="Fill-2复制-5" transform="translate(12.312551, 10.460836) rotate(-330.000000) translate(-12.312551, -10.460836) "></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/6.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1461.000000, -695.000000)" fill="#FFFFFF">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="9" transform="translate(79.000000, 79.000000)">
<g id="9" transform="translate(79.000000, 79.000000) scale(0.9)">
<polygon id="Fill-1" points="11.0052 7.3645 10.9782 29.2045 13.3402 29.2125 13.3592 7.2255"></polygon>
<g id="编组" transform="translate(0.000000, 0.212000)">
<path d="M12.1751,6.9521 C12.0281,6.5281 10.6201,5.3741 9.5381,4.8721 C8.4561,4.3701 6.5491,4.4241 6.5491,4.4241 L3.4401,4.4361 L6.3951,0.8521 L3.7271,0.7881 L0.0001,5.4501 L3.7211,10.2231 L6.5631,10.1511 L3.3271,6.3451 L6.7631,6.3281 C6.7631,6.3281 8.4411,6.3221 9.6071,7.1411 C10.7731,7.9611 11.0681,9.6071 11.0751,10.0061 C11.0811,10.8041 12.4701,7.7981 12.1751,6.9521" id="Fill-2"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/64.svg
View File

@ -6,7 +6,7 @@
<g id="--" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_1_icon-汇总说明(一)" transform="translate(-2532.000000, -1541.000000)" fill="#ffffff" fill-rule="nonzero">
<g id="编组-5" transform="translate(2487.000000, 1465.000000)">
<g id="提示右后方掉头复制-2" transform="translate(45.000000, 75.000000)">
<g id="提示右后方掉头复制-2" transform="translate(45.000000, 75.000000) scale(0.9)">
<path d="M2.676,11.3454063 C2.67063205,9.22749842 2.44138369,7.99921639 2.676,6.87640626 C3.35922843,3.60665998 5.25238344,3.57798983 6.62671411,3.54689146 C7.63293806,3.52412262 9.04920727,3.68963843 9.70627148,4.800781 C10.3137327,5.82804132 10.201,7.72888847 10.201,9.49140626 L10.233,13.3034063 L5.551,9.44440626 L5.468,12.9274063 L11.556,17.7914063 L17.79,12.9344063 L17.694,9.22640626 L12.723,13.1864063 L12.744,6.99340626 C12.723,1.84469919 9.40506239,0.91289911 6.15097677,1 C2.98605771,1.0847142 0,2.80476579 0.045,6.87640626 L0,28.9614063 L2.655,28.9744063 L2.676,11.3454063 Z" id="path22940"></path>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/65.svg
View File

@ -12,7 +12,7 @@
<g id="--" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_1_icon-汇总说明(一)" transform="translate(-2487.000000, -1539.000000)" fill="#ffffff" fill-rule="nonzero" stroke="#ffffff">
<g id="编组-5" transform="translate(2487.000000, 1465.000000)">
<g id="提示前方可自行或右后方掉头复制-2" transform="translate(1.000000, 74.000000)">
<g id="提示前方可自行或右后方掉头复制-2" transform="translate(1.000000, 74.000000) scale(0.9)">
<polygon id="path2214_3_" stroke-width="0.8" points="5.909 29.208 5.895 4.113 9.36 6.968 9.422 4.391 4.918 0.792 0.308 4.386 0.377 7.13 4.054 4.003 4.071 29.167"></polygon>
<use id="path22940_9_" mask="url(#mask-2)" stroke-width="1.6" stroke-dasharray="6" xlink:href="#path-1"></use>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/66.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-994.000000, -1237.000000)" fill-rule="nonzero">
<g id="编组-8" transform="translate(994.000000, 1237.000000)">
<g id="右右后方掉" transform="translate(1.000000, 1.000000)">
<g id="右右后方掉" transform="translate(1.000000, 1.000000) scale(0.9)">
<path d="M8.69673216,17.0755955 C8.73657986,15.4150167 10.0204962,14.8670616 11.3862362,14.8670616 C11.9616291,14.8670616 12.6918649,14.9523618 13.1476181,15.1676571 C13.6387556,15.3996679 13.7763603,15.6643292 13.8202362,15.9234665 C13.8917907,16.3460776 13.8917907,18.9354745 13.8202362,23.6916571 L10.3232362,20.6086571 L10.2562362,22.6636571 L14.8772362,26.5506571 L19.2902362,22.6906571 L19.2952362,20.4356571 L15.8102362,23.5996571 L15.8292362,16.1726571 C14.8772362,11.25012 6.81523618,12.7226571 7.00323618,16.0786571 L8.69673216,17.0755955 Z" id="path22940_9_复制-6" fill="#ffffff"></path>
<polygon id="path2200_4_复制-7" fill="#FFFFFF" points="6.158 32.9787224 6.186 7.15255237 8.54 6.987 8.522 32.987"></polygon>
<path d="M6.1998711,7.164 C6.3458711,6.74 7.7528711,5.586 8.8348711,5.084 C9.9168711,4.582 11.8238711,4.636 11.8238711,4.636 L14.9338711,4.648 L11.9778711,1.064 L14.6458711,1 L18.3738711,5.662 L14.6518711,10.435 L11.8108711,10.364 L15.0478711,6.558 L11.6108711,6.54 C11.6108711,6.54 9.9348711,6.534 8.7688711,7.353 C7.6028711,8.173 7.3078711,9.819 7.3018711,10.218 C7.2918711,11.016 5.9018711,8.01 6.1998711,7.164 Z" id="path2249_1_复制-3" fill="#ffffff"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/69.svg
View File

@ -6,7 +6,7 @@
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="C9_6_icon-汇总说明-" transform="translate(-995.000000, -1299.000000)" fill-rule="nonzero">
<g id="编组-8" transform="translate(994.000000, 1237.000000)">
<g id="左直右后方掉" transform="translate(2.000000, 63.000000)">
<g id="左直右后方掉" transform="translate(2.000000, 63.000000) scale(0.9)">
<path d="M13.8547322,18.0755955 C13.8945799,16.4150167 15.1784962,15.8670616 16.5442362,15.8670616 C17.1196291,15.8670616 17.8498649,15.9523618 18.3056181,16.1676571 C18.7967556,16.3996679 18.9343603,16.6643292 18.9782362,16.9234665 C19.0497907,17.3460776 19.0497907,19.9354745 18.9782362,24.6916571 L15.4812362,21.6086571 L15.4142362,23.6636571 L20.0352362,27.5506571 L24.4482362,23.6906571 L24.4532362,21.4356571 L20.9682362,24.5996571 L20.9872362,17.1726571 C20.0352362,12.25012 11.9732362,13.7226571 12.1612362,17.0786571 L13.8547322,18.0755955 Z" id="path22940_9_复制-7" fill="#FFFFFF"></path>
<polygon id="path2200_4_复制-6" fill="#FFFFFF" points="11.9201538 33.2190277 12.158 11.2390277 14.1168968 11.2390277 14.4526145 33.2190277"></polygon>
<path d="M13.175,15.1780277 C13.028,14.7540277 11.621,13.6000277 10.539,13.0980277 C9.457,12.5960277 7.55,12.6500277 7.55,12.6500277 L4.441,12.6620277 L7.396,9.07802773 L4.728,9.01402773 L1,13.6760277 L4.721,18.4490277 L7.563,18.3770277 L4.326,14.5710277 L7.762,14.5540277 C7.762,14.5540277 9.44,14.5480277 10.606,15.3670277 C11.772,16.1870277 12.066,17.8330277 12.073,18.2320277 C12.081,19.0300277 13.471,16.0240277 13.175,15.1780277 Z" id="path2214_5_复制-3" fill="#FFFFFF"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/7.svg
View File

@ -11,7 +11,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1669.000000, -701.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="12" transform="translate(287.000000, 85.168000)">
<g id="12" transform="translate(287.000000, 85.168000) scale(0.9)">
<g id="编组" transform="translate(0.000000, 10.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/8.svg
View File

@ -9,7 +9,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1747.000000, -619.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="6" transform="translate(365.000000, 4.000000)">
<g id="6" transform="translate(365.000000, 4.000000) scale(0.9)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/9.svg
View File

@ -9,7 +9,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-1815.000000, -621.000000)">
<g id="编组-25" transform="translate(1382.000000, 615.000000)">
<g id="7" transform="translate(433.000000, 5.000000)">
<g id="7" transform="translate(433.000000, 5.000000) scale(0.9)">
<path d="M13.4651,17.3904 C13.1941,12.0004 3.4731,11.9914 3.5741,17.5064 L3.5981,23.0574 L0.0651,19.9424 L0.0001,22.0184 L4.6671,25.9444 L9.1241,22.0434 L9.1301,19.7664 L5.6091,22.9614 L5.6281,17.9114 C5.7111,14.2944 11.3991,14.4274 11.5901,17.8164 L13.4651,17.3904 Z" id="Fill-1" fill="#FFFFFF"></path>
<g id="编组" transform="translate(7.000000, 0.436000)">
<mask id="mask-2" fill="white">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
collect-library/src/main/assets/omdb/arrowDirection/test.svg
View File

@ -6,7 +6,7 @@
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-316.000000, -1195.000000)" fill="#CBCBCB">
<g id="编组复制-5" transform="translate(316.000000, 1195.000000)">
<g id="Fill-20" transform="translate(0.205900, 0.000200)">
<g id="Fill-20" transform="translate(0.205900, 0.000200) scale(0.9)">
<polygon id="Fill-1" points="4.504 3.33955086e-13 6.98108238e-13 3.599 0.063 6.176 3.527 3.321 3.514 28.414 5.354 28.375 5.368 3.21 9.044 6.338 9.114 3.629 9.114 3.593"></polygon>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 927 B

After

Width:  |  Height:  |  Size: 938 B

4
collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
View File

@ -58,8 +58,8 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView, traceP
private lateinit var omdbReferenceLabelLayer: LabelLayer
private lateinit var tileGridLayer: TileGridLayer // 用来显示tile号的layer
private val omdbTileSource by lazy { OMDBTileSource() }
private val omdbReferenceTileSource by lazy { OMDBReferenceTileSource() }
private val omdbTileSource by lazy { OMDBTileSource(mMapView.vtmMap.viewport()) }
private val omdbReferenceTileSource by lazy { OMDBReferenceTileSource(mMapView.vtmMap.viewport()) }
private val labelTileLoaderHook = LabelTileLoaderHook()
private val navinfoTileThemeHook = NavinfoTileThemeHook()

1
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
View File

@ -4,7 +4,6 @@ import static org.oscim.core.MercatorProjection.latitudeToY;
import static org.oscim.core.MercatorProjection.longitudeToX;
import android.os.Build;
import android.util.Log;
import androidx.annotation.RequiresApi;

13
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java
View File

@ -12,6 +12,7 @@ import com.navinfo.collect.library.utils.MapParamUtils;
import org.locationtech.jts.geom.Polygon;
import org.oscim.layers.tile.MapTile;
import org.oscim.map.Viewport;
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
@ -24,6 +25,11 @@ import io.realm.RealmQuery;
public class OMDBReferenceDataSource implements ITileDataSource {
private boolean isUpdate;
private Viewport viewport;
public OMDBReferenceDataSource(Viewport viewport) {
this.viewport = viewport;
}
private final ThreadLocal<OMDBReferenceDecoder> mThreadLocalDecoders = new ThreadLocal<OMDBReferenceDecoder>() {
@Override
@ -48,7 +54,7 @@ public class OMDBReferenceDataSource implements ITileDataSource {
yStart = (int) (yStart << m);
yEnd = (int) (yEnd << m);
}
final int currentTileX = xStart;
if(isUpdate){
Realm.getInstance(MapParamUtils.getTaskConfig()).refresh();
@ -76,7 +82,10 @@ public class OMDBReferenceDataSource implements ITileDataSource {
List<ReferenceEntity> listResult = realmQuery/*.distinct("id")*/.findAll();
if (!listResult.isEmpty()) {
Polygon tilePolygon = GeometryTools.getTilePolygon(tile);
listResult = listResult.stream().filter((ReferenceEntity referenceEntity) -> referenceEntity.getWkt().intersects(tilePolygon)).collect(Collectors.toList());
listResult = listResult.stream().filter((ReferenceEntity referenceEntity) -> referenceEntity.getWkt().intersects(tilePolygon))
/*过滤数据，只有最小x（屏幕的最小x或数据的最小x会被渲染，跨Tile的其他数据不再重复渲染）*/
// .filter((ReferenceEntity referenceEntity) -> MercatorProjection.longitudeToTileX(viewport.fromScreenPoint(0,0).getLongitude(), (byte) Constant.DATA_ZOOM) == currentTileX || referenceEntity.getTileX().stream().min(Integer::compare).get() == currentTileX)
.collect(Collectors.toList());
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
mapDataSink.completed(QueryResult.SUCCESS);
} else {

9
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceTileSource.java
View File

@ -2,11 +2,18 @@ package com.navinfo.collect.library.map.source;
import com.navinfo.collect.library.system.Constant;
import org.oscim.map.Viewport;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.OverzoomTileDataSource;
public class OMDBReferenceTileSource extends RealmDBTileSource {
private OMDBReferenceDataSource omdbReferenceTileSource = new OMDBReferenceDataSource();
private OMDBReferenceDataSource omdbReferenceTileSource;
private Viewport viewport;
public OMDBReferenceTileSource(Viewport viewport) {
this.viewport = viewport;
this.omdbReferenceTileSource = new OMDBReferenceDataSource(this.viewport);
}
@Override
public ITileDataSource getDataSource() {

14
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
View File

@ -12,6 +12,7 @@ import com.navinfo.collect.library.utils.MapParamUtils;
import org.locationtech.jts.geom.Polygon;
import org.oscim.layers.tile.MapTile;
import org.oscim.map.Viewport;
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
@ -24,6 +25,7 @@ import io.realm.RealmQuery;
public class OMDBTileDataSource implements ITileDataSource {
private boolean isUpdate;
private Viewport viewport;
private final ThreadLocal<OMDBDataDecoder> mThreadLocalDecoders = new ThreadLocal<OMDBDataDecoder>() {
@Override
protected OMDBDataDecoder initialValue() {
@ -31,6 +33,10 @@ public class OMDBTileDataSource implements ITileDataSource {
}
};
public OMDBTileDataSource(Viewport viewport) {
this.viewport = viewport;
}
@RequiresApi(api = Build.VERSION_CODES.N)
@Override
public void query(MapTile tile, ITileDataSink mapDataSink) {
@ -48,6 +54,7 @@ public class OMDBTileDataSource implements ITileDataSource {
yEnd = (int) (yEnd << m);
}
final int currentTileX = xStart;
if(isUpdate){
Realm.getInstance(MapParamUtils.getTaskConfig()).refresh();
isUpdate = false;
@ -74,7 +81,12 @@ public class OMDBTileDataSource implements ITileDataSource {
// 数据记录的tile号是以正外接tile号列表，此处过滤并未与当前tile相交的数据
if (!listResult.isEmpty()) {
Polygon tilePolygon = GeometryTools.getTilePolygon(tile);
listResult = listResult.stream().filter((RenderEntity renderEntity) -> renderEntity.getWkt().intersects(tilePolygon)).collect(Collectors.toList());
System.out.println("第一条数据的最小x值:" + listResult.get(0).getTileX().stream().min(Integer::compare).get());
System.out.println("当前tile的:" + listResult.get(0).getTileX().stream().min(Integer::compare).get());
listResult = listResult.stream().filter((RenderEntity renderEntity) -> renderEntity.getWkt().intersects(tilePolygon))
/*过滤数据，只有最小x（屏幕的最小x或数据的最小x会被渲染，跨Tile的其他数据不再重复渲染）*/
// .filter((RenderEntity renderEntity) -> MercatorProjection.longitudeToTileX(viewport.fromScreenPoint(0,0).getLongitude(), (byte) Constant.DATA_ZOOM) == currentTileX || renderEntity.getTileX().stream().min(Integer::compare).get() == currentTileX)
.collect(Collectors.toList());
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
mapDataSink.completed(QueryResult.SUCCESS);
} else {

14
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java
View File

@ -5,17 +5,25 @@ import android.util.Log;
import com.navinfo.collect.library.data.entity.RenderEntity;
import com.navinfo.collect.library.system.Constant;
import org.oscim.map.Viewport;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.OverzoomTileDataSource;
import io.realm.Realm;
public class OMDBTileSource extends RealmDBTileSource {
private OMDBTileDataSource omdbTileSource = new OMDBTileDataSource();
private Viewport viewport;
private OMDBTileDataSource omdbTileDataSource;
public OMDBTileSource(Viewport viewport) {
this.viewport = viewport;
this.omdbTileDataSource = new OMDBTileDataSource(this.viewport);
}
@Override
public ITileDataSource getDataSource() {
// return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM);
return new OverzoomTileDataSource(omdbTileSource, Constant.OVER_ZOOM);
return new OverzoomTileDataSource(omdbTileDataSource, Constant.OVER_ZOOM);
}
@Override
@ -32,6 +40,6 @@ public class OMDBTileSource extends RealmDBTileSource {
@Override
public void update() {
super.update();
omdbTileSource.update();
omdbTileDataSource.update();
}
}

2
vtm

@ -1 +1 @@
Subproject commit c31554d80a4e8a16e90dfc00911478ab5897e674
Subproject commit 50f7b028e7f3934a8c330ea8a54046d7d368682d