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

1、增加任务列表定位2、地图初始化显示底部工具栏3、修改道路形态标题

Browse Source
This commit is contained in:
qiji4215
2023-09-19 16:33:42 +08:00
parent 0d9b6e90ac
commit 5320caac69
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@
"name": "车道边界类型", "name": "车道边界类型",
"zoomMin": 18, "zoomMin": 18,
"zoomMax": 20, "zoomMax": 20,
"checkLinkId": false,
"filterData": true, "filterData": true,
"catch":true, "catch":true,
"transformer": [ "transformer": [

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

@@ -352,6 +352,10 @@ class TaskListAdapter(
refreshData(list) refreshData(list)
} }
fun getSelectTaskPosition():Int{
return selectPosition
}
companion object { companion object {
object ItemClickStatus { object ItemClickStatus {
const val ITEM_LAYOUT_CLICK = 0 //条目点击 const val ITEM_LAYOUT_CLICK = 0 //条目点击

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

@@ -126,6 +126,12 @@ class TaskListFragment : BaseFragment() {
viewModel.liveDataTaskList.observe(viewLifecycleOwner) { viewModel.liveDataTaskList.observe(viewLifecycleOwner) {
loadFinish() loadFinish()
adapter.initSelectTask(it, viewModel.currentSelectTaskBean?.id) adapter.initSelectTask(it, viewModel.currentSelectTaskBean?.id)
var position = adapter.getSelectTaskPosition()
if(position<0){
position = 0
}
//定位到被选中的任务
binding.taskListRecyclerview.smoothScrollToPosition(position)
} }
//监听并调用上传 //监听并调用上传

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

@@ -126,9 +126,9 @@ class SignUtil {
//常规线限速 //常规线限速
DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速" DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速"
DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "形态" DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性"
DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "形态" DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态"
else -> DataCodeEnum.findTableNameByCode(data.code) else -> DataCodeEnum.findTableNameByCode(data.code)
} }

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

@@ -544,7 +544,6 @@
android:id="@+id/main_activity_bottom_sheet_group" android:id="@+id/main_activity_bottom_sheet_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids=" app:constraint_referenced_ids="
main_bottom_route_text, main_bottom_route_text,
main_bottom_offline_map_text, main_bottom_offline_map_text,
@@ -552,7 +551,7 @@
main_bottom_task_text,main_bottom_route, main_bottom_task_text,main_bottom_route,
main_bottom_offline_map, main_bottom_offline_map,
main_bottom_res, main_bottom_res,
main_activity_bottom_sheet_bg, main_activity_bottom_sheet_bg,
main_bottom_task,main_bottom_home" /> main_bottom_task,main_bottom_home" />

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

@@ -1813,7 +1813,7 @@
<!-- 环岛 --> <!-- 环岛 -->
<m v="OMDB_ROUNDABOUT"> <m v="OMDB_ROUNDABOUT">
<line stroke="#fcba5a" width="0.5" /> <line stroke="#fcba5a" width="0.5" />
<symbol repeat="false" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol> <symbol repeat="false" repeat-start="0" gland="false" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
</m> </m>
<!-- 停止位置 --> <!-- 停止位置 -->

2
collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
View File

@@ -262,7 +262,7 @@ public final class NIMapView extends RelativeLayout {
// 增加比例尺图层 // 增加比例尺图层
NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap()); NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 10, 0); mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 256, 60);
// if (gridLayer == null) { // if (gridLayer == null) {
// gridLayer = new TileGridLayer(getVtmMap()); // gridLayer = new TileGridLayer(getVtmMap());