[8.5.0]

[新加坡类型添加]

OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt

@@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.och.biz.R
 import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket
+import com.mogo.och.common.module.manager.EnvManager
 import com.mogo.och.common.module.utils.FlavorUtils
 
 
@@ -44,20 +45,17 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac
 
     private var viewModel: ErrorInfoViewModel? = null
     private fun initView() {
-
+        if(EnvManager.isDriver()){
-        if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))
-        ) {
-            LayoutInflater.from(context)
-                .inflate(R.layout.biz_login_errorinfo_view_1920x1080, this, true)
-        } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))
-        ) {
-            LayoutInflater.from(context)
-                .inflate(R.layout.biz_login_errorinfo_view_1080x1920, this, true)
-        } else {
             LayoutInflater.from(context)
                 .inflate(R.layout.biz_login_errorinfo_view_2560x1600, this, true)
+        }else{
+            if(EnvManager.isB1()||EnvManager.isM1()){
+                LayoutInflater.from(context)
+                    .inflate(R.layout.biz_login_errorinfo_view_1920x1080, this, true)
+            }else if(EnvManager.isB2()||EnvManager.isB4()){
+                LayoutInflater.from(context)
+                    .inflate(R.layout.biz_login_errorinfo_view_1080x1920, this, true)
+            }
         }
         actv_see = findViewById(R.id.actv_see)
         actv_countdown = findViewById(R.id.actv_countdown)

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt

@@ -13,6 +13,10 @@ object EnvManager {
         return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)
     }
 
+    fun isM1(): Boolean {
+        return AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)
+    }
+
     fun isB1Driver(): Boolean {
         return isB1() && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
     }
@@ -25,6 +29,11 @@ object EnvManager {
         return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)
     }
 
+    fun isB4(): Boolean {
+        return AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)
+    }
+
+
     fun isB2Driver(): Boolean {
         return isB2() && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
     }

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt

@@ -151,6 +151,7 @@ enum class VehicleType {
     C1,
     B1,
     B2,
+    B4,
     M1,
 }
 

OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt

@@ -46,6 +46,8 @@ object FlavorUtils {
             info.append(" B1")
         } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
             info.append(" B2")
+        } else if (AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)) {
+            info.append(" B4")
         } else {
             info.append(" none")
         }
@@ -139,6 +141,8 @@ object FlavorUtils {
                     VehicleType.B1
                 } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
                     VehicleType.B2
+                } else if (AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)) {
+                    VehicleType.B4
                 } else {
                     VehicleType.C1
                 }

foudations/mogo-commons/src/main/java/com/mogo/commons/env/ProjectUtils.kt

@@ -41,7 +41,7 @@ object ProjectUtils {
                 return Project.YANTAI
             }
             Project.SINGAPORE.value -> {
-                return Project.SAAS
+                return Project.SINGAPORE
             }
         }
         return Project.MOGO