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; *

* mvp 的 activity */ -public abstract class MvpActivity> - extends AppCompatActivity implements IView { +public abstract class MvpActivity> extends AppCompatActivity implements IView { protected static final String TAG = "MvpActivity"; @@ -45,15 +44,6 @@ public abstract class MvpActivity> 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> 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> 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 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) {