Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

This commit is contained in:
2023-05-06 11:04:32 +08:00
43 changed files with 397 additions and 189 deletions

View File

@@ -163,7 +163,8 @@
<color name="cv_gray_153">#999999</color>
<color name="cvm_red">#FF3B30</color>
<color name="btn_blue_solid">#108ee9</color>
<color name="titleColor">#2631DD</color>
<color name="highFontColor">#2631DD</color>
<color name="high_item_color">#FFF5F7FE</color>
<color name="contentColor">#000000</color>
<!-- 一键连接对话框背景色 -->
<color name="bg_gray2">#d1d1d1</color>
@@ -171,5 +172,6 @@
<color name="bg_dark">#999999</color>
<color name="gray_121">#797979</color>
<color name="gray_59">#595959</color>
<color name="btn_bg_blue">#FF3266F1</color>
<color name="text_hint_gray" comment="输入框内默认字体颜色,输入框边框颜色">#c1c1c1</color>
</resources>

View File

@@ -28,6 +28,8 @@
<dimen name="twenty">20dp</dimen>
<dimen name="twenty_two">22dp</dimen>
<dimen name="twenty_four">24dp</dimen>
<dimen name="fragment_margin_top">64dp</dimen>
<dimen name="fragment_margin_left">400dp</dimen>
<!-- 相机设置iv距离上方间距-->
<dimen name="camear_dialog_iv_margin_top" comment="相机设置窗体高度">25dp</dimen>
<!-- 相机设置窗体高度-->

View File

@@ -27,7 +27,7 @@
<style name="card_title_font_default">
<item name="android:gravity">center_vertical</item>
<item name="android:textSize">@dimen/card_title_font_size</item>
<item name="android:textColor">@color/titleColor</item>
<item name="android:textColor">@color/highFontColor</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
@@ -46,7 +46,7 @@
<style name="card_text_font_default">
<item name="android:gravity">center_vertical</item>
<item name="android:textSize">@dimen/card_title_font_2size</item>
<item name="android:textColor">@color/titleColor</item>
<item name="android:textColor">@color/highFontColor</item>
<item name="android:padding">10dp</item>
<item name="android:drawableRight">@drawable/icon_down_arrow</item>
<item name="android:background">@drawable/fm_card_map_down_status_bg</item>