Merge branch 'qa_hengyang_base' into feature/feature_hengyang_base

# Conflicts:
#	.idea/runConfigurations.xml
This commit is contained in:
董宏宇
2021-07-26 11:08:53 +08:00
48 changed files with 984 additions and 607 deletions

View File

@@ -319,18 +319,6 @@ public class MogoApplication extends AbsMogoApplication {
// }
ARouter.getInstance().navigation(ITestCrashReportProvider.class);
Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
try {
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
Intent intent = new Intent();
intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad",
"com.zhidao.speech.MainActivity"));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
} catch (Exception e) {
e.printStackTrace();
}
}
@Override