From 429e232c995eced5ad9e9d63e9921b0259a5d08a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 19 Jan 2023 16:24:02 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=B0=86=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8CDNS=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=92=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E7=94=B1?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=BF=9B=E8=A1=8C=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/launcher/stageone/HttpDnsStartUp.kt | 4 ++-- .../dispatch/network/DispatchServiceModel.kt | 2 +- .../network/IDispatchAdasApiService.kt | 6 +++--- .../biz/monitoring/CronTaskManager.kt | 8 ++++---- .../biz/monitoring/net/ICameraListServices.kt | 8 ++++---- .../biz/notice/network/INoticeApiService.java | 4 ++-- .../notice/network/NoticeNetWorkManager.java | 3 ++- .../chat/facade/net/ChatServiceModel.kt | 17 ++++++++-------- .../badcase/consts/BadCaseHost.kt | 20 ------------------- 9 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kt diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index d25c10b26d..c5b48cecc6 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -217,7 +217,8 @@ class HttpDnsStartUp : AndroidStartup() { // 异步初始化NetConfig asyncInit() // HttpDns ttl回调 --- socketTTL - registerSocketHttpDnsTTL() +// registerSocketHttpDnsTTL() + startSocketService() // 开启每5s/次定位上报 uploadLocPerFiveSecond() gotToken = true @@ -276,7 +277,6 @@ class HttpDnsStartUp : AndroidStartup() { SceneConstant.M_MAIN + TAG, "获取缓存Dns IP : $dnsCacheIp , 原缓存 IP ： $cacheIp" ) - startSocketService() cacheIp = dnsCacheIp } } diff --git 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 index 850fad5f74..a2ffd09f4d 100644 --- 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 ) diff --git 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 index af2bb38117..4c018f2030 100644 --- 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): Observable /** @@ -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): Observable /** @@ -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): Observable } \ No newline at end of file diff --git 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 index 70263088ac..6592c9e714 100644 --- 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 { diff --git 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 index 7328b33246..e3efa5b5bc 100644 --- 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 - @POST("/yycp-launcherSnapshot/car/queryLiveCarByLocal") + @POST("eagle-eye-dns/yycp-launcherSnapshot/car/queryLiveCarByLocal") fun getCarCameraList(@Body reqBody: ReqLiveCarBean): Single @GET("/openStream/{cameraIp}") fun openCameraStream(@Path("cameraIp") cameraIp: String): Single - @GET("/camera-stream/stream/camera/openStream") + @GET("eagle-eye-dns/camera-stream/stream/camera/openStream") fun reqOpenCameraStream(@Query("ip") cameraIp: String): Single - @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 - @GET("/camera-stream/stream/camera/openStream") + @GET("eagle-eye-dns/camera-stream/stream/camera/openStream") fun reqOpenCameraStreamWithRetry(@Query("ip") cameraIp: String): Observable } \ No newline at end of file diff --git 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 index 1a564de54a..3a9b27eb3f 100644 --- 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 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 sendAcceptStatus(@QueryMap Map accidentParameters); /** diff --git 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 index 55f30615e8..7234f941ad 100644 --- 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); } diff --git 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 index f01562296b..f40d1d26c3 100644 --- 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 @@ -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): BaseResponse //车队状态同步 @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): BaseResponse //查询用户是否在线 @FormUrlEncoded - @POST("/yycp-chat-service/car/queryOnLineBySn/v1") + @POST("eagle-eye-dns/yycp-chat-service/car/queryOnLineBySn/v1") suspend fun isOnLine(@FieldMap onLine: Map): BaseResponse - @POST("/yycp-realtimeLocations/realTimeLocationServer/queryRsAncCarAndUserInfoBySns") + @POST("eagle-eye-dns/yycp-realtimeLocations/realTimeLocationServer/queryRsAncCarAndUserInfoBySns") suspend fun queryUserInfoBySnS(@Body body: SnArrayRequestBody): BaseResponse //语音房间信息，原路径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): BaseResponse } \ No newline at end of file diff --git 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 deleted file mode 100644 index 241b3d941e..0000000000 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseHost.kt +++ /dev/null @@ -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 - } - } - -} \ No newline at end of file