From d602e552878d2364777dcf0da6b13122c147eadd Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 9 Feb 2023 17:54:56 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E7=BB=9F=E4=B8=80ob?=
 =?UTF-8?q?u=E7=9A=84ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacenter/obu/MoGoObuProvider.kt         | 42 +++++--------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt
index cc09c18978..29eb90cdbc 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt
@@ -22,8 +22,7 @@ class MoGoObuProvider : IMoGoObuProvider {
     private val TAG = "MoGoObuProvider"
 
     private var mContext: Context? = null
-    private val busObuIp = "192.168.8.199"
-    private val taxiObuIp = "192.168.1.199"
+    private val taxiObuIp = "192.168.1.199" //obu的taxi和bus的ip已经全部统一成1网段ip
 
     override val functionName: String
         get() = TAG
@@ -38,35 +37,16 @@ class MoGoObuProvider : IMoGoObuProvider {
         CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress())
 
         //bus乘客版本obu功能去掉，大理项目需要全部车辆接收，不在限制
-//        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
-//            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
-//        ) {
-//            //不处理
-//        } else {
-            mContext = context
-            mContext?.let {
-                if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //bus 司机端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, busObuIp)
-
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //taxi 司机端和乘客端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                }
-            }
-//        }
+        mContext = context
+        mContext?.let {
+            val ipAddress = SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
+            //mogo obu
+            MogoPrivateObuNewManager.INSTANCE.connectObu(
+                it,
+                ipAddress,
+                CommonUtils.getIpAddressString()
+            )
+        }
     }
 
     /**