yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除PAD拉起小智语音的功能，采用自研

Browse Source 
Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-09-23 16:20:26 +08:00
committed by liujing
parent 69efc7e6f0
commit 703d2c0911
3 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
View File

@@ -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);
// }
}

9
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -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();
}
}
}
}

2
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -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) {