[6.10.0]

[fix]
[screen]
[车型变更后 调整页面横竖屏]

OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt

@@ -1,6 +1,7 @@
 package com.mogo.och.biz.login
 
 import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.util.Log
 import androidx.fragment.app.Fragment
 import com.mogo.commons.AbsMogoApplication
@@ -29,6 +30,8 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.biz.login.callback.ILoginViewCallback
 import com.mogo.och.biz.login.model.LoginModel
 import com.mogo.och.biz.login.bean.LoginInfo
+import com.mogo.och.common.module.biz.lansocket.IOchLanPassengerStatusListener
+import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.login.EnumRole
 import com.mogo.och.common.module.biz.login.EnumLoginStatus
@@ -40,13 +43,8 @@ import com.mogo.och.common.module.manager.cache.OchSPManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.loop.LoopInfo
-import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
-import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
-import com.mogo.och.common.module.manager.socket.lan.bean.EnvCheck
-import com.mogo.och.common.module.manager.socket.lan.bean.EnvType
 import com.mogo.och.common.module.manager.socket.lan.bean.LoginInfo2Client
-import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType
 import com.mogo.och.common.module.utils.FlavorUtils
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.schedulers.Schedulers
@@ -55,7 +53,7 @@ import kotlin.properties.Delegates
 /**
  * 网约车小巴业务实现入口
  */
-object LoginServiceManager {
+object LoginServiceManager : IOchLanPassengerStatusListener {
 
     private val tag = M_OCHCOMMON + "LoginManager"
     private var TAGLoopStatus = "LoginStatusManagerLoop"
@@ -177,8 +175,8 @@ object LoginServiceManager {
      */
     private fun initProductAndVehicle() {
         productEnum = AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode)
-        vehicleEnum =AppIdentityModeUtils.getVehicle(FunctionBuildConfig.appIdentityMode)
-
+        vehicleEnum = AppIdentityModeUtils.getVehicle(FunctionBuildConfig.appIdentityMode)
+        LoginLanPassengerSocket.addListener(tag,this)
     }
 
     private fun queryLoginStatusByNet() {
@@ -480,6 +478,13 @@ object LoginServiceManager {
             BizLoopManager.runInMainThread{
                 ActivityUtils.getTopActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
             }
+        }else{
+            val orientation = ActivityUtils.getTopActivity().resources.configuration.orientation
+            if(orientation==Configuration.ORIENTATION_PORTRAIT){
+                BizLoopManager.runInMainThread{
+                    ActivityUtils.getTopActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                }
+            }
         }
 
         CallerDevaToolsManager.updateAppChannel()

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt

@@ -25,7 +25,7 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase<IOchLanPasseng
             // 司机屏发生变化
             val msg = BaseDPMsg(type = DPMsgType.TYPE_CLIENT_REGISTER.type)
             LanSocketManager.sendMsgToServer(msg)
-            LoginStatusManager.changeStatus("sn 变化 连接成功 司机SN:${newV}")
+            LoginStatusManager.changeStatus("sn 变化 连接成功 司机SN:${oldV}---->${newV}")
             if(newV.isNotEmpty()){
                 OchChainLogManager.writeChainLogNetLanSocketConnect("局域网socket链接状态","sn 变化 已连接 sn${newV}")
             }

OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt

@@ -11,10 +11,8 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.env.ProjectUtils
-import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.function.hmi.ui.setting.SopView
@@ -23,10 +21,8 @@ import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.Product
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.ProcessUtils
-import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.eagle.core.utilcode.util.VolumeUtils
 import com.mogo.och.common.module.biz.login.ILoginCallback