diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 663459aa50..0d156937bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
+
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index b552f706b5..b46e500568 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -212,9 +212,9 @@ class CosStatusController : CosStatusCallback {
latitude = latitude
) { success ->
CosCallbackMapController.unregisterCallbacks(map)
- CosCallbackMapController.mainService?.let {
- CosCallbackMapController.mainService?.sendCustomResult(success)
- }
+// CosCallbackMapController.mainService?.let {
+// CosCallbackMapController.mainService?.sendCustomResult(success)
+// }
Log.d(TAG, "type = $type ----success = $success")
if (success) {
//分享成功,并打点,如果是上报拥堵,需要takeVideo
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 7e734f6140..7dbd0c5d3b 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -66,11 +66,11 @@ class MainService : Service() {
private var mLatitude: Double = 0.0
//发送主动上报结果广播给外部
- fun sendCustomResult(result: Boolean) {
- var intent = Intent(customResultAction)
- intent.putExtra("isSuccess", result)
- sendBroadcast(intent)
- }
+// fun sendCustomResult(result: Boolean) {
+// var intent = Intent(customResultAction)
+// intent.putExtra("isSuccess", result)
+// sendBroadcast(intent)
+// }
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
Log.d(TAG, "onStartCommand -----------> ")
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
new file mode 100644
index 0000000000..7ae04a2bed
--- /dev/null
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
@@ -0,0 +1,38 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
index 622a231939..d814bc3f20 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
@@ -2,8 +2,9 @@
+ android:layout_height="wrap_content">
+
+ android:background="@drawable/tanlu_alert_window_bg">
-
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
index 2daeba4505..7716b8ccc7 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
@@ -78,6 +78,7 @@
642px
186px
+ 176px
250px
172px
45px
@@ -92,7 +93,7 @@
28px
56px
- 3px
+ 6px
16px
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 35ac4ea9c3..4062891c80 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -78,13 +78,14 @@
1233px
326px
+ 306px
480px
- 280px
+ 290px
80px
19px
12px
- 12px
+ 24px
30px
9px
27px
@@ -92,7 +93,7 @@
50px
90px
- 6px
+ 10px
30px
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
index 205767293e..88af7354b4 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
@@ -77,22 +77,23 @@
1060px
- 326px
+ 330px
+ 306px
421px
- 280px
+ 290px
80px
19px
- 5px
- 0px
- 30px
+ 13px
+ 24px
+ 15px
9px
27px
46px
50px
98px
- 6px
+ 10px
30px
diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
index 2daeba4505..7716b8ccc7 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -78,6 +78,7 @@
642px
186px
+ 176px
250px
172px
45px
@@ -92,7 +93,7 @@
28px
56px
- 3px
+ 6px
16px
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index d4095a09f9..21256ebd26 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.SpacesItemDecoration;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment
-
+
-
@@ -20,13 +20,13 @@
android:right="2dp"
android:top="2dp" />
-
+
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 5b9ea8d44f..49fced883d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -6,14 +6,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
- android:layout_marginBottom="14px"
+ android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
+ android:textSize="@dimen/dp_32" />
+ android:textSize="@dimen/share_item_text_size" />
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml b/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
index a4b31bedf9..921c20b656 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_30"
- app:roundLayoutRadius="@dimen/dp_40">
+ app:roundLayoutRadius="@dimen/dp_28">
18px
20px
- 170px
+ 190px
250px
190px
210px
- 122px
+ 136px
82px
@@ -76,5 +76,6 @@
-8px
84px
120px
+ 16px
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 f66ced6bbf..66c449c427 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
@@ -64,7 +64,7 @@
281px
90px
28px
- 30px
+ 28px
67.5px
30px
40px
@@ -75,5 +75,6 @@
114px
158px
300px
+ 26px
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 06cddf5140..f928adef36 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -4,12 +4,12 @@
18px
20px
- 170px
+ 190px
250px
190px
210px
- 122px
+ 136px
82px
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
new file mode 100644
index 0000000000..afd05b86dd
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
@@ -0,0 +1,41 @@
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_dialog_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_dialog_bg_light.xml
new file mode 100644
index 0000000000..932615f8b3
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_dialog_bg_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
index abd9150dc2..9514cc43b3 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
@@ -1,6 +1,8 @@
30px
+ 20px
+ 16px
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
index ee228e322c..b22064a243 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
@@ -2,6 +2,8 @@
30px
+ 20px
+ 16px
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
index c35c322fdd..6a87855ba7 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
@@ -1,5 +1,7 @@
16px
+ 10px
+ 8px
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_daolushigong_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_daolushigong_nor_light.png
new file mode 100644
index 0000000000..8b2bfb80a4
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_daolushigong_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_fenglu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_fenglu_nor_light.png
new file mode 100644
index 0000000000..5eaca3eb9d
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_fenglu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongjiancha_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongjiancha_nor_light.png
new file mode 100644
index 0000000000..32553d65e1
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongjiancha_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongshigu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongshigu_nor_light.png
new file mode 100644
index 0000000000..d8f377dcb1
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongshigu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiebing_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiebing_nor_light.png
new file mode 100644
index 0000000000..3c531ce8f9
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiebing_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jishui_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jishui_nor_light.png
new file mode 100644
index 0000000000..39a2cb05ae
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jishui_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_nongwu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_nongwu_nor_light.png
new file mode 100644
index 0000000000..7100c16b4c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_nongwu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_qiuzhu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_qiuzhu_nor_light.png
new file mode 100644
index 0000000000..206317bbcc
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_qiuzhu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_shishlukuang_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_shishlukuang_nor_light.png
new file mode 100644
index 0000000000..9446f5093a
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_shishlukuang_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_yongdu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_yongdu_nor_light.png
new file mode 100644
index 0000000000..5cf9fe2083
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_yongdu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png
old mode 100755
new mode 100644
index 5b93e817d8..8b2bfb80a4
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png
old mode 100755
new mode 100644
index d4f16ca8fe..5eaca3eb9d
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png
old mode 100755
new mode 100644
index 870bf87e82..32553d65e1
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png 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
old mode 100755
new mode 100644
index 547bd4ce22..d8f377dcb1
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png 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_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png
index dcef2a496c..3c531ce8f9 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png
old mode 100755
new mode 100644
index 75489d8075..39a2cb05ae
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png
old mode 100755
new mode 100644
index f9347adaf3..7100c16b4c
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png
old mode 100755
new mode 100644
index a5d9f22c18..206317bbcc
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png
old mode 100755
new mode 100644
index 6e069f57de..9446f5093a
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png 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
old mode 100755
new mode 100644
index 508d6b2ebf..5cf9fe2083
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png 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-xhdpi/mogo_image_daolushigong_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png
old mode 100755
new mode 100644
index 76847aaee9..8eeff5ac88
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png
old mode 100755
new mode 100644
index 2538c35258..1c2c707b03
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png
old mode 100755
new mode 100644
index 307d137ef4..00416fda47
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png 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
old mode 100755
new mode 100644
index bfea0e04b9..a961e64dfe
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png 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_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png
index dcef2a496c..43b0775cd0 100644
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png
old mode 100755
new mode 100644
index af4fd037ae..188c642d4a
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png
old mode 100755
new mode 100644
index 5c965dbf11..d150bb2635
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png
old mode 100755
new mode 100644
index 5ebfc76a29..3ebf17ac60
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png
old mode 100755
new mode 100644
index 33a17d184c..6fce6b32bf
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png 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
old mode 100755
new mode 100644
index a72533bfb0..cc9313655c
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png 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/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png
old mode 100644
new mode 100755
index c18352b4fa..cbf14c5566
Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
index afd05b86dd..8790c3b9a1 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -9,7 +9,7 @@
android:right="2dp"
android:top="2dp" />
-
+
-
@@ -20,22 +20,19 @@
android:right="2dp"
android:top="2dp" />
-
+
-
-
-
-
-
-
+
+
+
\ No newline at end of file