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

Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	gradle.properties
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
This commit is contained in:
donghongyu
2021-12-31 15:25:55 +08:00
parent 9bb0e94a78 d46a7c5c17
commit 1b8c47c617
30 changed files with 339 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
View File

@@ -1,7 +1,6 @@
package com.mogo.eagle.core.function.main;
import android.content.Context;
import android.content.Intent;
import android.os.Process;
import android.util.Log;
@@ -11,6 +10,7 @@ import com.mogo.cloud.httpdns.bean.HttpDnsSimpleLocation;
import com.mogo.cloud.passport.IMoGoTokenCallback;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.SocketBuildConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.commons.debug.DebugConfig;
@@ -30,7 +30,6 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.main.service.MogoMainService;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.share.constant.ShareConstants;
import com.mogo.service.IMogoServiceApis;
@@ -41,6 +40,8 @@ import com.zhidao.boot.persistent.lib.PersistentManager;
import com.zhidao.support.obu.ami.AmiClientManager;
import com.zhjt.service.chain.core.ChainTraceStarter;
import java.lang.reflect.Field;
/**
* 默认初始化一些基础服务配置
*/
@@ -87,7 +88,18 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
/**
* 初始化日志
*/
protected abstract void initLogConfig();
protected void initLogConfig() {
// 为了不引入maven的情况下修改日志控制字段值，采用反射
try {
Class clazz = Class.forName("com.mogo.cloud.location.LocationConfig");
Field nameField = clazz.getField("isPrintLog");
nameField.setBoolean(null, false);
} catch (Exception e) {
e.printStackTrace();
}
SocketBuildConfig.isPrintLog = false;
}
/**
* 初始化 MoGoAiCloudClientConfig
@@ -249,22 +261,26 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
}
private void startSocketService() {
Logger.d(TAG,"startSocketService");
IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
// 关闭长链服务
apis.getSocketManagerApi(getApplicationContext()).destroy();
apis.getSocketManagerApi(this).registerLifecycleListener(10020, new IMogoLifecycleListener() {
@Override
public void onConnectFailure() {
Logger.d(TAG,"socket-onConnectFailure");
DebugConfig.setDownloadSnapshot(false);
}
@Override
public void onConnectSuccess() {
Logger.d(TAG,"socket-onConnectSuccess");
DebugConfig.setDownloadSnapshot(true);
}
@Override
public void onConnectLost() {
Logger.d(TAG,"socket-onConnectLost");
DebugConfig.setDownloadSnapshot(false);
}
});
@@ -326,8 +342,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
if (!DebugConfig.isLauncher()) {
PersistentManager.getInstance().initManager(this);
Intent intent = new Intent(this, MogoMainService.class);
startService(intent);
}
Log.i(TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");