diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml index d45ca08f1b..4d7ff1b8b4 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml @@ -4,6 +4,6 @@ + android:endColor="#5CC1FF" + android:startColor="#256BFF" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index f96911d38e..c3e82ff512 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -4,8 +4,8 @@ android:id="@+id/clPanelContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_v2x_event_surrounding_item"> - +> + @@ -23,7 +23,7 @@ android:gravity="top" android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:text="周围5公里,共15条交通信息" - android:textColor="@color/white" + android:textColor="@color/v2x_white" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> @@ -111,7 +111,7 @@ android:background="@drawable/bg_v2x_go_to_share" android:gravity="center" android:text="@string/v2x_surrounding_go_to_share" - android:textColor="@color/white" + android:textColor="@color/v2x_white" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> @@ -126,7 +126,7 @@ android:background="@drawable/bg_v2x_refresh" android:gravity="center" android:text="@string/v2x_surrounding_refresh" - android:textColor="@color/white" + android:textColor="@color/v2x_white_refresh" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml index 5e497f6ba6..71284be35c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml @@ -34,7 +34,7 @@ android:layout_toRightOf="@+id/iv_event_type" android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left" android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize" - android:textColor="@color/white" + android:textColor="@color/v2x_item_white" android:text="求助" /> 150px 48px 32px - 130px + 110px 10px 20px 190px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 45ca7333ff..36754f0fc3 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -37,7 +37,7 @@ 150px 48px 32px - 130px + 110px 10px 20px 190px diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 5b32848fff..827bd35c63 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -3,7 +3,9 @@ #256BFF #3F4057 #10121E - #FFFFFF + #FFFFFF + #FFFFFF + #FFFFFF #B3FFFFFF #1F2131 #1F2131 diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index c6458087a1..c14b11c750 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,7 +39,7 @@ 150px 48px 32px - 130px + 90px 10px 20px 190px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index 4662fe9ead..abd5bac484 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml @@ -1,6 +1,6 @@ - #333333 + #333333 #666666 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png new file mode 100644 index 0000000000..57abc3ccb6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor.png deleted file mode 100644 index c77748e661..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png new file mode 100755 index 0000000000..6a9605f5a9 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor.png deleted file mode 100644 index 06163dda3f..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png new file mode 100755 index 0000000000..547bd4ce22 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small.png deleted file mode 100644 index 632d1e5ad3..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png new file mode 100755 index 0000000000..dcf7a4fc97 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor.png deleted file mode 100644 index c25514506f..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png new file mode 100755 index 0000000000..508d6b2ebf Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png deleted file mode 100644 index c77748e661..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png new file mode 100755 index 0000000000..57fc9d6829 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png deleted file mode 100644 index 06163dda3f..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png new file mode 100755 index 0000000000..bfea0e04b9 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png deleted file mode 100644 index 632d1e5ad3..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png new file mode 100755 index 0000000000..f6d348cc83 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor.png deleted file mode 100644 index c25514506f..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png new file mode 100755 index 0000000000..a72533bfb0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml new file mode 100644 index 0000000000..5132bd085c --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml new file mode 100644 index 0000000000..17e43ef185 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml index 216f9f6ccf..6e1f3d1496 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml @@ -1,6 +1,6 @@ - + 24px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml index 216f9f6ccf..6e1f3d1496 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -1,6 +1,6 @@ - + 24px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 20c2a27b35..1378eb27fd 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -5,6 +5,10 @@ #999999 #333333 #F5F5F5 + #333333 + #FFFFFF + #FFFFFF + #B3FFFFFF #333333 #999999 #333333 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml new file mode 100644 index 0000000000..6e1f3d1496 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -0,0 +1,7 @@ + + + 24px + + + +