From 998eab6d8beb205c506f90973cc6782ff7567234 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Aug 2020 21:21:26 +0800
Subject: [PATCH] 1. merge 2. bugfix

---
 .../independent/MainIndependentActivity.java     |  2 +-
 .../src/main/res/values/strings.xml              |  2 +-
 .../launchercard/LauncherCardRefresher.java      |  6 +++---
 .../scenario/scene/seek/V2XSeekHelpDialog.java   | 16 +++++++---------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
index 3da48ac1f3..5e8642fa01 100644
--- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
+++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
@@ -57,7 +57,7 @@ public class MainIndependentActivity extends MainActivity {
     @TargetApi( Build.VERSION_CODES.N )
     private void fixInMultiWindowMode(){
         if ( isInMultiWindowMode() ) {
-            TipToast.shortTip( R.string.module_main_unsupport_multi_window_mode );
+            TipToast.shortTip( R.string.module_main_un_support_multi_window_mode );
         }
     }
 
diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
index 472f7c8136..3eade77337 100644
--- a/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
+++ b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="module_main_unsupport_multi_window_mode">应用不支持分屏</string>
+    <string name="module_main_un_support_multi_window_mode">应用不支持分屏</string>
 </resources>
\ No newline at end of file
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 90987517d1..825c071feb 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
@@ -247,9 +247,9 @@ class LauncherCardRefresher {
 
     private void notifyLauncherCard( String info, int amount, String tts ) {
         Intent intent = new Intent( "com.mogo.launcher.v2x" );
-        intent.putExtra( "v2x_warning_type", 20000 );
-        intent.putExtra( "v2x_warining_timeout", 20 * 1000L );
-        intent.putExtra( "v2x_warning_tts", "" );
+        intent.putExtra( "v2x_warning_type", "20000" );
+        intent.putExtra( "v2x_warining_timeout", 20 * 1000 );
+        intent.putExtra( "v2x_warning_tts", tts );
         intent.putExtra( "v2x_warning_eventCount", amount );
         intent.putExtra( "v2x_warning_info", info );
         mContext.sendBroadcast( intent );
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 f75ff027e4..e88c985170 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
@@ -79,22 +79,20 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
         void onClickRight();
     }
 
-    private boolean isShown;
     private WindowManagerView windowManager;
 
     public void show() {
         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();
             }
+            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗");
+            unRegisterVoiceCmd();
+            registerVoiceCmd();
+            windowManager.show();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -111,10 +109,10 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
     };
 
     public void dismiss() {
-        if (isShown && windowManager != null) {
+        if (windowManager != null) {
             windowManager.dismiss();
-            isShown = false;
         }
+        windowManager = null;
     }
 
     //放弃求助