diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png
index fddef2479b..b542105123 100644
Binary files a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png
index fddef2479b..b542105123 100644
Binary files a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index ce5f8afa46..fc085fceb9 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -24,6 +24,10 @@
android:layout_width="@dimen/module_ext_weather_icon_width"
android:layout_height="@dimen/module_ext_weather_icon_height" />
+
+
54px
100px
90px
+ 8px
180px
180px
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index c28815a838..00944d0a4f 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -18,6 +18,7 @@
54px
100px
90px
+ 8px
180px
180px
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index e14a3012a0..00d9c62dbf 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -71,6 +71,7 @@
24px
18px
18.48px
+ 5px
16px
22px
16px
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index d19c0f9d04..d2810aa359 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -146,6 +146,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance());
// }
+ initAdasControlStatusListener();
EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
@@ -181,7 +182,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this);
// monitorProvider.resetActivityContext(this);
mServiceApis.getMogoMonitorApi().resetActivityContext( this );
- initAdasControlStatusListener();
}
private void initAdasControlStatusListener() {
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml
rename to modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
index a07777a45f..45666a44f2 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
@@ -3,6 +3,7 @@ package com.mogo.module.share.dialog;
import android.content.Context;
import android.view.View;
import android.view.WindowManager;
+import android.widget.ImageView;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
@@ -33,17 +34,17 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL
private boolean isShown = false;
- private TextView tvBlock;
- private TextView tvTrafficCheck;
- private TextView tvClosure;
- private TextView tvNeedHelp;
+ private ImageView ivBlock;
+ private ImageView ivTrafficCheck;
+ private ImageView ivClosure;
+ private ImageView ivNeedHelp;
- private TextView tvAccident;
- private TextView tvRealTimeTraffic;
- private TextView tvStagnantWater;
- private TextView tvRoadIcy;
- private TextView tvDenseFog;
- private TextView tvConstruction;
+ private ImageView ivAccident;
+ private ImageView ivRealTimeTraffic;
+ private ImageView ivStagnantWater;
+ private ImageView ivRoadIcy;
+ private ImageView ivDenseFog;
+ private ImageView ivConstruction;
private Context mContext;
private IMogoAnalytics mAnalytics;
@@ -86,83 +87,83 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL
// });
- tvBlock = findViewById(R.id.tvBlock);
- tvTrafficCheck = findViewById(R.id.tvTrafficCheck);
- tvClosure = findViewById(R.id.tvClosure);
- tvNeedHelp = findViewById(R.id.tvSeekHelp);
+ ivBlock = findViewById(R.id.ivBlock);
+ ivTrafficCheck = findViewById(R.id.ivTrafficCheck);
+ ivClosure = findViewById(R.id.ivClosure);
+ ivNeedHelp = findViewById(R.id.ivSeekHelp);
- tvAccident = findViewById(R.id.tvAccident);
- tvRealTimeTraffic = findViewById(R.id.tvRealTimeTraffic);
- tvStagnantWater = findViewById(R.id.tvStagnantWater);
- tvRoadIcy = findViewById(R.id.tvRoadIcy);
- tvDenseFog = findViewById(R.id.tvDenseFog);
- tvConstruction = findViewById(R.id.tvConstruction);
+ ivAccident = findViewById(R.id.ivAccident);
+ ivRealTimeTraffic = findViewById(R.id.ivRealTimeTraffic);
+ ivStagnantWater = findViewById(R.id.ivStagnantWater);
+ ivRoadIcy = findViewById(R.id.ivRoadIcy);
+ ivDenseFog = findViewById(R.id.ivDenseFog);
+ ivConstruction = findViewById(R.id.ivConstruction);
}
private void initListener() {
- tvBlock.setOnClickListener(this);
- tvNeedHelp.setOnClickListener(this);
- tvTrafficCheck.setOnClickListener(this);
- tvClosure.setOnClickListener(this);
+ ivBlock.setOnClickListener(this);
+ ivNeedHelp.setOnClickListener(this);
+ ivTrafficCheck.setOnClickListener(this);
+ ivClosure.setOnClickListener(this);
- tvAccident.setOnClickListener(this);
- tvRealTimeTraffic.setOnClickListener(this);
- tvStagnantWater.setOnClickListener(this);
- tvRoadIcy.setOnClickListener(this);
- tvDenseFog.setOnClickListener(this);
- tvConstruction.setOnClickListener(this);
+ ivAccident.setOnClickListener(this);
+ ivRealTimeTraffic.setOnClickListener(this);
+ ivStagnantWater.setOnClickListener(this);
+ ivRoadIcy.setOnClickListener(this);
+ ivDenseFog.setOnClickListener(this);
+ ivConstruction.setOnClickListener(this);
}
@Override
public void onClick(View view) {
int id = view.getId();
- if (id == R.id.tvBlock) {
+ if (id == R.id.ivBlock) {
//拥堵
Logger.d(TAG,"点击拥堵");
sendShareReceiver(IMogoTanluProvider.TYPE_BLOCK);
dismiss();
- } else if (id == R.id.tvTrafficCheck) {
+ } else if (id == R.id.ivTrafficCheck) {
//交通检查
Logger.d(TAG,"点击交通检查");
sendShareReceiver(IMogoTanluProvider.TYPE_TRAFFIC_CHECK);
dismiss();
- } else if (id == R.id.tvClosure) {
+ } else if (id == R.id.ivClosure) {
//封路
Logger.d(TAG,"点击封路");
sendShareReceiver(IMogoTanluProvider.TYPE_CLOSURE);
dismiss();
- } else if (id == R.id.tvSeekHelp) {
+ } else if (id == R.id.ivSeekHelp) {
// 故障求助
Logger.d(TAG,"点击求助");
SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true);
dismiss();
- } else if (id == R.id.tvAccident) {
+ } else if (id == R.id.ivAccident) {
// 事故
Logger.d(TAG,"点击事故");
sendShareReceiver(IMogoTanluProvider.TYPE_ACCIDENT);
dismiss();
- } else if (id == R.id.tvConstruction) {
+ } else if (id == R.id.ivConstruction) {
// 道路施工
Logger.d(TAG,"点击道路施工");
sendShareReceiver(IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION);
dismiss();
- } else if (id == R.id.tvRealTimeTraffic) {
+ } else if (id == R.id.ivRealTimeTraffic) {
// 实时路况
Logger.d(TAG,"点击实时路况");
sendShareReceiver(IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC);
dismiss();
- } else if (id == R.id.tvStagnantWater) {
+ } else if (id == R.id.ivStagnantWater) {
// 道路积水
Logger.d(TAG,"点击道路积水");
sendShareReceiver(IMogoTanluProvider.TYPE_STAGNANT_WATER);
dismiss();
- } else if (id == R.id.tvRoadIcy) {
+ } else if (id == R.id.ivRoadIcy) {
// 道路结冰
Logger.d(TAG,"点击道路结冰");
sendShareReceiver(IMogoTanluProvider.TYPE_ROAD_ICY);
dismiss();
- } else if (id == R.id.tvDenseFog) {
+ } else if (id == R.id.ivDenseFog) {
// 浓雾
Logger.d(TAG,"点击浓雾");
sendShareReceiver(IMogoTanluProvider.TYPE_DENSE_FOG);
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png
index cc87445c69..1b49fddbc4 100644
Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png
index cc87445c69..1b49fddbc4 100644
Binary files a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml
deleted file mode 100644
index ad9dc6d8fb..0000000000
--- a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
- 90px
- 32px
- 2px
- 16px
- 26px
- 26px
- 32px
-
- 90px
- 32px
- 2px
- 100px
- 90px
- 2px
- 54px
- 100px
- 90px
-
- 180px
- 180px
- 2px
- 60px
- 60px
- 28px
-
- 32px
- 2px
-
- 120px
- 32px
- 60px
- 92px
- 24px
- 48px
- 2px
- 120px
- 120px
- 120px
- 30px
- 30px
- 32px
- 32px
-
- 120px
- 120px
- 32px
- 60px
- 32px
- 60px
- 32px
- 20px
-
-
- 100px
- 60px
- 60px
- 32px
- 48px
- 80px
- 28px
- 26px
- 44px
- 44px
- 18px
- 34px
- 26px
- 28px
- 30px
- 30px
- 30px
- 20px
-
- 103px
- 103px
-
-
- 1058px
- 210px
- 144px
- 159px
- 159px
- 70px
- 70px
- 56px
- 83px
- 24px
- 40px
- 60px
- 50px
- 12px
- 10px
- 40px
- 30px
- 34px
- 24px
- 28px
- 23px
- 17px
- 17px
- 36px
- 36px
- -2px
- 95px
-
- 30px
- 40px
- 40px
- 15px
- 15px
- 5px
- 50px
- 56px
- 30px
- 56px
- 30px
- 56px
- 30px
- 15px
- 15px
-
-
- 1000px
- 390px
- 200px
- 200px
- 240px
- 30px
- 120px
- 120px
- 30px
- 22px
- 28px
- 28px
- 30px
- 90px
- 90px
- 6dp
- 15px
- 4px
- 10px
- 20px
-
- 40px
-
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml
deleted file mode 100644
index 7423964cdd..0000000000
--- a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
- 90px
- 32px
- 2px
- 16px
- 26px
- 26px
- 32px
-
- 90px
- 32px
- 2px
- 100px
- 90px
- 2px
- 54px
- 100px
- 90px
-
- 180px
- 180px
- 2px
- 60px
- 60px
- 28px
-
- 32px
- 2px
-
- 120px
- 32px
- 60px
- 92px
- 24px
- 48px
- 2px
- 120px
- 120px
- 120px
- 30px
- 30px
- 32px
- 32px
-
- 120px
- 120px
- 32px
- 60px
- 32px
- 60px
- 32px
- 20px
-
-
- 100px
- 60px
- 60px
- 32px
- 48px
- 80px
- 28px
- 26px
- 44px
- 44px
- 18px
- 34px
- 26px
- 28px
- 30px
- 30px
- 30px
- 20px
-
- 103px
- 103px
-
-
- 1058px
- 210px
- 144px
- 159px
- 159px
- 70px
- 70px
- 56px
- 83px
- 24px
- 40px
- 60px
- 50px
- 12px
- 10px
- 40px
- 30px
- 34px
- 24px
- 28px
- 24px
- 17px
- 17px
- 36px
- 36px
- -2px
- 95px
-
- 30px
- 40px
- 40px
- 15px
- 15px
- 5px
- 50px
- 37px
- 26px
- 37px
- 26px
- 37px
- 26px
- 15px
- 15px
-
-
- 1000px
- 390px
- 200px
- 200px
- 240px
- 30px
- 120px
- 120px
- 30px
- 22px
- 28px
- 28px
- 30px
- 90px
- 90px
- 6dp
- 15px
- 4px
- 10px
- 20px
-
- 34px
-
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml
deleted file mode 100644
index 26b9b2c5fe..0000000000
--- a/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
- 58px
- 18px
- 1px
- 11.2px
- 10.8px
- 17px
- 20px
-
- 58px
- 19px
- 1px
- 64.2px
- 58px
- 1px
- 33.4px
- 64.2px
- 58px
-
-
- 96px
- 96px
- 1px
- 32px
- 32px
- 15px
-
- 20px
- 1px
-
- 66px
- 20px
- 34.5px
- 58px
- 17px
- 31.4px
- 1.2px
- 66px
- 66px
- 66px
- 16px
- 16px
- 34.5px
- 20px
-
-
- 66px
- 66px
- 20px
- 32px
- 20px
- 30px
- 16px
- 8px
-
-
- 56px
- 32px
- 32px
-
- 22px
- 28px
- 22px
- 22px
- 16px
- 24px
- 24px
- 18px
- 18.48px
- 16px
- 22px
- 16px
- 15px
- 15px
- 11.73px
-
- 56px
- 56px
-
-
- 544px
- 117px
- 80px
- 85px
- 85px
- 40px
- 40px
- 30px
- 44px
- 13px
- 20px
- 32px
- 28px
- 7px
- 5px
- 22px
- 16px
- 18px
- 24px
- 15px
- 13px
- 58px
-
- 9px
- 9px
- 18px
- 18px
- -1px
-
- 30px
- 23px
- 23px
- 15px
- 15px
- 5px
- 20px
- 14px
- 20px
- 14px
- 20px
- 14px
- 34px
- 8px
- 8px
-
-
- 550px
- 208px
- 100px
- 100px
- 16px
- 142px
- 66px
- 66px
- 16px
- 12px
- 14px
- 14px
- 18px
- 58px
- 58px
- 3dp
- 10px
- 4px
- 6px
- 10px
-
- 19px
-
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml
new file mode 100644
index 0000000000..9bb9aa1a6a
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_next_bg_selector_light.xml
@@ -0,0 +1,14 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml
new file mode 100644
index 0000000000..adce397ed8
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_play_bg_selector_light.xml
@@ -0,0 +1,13 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml
index efa03f2ee4..38ac04abf5 100644
--- a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml
@@ -3,7 +3,7 @@
-
-
+
\ No newline at end of file