diff --git a/app/build.gradle b/app/build.gradle index ef8a91ff95..ac67091a5b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -345,7 +345,6 @@ dependencies { } implementation rootProject.ext.dependencies.moduletanluapi implementation rootProject.ext.dependencies.mogomonitor - implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.mogomoduleback implementation rootProject.ext.dependencies.guideshow } else { @@ -363,7 +362,6 @@ dependencies { } implementation project(':libraries:mogo-tanlu-api') implementation project(':modules:mogo-module-monitor') - implementation project(':modules:mogo-module-widgets') implementation project(':modules:mogo-module-back') implementation project(':modules:mogo-module-guide') } @@ -375,6 +373,7 @@ dependencies { apply from: "./functions/leftpanel.gradle" apply from: "./functions/skin.gradle" apply from: "./functions/crashreport.gradle" + apply from: "./functions/widgets.gradle" } android.applicationVariants.all { variant -> diff --git a/app/functions/widgets.gradle b/app/functions/widgets.gradle new file mode 100644 index 0000000000..cc816fc4c2 --- /dev/null +++ b/app/functions/widgets.gradle @@ -0,0 +1,9 @@ +// 悬浮控件:独立 app 和 launcher + +project.dependencies { + if (Boolean.valueOf(RELEASE)) { + independentImplementation rootProject.ext.dependencies.mogomodulewidgets + } else { + independentImplementation project(':modules:mogo-module-widgets') + } +} \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 14ef1e191f..254c30320d 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -23,7 +23,6 @@ import com.mogo.module.service.ServiceConst; import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.utils.ObuConfig; -import com.mogo.module.widgets.MogoWidgetsProvider; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.passport.IMogoTicketCallback; @@ -76,7 +75,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); } else { - MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) ); + MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) ); } if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 0a05343782..1b7e1ebc8b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -273,6 +273,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void onTouch( MotionEvent motionEvent ) { MogoMapListenerHandler.getInstance().onTouch( motionEvent ); + changeMyLocationType2UnFollow(); } /** @@ -456,6 +457,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, break; } mMapView.setViewOptions( options ); + changeMyLocationType2Follow(); } } @@ -527,6 +529,12 @@ public class AMapNaviViewWrapper implements IMogoMapView, style = new MyLocationStyle(); } style.showMyLocation( visible ); + if ( mCurrentUIMode == EnumMapUI.CarUp_2D + || mCurrentUIMode == EnumMapUI.CarUp_3D ) { + style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + } else { + style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW ); + } if ( visible ) { // 强制刷新一遍车标 style.myLocationIcon( BitmapDescriptorFactory.fromResource( mCarCursorOption.getCarCursorRes() ) ); @@ -548,17 +556,69 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( style == null ) { style = new MyLocationStyle(); } + if ( mCurrentUIMode == EnumMapUI.CarUp_2D + || mCurrentUIMode == EnumMapUI.CarUp_3D ) { + style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + } else { + style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW ); + } style.showMyLocation( true ); style.myLocationIcon( BitmapDescriptorFactory.fromView( view ) ); mMapView.getMap().setMyLocationStyle( style ); } } + private void changeMyLocationType2UnFollow(){ + if ( mCurrentUIMode == null ) { + return; + } + if ( !checkAMapView() ) { + return; + } + MyLocationStyle style = getMyLocationStyle(); + if ( style == null ) { + style = new MyLocationStyle(); + } + switch ( mCurrentUIMode ) { + case NorthUP_2D: + style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER ); + break; + case CarUp_2D: + case CarUp_3D: + style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + break; + } + mMapView.getMap().setMyLocationStyle( style ); + } + + private void changeMyLocationType2Follow() { + if ( mCurrentUIMode == null ) { + return; + } + if ( !checkAMapView() ) { + return; + } + MyLocationStyle style = getMyLocationStyle(); + if ( style == null ) { + style = new MyLocationStyle(); + } + switch ( mCurrentUIMode ) { + case NorthUP_2D: + style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW ); + break; + case CarUp_2D: + case CarUp_3D: + style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE ); + break; + } + mMapView.getMap().setMyLocationStyle( style ); + } + public void initMyLocation() { if ( checkAMapView() ) { mMapView.getMap().setMyLocationEnabled( true ); MyLocationStyle style = getMyLocationStyle(); - style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE ); style.interval( 1000 ); style.anchor( 0.5F, 0.5F ); style.strokeColor( Color.TRANSPARENT ); @@ -576,6 +636,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } Logger.d( TAG, "锁车" ); mMapView.recoverLockMode(); + changeMyLocationType2Follow(); mIsCarLocked = true; } } diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index d335541a42..8864e74f0f 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -21,8 +21,8 @@ 50px 50px - 78px - 78px + 94px + 94px 17px 55px 55px diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 6d816aa8bd..50b4577f6e 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -55,9 +55,10 @@ android:gravity="center_horizontal" android:orientation="vertical" android:visibility="gone" + android:layout_marginLeft="@dimen/module_common_shadow_width_pos" app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg" app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg" - tools:visibility="gone"> + tools:visibility="visible"> @@ -140,7 +143,8 @@ android:textColor="#FFFFFF" android:textSize="@dimen/module_ext_navi_exit_textSize" android:textStyle="bold" - android:visibility="gone" /> + android:visibility="gone" + tools:visibility="visible" /> + android:visibility="gone" + tools:visibility="visible" /> + android:visibility="gone" + tools:visibility="visible" /> diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 592d7824ff..89e4866069 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -19,20 +19,15 @@ android:visibility="gone" tools:visibility="visible" /> - - - - - - - - + android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/> + android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> + android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> + + + 350px + 8px + 352px + 370px + 32px + 140.5px + 18px + 20px + 10px + 144px + 352px + + 320px + 319px + + 110px + 10px + 15px + 460px + 444px + 350px + 10px + 16px + 658px + 8px + 2px + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml index 59fb5b577a..34395c22d7 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -26,5 +26,6 @@ 635px 1263px 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 6f39e995db..197f976f30 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -26,4 +26,5 @@ 340px 1313px 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index adabf11063..3cf1f1ee39 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -26,5 +26,6 @@ 16px 658px 8px + 10px \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 9f6a51ce93..7a4f9479f7 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,6 +1,6 @@ - 462px + 468px 573px @@ -62,7 +62,7 @@ 3.2px 332px - 76.7px + 82px 60px 18px 44px diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml index 4c801b2ae2..1f1106b6c5 100644 --- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml @@ -87,8 +87,8 @@ 310px 350px 60px - 8px - 8px + 2px + 2px 8px 28px 16px diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml index 4c801b2ae2..1f1106b6c5 100644 --- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml @@ -87,8 +87,8 @@ 310px 350px 60px - 8px - 8px + 2px + 2px 8px 28px 16px diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml index b397604b5d..06dbe9cde9 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -87,8 +87,8 @@ 310px 350px 60px - 8px - 8px + 2px + 2px 8px 28px 16px diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index 40935255db..73fe2a4801 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -67,7 +67,7 @@ class LauncherCardRefresher { public static final long ONE_MINUTE = 60 * 1000L; public static final long ONE_DAY = 24 * 60 * ONE_MINUTE; private String mLaunchTTSText; - private long mDefaultTTSPlayInterval = 30 * ONE_MINUTE; + private long mDefaultTTSPlayInterval = 60 * ONE_MINUTE; private LauncherCardAdvertisementData.LauncherCardAdvertisement mDefaultLauncherCardConfig; private List< LauncherCardAdvertisementData.LauncherCardAdvertisement > mAdvertisements; @@ -180,6 +180,7 @@ class LauncherCardRefresher { } mHandler.sendEmptyMessageDelayed( MSG_LOAD_NET_CONFIG, delay ); startInduceStrategy(); + SharedPrefsMgr.getInstance( mContext ).putLong( KEY_LauncherCardTipLastTipTime, System.currentTimeMillis() ); } /** @@ -365,7 +366,7 @@ class LauncherCardRefresher { int counter = SharedPrefsMgr.getInstance( mContext ).getInt( KEY_LauncherCardTipCounter, 0 ); if ( counter >= 5 ) { long lastTipTime = SharedPrefsMgr.getInstance( mContext ).getLong( KEY_LauncherCardTipLastTipTime, 0L ); - if ( System.currentTimeMillis() - lastTipTime < 10 * ONE_DAY ) { + if ( System.currentTimeMillis() - lastTipTime < 1 * ONE_DAY ) { return; } else { SharedPrefsMgr.getInstance( mContext ).putInt( KEY_LauncherCardTipCounter, 0 ); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index cfe83a392e..0010dcb332 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -256,4 +256,9 @@ public class MogoServicePaths { */ @Deprecated public static final String PATH_CRASH_WARNING = "/crash/warning"; + + /** + * 悬浮小控件 + */ + public static final String PATH_WIDGETS = "/widgets/provider"; } 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 deleted file mode 100644 index 8b2bfb80a4..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_daolushigong_nor_light.png and /dev/null 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 deleted file mode 100644 index 5eaca3eb9d..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_fenglu_nor_light.png and /dev/null 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 deleted file mode 100644 index 32553d65e1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongjiancha_nor_light.png and /dev/null 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 deleted file mode 100644 index d8f377dcb1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiaotongshigu_nor_light.png and /dev/null 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 deleted file mode 100644 index 3c531ce8f9..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jiebing_nor_light.png and /dev/null 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 deleted file mode 100644 index 39a2cb05ae..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_jishui_nor_light.png and /dev/null 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 deleted file mode 100644 index 7100c16b4c..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_nongwu_nor_light.png and /dev/null 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 deleted file mode 100644 index 206317bbcc..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_qiuzhu_nor_light.png and /dev/null 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 deleted file mode 100644 index 9446f5093a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_shishlukuang_nor_light.png and /dev/null 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 deleted file mode 100644 index 5cf9fe2083..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/mogo_image_yongdu_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png deleted file mode 100755 index 6756d3e6a8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png and /dev/null 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 deleted file mode 100644 index 8b2bfb80a4..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png deleted file mode 100755 index 8a3b38601e..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png and /dev/null 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 deleted file mode 100644 index 5eaca3eb9d..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png deleted file mode 100755 index d7207113b6..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png and /dev/null 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 deleted file mode 100644 index 32553d65e1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png deleted file mode 100755 index b3092ae360..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.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 deleted file mode 100644 index d8f377dcb1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png and /dev/null 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 deleted file mode 100644 index 3c531ce8f9..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png deleted file mode 100755 index b4fb7eda7d..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png and /dev/null 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 deleted file mode 100644 index 39a2cb05ae..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png deleted file mode 100644 index c93bd218fb..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png and /dev/null 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 deleted file mode 100644 index 7100c16b4c..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png deleted file mode 100755 index 1c51c47115..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png and /dev/null 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 deleted file mode 100644 index 206317bbcc..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png deleted file mode 100755 index 377f3ee1ca..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.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 deleted file mode 100755 index dcf7a4fc97..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png and /dev/null 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 deleted file mode 100644 index 9446f5093a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.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 deleted file mode 100644 index 5cf9fe2083..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png deleted file mode 100755 index 1bcc7852d1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png and /dev/null differ 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.png deleted file mode 100644 index afb24a513b..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png deleted file mode 100755 index e1354bab9c..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png and /dev/null 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 deleted file mode 100644 index 8eeff5ac88..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index 0a9bd75fb4..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png deleted file mode 100755 index 9bf06bf948..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png and /dev/null 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 deleted file mode 100644 index 1c2c707b03..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index 9ec480e6ad..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png deleted file mode 100755 index 263a63a1c1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png and /dev/null 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 deleted file mode 100644 index 00416fda47..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index e466283c43..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png deleted file mode 100755 index 9a2ca23726..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.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 deleted file mode 100644 index a961e64dfe..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png and /dev/null 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 deleted file mode 100644 index 43b0775cd0..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index aad0a13730..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png deleted file mode 100755 index cddfe149f1..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png and /dev/null 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 deleted file mode 100644 index 188c642d4a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index aeaf6b9b67..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png deleted file mode 100644 index c93bd218fb..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png and /dev/null 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 deleted file mode 100644 index d150bb2635..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index 412c1eafa5..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png deleted file mode 100755 index 963694c6af..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png and /dev/null 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 deleted file mode 100644 index 3ebf17ac60..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png and /dev/null differ 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.png deleted file mode 100644 index 9b9628fc4b..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png deleted file mode 100755 index ea26ce1853..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png and /dev/null differ 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 ae021bc829..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 deleted file mode 100755 index f6d348cc83..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png and /dev/null 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 deleted file mode 100644 index 6fce6b32bf..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.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 deleted file mode 100644 index cc9313655c..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png and /dev/null 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.png deleted file mode 100644 index 6f6083dc10..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png deleted file mode 100755 index cc0e15621e..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png and /dev/null differ