diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java index 27dcfff469..115ee5b844 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java @@ -3,7 +3,10 @@ package com.mogo.module.apps.applaunch; import android.app.Activity; import android.content.Context; +import com.mogo.commons.voice.AIAssist; +import com.mogo.map.impl.amap.navi.NaviClient; import com.mogo.module.apps.AppServiceHandler; +import com.mogo.module.apps.R; import com.mogo.module.apps.model.AppInfo; import com.mogo.utils.logger.Logger; @@ -17,14 +20,23 @@ public class GuideShowLauncher extends BaseAppLauncher { @Override public void launch(Context context, AppInfo appInfo) { if (appInfo != null && APP_INFO_NAME_GUIDE_SHOW.equals(appInfo.getName())) { - AppServiceHandler.getMogoGuideShow().playGuideVideo((Activity) context,(s) -> { - Logger.d(TAG, s); - return Unit.INSTANCE; - }); - }else{ - if ( getNext() != null ) { - getNext().launch( context, appInfo ); + if (!NaviClient.getInstance(context).isNaviing()) { + AppServiceHandler.getMogoGuideShow().playGuideVideo((Activity) context, (s) -> { + Logger.d(TAG, s); + return Unit.INSTANCE; + }); + } else { + AIAssist.getInstance(context).speakTTSVoice(context.getString(R.string.module_apps_str_guide_warning)); + processChain(context,appInfo); } + } else { + processChain(context, appInfo); + } + } + + private void processChain(Context context, AppInfo appInfo) { + if (getNext() != null) { + getNext().launch(context, appInfo); } } diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index da20e97ccb..2404f9eefe 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ mogo-module-apps APP 未安装 新手引导服务未加载 + 提示为了您的安全,导航中不可播放视频 com.mogo.launcher diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml index 9ef60818a8..d9b7c29f63 100644 --- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml +++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml @@ -166,6 +166,7 @@ android:id="@+id/tvAuthorizeContent" android:layout_width="match_parent" android:layout_height="match_parent" + android:lineSpacingExtra="@dimen/dp_15" android:textColor="@android:color/white" android:textSize="@dimen/dp_44" /> @@ -173,13 +174,18 @@ android:id="@+id/tvAuthorizeButtonContent" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/white" /> + android:layout_gravity="center_horizontal" + android:textColor="@android:color/white" + android:textSize="@dimen/dp_44" /> + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/dp_15" + android:textColor="@android:color/white" + android:textSize="@dimen/dp_44" /> @@ -191,6 +197,7 @@ android:layout_marginTop="@dimen/dp_62" android:textColor="@android:color/white" android:textSize="@dimen/dp_55" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />