diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java index 9144976b43..22ddf0dfd5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java @@ -12,10 +12,12 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.wm.WindowManagerView; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; +import com.mogo.service.entrance.ButtonIndex; import com.mogo.utils.logger.Logger; /** @@ -77,18 +79,26 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL void onClickRight(); } - boolean isShown; - WindowManagerView windowManager; + private boolean isShown; + private WindowManagerView windowManager; public void show() { - Logger.d(TAG, "使用windowManager实现"); - if (!isShown) { - windowManager = new WindowManagerView.Builder(getContext()).contentView(R.layout.module_commons_layout_wm_dialog).build(); - windowManager.show(); - isShown = true; - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); - unRegisterVoiceCmd(); - registerVoiceCmd(); + try { + Logger.d(TAG, "使用windowManager实现"); + if (!isShown) { + if (windowManager == null) { + windowManager = new WindowManagerView.Builder( + V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext() + ).contentView(this).build(); + } + windowManager.show(); + isShown = true; + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); + unRegisterVoiceCmd(); + registerVoiceCmd(); + } + } catch (Exception e) { + e.printStackTrace(); } } @@ -105,18 +115,15 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL public void dismiss() { if (isShown && windowManager != null) { windowManager.dismiss(); - windowManager = null; isShown = false; } } - //放弃求助 private void handleLeft() { if (mListener != null) { mListener.onClickLeft(); } - unRegisterVoiceCmd(); } @@ -126,7 +133,6 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL mListener.onClickRight(); } unRegisterVoiceCmd(); - } private void registerVoiceCmd() { diff --git a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml index cf29b7fb6b..d82d598dd3 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_75" android:gravity="center" - android:textColor="@color/white" + android:textColor="#FFF" android:textSize="@dimen/dp_40" app:layout_constraintEnd_toEndOf="@id/ivDialogBg" app:layout_constraintStart_toStartOf="@id/ivDialogBg" @@ -35,7 +35,7 @@ android:layout_height="@dimen/dp_130" android:background="@drawable/v2x_dialog_left_bg" android:gravity="center" - android:textColor="@color/white" + android:textColor="#FFF" android:textSize="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="@id/ivDialogBg" app:layout_constraintEnd_toStartOf="@id/tvDialogRight" @@ -48,7 +48,7 @@ android:layout_height="@dimen/dp_130" android:background="@drawable/v2x_dialog_right_bg" android:gravity="center" - android:textColor="@color/white" + android:textColor="#FFF" android:textSize="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="@id/ivDialogBg" app:layout_constraintEnd_toEndOf="@id/ivDialogBg"