From 703d2c0911a1bdbe56aaa450c17a66f4fc0ba6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 23 Sep 2021 16:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4PAD=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E5=B0=8F=E6=99=BA=E8=AF=AD=E9=9F=B3=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=87=87=E7=94=A8=E8=87=AA=E7=A0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .../com/mogo/commons/mvp/MvpActivity.java     | 48 +------------------
 .../com/mogo/module/main/MainActivity.java    |  9 +---
 .../service/impl/adas/MogoADASController.java |  2 +-
 3 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index a1b0312719..118d0ed3f3 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -26,8 +26,7 @@ import com.mogo.utils.logger.Logger;
  * <p>
  * mvp 的 activity
  */
-public abstract class MvpActivity<V extends IView, P extends Presenter<V>>
-        extends AppCompatActivity implements IView {
+public abstract class MvpActivity<V extends IView, P extends Presenter<V>> extends AppCompatActivity implements IView {
 
     protected static final String TAG = "MvpActivity";
 
@@ -45,15 +44,6 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>>
         initViews();
         mPresenter = createPresenter();
         getLifecycle().addObserver(mPresenter);
-        //申请悬浮窗权限
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // 检查是否有悬浮窗权限
-            if (Settings.canDrawOverlays(this)) {
-                startVoicePad();
-            }
-        } else {
-            startVoicePad();
-        }
     }
 
     @Override
@@ -62,41 +52,13 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>>
         hideBottomUIMenu();
     }
 
-    /**
-     * 在Pad上拉起语音
-     */
-    public void startVoicePad() {
-        try {
-            getWindow().getDecorView().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-                            Logger.d(TAG, "启动小智语音");
-                            Intent intent = new Intent();
-                            intent.setComponent(new ComponentName("com.zhidao.speech",
-                                    "com.zhidao.speech.MainActivity"));
-                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            startActivity(intent);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }, 3000);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
     //隐藏导航栏
     protected void hideBottomUIMenu() {
         //隐藏虚拟按键
         if (Build.VERSION.SDK_INT >= 19) {
             //for new api versions.
             View decorView = getWindow().getDecorView();
-            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
             decorView.setSystemUiVisibility(uiOptions);
         }
     }
@@ -158,10 +120,4 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>>
         mPresenter = null;
     }
 
-//    @NonNull
-//    @Override
-//    public AppCompatDelegate getDelegate() {
-//        return MogoSkinManager.getInstance().getInstaller().getSkinAppCompatDelegate(this,
-//                super.getDelegate(), this);
-//    }
 }
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 721a2ba77d..7c694e9073 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -468,14 +468,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         Logger.d(TAG, "requestCode: " + requestCode + " resultCode: " + resultCode);
         if (requestCode == REQUEST_CODE_DIALOG) {
             //申请悬浮窗权限
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                // 检查是否有悬浮窗权限
-                if (Settings.canDrawOverlays(this)) {
-                    startVoicePad();
-                }
-            } else {
-                startVoicePad();
-            }
+
         }
     }
 }
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 7721ef5944..70ec2efc43 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
@@ -394,7 +394,7 @@ public class MogoADASController implements IMogoADASController {
 
                 @Override
                 public void notifyAutopilotState(AutopilotStatus autopilotStatus) {
-                    Logger.d(TAG, "notifyAutopilotState: " + autopilotStatus);
+                    Logger.d(TAG, "notifyAutopilotState: " + GsonUtil.jsonFromObject(autopilotStatus));
                     DebugConfig.setAutoPilotStatus(autopilotStatus.getValues().getState() + "");
                     if (!mAdasOCHCallback.isEmpty()) {
                         for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {