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
parent 09b3dd2f43 c54cbae676
commit a500d3ffea
25 changed files with 458 additions and 63 deletions
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="小标题">