diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 5d08ab26..7457dbf9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -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 { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt index 8c164c07..1c5d8efa 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt @@ -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 diff --git a/app/src/main/res/drawable-xhdpi/icon_add_road_n.png b/app/src/main/res/drawable-xhdpi/icon_add_road_n.png new file mode 100644 index 00000000..930c217f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_add_road_n.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_add_road_p.png b/app/src/main/res/drawable-xhdpi/icon_add_road_p.png new file mode 100644 index 00000000..8f901b6c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_add_road_p.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_road.png b/app/src/main/res/drawable-xxhdpi/icon_add_road.png new file mode 100644 index 00000000..61f2c976 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_add_road.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_road_n.png b/app/src/main/res/drawable-xxhdpi/icon_add_road_n.png new file mode 100644 index 00000000..fd11684a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_add_road_n.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_road_p.png b/app/src/main/res/drawable-xxhdpi/icon_add_road_p.png new file mode 100644 index 00000000..34224f46 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_add_road_p.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_task_n.png b/app/src/main/res/drawable-xxhdpi/icon_add_task_n.png new file mode 100644 index 00000000..77007856 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_add_task_n.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_task_p.png b/app/src/main/res/drawable-xxhdpi/icon_add_task_p.png new file mode 100644 index 00000000..0d7a74d2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_add_task_p.png differ diff --git a/app/src/main/res/drawable/selector_add_taskline.xml b/app/src/main/res/drawable/selector_add_taskline.xml index 45941ce4..ec6d08b2 100644 --- a/app/src/main/res/drawable/selector_add_taskline.xml +++ b/app/src/main/res/drawable/selector_add_taskline.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/selector_task_head_add_link.xml b/app/src/main/res/drawable/selector_task_head_add_link.xml new file mode 100644 index 00000000..5a398fa3 --- /dev/null +++ b/app/src/main/res/drawable/selector_task_head_add_link.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 08648202..ecc86505 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -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" /> + app:layout_constraintTop_toBottomOf="@id/task_search" + tools:ignore="MissingClass" /> \ No newline at end of file diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index d4f29fa3..04107426 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1490,12 +1490,6 @@ - - - - - @@ -1529,19 +1523,40 @@ + + + + + + + + + + + + + + + + + + - + - + @@ -1550,14 +1565,14 @@ - + - + @@ -1566,14 +1581,14 @@ - + - + @@ -1659,20 +1674,6 @@ - - - - - - - - - - - - @@ -1689,19 +1690,19 @@ + symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_4006_0.svg" symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_arrow_right.svg" symbol-height="64" + symbol-width="64"> @@ -1714,7 +1715,7 @@ stroke="#ffffff" stroke-width="1.0"> + src="assets:omdb/icon_4010.svg" symbol-height="24" symbol-width="18"> diff --git a/collect-library/src/main/assets/omdb/icon_4002_0.svg b/collect-library/src/main/assets/omdb/icon_4002_0.svg index a9418b73..4f4ac0a7 100644 --- a/collect-library/src/main/assets/omdb/icon_4002_0.svg +++ b/collect-library/src/main/assets/omdb/icon_4002_0.svg @@ -1 +1,43 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.svg b/collect-library/src/main/assets/omdb/icon_4022_0.svg index dc58b844..efaaed34 100644 --- a/collect-library/src/main/assets/omdb/icon_4022_0.svg +++ b/collect-library/src/main/assets/omdb/icon_4022_0.svg @@ -1 +1,126 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm b/vtm index c74bcd29..d7552c34 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c74bcd29c24cddf395fa9654ef0b69d0c88ac3ad +Subproject commit d7552c34ffdff6724b5e4ddcec461f81f1e0b669