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-05-06 16:45:38 +08:00
commit 0127c554f3
7 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/omdb.config
View File

@ -31,7 +31,7 @@
"name": "可变点限速"
},
{
"table": "OMDB_LANE_LINK_LG",
"table": "OMDB_LANE_LG_LINK",
"code": 5001,
"name": "车道中心线"
},

10
app/src/main/res/drawable/fm_card_map_down_status_bg.xml
View File

@ -4,7 +4,7 @@
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cv_gray_153" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<corners android:radius="@dimen/default_widget_padding"></corners>
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
</shape>
</item>
@ -12,7 +12,7 @@
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<corners android:radius="@dimen/default_widget_padding"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
</shape>
</item>
@ -20,7 +20,7 @@
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<corners android:radius="@dimen/default_widget_padding"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
</shape>
</item>
@ -28,7 +28,7 @@
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cvm_red" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<corners android:radius="@dimen/default_widget_padding"></corners>
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
</shape>
</item>
@ -36,7 +36,7 @@
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/transp" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<corners android:radius="@dimen/default_widget_padding"></corners>
<stroke android:width="1.1dp" android:color="@color/colorPrimary" />
</shape>
</item>

44
app/src/main/res/drawable/selector_horizontal_round_corner_bg.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cv_gray_153" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
</shape>
</item>
<item android:state_checked="true">
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/white" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
</shape>
</item>
<item android:state_selected="true">
<shape>
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
<solid android:color="@color/cvm_red" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
</shape>
</item>
<item>
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/transp" />
<corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/colorPrimary" />
</shape>
</item>
</selector>

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

@ -32,7 +32,7 @@
<TextView
android:id="@+id/offline_map_download_btn"
style="@style/map_download_style_btn"
style="@style/btn_default_stroke_horizontal_round"
android:layout_width="60dp"
android:layout_alignParentRight="true"
android:layout_gravity="center_vertical"

4
app/src/main/res/layout/adapter_task_list.xml
View File

@ -58,7 +58,7 @@
<TextView
android:id="@+id/task_download_btn"
style="@style/map_download_style_btn"
style="@style/btn_default_stroke_horizontal_round"
android:layout_width="60dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
@ -69,7 +69,7 @@
<TextView
android:id="@+id/task_upload_btn"
style="@style/map_download_style_btn"
style="@style/btn_default_stroke_horizontal_round"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_centerVertical="true"

13
app/src/main/res/values/styles.xml
View File

@ -107,6 +107,19 @@
<item name="android:textSize">15sp</item>
</style>
<style name="btn_default_stroke_horizontal_round" comment="左右为圆角的按钮" parent="ThemeOverlay.Material3.AutoCompleteTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:paddingHorizontal">@dimen/default_widget_padding</item>
<item name="android:paddingVertical">5dp</item>
<item name="android:background">@drawable/selector_horizontal_round_corner_bg</item>
<item name="android:foreground">@drawable/ripple_btn_press</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:textColor">@color/selector_default_primary_press_secondary</item>
<item name="android:textSize">15sp</item>
</style>
<!-- 默认按钮样式 -->
<style name="btn_default_style" parent="content_font_default">
<item name="android:textColor">@color/btn_select_color</item>

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

@ -55,7 +55,6 @@
<style-text fill="#000000" id="max-speed-limit" k="name" size="15" stroke="#ffffff"
stroke-width="0.1" />
<!--###### AREA styles ######-->
<!--residential-->