From c021dda5035a0c40e77351fec194af849e911274 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 5 Feb 2025 16:53:10 +0800 Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fea]=20[debug=20view=20=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E4=B8=9A=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/biz/login/LoginServiceManager.kt | 7 ++++++- .../mogo/och/biz/login/ui/debugview/BusinessView.kt | 13 ++++++++++++- OCH/facade/src/m2/AndroidManifest.xml | 10 ---------- .../com/mogo/och/facade/route/FacadeProvider.kt | 9 +++++++++ 4 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 OCH/facade/src/m2/AndroidManifest.xml 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 e4ad7a792d..9f2486544c 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 @@ -192,6 +192,7 @@ object LoginServiceManager { fun loginOut() { d(tag, "loginOut ") + FunctionBuildConfig.ochdebug = false LoginModel.logout() } @@ -225,9 +226,13 @@ object LoginServiceManager { * 设置登录信息 * 1、乘客屏从司机端获取到登录信息 * 2、支持老版本数据升级 - * 3、 + * 3、接口或者缓存调用 + * 4、debug 业务使用 */ fun setLoginInfo(loginInfo: LoginInfo) { + if(FunctionBuildConfig.ochdebug){ + return + } d(tag, "setLoginInfo:${loginInfo}") if (this.loginInfo != loginInfo) { this.loginInfo = loginInfo diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt index 7c3c71a647..046c602abc 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt @@ -6,10 +6,15 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.Product +import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.biz.R +import com.mogo.och.biz.login.LoginServiceManager +import com.mogo.och.biz.login.bean.LoginInfo +import com.mogo.och.common.module.biz.login.EnumLoginStatus import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_bus import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_charter import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle @@ -21,6 +26,8 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback private val TAG = "ItineraryView" + private val tempLoginJson = "{\"brand\":\"东风\",\"businessStatus\":0,\"businessType\":9,\"carModel\":\"E70\",\"cityCode\":\"110000\",\"currentSite\":0,\"driverId\":0,\"driverStatus\":0,\"leaving\":false,\"lineId\":null,\"orderNo\":\"\",\"phone\":\"\",\"photos\":\"https://img.zhidaohulian.com/fileServer/defaultPath/d46c5a1a778313d997e77b67efdaf8cc/1080x1920_01.png\",\"plateNumber\":\"测123456\",\"purpose\":0,\"servingStatus\":0,\"shiftsId\":0,\"siteId\":0,\"sn\":\"20230712ED9M636\",\"taskDate\":0,\"taskId\":null,\"tenantId\":201779277258031992,\"vin\":\"20230712ED9M636\"}" + constructor(context: Context) : super(context) constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) @@ -61,7 +68,11 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback } private fun swtichBusiness(businessEnum: Product) { - + val loginInfo = GsonUtils.fromJson(tempLoginJson, LoginInfo::class.java) + loginInfo.driverStatus = EnumLoginStatus.Login.code + loginInfo.businessType = businessEnum.code + LoginServiceManager.setLoginInfo(loginInfo) + FunctionBuildConfig.ochdebug = true } diff --git a/OCH/facade/src/m2/AndroidManifest.xml b/OCH/facade/src/m2/AndroidManifest.xml deleted file mode 100644 index b618877172..0000000000 --- a/OCH/facade/src/m2/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file 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 459edff60b..2c09e0df49 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 @@ -37,6 +37,7 @@ import com.mogo.och.common.module.biz.skin.SkinManager import com.mogo.och.common.module.biz.time.TimeManager import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import com.mogo.och.common.module.manager.loop.BizLoopManager import me.jessyan.autosize.utils.AutoSizeUtils @@ -151,6 +152,14 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } } + override fun onProductChange(businessEnum: Product?) { + if(FunctionBuildConfig.ochdebug){ + BizLoopManager.runInMainThread{ + showFragment() + } + } + } + override fun onDestroy() { //若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 if (activity == null) return