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

Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
This commit is contained in:
liujing
2021-09-15 18:09:27 +08:00
parent a246aa956b 1d00537cbd
commit a4631f7880
1270 changed files with 23741 additions and 379701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
View File

@@ -11,9 +11,14 @@ import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
<<<<<<< HEAD
import com.mogo.service.check.ICheckProvider;
import com.mogo.service.connection.IMogoSocketManager;
import com.mogo.service.connection.IMogoWebSocketManager;
=======
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
>>>>>>> dev/dev_eagle_architecture_upgrade
import com.mogo.service.datamanager.IMogoDataManager;
import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -25,9 +30,10 @@ import com.mogo.service.impl.intent.IntentManager;
import com.mogo.service.impl.singleton.SingletonsHolder;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.launcher.IMogoLauncher;
import com.mogo.service.locationinfo.IMogoLocationInfoService;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.map.IMogoMapFrameController;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.obu.IMoGoObuProvider;
import com.mogo.service.smp.IMogoSmallMapProvider;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoAddressManager;
@@ -38,7 +44,7 @@ import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoCrashWarnProvider;
import com.mogo.service.passport.IMogoPassportManager;
import com.mogo.service.cloud.passport.IMogoPassportManager;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.share.IMogoTrafficUploadProvider;
import com.mogo.service.statusmanager.IMogoMsgCenter;
@@ -49,6 +55,7 @@ import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.IMogoTanluUiProvider;
import com.mogo.service.v2x.DisplayEffectsInterface;
import com.mogo.service.v2x.IV2XProvider;
import com.mogo.service.warning.IMoGoWaringProvider;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.mogo.skin.support.IMogoSkinSupportInstaller;
@@ -170,11 +177,6 @@ public class MogoServiceApis implements IMogoServiceApis {
return getApiInstance(IMogoRefreshStrategyController.class, MogoServicePaths.PATH_REFRESH_STRATEGY_API);
}
@Override
public IMogoAddressManager getAddressManagerApi() {
return getApiInstance(IMogoAddressManager.class, MogoServicePaths.PATH_ADDRESS_MANAGER);
}
@Override
public IMogoLauncher getLauncherApi() {
return getApiInstance(IMogoLauncher.class, MogoServicePaths.PATH_LAUNCHER_API);
@@ -275,6 +277,16 @@ public class MogoServiceApis implements IMogoServiceApis {
return getApiInstance(IV2XProvider.class, MogoServicePaths.PATH_V2X_FRONT_CRASH_WARNING);
}
@Override
public IMoGoWaringProvider getWaringProviderApi() {
return getApiInstance(IMoGoWaringProvider.class, MogoServicePaths.PATH_V2X_WARNING);
}
@Override
public IMoGoObuProvider getMoGoObuProviderApi() {
return getApiInstance(IMoGoObuProvider.class, MogoServicePaths.PATH_V2X_OBU_MOGO);
}
@Override
public IMogoTrafficUploadProvider getTrafficUploadApi() {
return getApiInstance(IMogoTrafficUploadProvider.class, MogoServicePaths.PATH_TRAFFIC_UPLOAD);

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

@@ -111,7 +111,7 @@ public class MogoADASController implements IMogoADASController {
private IMogoAdasCarDataCallback mMogoAdasCarDataCallback;
private IMogoAdasOCHCallback mAdasOCHCallback;
private List<AdasAIDLOwnerCarRectModel> mLastFrameDatums;
private double mLastLon;
private double mLastLat;
@@ -135,6 +135,8 @@ public class MogoADASController implements IMogoADASController {
return satelliteTime;
}
private final List<IMogoAdasOCHCallback> mAdasOCHCallback = new CopyOnWriteArrayList<>();
/**
* 接收 adas 识别数据线程
*/
@@ -162,14 +164,14 @@ public class MogoADASController implements IMogoADASController {
ADASCarStateInfo stateInfo = GsonUtil.objectFromJson(((String) msg.obj), ADASCarStateInfo.class);
if (stateInfo == null || stateInfo.getValues() == null) {
Logger.d(TAG, "ADAS-LOC-timer", "upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null");
// Logger.d(TAG, "ADAS-LOC-timer", "upd 到 aidl 传输数据 stateInfo or stateInfo.getValues() is null");
return;
}
if (stateInfo.getValues().getStartReceiverDataTime() != null) {
Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时：%s", start - Long.valueOf(stateInfo.getValues().getStartReceiverDataTime()));
} else {
Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时时间字段 startReceiverDataTime is null");
}
// if (stateInfo.getValues().getStartReceiverDataTime() != null) {
// Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时：%s", start - Long.valueOf(stateInfo.getValues().getStartReceiverDataTime()));
// } else {
// Logger.d("ADAS-LOC-timer", "upd 到 aidl 传输耗时时间字段 startReceiverDataTime is null");
// }
mLastLon = stateInfo.getValues().getLon();
mLastLat = stateInfo.getValues().getLat();
@@ -178,7 +180,7 @@ public class MogoADASController implements IMogoADASController {
if (mMogoAdasCarDataCallback != null) {
mMogoAdasCarDataCallback.onAdasCarDataCallback(stateInfo);
}
Logger.i("ADAS-LOC-timer", "cost " + (System.currentTimeMillis() - start) + "ms");
// Logger.i("ADAS-LOC-timer", "cost " + (System.currentTimeMillis() - start) + "ms");
}
};
@@ -233,9 +235,9 @@ public class MogoADASController implements IMogoADASController {
}
}
// TODO 以前这里是考虑ADAS独立应用，现在集成ADAS-SDK到程序内了，这个判断不需要了
// if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
// return;
// }
// if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) {
// return;
// }
Logger.d(TAG, Log.getStackTraceString(new Throwable()));
init(AbsMogoApplication.getApp());
adasProvider.addAdasStatusListener(new IAdasStatusListener() {
@@ -360,14 +362,18 @@ public class MogoADASController implements IMogoADASController {
public void autopilotArrive(AdasAIDLAutopilotArriveModel autopilotArriveModel) {
Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel);
if (autopilotArriveModel == null) {
Logger.d(TAG,"autopilotArrive autopilotArriveModel is null");
return;
}
if (mAdasOCHCallback != null) {
mAdasOCHCallback.onArriveAt(new AdasOCHData(
autopilotArriveModel.getCarType(),
autopilotArriveModel.getLon(),
autopilotArriveModel.getLat())
);
Logger.d(TAG,"autopilotArrive : " + autopilotArriveModel.toString());
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(
autopilotArriveModel.getCarType(),
autopilotArriveModel.getLon(),
autopilotArriveModel.getLat())
);
}
}
}
@@ -400,8 +406,10 @@ public class MogoADASController implements IMogoADASController {
public void notifyAutopilotState(AutopilotStatus autopilotStatus) {
Logger.d(TAG, "notifyAutopilotState: " + autopilotStatus);
DebugConfig.setAutoPilotStatus(autopilotStatus.getValues().getState() + "");
if (mAdasOCHCallback != null) {
mAdasOCHCallback.onStateChanged(autopilotStatus.getValues().getState(), autopilotStatus.getValues().getReason());
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onStateChanged(autopilotStatus.getValues().getState(), autopilotStatus.getValues().getReason());
}
}
}
};
@@ -575,7 +583,7 @@ public class MogoADASController implements IMogoADASController {
requestCarModelList(params).
subscribeOn(Schedulers.io()).
observeOn(Schedulers.io()).
subscribe(new SubscribeImpl<CarModelListResponse>(RequestOptions.create(context)) {
subscribe(new SubscribeImplTemporary<CarModelListResponse>(RequestOptions.create(context)) {
@Override
public void onSuccess(CarModelListResponse o) {
super.onSuccess(o);
@@ -610,7 +618,7 @@ public class MogoADASController implements IMogoADASController {
adasProvider.removeAdasStatusListener();
//AutopilotServiceManage.getInstance().release();
//关闭定时任务
// if (mDisposable != null) mDisposable.dispose();
// if (mDisposable != null) mDisposable.dispose();
}
@Override
@@ -691,28 +699,33 @@ public class MogoADASController implements IMogoADASController {
}
@Override
public void setAdasCarDataCallback(IMogoAdasCarDataCallback carDataCallback) {
public void setAdasCarDataCallback( IMogoAdasCarDataCallback carDataCallback ) {
mMogoAdasCarDataCallback = carDataCallback;
}
@Override
public void addAdasOCHCallback(IMogoAdasOCHCallback callback) {
mAdasOCHCallback = callback;
if (mAdasOCHCallback.contains(callback)) {
return;
}
mAdasOCHCallback.add(callback);
}
@Override
public void removeAdasOCHCallback() {
mAdasOCHCallback = null;
mAdasOCHCallback.clear();
}
@Override
public void onAutopilotArriveLike(int carType) {
if (mAdasOCHCallback != null) {
mAdasOCHCallback.onArriveAt(new AdasOCHData(
carType,
116.09888888,
39.999999)
);
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(
carType,
116.09888888,
39.999999)
);
}
}
}
@@ -735,13 +748,17 @@ public class MogoADASController implements IMogoADASController {
@Override
public void mockOchStatus(int state, String reason) {
if (state == -1) {
if (mAdasOCHCallback != null) {
mAdasOCHCallback.onArriveAt(new AdasOCHData(1, 1d, 1d));
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onArriveAt(new AdasOCHData(1, 1d, 1d));
}
}
} else {
mockState = state;
if (mAdasOCHCallback != null) {
mAdasOCHCallback.onStateChanged(state, reason);
if (!mAdasOCHCallback.isEmpty()) {
for (IMogoAdasOCHCallback cb : mAdasOCHCallback) {
cb.onStateChanged(state, reason);
}
}
}
}
@@ -751,17 +768,6 @@ public class MogoADASController implements IMogoADASController {
adasProvider.cancelPilot();
}
@Override
public void mockAdasLoc(String json) {
ADASCarStateInfo stateInf = GsonUtil.objectFromJson(json, ADASCarStateInfo.class);
if (stateInf == null) {
return;
}
if (mMogoAdasCarDataCallback != null) {
mMogoAdasCarDataCallback.onAdasCarDataCallback(stateInf);
}
}
@Override
public void mockAdasRecognized(List<ADASRecognizedResult> recognizedResults) {
if (!mMogoAdasRecognizedDataCallbacks.isEmpty()) {

83
services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java Normal file
View File

@@ -0,0 +1,83 @@
package com.mogo.service.impl.adas;
import com.mogo.service.adas.entity.CarModelListResponse;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.Util;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
/**
* Created by congtaowang on 2018/10/14. //todo 后续干掉！！！ 优化adas模块
*/
public abstract class SubscribeImplTemporary<T> implements Observer<T> {
protected final RequestOptions mRequestOptions;
private static final String TAG = "SubscribeImpl";
private boolean mAutoTipMsg = true;
public SubscribeImplTemporary(RequestOptions requestOptions) {
mRequestOptions = requestOptions;
}
public SubscribeImplTemporary(RequestOptions requestOptions, boolean autoTipMsg) {
this(requestOptions);
mAutoTipMsg = autoTipMsg;
}
private void onFinish() {
if (!Util.checkAlive(mRequestOptions.getCaller())) {
}
}
@Override
public void onError(Throwable e) {
onFinish();
Logger.e(TAG, e, "occur when net request.");
}
@Override
public void onNext(T o) {
if (o != null) {
if (o instanceof CarModelListResponse) {
CarModelListResponse response = (CarModelListResponse) o;
if (response.code != 0 && response.code != 200) {
onError(response.msg, response.code);
} else {
onSuccess(o);
}
} else {
onError("", -1);
}
} else {
onError("", -1);
}
}
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onComplete() {
onFinish();
}
public void onSuccess(T o) {
}
public void onError(String message, int code) {
Logger.e(TAG, "%d - %s", code, message);
}
private static boolean isTicketUpdated = false;
private void onUpdateTicket() {
}
}

4
services/mogo-service/src/main/java/com/mogo/service/impl/locationinfo/MogoLocationInfoService.java → services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java
View File

@@ -1,11 +1,11 @@
package com.mogo.service.impl.locationinfo;
package com.mogo.service.impl.cloud.location;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.map.location.MogoLocation;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.locationinfo.IMogoLocationInfoService;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.utils.logger.Logger;
import java.lang.reflect.Method;

6
services/mogo-service/src/main/java/com/mogo/service/impl/passport/MogoPassportManager.java → services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java
View File

@@ -1,11 +1,11 @@
package com.mogo.service.impl.passport;
package com.mogo.service.impl.cloud.passport;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.passport.IMogoPassportManager;
import com.mogo.service.passport.IMogoTicketCallback;
import com.mogo.service.cloud.passport.IMogoPassportManager;
import com.mogo.service.cloud.passport.IMogoTicketCallback;
import com.mogo.utils.logger.Logger;
import java.lang.reflect.Method;

17
services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java → services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java
View File

@@ -1,14 +1,14 @@
package com.mogo.service.impl.connection;
package com.mogo.service.impl.cloud.socket;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.socket.entity.MsgBody;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.connection.IMogoLifecycleListener;
import com.mogo.service.connection.IMogoMsgAckListener;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.connection.IMogoSocketManager;
import com.mogo.service.cloud.socket.IMogoLifecycleListener;
import com.mogo.service.cloud.socket.IMogoMsgAckListener;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.utils.logger.Logger;
import java.lang.reflect.Method;
@@ -74,6 +74,13 @@ public class MogoSocketManager implements IMogoSocketManager {
}
}
@Override
public void destroy() {
if ( mDelegate != null ) {
mDelegate.destroy();
}
}
@Override
public void init( Context context ) {

6
services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoWebSocketManager.java → services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java
View File

@@ -1,10 +1,10 @@
package com.mogo.service.impl.connection;
package com.mogo.service.impl.cloud.socket;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.connection.IMogoOnWebSocketMessageListener;
import com.mogo.service.connection.IMogoWebSocketManager;
import com.mogo.service.cloud.socket.IMogoOnWebSocketMessageListener;
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
import com.mogo.utils.logger.Logger;
import java.lang.reflect.Method;