From 922ab45708fd740ce0fa650a60cf576ecd0d0ad8 Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Thu, 23 Mar 2023 16:33:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E6=B8=85=E6=89=AB?=
 =?UTF-8?q?=E8=BD=A6=E7=83=9F=E5=8F=B0=E7=8E=AF=E5=A2=83=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/sweeper/constant/SweeperConst.kt   |  4 +++-
 .../mogo/och/sweeper/fragment/SweeperFragment.kt    |  4 ++--
 .../function/startup/stageone/HttpDnsStartUp.kt     | 13 ++++++++++++-
 .../java/com/mogo/commons/constants/HostConst.java  |  9 +++++++--
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
index 83e0552166..38c788551f 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
@@ -10,7 +10,9 @@ class SweeperConst {
 
         private const val BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com"
         private const val BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com"
-        private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
+
+        //private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
+        private const val BASE_URL_OCH_RELEASE = "https://och-driver-yt.zhidaozhixing.com"
 
         @JvmStatic
         fun getBaseUrl(): String {
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
index facfdaf0f7..79b6a19381 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
@@ -515,8 +515,8 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
 
     //模拟结束子任务
     override fun debugEndSubTask() {
-        //mPresenter?.onArriveTaskEnd(null)
-        super.debugEndSubTask()
+        mPresenter?.onArriveTaskEnd(null)
+        //super.debugEndSubTask()
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
index 584308b320..5cf03471a4 100644
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -101,6 +101,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
 //        clientConfig.passportUrl //todo 亚坤
 //        clientConfig.socketBaseUrl
 //        clientConfig.socketTechUrl
+        //设置基础服务平台域名
+        setBasicServicesDns(clientConfig)
         // 设置是否是直播推流的主播
         clientConfig.isAnchor = true
         when (DebugConfig.getCarMachineType()) {
@@ -125,7 +127,6 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         //设置长链接的secretKey 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
         clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ"
 //        clientConfig.secretKey = "n48AlVufihvMDWgzwHX42yzSgiWaad6v"
-
         clientConfig.iHttpCurrentLocation = object : ICurrentLocation {
             override fun getCurrentLocation(): SimpleLocation {
                 val envConfig = CallerDevaToolsManager.getEnvConfig()
@@ -353,4 +354,14 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         }
     }
 
+    /**
+     * 设置基础服务平台域名
+     */
+    private fun setBasicServicesDns(clientConfig:MoGoAiCloudClientConfig){
+        if (DebugConfig.getNetMode()==DebugConfig.NET_MODE_RELEASE||DebugConfig.getNetMode()==DebugConfig.NET_MODE_DEMO){
+            clientConfig.passportUrl="https://och-driver-yt.zhidaozhixing.com/arch/passport/"
+            clientConfig.socketBaseUrl="https://och-driver-yt.zhidaozhixing.com/arch/push/"
+            clientConfig.socketTechUrl="https://och-driver-yt.zhidaozhixing.com/arch/"
+        }
+    }
 }
\ No newline at end of file
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
index 62e5713ece..7d887ab5f2 100644
--- 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
@@ -22,9 +22,14 @@ public class HostConst {
     public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/";
 
     public static final String HOST_DEV = "http://eagle-mis-a.zhidaozhixing.com";
-    public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com";
 
-    public static final String HOST_EAGLE_QA = "http://eagle-dns-a.zhidaozhixing.com/";
+    //public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com";
+
+    public static final String HOST_RELEASE = "https://och-hailing-yt.zhidaozhixing.com";
+
+    //public static final String HOST_EAGLE_QA = "http://eagle-dns-a.zhidaozhixing.com/";
+
+    public static final String HOST_EAGLE_QA = "https://och-hailing-yt.zhidaozhixing.com/";
 
     public static String getHost() {
         String host = HOST_RELEASE;