diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 72fb85954d..f7e1fb318a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,6 +119,9 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + } // f系列-分体机 f80x { @@ -139,6 +142,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // e系列，采用Launcher方案 e8xx { @@ -159,6 +164,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // 同上 em4 { @@ -179,6 +186,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -199,6 +208,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -219,6 +230,30 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'false' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + } + // e系列-1+16，对标D系列1+16，采用独立app形式 + em2 { + applicationId rootProject.ext.android.independentApplicationId + dimension "product" + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] + // 是否使用高德sdk自定义导航 + buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' + // 是否支持查询导航目的地车友 + buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' + // 是否支持桌面卡片刷新 + buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'false' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' } // d系列 d8xx { @@ -239,6 +274,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // d系列 2 + 32 d80x { @@ -259,6 +296,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } // d系列 1+16 版本 d82x { @@ -274,11 +313,13 @@ android { // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' + buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' + buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + buildConfigField 'boolean', 'IS_MAP_BASED', 'false' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' } // 比亚迪 bydauto { @@ -299,6 +340,8 @@ android { buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + // 是否加载引导模块 + buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' } qa { dimension "env" @@ -353,7 +396,6 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.modulesearch - implementation rootProject.ext.dependencies.mogomoduleguide implementation rootProject.ext.dependencies.mogomoduleauth implementation rootProject.ext.dependencies.modulesplash implementation rootProject.ext.dependencies.mogoservice @@ -376,7 +418,6 @@ dependencies { implementation project(':modules:mogo-module-share') implementation project(':libraries:tanlulib') implementation project(':modules:mogo-module-monitor') - implementation project(':modules:mogo-module-guide') implementation project(':modules:mogo-module-extensions') implementation project(':modules:mogo-module-map') } @@ -392,6 +433,7 @@ dependencies { apply from: "./functions/tts.gradle" apply from: "./functions/backwidget.gradle" apply from: "./functions/mediaui.gradle" + apply from: "./functions/bizguide.gradle" // implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true // implementation group: "com.tencent.matrix", name: "matrix-android-commons", version: '0.6.6', changing: true diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle index 3472339744..c085c57a48 100644 --- a/app/functions/baseservices.gradle +++ b/app/functions/baseservices.gradle @@ -6,6 +6,7 @@ project.dependencies { d82xImplementation rootProject.ext.dependencies.mogobaseserviceapk em1Implementation rootProject.ext.dependencies.mogobaseserviceapk + em2Implementation rootProject.ext.dependencies.mogobaseserviceapk d8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk d80xImplementation rootProject.ext.dependencies.mogobaseserviceapk em4Implementation rootProject.ext.dependencies.mogobaseserviceapk @@ -19,6 +20,7 @@ project.dependencies { d82xImplementation project(':foudations:mogo-base-services-apk') em1Implementation project(':foudations:mogo-base-services-apk') + em2Implementation project(':foudations:mogo-base-services-apk') d8xxImplementation project(':foudations:mogo-base-services-apk') d80xImplementation project(':foudations:mogo-base-services-apk') em4Implementation project(':foudations:mogo-base-services-apk') diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle new file mode 100644 index 0000000000..a06377360a --- /dev/null +++ b/app/functions/bizguide.gradle @@ -0,0 +1,23 @@ +// 引导模块：部分机型暂不需要引导模块 + +project.dependencies { + if (Boolean.valueOf(RELEASE)) { + bydautoImplementation rootProject.ext.dependencies.mogomoduleguide + d8xxImplementation rootProject.ext.dependencies.mogomoduleguide + d80xImplementation rootProject.ext.dependencies.mogomoduleguide + em4Implementation rootProject.ext.dependencies.mogomoduleguide + e8xxImplementation rootProject.ext.dependencies.mogomoduleguide + f8xxImplementation rootProject.ext.dependencies.mogomoduleguide + f80xImplementation rootProject.ext.dependencies.mogomoduleguide + em3Implementation rootProject.ext.dependencies.mogomoduleguide + } else { + bydautoImplementation project(':modules:mogo-module-guide') + d8xxImplementation project(':modules:mogo-module-guide') + d80xImplementation project(':modules:mogo-module-guide') + em4Implementation project(':modules:mogo-module-guide') + e8xxImplementation project(':modules:mogo-module-guide') + f8xxImplementation project(':modules:mogo-module-guide') + f80xImplementation project(':modules:mogo-module-guide') + em3Implementation project(':modules:mogo-module-guide') + } +} \ No newline at end of file diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle index 3fc7d6bba3..d1ff2a99ea 100644 --- a/app/functions/leftpanel.gradle +++ b/app/functions/leftpanel.gradle @@ -2,10 +2,11 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { - d82xImplementation rootProject.ext.dependencies.moduleleftpanel bydautoImplementation rootProject.ext.dependencies.moduleleftpanel + d82xImplementation rootProject.ext.dependencies.moduleleftpanelnoop em1Implementation rootProject.ext.dependencies.moduleleftpanelnoop + em2Implementation rootProject.ext.dependencies.moduleleftpanelnoop d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop d80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop @@ -15,10 +16,11 @@ project.dependencies { f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop } else { - d82xImplementation project(':modules:mogo-module-left-panel') bydautoImplementation project(':modules:mogo-module-left-panel') + d82xImplementation project(':modules:mogo-module-left-panel-noop') em1Implementation project(':modules:mogo-module-left-panel-noop') + em2Implementation project(':modules:mogo-module-left-panel-noop') d8xxImplementation project(':modules:mogo-module-left-panel-noop') d80xImplementation project(':modules:mogo-module-left-panel-noop') em4Implementation project(':modules:mogo-module-left-panel-noop') diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle index e8660ab061..b74c1d170d 100644 --- a/app/functions/skin.gradle +++ b/app/functions/skin.gradle @@ -2,8 +2,10 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.skinsupportnoop - d82xImplementation rootProject.ext.dependencies.skinsupportimpl - em1Implementation rootProject.ext.dependencies.skinsupportimpl + d82xImplementation rootProject.ext.dependencies.skinsupportnoop + em1Implementation rootProject.ext.dependencies.skinsupportnoop + em2Implementation rootProject.ext.dependencies.skinsupportnoop + em3Implementation rootProject.ext.dependencies.skinsupportimpl d8xxImplementation rootProject.ext.dependencies.skinsupportimpl d80xImplementation rootProject.ext.dependencies.skinsupportimpl @@ -19,15 +21,15 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.skinsupportlight d80xImplementation rootProject.ext.dependencies.skinsupportlight em3Implementation rootProject.ext.dependencies.skinsupportlight - d82xImplementation rootProject.ext.dependencies.skinsupportlight - em1Implementation rootProject.ext.dependencies.skinsupportlight } else { bydautoImplementation project(':skin:mogo-skin-support-noop') - d82xImplementation project(':skin:mogo-skin-support-impl') - em1Implementation project(':skin:mogo-skin-support-impl') + d82xImplementation project(':skin:mogo-skin-support-noop') + em1Implementation project(':skin:mogo-skin-support-noop') + em2Implementation project(':skin:mogo-skin-support-noop') + em3Implementation project(':skin:mogo-skin-support-impl') d8xxImplementation project(':skin:mogo-skin-support-impl') d80xImplementation project(':skin:mogo-skin-support-impl') @@ -42,8 +44,6 @@ project.dependencies { e8xxImplementation project(':skin:mogo-skin-light') d8xxImplementation project(':skin:mogo-skin-light') d80xImplementation project(':skin:mogo-skin-light') - d82xImplementation project(':skin:mogo-skin-light') - em1Implementation project(':skin:mogo-skin-light') em3Implementation project(':skin:mogo-skin-light') } } \ No newline at end of file diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle index 172da172b0..796ba7d340 100644 --- a/app/functions/tts.gradle +++ b/app/functions/tts.gradle @@ -3,6 +3,7 @@ project.dependencies { bydautoImplementation rootProject.ext.dependencies.ttsdi d82xImplementation rootProject.ext.dependencies.ttszhi em1Implementation rootProject.ext.dependencies.ttszhi + em2Implementation rootProject.ext.dependencies.ttszhi em3Implementation rootProject.ext.dependencies.ttszhi d8xxImplementation rootProject.ext.dependencies.ttszhi d80xImplementation rootProject.ext.dependencies.ttszhi @@ -14,6 +15,7 @@ project.dependencies { bydautoImplementation project(':tts:tts-di') d82xImplementation project(':tts:tts-zhi') em1Implementation project(':tts:tts-zhi') + em2Implementation project(':tts:tts-zhi') em3Implementation project(':tts:tts-zhi') d8xxImplementation project(':tts:tts-zhi') d80xImplementation project(':tts:tts-zhi') diff --git a/app/regroup.gradle b/app/regroup.gradle index 84cd73d13d..35af7ed6d0 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -2,7 +2,7 @@ afterEvaluate { - def independent = ["em3", "em1", "d80x", "d82x", "bydauto"] + def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2"] def launcher = ["f80x", "em4", "e8xx"] it.getTasks().iterator().forEachRemaining { diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 7cf051ce91..6faee498cb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -34,9 +34,6 @@ import com.squareup.leakcanary.LeakCanary; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.mogo.module.left.panel.LeftPanelConst; -import static com.mogo.module.guide.GuideConstant.PATH_GUIDE_FRAGMENT; -import static com.mogo.module.guide.GuideConstant.PATH_GUIDE_MODULE_NAME; - /** * @author congtaowang * @since 2019-12-18 @@ -62,8 +59,8 @@ public class MogoApplication extends AbsMogoApplication { crashSystem.setDebug( BuildConfig.DEBUG ); Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE ); - if( DebugConfig.isMapBased() ){ - MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) ); + if( DebugConfig.isNeedLoadGuideModule() ){ + MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_GUIDE, MogoModulePaths.PATH_GUIDE ) ); } MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) ); @@ -132,6 +129,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush( BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH ); DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); + DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index e5b431ce7b..1c5d3e4307 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -308,4 +308,14 @@ public class DebugConfig { public static void setMapBased( boolean isMapBased ) { DebugConfig.isMapBased = isMapBased; } + + private static boolean isNeedLoadGuideModule = true; + + public static void setNeedLoadGuideModule( boolean isNeedLoadGuideModule ) { + DebugConfig.isNeedLoadGuideModule = isNeedLoadGuideModule; + } + + public static boolean isNeedLoadGuideModule() { + return isNeedLoadGuideModule; + } } diff --git a/modules/mogo-module-authorize/src/main/res/values/colors.xml b/modules/mogo-module-authorize/src/main/res/values/colors.xml index 5886e84810..e32111d451 100644 --- a/modules/mogo-module-authorize/src/main/res/values/colors.xml +++ b/modules/mogo-module-authorize/src/main/res/values/colors.xml @@ -3,5 +3,5 @@ #99FFFFFF #FFFFFF #FFFFFF - #7F000000 + #99000000 \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java index de44e7c25e..d204367c99 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java @@ -41,6 +41,11 @@ public class MogoModulePaths { */ public static final String PATH_MEDIA = "/media/ui"; + /** + * 引导页面 + */ + public static final String PATH_GUIDE = "/guide/showFragment"; + /** * 添加卡片模块 * diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml index 0856fc721d..3b0ff8796d 100644 --- a/modules/mogo-module-common/src/main/res/values/colors.xml +++ b/modules/mogo-module-common/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #7f000000 + #99000000 #FFFFFF #FFFFFF #FFFFFF diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml index e12e13d325..047f2a7f55 100644 --- a/modules/mogo-module-common/src/main/res/values/styles.xml +++ b/modules/mogo-module-common/src/main/res/values/styles.xml @@ -5,7 +5,7 @@ @null true @android:color/transparent - 0.4 + 0.6 true @null @android:color/transparent diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/StrokeTextView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/StrokeTextView.java new file mode 100644 index 0000000000..65e37ad663 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/StrokeTextView.java @@ -0,0 +1,101 @@ +package com.mogo.module.extensions.weather; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.text.Layout; +import android.text.TextPaint; +import android.util.AttributeSet; +import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; + +import com.mogo.skin.support.IMogoSkinCompatSupportable; +import com.mogo.skin.support.helper.MogoSkinCompatTextHelperDelegate; + +import java.lang.reflect.Field; + +/** + * 带边框的textView + * + * @author tongchenfei + */ +public class StrokeTextView extends AppCompatTextView implements IMogoSkinCompatSupportable { + + private MogoSkinCompatTextHelperDelegate textHelperDelegate; + + public StrokeTextView(Context context) { + this(context,null); + } + + public StrokeTextView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public StrokeTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + textHelperDelegate = new MogoSkinCompatTextHelperDelegate(this); + } + + @Override + public void setTextAppearance(Context context, int resId) { + super.setTextAppearance(context, resId); + textHelperDelegate.onSetTextAppearance(context, resId); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int widthMode = MeasureSpec.getMode(widthMeasureSpec); + int widthSize = getMeasuredWidth(); + if (widthMode == MeasureSpec.AT_MOST) { + widthSize += 20; + Layout mLayout = getLayout(); + if (mLayout != null) { + mLayout.increaseWidthTo(widthSize); + } + setMeasuredDimension(widthSize, getMeasuredHeight()); + } + } + + @Override + protected void onDraw(Canvas canvas) { + int oriColor = getCurrentTextColor(); + // 先画边框 + TextPaint paint = getPaint(); + setCurTextColor(Color.YELLOW); + paint.setStyle(Paint.Style.STROKE); + paint.setShadowLayer(10F, 0F, 0F, Color.YELLOW); + float b = getTextSize() / 20; + float shadowWidth = Math.max(b, 2f); + paint.setStrokeWidth(shadowWidth); + super.onDraw(canvas); + // 再画文字 + setCurTextColor(oriColor); + paint.setStyle(Paint.Style.FILL); + super.onDraw(canvas); + } + + /** + * 通过反射直接设置mCurTextColor这个变量，直接调用{@link #setTextColor(int)}会出现重复递归的问题 + * + * @param color 要设置的颜色值 + */ + private void setCurTextColor(int color) { + try { + Field mCurTextColor = TextView.class.getDeclaredField("mCurTextColor"); + mCurTextColor.setAccessible(true); + mCurTextColor.set(this,color); + mCurTextColor.setAccessible(false); + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + } + + @Override + public void applySkin() { + textHelperDelegate.applySkin(); + } +} diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml index 1536ded683..bdb44f20e0 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png new file mode 100644 index 0000000000..f2ddecbd13 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png differ 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 4446c317a0..6adf068080 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 @@ -290,5 +290,4 @@ android:layout_height="wrap_content" android:visibility="gone" app:constraint_referenced_ids="btnShowDrawableTipNoSize,btnShowDrawableTip,btnShowTextTip,btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView,btnDebugAddBottomLayerView" /> - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml index 7acc4204c5..d272fb0de0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml @@ -57,7 +57,7 @@ android:layout_height="@dimen/module_ext_operation_panel_width" android:layout_marginLeft="@dimen/module_entrance_id_button_marginLeft" android:layout_marginTop="@dimen/module_entrance_id_button_marginTop" - android:background="@drawable/module_ext_shadow_bkg" + android:background="@drawable/module_ext_drawable_shadow_bg" android:gravity="center" android:padding="0dp" android:text="取消\n求助" 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 7f398cd1a2..e61d37ba08 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 @@ -52,7 +52,7 @@ 32px 60px 32px - 30px + 28px 20px diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java index 8ae15c040c..f0fe7979e4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java @@ -6,7 +6,6 @@ import android.os.Handler; import android.os.Message; import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.debug.DebugConfig; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.uicontroller.CarCursorOption; @@ -16,7 +15,6 @@ import com.mogo.module.service.R; import com.mogo.utils.WorkThreadHandler; import java.util.ArrayList; -import java.util.List; /** @@ -34,71 +32,53 @@ public class CarIconDisplayStrategy { // F 系列才有这个帧动画 public static final int[] sFrame = { - R.drawable.module_service_ic_seek_helping_00000, - R.drawable.module_service_ic_seek_helping_00001, - R.drawable.module_service_ic_seek_helping_00002, - R.drawable.module_service_ic_seek_helping_00003, - R.drawable.module_service_ic_seek_helping_00004, - R.drawable.module_service_ic_seek_helping_00005, - R.drawable.module_service_ic_seek_helping_00006, - R.drawable.module_service_ic_seek_helping_00007, - R.drawable.module_service_ic_seek_helping_00008, - R.drawable.module_service_ic_seek_helping_00009, - R.drawable.module_service_ic_seek_helping_00010, - R.drawable.module_service_ic_seek_helping_00011, - R.drawable.module_service_ic_seek_helping_00012, - R.drawable.module_service_ic_seek_helping_00013, - R.drawable.module_service_ic_seek_helping_00014, - R.drawable.module_service_ic_seek_helping_00015, - R.drawable.module_service_ic_seek_helping_00016, - R.drawable.module_service_ic_seek_helping_00017, - R.drawable.module_service_ic_seek_helping_00018, - R.drawable.module_service_ic_seek_helping_00019, - R.drawable.module_service_ic_seek_helping_00020, - R.drawable.module_service_ic_seek_helping_00021, - R.drawable.module_service_ic_seek_helping_00022, - R.drawable.module_service_ic_seek_helping_00023, - R.drawable.module_service_ic_seek_helping_00024, - R.drawable.module_service_ic_seek_helping_00025, - R.drawable.module_service_ic_seek_helping_00026, - R.drawable.module_service_ic_seek_helping_00027, - R.drawable.module_service_ic_seek_helping_00028, - R.drawable.module_service_ic_seek_helping_00029, - R.drawable.module_service_ic_seek_helping_00030, - R.drawable.module_service_ic_seek_helping_00031, - R.drawable.module_service_ic_seek_helping_00032, - R.drawable.module_service_ic_seek_helping_00033, - R.drawable.module_service_ic_seek_helping_00034, - R.drawable.module_service_ic_seek_helping_00035, - R.drawable.module_service_ic_seek_helping_00036, - R.drawable.module_service_ic_seek_helping_00037, - R.drawable.module_service_ic_seek_helping_00038, - R.drawable.module_service_ic_seek_helping_00039, - R.drawable.module_service_ic_seek_helping_00040, - R.drawable.module_service_ic_seek_helping_00041, - R.drawable.module_service_ic_seek_helping_00042, - R.drawable.module_service_ic_seek_helping_00043, - R.drawable.module_service_ic_seek_helping_00044, - R.drawable.module_service_ic_seek_helping_00045, - R.drawable.module_service_ic_seek_helping_00046, - R.drawable.module_service_ic_seek_helping_00047, - R.drawable.module_service_ic_seek_helping_00048, - R.drawable.module_service_ic_seek_helping_00049, - R.drawable.module_service_ic_seek_helping_00050, - R.drawable.module_service_ic_seek_helping_00051, - R.drawable.module_service_ic_seek_helping_00052, - R.drawable.module_service_ic_seek_helping_00053, - R.drawable.module_service_ic_seek_helping_00054, - R.drawable.module_service_ic_seek_helping_00055, - R.drawable.module_service_ic_seek_helping_00056, - R.drawable.module_service_ic_seek_helping_00057, - R.drawable.module_service_ic_seek_helping_00058, - R.drawable.module_service_ic_seek_helping_00059, - R.drawable.module_service_ic_seek_helping_00060, - R.drawable.module_service_ic_seek_helping_00061, - R.drawable.module_service_ic_seek_helping_00062, - R.drawable.module_service_ic_seek_helping_00063, - R.drawable.module_service_ic_seek_helping_00064 + R.drawable.v_to_x_warning_circle_orange_00000, + R.drawable.v_to_x_warning_circle_orange_00001, + R.drawable.v_to_x_warning_circle_orange_00002, + R.drawable.v_to_x_warning_circle_orange_00003, + R.drawable.v_to_x_warning_circle_orange_00004, + R.drawable.v_to_x_warning_circle_orange_00005, + R.drawable.v_to_x_warning_circle_orange_00006, + R.drawable.v_to_x_warning_circle_orange_00007, + R.drawable.v_to_x_warning_circle_orange_00008, + R.drawable.v_to_x_warning_circle_orange_00009, + R.drawable.v_to_x_warning_circle_orange_00010, + R.drawable.v_to_x_warning_circle_orange_00011, + R.drawable.v_to_x_warning_circle_orange_00012, + R.drawable.v_to_x_warning_circle_orange_00013, + R.drawable.v_to_x_warning_circle_orange_00014, + R.drawable.v_to_x_warning_circle_orange_00015, + R.drawable.v_to_x_warning_circle_orange_00016, + R.drawable.v_to_x_warning_circle_orange_00017, + R.drawable.v_to_x_warning_circle_orange_00018, + R.drawable.v_to_x_warning_circle_orange_00019, + R.drawable.v_to_x_warning_circle_orange_00020, + R.drawable.v_to_x_warning_circle_orange_00023, + R.drawable.v_to_x_warning_circle_orange_00024, + R.drawable.v_to_x_warning_circle_orange_00025, + R.drawable.v_to_x_warning_circle_orange_00026, + R.drawable.v_to_x_warning_circle_orange_00027, + R.drawable.v_to_x_warning_circle_orange_00028, + R.drawable.v_to_x_warning_circle_orange_00029, + R.drawable.v_to_x_warning_circle_orange_00030, + R.drawable.v_to_x_warning_circle_orange_00031, + R.drawable.v_to_x_warning_circle_orange_00032, + R.drawable.v_to_x_warning_circle_orange_00033, + R.drawable.v_to_x_warning_circle_orange_00034, + R.drawable.v_to_x_warning_circle_orange_00035, + R.drawable.v_to_x_warning_circle_orange_00036, + R.drawable.v_to_x_warning_circle_orange_00037, + R.drawable.v_to_x_warning_circle_orange_00038, + R.drawable.v_to_x_warning_circle_orange_00039, + R.drawable.v_to_x_warning_circle_orange_00040, + R.drawable.v_to_x_warning_circle_orange_00041, + R.drawable.v_to_x_warning_circle_orange_00042, + R.drawable.v_to_x_warning_circle_orange_00043, + R.drawable.v_to_x_warning_circle_orange_00044, + R.drawable.v_to_x_warning_circle_orange_00045, + R.drawable.v_to_x_warning_circle_orange_00046, + R.drawable.v_to_x_warning_circle_orange_00047, + R.drawable.v_to_x_warning_circle_orange_00048 }; private static volatile CarIconDisplayStrategy sInstance; @@ -216,12 +196,12 @@ public class CarIconDisplayStrategy { } mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(TAG, new MogoMarkerOptions() - .icons(mBitmapFrames) - .period(1) - .zIndex(1000) - .autoManager(false) - .anchor(0.5f, 0.5f) - .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2())); + .icons(mBitmapFrames) + .period(1) + .zIndex(1000) + .autoManager(false) + .anchor(0.5f, 0.5f) + .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2())); } catch (Exception e) { e.printStackTrace(); mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker( diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00000.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00000.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00000.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00001.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00001.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00001.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00002.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00002.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00002.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00003.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00003.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00003.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00004.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00004.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00004.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00005.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00005.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00005.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00006.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00006.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00006.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00007.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00007.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00007.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00008.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00008.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00008.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00009.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00009.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00009.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00010.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00010.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00010.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png new file mode 100644 index 0000000000..8d9998567c Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png new file mode 100644 index 0000000000..beb5a59f54 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png new file mode 100644 index 0000000000..c08c5e5982 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png new file mode 100644 index 0000000000..9a23c12a36 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png new file mode 100644 index 0000000000..8356f81130 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png new file mode 100644 index 0000000000..cc1afcc0d1 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png new file mode 100644 index 0000000000..e884d184e8 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png new file mode 100644 index 0000000000..5b3f19ba10 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png new file mode 100644 index 0000000000..5bc6419dfe Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png new file mode 100644 index 0000000000..ef392fd356 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png new file mode 100644 index 0000000000..d071115f04 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png new file mode 100644 index 0000000000..2a72efc51b Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png new file mode 100644 index 0000000000..67c7798238 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png new file mode 100644 index 0000000000..d5829c621c Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png new file mode 100644 index 0000000000..f8617cf9ca Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png new file mode 100644 index 0000000000..d0ce57e557 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png new file mode 100644 index 0000000000..78264c7ac8 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png new file mode 100644 index 0000000000..d730bd66fa Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png new file mode 100644 index 0000000000..8501a0436e Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png new file mode 100644 index 0000000000..5546e8c689 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png new file mode 100644 index 0000000000..430bbfa6df Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png new file mode 100644 index 0000000000..73acf7d907 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png new file mode 100644 index 0000000000..0f28b9bfb7 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png new file mode 100644 index 0000000000..9b2f25f6e2 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png new file mode 100644 index 0000000000..f652bdb6ae Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png new file mode 100644 index 0000000000..8dc68ecf6d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png new file mode 100644 index 0000000000..4446b13c19 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png new file mode 100644 index 0000000000..f85ee6194f Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png new file mode 100644 index 0000000000..47ce61dfa3 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png new file mode 100644 index 0000000000..9f4f9745c0 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png new file mode 100644 index 0000000000..624af113ad Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png new file mode 100644 index 0000000000..224a21e14c Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png new file mode 100644 index 0000000000..201975ff46 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png new file mode 100644 index 0000000000..8423e68d87 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png new file mode 100644 index 0000000000..973f2a7c95 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png differ diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index 3978ff4297..0da5f3fd8e 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -80,7 +80,7 @@ android:textStyle="bold" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" - android:layout_marginEnd="@dimen/dp_46" + android:layout_marginEnd="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00014.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00014.png new file mode 100644 index 0000000000..beb5a59f54 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00014.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00016.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00016.png new file mode 100644 index 0000000000..9a23c12a36 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00016.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00021.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00021.png new file mode 100644 index 0000000000..5bc6419dfe Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00021.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00022.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00022.png new file mode 100644 index 0000000000..ef392fd356 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00022.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00024.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00024.png new file mode 100644 index 0000000000..2a72efc51b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00024.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00025.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00025.png new file mode 100644 index 0000000000..67c7798238 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00025.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00026.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00026.png new file mode 100644 index 0000000000..d5829c621c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00026.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00027.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00027.png new file mode 100644 index 0000000000..f8617cf9ca Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00027.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00028.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00028.png new file mode 100644 index 0000000000..d0ce57e557 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00028.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00029.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00029.png new file mode 100644 index 0000000000..78264c7ac8 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00029.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00030.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00030.png new file mode 100644 index 0000000000..d730bd66fa Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00030.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00031.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00031.png new file mode 100644 index 0000000000..8501a0436e Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00031.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00032.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00032.png new file mode 100644 index 0000000000..5546e8c689 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00032.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00033.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00033.png new file mode 100644 index 0000000000..430bbfa6df Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00033.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00034.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00034.png new file mode 100644 index 0000000000..73acf7d907 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00034.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00035.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00035.png new file mode 100644 index 0000000000..0f28b9bfb7 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00035.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00036.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00036.png new file mode 100644 index 0000000000..9b2f25f6e2 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00036.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00037.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00037.png new file mode 100644 index 0000000000..f652bdb6ae Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00037.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00038.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00038.png new file mode 100644 index 0000000000..8dc68ecf6d Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00038.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00039.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00039.png new file mode 100644 index 0000000000..4446b13c19 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00039.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00040.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00040.png new file mode 100644 index 0000000000..f85ee6194f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00040.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00041.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00041.png new file mode 100644 index 0000000000..47ce61dfa3 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00041.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00042.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00042.png new file mode 100644 index 0000000000..9f4f9745c0 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00042.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00043.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00043.png new file mode 100644 index 0000000000..624af113ad Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00043.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00044.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00044.png new file mode 100644 index 0000000000..224a21e14c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00044.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00045.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00045.png new file mode 100644 index 0000000000..201975ff46 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00045.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00046.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00046.png new file mode 100644 index 0000000000..8423e68d87 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00046.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00047.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00047.png new file mode 100644 index 0000000000..973f2a7c95 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00047.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00048.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00048.png new file mode 100644 index 0000000000..631cb79062 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00048.png differ diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 141b24d974..cecfbc5973 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -7,8 +7,11 @@ import android.content.Intent; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.context.ContextHolderUtil; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.MogoModule; +import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.map.MyLocationUtil; import com.mogo.module.common.utils.CarSeries; import com.mogo.service.MogoServicePaths; @@ -60,7 +63,7 @@ public class MogoADASController implements IMogoADASController { private List adasDataCallbackList = new ArrayList<>(); - private boolean mIsReleased = true; + private IAutopolitDataCallBack mAutopolitDataCallBack; @Override public void openADAS() { @@ -80,8 +83,11 @@ public class MogoADASController implements IMogoADASController { @Override public void showADAS() { - if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) { - return; + + if( DebugConfig.isNeedLoadGuideModule() ){ + if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) { + return; + } } init( AbsMogoApplication.getApp() ); AutopilotServiceManage.getInstance().registerAutopilotServiceStatusListener( new IAutopilotServiceStatusListener() { @@ -96,54 +102,58 @@ public class MogoADASController implements IMogoADASController { } } ); invokeShowADASOperation(); - AutopilotServiceManage.getInstance().registerAutopilotDataListener(new IAutopolitDataCallBack() { - @Override - public void sendMsg(String msg) { - Logger.d(TAG, "收到adas数据回调: " + msg); - for (IMogoAdasDataCallback callback : adasDataCallbackList) { - try { - callback.onAdasDataCallback(msg); - } catch ( Exception e ) { - Logger.e( TAG, e, "sendMsg" ); + + if ( mAutopolitDataCallBack == null ) { + mAutopolitDataCallBack = new IAutopolitDataCallBack() { + @Override + public void sendMsg( String msg ) { + Logger.d( TAG, "收到adas数据回调: " + msg ); + for ( IMogoAdasDataCallback callback : adasDataCallbackList ) { + try { + callback.onAdasDataCallback( msg ); + } catch ( Exception e ) { + Logger.e( TAG, e, "sendMsg" ); + } } } - } - @Override - public void cameraEyeDetectResult(String detectResult) { + @Override + public void cameraEyeDetectResult( String detectResult ) { - } - - @Override - public void selectCarModelUrl(String carStyleUrl) { - Logger.d(TAG,"selectCarModelUrl: "+carStyleUrl); - needEmphasizeMyLocation = true; - // 修改自车图标展示 - SharedPrefsMgr.getInstance(context).putString("MY_LOCATION_CONFIG", carStyleUrl); - MyLocationUtil.setMyLocationIconUrl(context, carStyleUrl); - } - - @Override - public void requestGetCarModelListInfo() { - Logger.d(TAG, "requestGetCarModelListInfo"); - // 向adas发送车模list - AutopilotServiceManage.getInstance().settingCarModelListInfo(SharedPrefsMgr.getInstance(context).getString( - "CAR_MODEL_LIST", "default-value")); - } - - @Override - public void clickSettingBack() { - if (needEmphasizeMyLocation) { - MyLocationUtil.emphasizeMyLocation(); } - needEmphasizeMyLocation = false; - } - @Override - public void showToast(String msg) { - UiThreadHandler.post(() -> TipToast.tip(msg)); - } - }); + @Override + public void selectCarModelUrl( String carStyleUrl ) { + Logger.d( TAG, "selectCarModelUrl: " + carStyleUrl ); + needEmphasizeMyLocation = true; + // 修改自车图标展示 + SharedPrefsMgr.getInstance( context ).putString( "MY_LOCATION_CONFIG", carStyleUrl ); + MyLocationUtil.setMyLocationIconUrl( context, carStyleUrl ); + } + + @Override + public void requestGetCarModelListInfo() { + Logger.d( TAG, "requestGetCarModelListInfo" ); + // 向adas发送车模list + AutopilotServiceManage.getInstance().settingCarModelListInfo( SharedPrefsMgr.getInstance( context ).getString( + "CAR_MODEL_LIST", "default-value" ) ); + } + + @Override + public void clickSettingBack() { + if ( needEmphasizeMyLocation ) { + MyLocationUtil.emphasizeMyLocation(); + } + needEmphasizeMyLocation = false; + } + + @Override + public void showToast( String msg ) { + UiThreadHandler.post( () -> TipToast.tip( msg ) ); + } + }; + AutopilotServiceManage.getInstance().registerAutopilotDataListener( mAutopolitDataCallBack ); + } } private void invokeShowADASOperation() { @@ -212,7 +222,6 @@ public class MogoADASController implements IMogoADASController { public void init( Context context ) { AutopilotServiceManage.getInstance().init( context ); this.context = context; - mIsReleased = false; } @Override @@ -227,7 +236,7 @@ public class MogoADASController implements IMogoADASController { @Override public void changeAdasControlMode( EnumMapUI ui ) { - if ( ui == null ) { + if ( ui == null || !DebugConfig.isMapBased() ) { return; } @@ -260,6 +269,9 @@ public class MogoADASController implements IMogoADASController { @Override public EnumMapUI getCurrentSkinMode() { + if ( !DebugConfig.isMapBased() ) { + return EnumMapUI.Type_Night; + } boolean white = AdasConfigApiController.getInstance().isShowUISkinWhiteModel(); if ( !white ) { return EnumMapUI.Type_Night; @@ -288,7 +300,6 @@ public class MogoADASController implements IMogoADASController { @Override public void release() { - mIsReleased = true; AutopilotServiceManage.getInstance().release(); } } diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml index 70e133acad..8accac9d8d 100644 --- a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png new file mode 100644 index 0000000000..f2ddecbd13 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_pressed_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png index 51a1e27744..a676aad633 100644 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png differ