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 200feb725f..c59d6f8fc1 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 @@ -10,14 +10,17 @@ 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.mogo.Vehicle 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_bus_B1 +import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_bus_B2 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 +import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle_B1 +import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle_B2 import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_sweeper import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_taxi import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_debugview @@ -61,21 +64,24 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback viewModel?.setDistanceCallback(this) - actv_business_shuttle.onClick { swtichBusiness(Product.SHUTTLE) } - actv_business_bus.onClick { swtichBusiness(Product.BUS) } - actv_business_taxi.onClick { swtichBusiness(Product.TAXI) } - actv_business_charter.onClick { swtichBusiness(Product.CHARTER) } - actv_business_sweeper.onClick { swtichBusiness(Product.SWEEPER) } + actv_business_shuttle_B1.onClick { swtichBusiness(Product.SHUTTLE, Vehicle.B1) } + actv_business_shuttle_B2.onClick { swtichBusiness(Product.SHUTTLE,Vehicle.B2) } + actv_business_bus_B1.onClick { swtichBusiness(Product.BUS,Vehicle.B1) } + actv_business_bus_B2.onClick { swtichBusiness(Product.BUS,Vehicle.B2) } + actv_business_taxi.onClick { swtichBusiness(Product.TAXI,Vehicle.T1T2) } + actv_business_charter.onClick { swtichBusiness(Product.CHARTER,Vehicle.M1) } + actv_business_sweeper.onClick { swtichBusiness(Product.SWEEPER,Vehicle.C1) } actv_debugview.onClick { ToggleDebugView.toggleDebugView.toggle(context) } } - private fun swtichBusiness(businessEnum: Product) { + private fun swtichBusiness(businessEnum: Product, vehicle: Vehicle) { var loginInfo = LoginServiceManager.getLoginInfo() if(loginInfo==null) { loginInfo = GsonUtils.fromJson(tempLoginJson, LoginInfo::class.java) } loginInfo?.driverStatus = EnumLoginStatus.Login.code loginInfo?.businessType = businessEnum.code + loginInfo?.carModel = vehicle.code LoginServiceManager.setLoginInfo(loginInfo!!) FunctionBuildConfig.ochdebug = true } diff --git a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml index bcff527ebb..987e471991 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml @@ -1,19 +1,34 @@ - + + + + + - \ No newline at end of file + \ No newline at end of file