From fbb15bcf47d2a7cfd9ba10da29be300bd4365d21 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 30 Nov 2022 16:23:32 +0800 Subject: [PATCH] [2.13.0] change the host const loc --- .../mogo/launcher/stageone/HttpDnsStartUp.kt | 2 +- .../network/UpgradeAppNetWorkManager.java | 2 +- .../network/BindingcarNetWorkManager.java | 2 +- .../check/net/CheckApiServiceFactory.java | 2 +- .../network/UpgradeVersionNetWorkModel.kt | 6 +-- .../mogo-core-function-dispatch/build.gradle | 2 +- .../dispatch/model/DispatchServiceModel.java | 4 +- .../build.gradle | 1 + .../function/monitoring/CronTaskManager.kt | 2 +- .../com/mogo/commons/constants/HostConst.java | 37 +++++++++++++++++++ .../com/mogo/commons/constants/HostConst.kt | 36 ------------------ 11 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.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 5f10d0eb52..a6ff98ac7e 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -15,13 +15,13 @@ import com.mogo.cloud.passport.IMoGoTokenCallback import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.constants.HostConst import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.commons.debug.DebugConfig import com.mogo.commons.device.Devices import com.mogo.commons.network.NetConfigUtils import com.mogo.commons.network.Utils import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.commons.constants.HostConst import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index 5bf1b0d44c..6ee94ac086 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -33,7 +33,7 @@ public class UpgradeAppNetWorkManager { private UpgradeAppNetWorkManager() { - mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.Companion.getHost()) + mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost()) .create(UpgradeApiService.class); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index 261e5498b2..d9c1726171 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -35,7 +35,7 @@ public class BindingcarNetWorkManager { private static final String TAG = "BindingcarNetManager"; private BindingcarNetWorkManager() { - mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.Companion.getHost()) + mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost()) .create(BindingcarApiService.class); } diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java index cdd018991a..b8cf015887 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.check.net; -import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.commons.constants.HostConst; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; /** * @author liujing diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionNetWorkModel.kt index 2aad01f127..ae74252670 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionNetWorkModel.kt @@ -4,12 +4,10 @@ import com.mogo.eagle.core.data.Response import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.apiResponseCall import com.mogo.eagle.core.network.request -import com.mogo.commons.constants.HostConst -import com.zhjt.mogo_core_function_devatools.upgrade.network.HostConst.Companion.getBaseUrl class UpgradeVersionNetWorkModel { - private fun getNetWorkApi(baseUrl: String = HostConst.CITY_HOST): UpgradeVersionApiService { + private fun getNetWorkApi(baseUrl: String = HostConst.getBaseUrl()): UpgradeVersionApiService { return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) .create(UpgradeVersionApiService::class.java) } @@ -22,7 +20,7 @@ class UpgradeVersionNetWorkModel { request> { loader { apiResponseCall { - getNetWorkApi(getBaseUrl()).getUpgradeVersion( + getNetWorkApi().getUpgradeVersion( versionName ) } diff --git a/core/function-impl/mogo-core-function-dispatch/build.gradle b/core/function-impl/mogo-core-function-dispatch/build.gradle index f7168c62e7..b76080d0f6 100644 --- a/core/function-impl/mogo-core-function-dispatch/build.gradle +++ b/core/function-impl/mogo-core-function-dispatch/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_network implementation rootProject.ext.dependencies.mogo_core_function_call }else{ - + implementation project(":foudations:mogo-commons") implementation project(':modules:mogo-module-common') implementation project(':core:mogo-core-data') diff --git a/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/model/DispatchServiceModel.java b/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/model/DispatchServiceModel.java index 64e488cf90..160825acee 100644 --- a/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/model/DispatchServiceModel.java +++ b/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/model/DispatchServiceModel.java @@ -1,9 +1,9 @@ package com.zhjt.dispatch.model; import static com.mogo.commons.context.ContextHolderUtil.getContext; -import static com.mogo.commons.constants.HostConst.DATA_SERVICE_HOST; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.constants.HostConst; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatus; @@ -34,7 +34,7 @@ public class DispatchServiceModel { private final IDispatchAdasApiService mAdasApiService; private DispatchServiceModel() { - mAdasApiService = MoGoRetrofitFactory.getInstance(DATA_SERVICE_HOST).create(IDispatchAdasApiService.class); + mAdasApiService = MoGoRetrofitFactory.getInstance(HostConst.DATA_SERVICE_HOST).create(IDispatchAdasApiService.class); } public static DispatchServiceModel getInstance() { diff --git a/core/function-impl/mogo-core-function-monitoring/build.gradle b/core/function-impl/mogo-core-function-monitoring/build.gradle index 9b0b62b968..6a91089dfd 100644 --- a/core/function-impl/mogo-core-function-monitoring/build.gradle +++ b/core/function-impl/mogo-core-function-monitoring/build.gradle @@ -65,6 +65,7 @@ dependencies { implementation project(':core:mogo-core-function-api') implementation project(':core:mogo-core-function-call') implementation project(':modules:mogo-module-common') + implementation project(":foudations:mogo-commons") } } diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt index 93f95cdd3d..8e310b7ab7 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Handler import android.os.Looper import android.os.Message +import com.mogo.commons.constants.HostConst import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.data.camera.ReqLiveCarBean import com.mogo.eagle.core.function.call.hmi.CallerHmiManager @@ -12,7 +13,6 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MONITOR import com.mogo.map.MogoLocationClient -import com.mogo.commons.constants.HostConst import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java new file mode 100644 index 0000000000..36eeae34d5 --- /dev/null +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java @@ -0,0 +1,37 @@ +package com.mogo.commons.constants; + +import com.mogo.commons.debug.DebugConfig; + +public class HostConst { + public static final String DEVA_HOST = "http://dzt-deva.zhidaozhixing.com"; + public static final String DATA_SERVICE_HOST = "http://dzt-dataService.zhidaozhixing.com"; + public static final String REALTIME_LOCATION_HOST = "http://dzt-realtimeLocation.zhidaozhixing.com"; + public static final String GEOFENCE_HOST = "http://dzt-geoFenceCarService.zhidaozhixing.com"; + public static final String CARLIFE_HOST = "http://dzt-carlife.zhidaozhixing.com"; + public static final String STRATEGY_PUSH_HOST = "http://dzt-strategyPush.zhidaozhixing.com"; + public static final String CAMERA_STREAM_HOST = "http://dzt-smartTransportationAiCloud.zhidaozhixing.com"; + public static final String OPEN_CAMERA_STREAM_HOST = "http://10.0.16.6:18080"; + + public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com"; + public static final String SOCKET_CENTER_DOMAIN = "socketRegion"; + + // public static final String UPGRADE_APP_HOST_TEST = "http://10.0.200.12:32423?/"; + public static final String UPGRADE_APP_HOST = "http://eagle-mis.zhidaozhixing.com/"; + + public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/"; + + public static final String HOST_DEV = "https://eagle-qa.zhidaozhixing.com"; + public static final String HOST_RELEASE = "https://eagle-mis.zhidaozhixing.com"; + + public static String getHost() { + String host = HOST_RELEASE; + switch (DebugConfig.getNetMode()) { + case DebugConfig.NET_MODE_DEV: + case DebugConfig.NET_MODE_QA: + host = HOST_DEV; + break; + } + return host; + } + +} diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.kt deleted file mode 100644 index d134c4ac51..0000000000 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.commons.constants - -import com.mogo.commons.debug.DebugConfig - -/** - * 通用接口请求host - */ -class HostConst { - companion object{ - const val DEVA_HOST = "http://dzt-deva.zhidaozhixing.com" - const val DATA_SERVICE_HOST = "http://dzt-dataService.zhidaozhixing.com" - const val REALTIME_LOCATION_HOST = "http://dzt-realtimeLocation.zhidaozhixing.com" - const val GEOFENCE_HOST = "http://dzt-geoFenceCarService.zhidaozhixing.com" - const val STRATEGY_PUSH_HOST = "http://dzt-strategyPush.zhidaozhixing.com" - const val CAMERA_STREAM_HOST = "http://dzt-smartTransportationAiCloud.zhidaozhixing.com" - const val OPEN_CAMERA_STREAM_HOST = "http://10.0.16.6:18080" - const val CITY_HOST = "http://dzt-city.zhidaozhixing.com" - const val SOCKET_CENTER_DOMAIN = "socketRegion" - - // public static final String UPGRADE_APP_HOST_TEST = "http://10.0.200.12:32423?/"; - const val CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/" - - private const val HOST_DEV = "https://eagle-qa.zhidaozhixing.com" - private const val HOST_RELEASE = "https://eagle-mis.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