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

fix: 解决冲突

Browse Source
This commit is contained in:
xiaoyan 2023-08-01 16:30:08 +08:00
commit a500d3ffea
25 changed files with 458 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/assets/omdb_config.json
View File

@ -5,42 +5,42 @@
"code": 1012,
"name": "检查点",
"zoomMin": 16,
"zoomMax": 19
"zoomMax": 22
},
"2001": {
"table": "OMDB_RD_LINK",
"code": 2001,
"name": "道路线",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2002": {
"table": "OMDB_RD_LINK_FUNCTION_CLASS",
"code": 2002,
"name": "道路功能等级",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2008": {
"table": "OMDB_RD_LINK_KIND",
"code": 2008,
"name": "道路种别",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2010": {
"table": "OMDB_LINK_DIRECT",
"code": 2010,
"name": "道路方向",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2011": {
"table": "OMDB_LINK_NAME",
"code": 2011,
"name": "道路名",
"zoomMin": 16,
"zoomMax": 17,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -54,8 +54,8 @@
"table": "OMDB_LANE_MARK_BOUNDARYTYPE",
"code": 2013,
"name": "车道边界类型",
"zoomMin": 18,
"zoomMax": 21,
"zoomMin": 19,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -70,21 +70,21 @@
"code": 2019,
"name": "常规线限速",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2020": {
"table": "OMDB_LINK_SPEEDLIMIT_COND",
"code": 2020,
"name": "条件线限速",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2021": {
"table": "OMDB_LINK_SPEEDLIMIT_VAR",
"code": 2021,
"name": "可变线限速",
"zoomMin": 16,
"zoomMax": 17
"zoomMax": 22
},
"2022": {
"table": "OMDB_CON_ACCESS",
@ -110,8 +110,8 @@
"table": "OMDB_RDBOUND_BOUNDARYTYPE",
"code": 2083,
"name": "道路边界类型",
"zoomMin": 18,
"zoomMax": 21
"zoomMin": 19,
"zoomMax": 22
},
"2201":{
"table": "OMDB_BRIDGE",
@ -123,7 +123,7 @@
"code": 2202,
"name": "隧道",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -138,7 +138,7 @@
"code": 4001,
"name": "路口",
"zoomMin": 16,
"zoomMax": 17,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -153,7 +153,7 @@
"code": 4002,
"name": "常规点限速",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "maxSpeed",
@ -174,7 +174,7 @@
"code": 4003,
"name": "条件点限速",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "maxSpeed",
@ -189,7 +189,7 @@
"code": 4004,
"name": "可变点限速",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "location",
@ -216,7 +216,7 @@
"code": 4006,
"name": "普通交限",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -255,7 +255,7 @@
"code": 4010,
"name": "电子眼",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -288,7 +288,7 @@
"code": 4022,
"name": "交通灯",
"zoomMin": 16,
"zoomMax": 21,
"zoomMax": 22,
"transformer": [
]
},
@ -297,7 +297,7 @@
"code": 4601,
"name": "车信",
"zoomMin": 16,
"zoomMax": 17,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",
@ -323,8 +323,8 @@
"table": "OMDB_LANE_LINK_LG",
"code": 5001,
"name": "车道中心线",
"zoomMin": 18,
"zoomMax": 21,
"zoomMin": 19,
"zoomMax": 22,
"transformer": [
{
"k": "geometry",

2
app/src/main/java/com/navinfo/omqs/Constant.kt
View File

@ -67,7 +67,7 @@ class Constant {
/**
* 地图最多缩放级别23
*/
const val MAX_ZOOM = 23
const val MAX_ZOOM = 22
/**
* 是否自动定位

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

@ -164,7 +164,7 @@ class TaskUploadScope(
val objects = realm.where(QsRecordBean::class.java)
.equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).and()
.equalTo("taskId", hadLinkDvoBean.taskId).findAll()
.equalTo("taskId", taskBean.id).findAll()
if (objects != null && objects.size > 0) {
val copyList = realm.copyFromRealm(objects)
@ -241,7 +241,7 @@ class TaskUploadScope(
change(FileUploadStatus.ERROR)
}
} else {
change(FileUploadStatus.NONE)
change(FileUploadStatus.NONE,"无可上传数据")
}
} catch (e: Throwable) {
change(FileUploadStatus.ERROR)

3
app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
View File

@ -281,6 +281,9 @@ class LoginViewModel @Inject constructor(
task.operationTime = DateTimeUtil.getNowDate().time
}
} else {
for (hadLink in task.hadLinkDvoList) {
hadLink.taskId = task.id
}
//赋值时间，用于查询过滤
task.operationTime = DateTimeUtil.getNowDate().time
}

43
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
View File

@ -465,7 +465,7 @@ class MainActivity : BaseActivity() {
if (leftFragment != null) {
supportFragmentManager.beginTransaction().remove(leftFragment!!).commit()
leftFragment = null
binding.mainActivityBottomSheetGroup.visibility = View.GONE
hideMainActivityBottomSheetGroup()
binding.mainActivityLeftFragment.visibility = View.GONE
}
// binding.mainActivityDrawer.open()
@ -767,19 +767,10 @@ class MainActivity : BaseActivity() {
binding.mainActivityLeftFragment.visibility = View.GONE
}
binding.mainActivityBottomSheetGroup.visibility = View.GONE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5)
hideMainActivityBottomSheetGroup()
} else {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
showMainActivityBottomSheetGroup()
}
mapController.mMapView.vtmMap.animator().animateTo(
GeoPoint(
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
)
)
}
private fun voiceOnTouchStart() {
@ -800,7 +791,7 @@ class MainActivity : BaseActivity() {
fun onClickTaskFragment() {
if (leftFragment !is TaskManagerFragment) {
if (leftFragment == null) {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
showMainActivityBottomSheetGroup()
binding.mainActivityLeftFragment.visibility = View.VISIBLE
}
leftFragment = TaskManagerFragment {
@ -820,7 +811,7 @@ class MainActivity : BaseActivity() {
fun onClickResFragment() {
if (leftFragment !is QsRecordListFragment) {
if (leftFragment == null) {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
showMainActivityBottomSheetGroup()
binding.mainActivityLeftFragment.visibility = View.VISIBLE
}
leftFragment = QsRecordListFragment {
@ -834,6 +825,28 @@ class MainActivity : BaseActivity() {
}
}
private fun showMainActivityBottomSheetGroup(){
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
mapController.mMapView.vtmMap.animator().animateTo(
GeoPoint(
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
)
)
}
private fun hideMainActivityBottomSheetGroup(){
binding.mainActivityBottomSheetGroup.visibility = View.GONE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5)
mapController.mMapView.vtmMap.animator().animateTo(
GeoPoint(
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
)
)
}
/**
* 显示轨迹回放布局
*/
@ -868,7 +881,7 @@ class MainActivity : BaseActivity() {
fun onClickOfflineMapFragment() {
if (leftFragment !is OfflineMapFragment) {
if (leftFragment == null) {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
showMainActivityBottomSheetGroup()
binding.mainActivityLeftFragment.visibility = View.VISIBLE
}
leftFragment = OfflineMapFragment {

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

@ -1,5 +1,6 @@
package com.navinfo.omqs.ui.fragment.tasklist
import android.util.Log
import android.view.LayoutInflater
import android.view.ViewGroup
import com.navinfo.collect.library.data.entity.HadLinkDvoBean
@ -37,6 +38,11 @@ class TaskAdapter(
val binding: AdapterTaskBinding =
holder.viewBinding as AdapterTaskBinding
val bean = data[position]
if(bean.linkStatus==1){
binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head)
}else{
binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head_add_link)
}
binding.taskLinkPid.text = "PID:${bean.linkPid}"
binding.taskMesh.text = "mesh:${bean.mesh}"
binding.root.isSelected = selectPosition == position

BIN
app/src/main/res/drawable-xhdpi/icon_add_road_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

BIN
app/src/main/res/drawable-xhdpi/icon_add_road_p.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 544 B

BIN
app/src/main/res/drawable-xxhdpi/icon_add_road.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 950 B

BIN
app/src/main/res/drawable-xxhdpi/icon_add_road_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 763 B

BIN
app/src/main/res/drawable-xxhdpi/icon_add_road_p.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 798 B

BIN
app/src/main/res/drawable-xxhdpi/icon_add_task_n.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_add_task_p.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
app/src/main/res/drawable/selector_add_taskline.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/baseline_add_24_press" android:state_selected="true" />
<item android:drawable="@drawable/baseline_add_24" android:state_selected="false" />
<item android:drawable="@drawable/icon_add_road_p" android:state_selected="true" />
<item android:drawable="@drawable/icon_add_road_n" android:state_selected="false" />
</selector>

5
app/src/main/res/drawable/selector_task_head_add_link.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_add_task_p" android:state_selected="true"></item>
<item android:drawable="@drawable/icon_add_task_n" />
</selector>

2
app/src/main/res/layout/activity_main.xml
View File

@ -154,7 +154,7 @@
android:id="@+id/main_activity_task_line"
style="@style/top_right_drawer_btns_style"
android:onClick="@{()->mainActivity.onClickTaskLink()}"
android:src="@drawable/icon_calc_disance" />
android:src="@drawable/icon_add_road" />
<ImageButton
android:id="@+id/main_activity_menu"

3
app/src/main/res/layout/fragment_task.xml
View File

@ -58,6 +58,7 @@
android:layout_height="0dp"
android:layout_marginTop="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/task_search" />
app:layout_constraintTop_toBottomOf="@id/task_search"
tools:ignore="MissingClass" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/menu/personal_center_menu.xml
View File

@ -38,7 +38,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本：ONE_QE_V1.4.0_20230721_A" />
android:title="版本：ONE_QE_V1.5.0_20230728_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">

215
collect-library/src/main/assets/editormarker.xml
View File

@ -1483,15 +1483,9 @@
<m k="qi_table">
<!-- 道路线 -->
<m v="OMDB_RD_LINK">
<!-- <m v="OMDB_RD_LINK">
<line stroke="#9c9c9c" width="1" />
</m>
<!-- 检查点 -->
<m v="OMDB_CHECKPOINT">
<symbol src="assets:omdb/icon_1012_0.svg" symbol-height="64"
symbol-width="64"></symbol>
</m>
</m>-->
<!--道路种别-->
<m v="OMDB_RD_LINK_KIND">
@ -1526,6 +1520,7 @@
</m>
</m>
<<<<<<< HEAD
<!--常规点限速-->
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag" v="0">
@ -1671,6 +1666,8 @@
</m>
</m>
=======
>>>>>>> c54cbae676b3b188af9977770fbe8425328782f6
<!--道路方向-->
<m v="OMDB_LINK_DIRECT">
<m k="direct">
@ -1683,6 +1680,7 @@
</m>
</m>
<<<<<<< HEAD
<!--交通灯-->
<m v="OMDB_TRAFFICLIGHT">
<symbol repeat="false" rotate="false" src="assets:omdb/icon_4022_0.svg"
@ -1728,9 +1726,11 @@
</m>
</m>
=======
>>>>>>> c54cbae676b3b188af9977770fbe8425328782f6
<!-- 道路名 -->
<m v="OMDB_LINK_NAME">
<text use="road"></text>
<text use="road" size="16"></text>
</m>
<!-- 车信 -->
@ -2149,5 +2149,202 @@
<m v="OMDB_AREA">
<area use="sign-bg" repeat="true" src="assets:omdb/area_test.jpg" stroke="#ff0000" stroke-width="2"></area>
</m>
<!-- 路口 -->
<m v="OMDB_INTERSECTION">
<m k="type" v="node">
<symbol src="assets:symbols/dot_blue_dark.svg"></symbol>
</m>
<m k="intersectionPid">
<symbol src="assets:symbols/dot_magenta.svg"></symbol>
</m>
</m>
<!--车道中心线-->
<m v="OMDB_LANE_LINK_LG">
<m k="width" v="~">
<line stroke="#7A88A0" width="3.8" />
</m>
</m>
<!--隧道-->
<m v="OMDB_TUNNEL">
<m k="formOfWay">
<line dasharray="4,4" stroke="#4624FF" width="0.4" />
</m>
<m k="type" v="s_2_p">
<symbol repeat="false" repeat-start="0" rotate="false"
src="assets:omdb/icon_2202_0.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
<m k="type" v="e_2_p">
<symbol repeat="false" repeat-start="0" rotate="false"
src="assets:omdb/icon_2202_1.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
</m>
<!-- 检查点 -->
<m v="OMDB_CHECKPOINT">
<symbol src="assets:omdb/icon_1012_0.svg" symbol-height="56"
symbol-width="56"></symbol>
</m>
<!-- 道路边界类型 -->
<m v="OMDB_RDBOUND_BOUNDARYTYPE">
<outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
<m k="boundaryType" v="0|2|3|4|5|6|7|8|9">
<line stroke="#ffffff" use="boundaryType" width="0.1"/>
</m>
<m k="boundaryType" v="1">
<!--无标线无可区分边界-->
<line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.2"/>
</m>
</m>
<!-- 车道边界类型 -->
<m v="OMDB_LANE_MARK_BOUNDARYTYPE">
<outline-layer id="boundary" stroke="#ffffff" width="0.1" />
<m k="boundaryType" v="2">
<!--标线-->
<m k="markType" v="0|1|4|5|6|7|8">
<!--其他|实线-->
<m k="markColor" v="1">
<line stroke="#ffffff" use="boundaryType" />
</m>
<m k="markColor" v="2">
<line stroke="#eccc68" use="boundaryType" />
</m>
<m k="markColor" v="6">
<line stroke="#0000ff" use="boundaryType" />
</m>
<m k="markColor" v="7">
<line stroke="#00ff00" use="boundaryType" />
</m>
<m k="markColor" v="0|9">
<line stroke="#8e44ad" use="boundaryType" />
</m>
</m>
<m k="markType" v="2|3">
<!--其他|实线-->
<m v="0|1|2|3|4|5|6|7|8">
<!--其他|实线-->
<m k="markColor" v="1">
<line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.1"/>
</m>
<m k="markColor" v="2">
<line dasharray="12,6" repeat-start="0" stroke="#eccc68" width="0.1"/>
</m>
<m k="markColor" v="6">
<line dasharray="12,6" repeat-start="0" stroke="#0000ff" width="0.1"/>
</m>
<m k="markColor" v="7">
<line dasharray="12,6" repeat-start="0" stroke="#00ff00" width="0.1"/>
</m>
<m k="markColor" v="0|9">
<line dasharray="12,6" repeat-start="0" stroke="#8e44ad" width="0.1"/>
</m>
</m>
</m>
</m>
<m k="boundaryType" v="0|3|4|5|6|7|8|9">
<line stroke="#ffffff" use="boundaryType" />
</m>
<!--只区分虚线与实线-->
<m k="boundaryType" v="1">
<line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.1"/>
</m>
</m>
<!--常规点限速-->
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag" v="0">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4002_0.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
<m k="speedFlag" v="1">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4002_1.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
</m>
<!--条件点限速-->
<m v="OMDB_SPEEDLIMIT_COND">
<m k="speedFlag" v="0">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4003_0.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
<m k="speedFlag" v="1">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4003_1.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
</m>
<!--可变点限速-->
<m v="OMDB_SPEEDLIMIT_VAR" >
<m k="speedFlag" v="0">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
<m k="speedFlag" v="1">
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
symbol-width="42"></symbol>
</m>
</m>
<!--交通灯-->
<m v="OMDB_TRAFFICLIGHT">
<symbol repeat="false" rotate="false" src="assets:omdb/icon_4022_0.svg"
symbol-height="56" symbol-width="56"></symbol>
</m>
<!--普通交限-->
<m v="OMDB_RESTRICTION">
<m k="angle">
<symbol repeat="false" repeat-start="0" rotate="false"
src="assets:omdb/icon_4006_0.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="assets:omdb/icon_arrow_right.svg" symbol-height="64"
symbol-width="64"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
</m>
</m>
<!--电子眼-->
<m v="OMDB_ELECTRONICEYE">
<caption dy="-30" fill="#0000FF" k="name" priority="0" size="12"
stroke="#ffffff" stroke-width="1.0"></caption>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="assets:omdb/icon_4010.svg" symbol-height="24" symbol-width="18"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
</m>
</m>
</m>
</rendertheme>

44
collect-library/src/main/assets/omdb/icon_4002_0.svg
View File

@ -1 +1,43 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{stroke:#db4646;stroke-width:3px;}.g{stroke:none;}.h{fill:none;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ff9287"/><stop offset="0.786" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-956 -396)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10174 7640)"><g class="f" transform="translate(-9178 -7204)"><circle class="g" cx="28" cy="28" r="28"/><circle class="h" cx="28" cy="28" r="26.5"/></g></g></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136"
height="136" viewBox="0 0 136 136">
<defs>
<style>
.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{stroke:#db4646;stroke-width:3px;}.g{stroke:none;}.h{fill:none;}
</style>
<radialGradient id="a" cx="0.21" cy="0.134" r="1.274"
gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)"
gradientUnits="objectBoundingBox">
<stop offset="0" stop-color="#ff9287" />
<stop offset="0.786" stop-color="#ff5f4c" />
<stop offset="1" stop-color="#ff5f4c" />
</radialGradient>
<radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox">
<stop offset="0" stop-color="#e75545" />
<stop offset="0.793" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g transform="translate(-956 -396)">
<rect class="a" width="136" height="136" transform="translate(956 396)" />
<g transform="translate(989.164 429.346)">
<g transform="translate(10.653 81.66)">
<ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497" />
<ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268"
transform="translate(15.687 5.229)" />
</g>
<g transform="translate(0 0)">
<path class="d"
d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z"
transform="translate(0 0)" />
<circle class="e" cx="27.451" cy="27.451" r="27.451"
transform="translate(7.029 7.568)" />
</g>
</g>
<g transform="translate(10174 7640)">
<g class="f" transform="translate(-9178 -7204)">
<circle class="g" cx="28" cy="28" r="28" />
<circle class="h" cx="28" cy="28" r="26.5" />
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

127
collect-library/src/main/assets/omdb/icon_4022_0.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

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

@ -10,7 +10,8 @@ public class OMDBReferenceTileSource extends TileSource {
@Override
public ITileDataSource getDataSource() {
return new OverzoomTileDataSource(new OMDBReferenceDataSource(), Constant.OVER_ZOOM);
//return new OverzoomTileDataSource(new OMDBReferenceDataSource(), Constant.OVER_ZOOM);
return new OMDBReferenceDataSource();
}
@Override

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

@ -10,7 +10,8 @@ public class OMDBTileSource extends TileSource {
@Override
public ITileDataSource getDataSource() {
return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM);
// return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM);
return new OMDBTileDataSource();
}
@Override

3
collect-library/src/main/java/com/navinfo/collect/library/map/source/RealmDBTileSource.java
View File

@ -12,7 +12,8 @@ public class RealmDBTileSource extends TileSource {
@Override
public ITileDataSource getDataSource() {
return new OverzoomTileDataSource(new RealmDBTileDataSource(), Constant.OVER_ZOOM);
//return new OverzoomTileDataSource(new RealmDBTileDataSource(), Constant.OVER_ZOOM);
return new RealmDBTileDataSource();
}
@Override

4
collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
View File

@ -29,8 +29,8 @@ public class Constant {
HAD_LAYER_INVISIABLE_ARRAY = HD_LAYER_VISIABLE_MAP.keySet().toArray(new String[HD_LAYER_VISIABLE_MAP.keySet().size()]);
}
public static String[] HAD_LAYER_INVISIABLE_ARRAY;
public static final int OVER_ZOOM = 21;
public static final int MAX_ZOOM = 23;
public static final int OVER_ZOOM = 22;
public static final int MAX_ZOOM = 22;
public static final int OMDB_MIN_ZOOM = 16;
/**