Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

2021-09-17 17:41:02 +08:00
parent 0558d54494 4556727d23
commit 3d6470e140
185 changed files with 241 additions and 270 deletions
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -13,13 +13,12 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;

-import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.map.IDestroyable;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/Utils.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/Utils.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -10,7 +10,7 @@ import android.os.Handler;
 import android.os.Message;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.dispatch.bean;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -18,7 +18,7 @@ import com.mogo.cloud.socket.entity.SocketDownDataHelper;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.navi.IMogoNaviListener;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.text.TextUtils;

 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -12,7 +12,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.service.MarkerServiceHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -8,7 +8,7 @@ import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
@@ -2,25 +2,18 @@ package com.mogo.module.service.network;

 import android.content.Context;

-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.service.ServiceConst;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.network.IMogoNetwork;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
 import com.mogo.utils.network.utils.GsonUtil;

-import java.util.List;
 import java.util.Map;

 import io.reactivex.android.schedulers.AndroidSchedulers;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java
@@ -3,25 +3,10 @@ package com.mogo.module.service.network;
 import android.content.Context;

 import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.constants.HostConst;
-import com.mogo.module.common.entity.MarkerResponse;
-import com.mogo.module.service.ServiceConst;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.network.IMogoNetwork;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.Map;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;


 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java
@@ -3,7 +3,7 @@ package com.mogo.module.service.network.bean;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.ArrayList;
 import java.util.List;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
@@ -8,7 +8,7 @@ import androidx.lifecycle.LifecycleOwner;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.map.IDestroyable;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNaviListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.MarkerResponse;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/polyline/LimberCollisionPolyline.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/polyline/LimberCollisionPolyline.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.polyline;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.service.MarkerServiceHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/refresh/RefreshObject.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/refresh/RefreshObject.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.refresh;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.service.network.RefreshCallback;

 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
@@ -2,7 +2,7 @@ package com.mogo.module.service.utils;

 import android.location.Location;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.service.cloud.location.CloudLocationInfo;

 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
@@ -2,7 +2,7 @@ package com.mogo.module.service.utils;

 import android.os.SystemClock;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.cloud.location.CloudLocationInfo;
 import com.mogo.utils.logger.Logger;