From f5ffad3edadd91546d5d2587b4224fb3a37d4db1 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 18 Apr 2024 19:45:00 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=B8=BAnull=E6=9D=A5=E5=88=A4=E6=96=AD]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/lansocket/LoginLanDriverSocket.kt     | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
index cd1188a899..672c5ec06f 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
@@ -58,20 +58,32 @@ object LoginLanDriverSocket : ILoginCallback {
 
     // 司机端发送业务模式更改和环境校验
     override fun onStatusChange(currentStatus: LoginStatusEnum?) {
-        when (currentStatus) {
-            LoginStatusEnum.Login -> {
-                FlavorUtils.getEnvCheck()
-                val msg =
-                    ChangeBusinessType(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!)
-                LanSocketManager.sendMsgToClient(msg)
-                BizLoopManager.setLoopFunction(TAG, LoopInfo(60, ::loopCheck))
-            }
+        if (FlavorUtils.vehicleType != null && FlavorUtils.projectType != null && FlavorUtils.envType != null) {
+            when (currentStatus) {
+                LoginStatusEnum.Login -> {
+                    FlavorUtils.getEnvCheck()
+                    val msg =
+                        ChangeBusinessType(
+                            FlavorUtils.vehicleType!!,
+                            FlavorUtils.businessType!!,
+                            FlavorUtils.projectType!!,
+                            FlavorUtils.envType!!
+                        )
+                    LanSocketManager.sendMsgToClient(msg)
+                    BizLoopManager.setLoopFunction(TAG, LoopInfo(60, ::loopCheck))
+                }
 
-            else -> {
-                BizLoopManager.removeLoopFunction(TAG)
-                val msg =
-                    ChangeBusinessType(FlavorUtils.vehicleType!!, BusinessType.none, FlavorUtils.projectType!!, FlavorUtils.envType!!)
-                LanSocketManager.sendMsgToClient(msg)
+                else -> {
+                    BizLoopManager.removeLoopFunction(TAG)
+                    val msg =
+                        ChangeBusinessType(
+                            FlavorUtils.vehicleType!!,
+                            BusinessType.none,
+                            FlavorUtils.projectType!!,
+                            FlavorUtils.envType!!
+                        )
+                    LanSocketManager.sendMsgToClient(msg)
+                }
             }
         }
     }