From 78fed2aaeb1d9fdf668cddd30a016b38a198929e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 26 Feb 2025 16:23:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fix]=20[screen]=20[=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=8F=98=E6=9B=B4=E5=90=8E=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A8=AA=E7=AB=96=E5=B1=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/login/LoginServiceManager.kt | 21 ++++++++++++------- .../biz/lansocket/LoginLanPassengerSocket.kt | 2 +- .../mogo/och/facade/route/FacadeProvider.kt | 4 ---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt index 87e374af7a..1fc6b54afa 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt +++ b/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() diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt index aeec1d64d3..9054f7c896 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt @@ -25,7 +25,7 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase${newV}") if(newV.isNotEmpty()){ OchChainLogManager.writeChainLogNetLanSocketConnect("局域网socket链接状态","sn 变化 已连接 sn${newV}") } diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 19527630d0..953494b8f6 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/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