opt

2020-07-03 11:29:09 +08:00
parent 5a9ea954f3
commit a4d1fe726e
327 changed files with 4768 additions and 12 deletions
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_back.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_back.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_choose_position2.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_choose_position2.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_company.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_company.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_gas.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_gas.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_go_company.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_go_company.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_go_home.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_go_home.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_home.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_home.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_park.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_park.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_position.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_position.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_restrant.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_restrant.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_setting.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_setting.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_sound_low.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_sound_low.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_sound_plus.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_sound_plus.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_tolit.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_tolit.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_wash.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_navi_wash.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_path_fail.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_path_fail.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_pb_thumb.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_pb_thumb.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_checked.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_checked.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_unchecked.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_search_category_unchecked.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_sound_high.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_sound_high.png
--- a/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_sound_low.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_sound_low.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_back.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_back.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_choose_position2.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_choose_position2.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_company.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_company.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_gas.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_gas.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_go_company.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_go_company.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_go_home.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_go_home.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_home.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_home.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_park.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_park.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_position.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_position.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_restrant.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_restrant.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_setting.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_setting.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_sound_low.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_sound_low.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_sound_plus.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_sound_plus.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_tolit.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_tolit.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_wash.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_navi_wash.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_path_fail.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_path_fail.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_pb_thumb.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_pb_thumb.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_search_category_checked.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_search_category_checked.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_search_category_unchecked.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_search_category_unchecked.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_sound_high.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_sound_high.png
--- a/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_sound_low.png
+++ b/modules/mogo-module-search/src/main/res/mipmap-mdpi/icon_sound_low.png
--- a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="moudle_search_fragment_padding">@dimen/dp_60</dimen>
-    <dimen name="moudle_search_fragment_padding_top">@dimen/dp_40</dimen>
-    <dimen name="moudle_search_et_width">600dp</dimen>
-    <dimen name="moudle_search_et_hight">@dimen/dp_120</dimen>
-    <dimen name="moudle_search_iv_back_hight">@dimen/dp_80</dimen>
-    <dimen name="moudle_search_iv_back_margin_left">@dimen/dp_24</dimen>
-    <dimen name="moudle_search_iv_back_margin_right">@dimen/dp_20</dimen>
+    <!--    module_main_activity_main.xml-->
+    <dimen name="txt_normal">@dimen/sp_32</dimen>
+    <dimen name="txt_title">@dimen/sp_40</dimen>
+    <dimen name="txt_large">25sp</dimen>
+    <dimen name="module_search_fragment_padding">@dimen/dp_60</dimen>
+    <dimen name="module_search_fragment_padding_top">@dimen/dp_40</dimen>
+    <dimen name="module_search_et_width">600dp</dimen>
+    <dimen name="module_search_et_hight">@dimen/dp_120</dimen>
+    <dimen name="module_search_iv_back_hight">@dimen/dp_80</dimen>
+    <dimen name="module_search_iv_back_margin_left">@dimen/dp_24</dimen>
+    <dimen name="module_search_iv_back_margin_right">@dimen/dp_20</dimen>
    <dimen name="module_search_et_margin_right">@dimen/dp_50</dimen>
    <dimen name="module_search_et_text_size">40px</dimen>
    <dimen name="module_search_btn_width">266px</dimen>
@@ -39,9 +42,9 @@
    <dimen name="module_search_dp_120">120px</dimen>
    <dimen name="module_search_txt_setting_width">45px</dimen>
    <dimen name="module_search_dp_838">838px</dimen>
-    <dimen name="module_search_category_margin_bottom">142px</dimen>
+    <dimen name="module_search_category_margin_bottom">184px</dimen>
    <dimen name="module_search_dp_104">104px</dimen>
-    <dimen name="module_search_strategy_name_width">154px</dimen>
+    <dimen name="module_search_strategy_name_width" >154px</dimen>
    <dimen name="module_search_marker_number_textSize">32px</dimen>
    <dimen name="module_search_choose_path_item_height">212px</dimen>
    <dimen name="module_search_calculate_item_strategy_name_textSize">26px</dimen>
--- a/modules/mogo-module-search/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-search/src/main/res/values/dimens.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <!--    module_main_activity_main.xml-->
+    <dimen name="txt_normal">18px</dimen>
    <dimen name="txt_title">@dimen/sp_40</dimen>
+    <dimen name="txt_large">28px</dimen>
    <dimen name="module_search_fragment_padding" >32px</dimen>
    <dimen name="module_search_fragment_padding_top">32px</dimen>
    <dimen name="module_search_et_width">640px</dimen>
@@ -18,7 +20,6 @@
    <dimen name="module_search_navi_home_width">304px</dimen>
    <dimen name="module_search_navi_home_height">64px</dimen>
    <dimen name="module_search_navi_home_margin_left">16px</dimen>
-    <dimen name="txt_normal">18px</dimen>
    <dimen name="module_search_dp_72">38px</dimen>
    <dimen name="module_search_dp_75">75px</dimen>
    <dimen name="module_search_navi_home_padding_left">40px</dimen>
@@ -28,7 +29,6 @@
    <dimen name="module_search_dp_40">20px</dimen>
    <dimen name="module_search_dp_60">30px</dimen>
    <dimen name="module_search_dp_37">20px</dimen>
-    <dimen name="txt_large">28px</dimen>
    <dimen name="module_search_dp_268">144px</dimen>
    <dimen name="module_search_dp_236">126px</dimen>
    <dimen name="module_search_dp_180">96px</dimen>