[dev_arch_opt_3.0]

[Change] [ 1、更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析 ]
2023-01-19 16:24:02 +08:00
parent db4d6a1771
commit 429e232c99
9 changed files with 27 additions and 45 deletions
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt
@@ -30,7 +30,7 @@ class DispatchServiceModel private constructor() {
    }

    private var mAdasApiService: IDispatchAdasApiService =
-        MoGoRetrofitFactory.getInstance(HostConst.DATA_SERVICE_HOST).create(
+        MoGoRetrofitFactory.getInstance(HostConst.getEagleHost()).create(
            IDispatchAdasApiService::class.java
        )

--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt
@@ -14,7 +14,7 @@ interface IDispatchAdasApiService {
     * @return [BaseData]
     */
    @FormUrlEncoded
-    @POST("/dataService/autoDriver/receiveCarPreSetPath")
+    @POST("eagle-eye-dns/eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath")
    fun uploadAutopilotRoute(@FieldMap parameters: Map<String, Any>): Observable<BaseData>

    /**
@@ -24,7 +24,7 @@ interface IDispatchAdasApiService {
     * @return [BaseData]
     */
    @FormUrlEncoded
-    @POST("/dataService/autoDriver/receiverDestSiteResult")
+    @POST("eagle-eye-dns/dataService/autoDriver/receiverDestSiteResult")
    fun uploadDispatchResult(@FieldMap parameters: MutableMap<String, Any>): Observable<BaseData>

    /**
@@ -34,6 +34,6 @@ interface IDispatchAdasApiService {
     * @return [BaseData]
     */
    @FormUrlEncoded
-    @POST("/dataService/autoDriver/receiveAutopilotState")
+    @POST("eagle-eye-dns/dataService/autoDriver/receiveAutopilotState")
    fun uploadAutopilotState(@FieldMap parameters: MutableMap<String, Any>): Observable<BaseData>
 }
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
@@ -91,7 +91,7 @@ class CronTaskManager {
     */
    private fun requestDeviceList() {
        CallerMapLocationListenerManager.getCurrentLocation()?.let { location ->
-            disposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST)
+            disposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
                .create(ICameraListServices::class.java)
                .getDeviceList(location.longitude, location.latitude, 500)
                .subscribeOn(Schedulers.io())
@@ -125,7 +125,7 @@ class CronTaskManager {

    private fun requestCarCameraList() {
        CallerMapLocationListenerManager.getCurrentLocation()?.let { location ->
-            carDisposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST)
+            carDisposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
                .create(ICameraListServices::class.java)
                .getCarCameraList(ReqLiveCarBean(location.longitude, location.latitude))
                .subscribeOn(Schedulers.io())
@@ -193,7 +193,7 @@ class CronTaskManager {
        streamDisposable?.let {
            if (!it.isDisposed) it.dispose()
        }
-        streamDisposable = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST)
+        streamDisposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
            .create(ICameraListServices::class.java)
            .reqOpenCameraStream(cameraIp)
            .subscribeOn(Schedulers.io())
@@ -222,7 +222,7 @@ class CronTaskManager {
        streamDisposable2?.let {
            if (!it.isDisposed) it.dispose()
        }
-        streamDisposable2 = MoGoRetrofitFactory.getInstance(HostConst.CITY_HOST)
+        streamDisposable2 = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
            .create(ICameraListServices::class.java)
            .reqOpenCameraStreamWithRetry(cameraIp)
            .flatMap {
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt
@@ -9,21 +9,21 @@ interface ICameraListServices {
    @GET("/yycp-smartTransportationAiCloud-service/eagle/device/list")
    fun getCameraList(@Query("roadId") roadId: String?): Single<CameraListInfo?>

-    @POST("/yycp-launcherSnapshot/car/queryLiveCarByLocal")
+    @POST("eagle-eye-dns/yycp-launcherSnapshot/car/queryLiveCarByLocal")
    fun getCarCameraList(@Body reqBody: ReqLiveCarBean): Single<LiveCarCameraInfo?>

    @GET("/openStream/{cameraIp}")
    fun openCameraStream(@Path("cameraIp") cameraIp: String): Single<CameraStreamEntity>

-    @GET("/camera-stream/stream/camera/openStream")
+    @GET("eagle-eye-dns/camera-stream/stream/camera/openStream")
    fun reqOpenCameraStream(@Query("ip") cameraIp: String): Single<OpenCameraStreamEntity>

-    @GET("/mec-etl-server/crossing/geo/device")
+    @GET("eagle-eye-dns/mec-etl-server/crossing/geo/device")
    fun getDeviceList(
        @Query("lon") lon: Double, @Query("lat") lat: Double,
        @Query("radiusMeter") radiusMeter: Int
    ): Single<CameraListInfo?>

-    @GET("/camera-stream/stream/camera/openStream")
+    @GET("eagle-eye-dns/camera-stream/stream/camera/openStream")
    fun reqOpenCameraStreamWithRetry(@Query("ip") cameraIp: String): Observable<OpenCameraStreamEntity>
 }
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java
@@ -27,7 +27,7 @@ public interface INoticeApiService {
     * @return {@link NoticeTrafficStyleInfo}
     */
    @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("/deva/accidentInfoManage/queryMyAccidentHandleInfo/server/v1")
+    @POST("eagle-eye-dns/deva/accidentInfoManage/queryMyAccidentHandleInfo/server/v1")
    Observable<NoticeTrafficStyleInfo> getAccidentInfo(@Body RequestBody requestBody);

    /**
@@ -36,7 +36,7 @@ public interface INoticeApiService {
     * @param accidentParameters 请求数据(infoID事故ID;sn;status接受状态 0否 1是)
     * @return {@link BaseData}
     */
-    @GET("/deva/accidentInfoManage/policeUpdateTroubleStatus")
+    @GET("eagle-eye-dns/deva/accidentInfoManage/policeUpdateTroubleStatus")
    Observable<BaseData> sendAcceptStatus(@QueryMap Map<String, String> accidentParameters);

    /**
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java
@@ -5,6 +5,7 @@ import android.util.ArrayMap;
 import com.mogo.cloud.network.NetConstants;
 import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
+import com.mogo.commons.constants.HostConst;
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.data.notice.NoticeNormalDetail;
 import com.mogo.eagle.core.data.notice.NoticeRequest;
@@ -34,7 +35,7 @@ public class NoticeNetWorkManager {
    private final INoticeApiService mNoticeApiService;

    private NoticeNetWorkManager() {
-        mNoticeApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST)
+        mNoticeApiService = RetrofitFactory.INSTANCE.getInstance(HostConst.getEagleHost())
                .create(INoticeApiService.class);
    }

--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.chat.facade.net
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.chat.UserInfo
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts
@@ -33,7 +34,7 @@ internal class ChatServiceModel {
        val sns = arrayListOf(sn)
        val requestData = SnArrayRequestBody().also { it.sns = sns }
        return apiCall {
-            getNetWorkApi(getConfig())?.queryUserInfoBySnS(requestData)
+            getNetWorkApi()?.queryUserInfoBySnS(requestData)
                ?: throw IllegalStateException("apis is null.")
        }.let { itx ->
            if (itx.code != 0 && itx.code != 200) {
@@ -120,7 +121,7 @@ internal class ChatServiceModel {
        return call.invoke()
    }

-    private fun getNetWorkApi(baseUrl: String = ChatHttp.getBaseUrl()): HttpApi? {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): HttpApi? {
        return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl).create(HttpApi::class.java)
    }
 }
@@ -128,7 +129,7 @@ internal class ChatServiceModel {
 internal interface HttpApi {

    @FormUrlEncoded
-    @POST("/yycp-chat-service/car/voiceRoom/no/operate/v1")
+    @POST("eagle-eye-dns/yycp-chat-service/car/voiceRoom/no/operate/v1")
    suspend fun requestConnectStatus(
        @Query("sn") sn: String,
        @FieldMap connectStatus: Map<String, String>
@@ -136,24 +137,24 @@ internal interface HttpApi {

    //邀请加入车队
    @FormUrlEncoded
-    @POST("/yycp-chat-service/car/chat/no/inviteJoinTeam/v1")
+    @POST("eagle-eye-dns/yycp-chat-service/car/chat/no/inviteJoinTeam/v1")
    suspend fun inviteJoinVehicleTeam(@FieldMap inviteVehicleTeam: Map<String, String>): BaseResponse<Any>

    //车队状态同步
    @FormUrlEncoded
-    @POST("/yycp-chat-service/car/chat/no/operateTeamRoom/v1")
+    @POST("eagle-eye-dns/yycp-chat-service/car/chat/no/operateTeamRoom/v1")
    suspend fun requestVehicleTeamConnectStatus(@FieldMap connectStatus: Map<String, String>): BaseResponse<Any>

    //查询用户是否在线
    @FormUrlEncoded
-    @POST("/yycp-chat-service/car/queryOnLineBySn/v1")
+    @POST("eagle-eye-dns/yycp-chat-service/car/queryOnLineBySn/v1")
    suspend fun isOnLine(@FieldMap onLine: Map<String, String>): BaseResponse<OnLineStatus>

-    @POST("/yycp-realtimeLocations/realTimeLocationServer/queryRsAncCarAndUserInfoBySns")
+    @POST("eagle-eye-dns/yycp-realtimeLocations/realTimeLocationServer/queryRsAncCarAndUserInfoBySns")
    suspend fun queryUserInfoBySnS(@Body body: SnArrayRequestBody): BaseResponse<JsonObject>

    //语音房间信息，原路径dataService
    @FormUrlEncoded
-    @POST("/yycp-chat-service/car/sender/no/createRoom/v1")
+    @POST("eagle-eye-dns/yycp-chat-service/car/sender/no/createRoom/v1")
    suspend fun requestRoomInfo(@FieldMap roomInfo: Map<String, String>): BaseResponse<RoomInfo>
 }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kt
@@ -1,20 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.badcase.consts
-
-import com.mogo.commons.debug.DebugConfig
-
-internal object BadCaseHost {
-
-    private const val HOST_DEV = "http://dzt-test.zhidaozhixing.com/"
-    private const val HOST_RELEASE = "http://dzt.zhidaozhixing.com/"
-
-    fun getHost(): String{
-        return when (DebugConfig.getNetMode()) {
-            DebugConfig.NET_MODE_DEV -> HOST_DEV
-            DebugConfig.NET_MODE_QA -> HOST_DEV
-            DebugConfig.NET_MODE_DEMO -> HOST_RELEASE
-            DebugConfig.NET_MODE_RELEASE -> HOST_RELEASE
-            else -> HOST_RELEASE
-        }
-    }
-
-}