[6.8.4]

[fea]
[删除BusinessEnum]

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

@@ -21,6 +21,7 @@ import com.mogo.eagle.core.function.hmi.ui.setting.SopView
 import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 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
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.util.AppUtils
@@ -28,10 +29,7 @@ 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.Utils
 import com.mogo.eagle.core.utilcode.util.VolumeUtils
-import com.mogo.och.biz.R
-import com.mogo.och.common.module.biz.login.BusinessEnum
 import com.mogo.och.common.module.biz.login.ILoginCallback
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.biz.login.LoginStatusManager
@@ -115,36 +113,28 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
                 OchChainLogManager.writeChainLog("音量设置后","最大声音量:${maxVolume}------当前音量:${volumeafter}----目的音量:${tartgetVolume}")
             }
         }
-        if (AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
-        } else if (AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
-        } else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
-        } else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
-//            return if (ProjectUtils.isMogo()) {
-//                getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
-//            } else if (ProjectUtils.isSaas()) {
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+            ||AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)
+            ||AppIdentityModeUtils.isScheduled(FunctionBuildConfig.appIdentityMode)) {
+            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+                return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
+            }else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+                return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
+            }
+        } else if(AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)){
+            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+                return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
+            }else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+                return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
+            }
+        } else if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){
+            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
                 return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER)
-//            } else {
-//                getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
-//            }
-        } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
+            }else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+                return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER)
+            }
+        } else if(AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){
             return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER)
-        } else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
-        } else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
-        } else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
-            return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
-        } else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
-//            return if (ProjectUtils.isMogo()) {
-//                getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
-//            } else if (ProjectUtils.isSaas()) {
-            return  getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER)
-//            } else {
-//                getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
-//            }
         }
         return LoginStatusManager.getFragment()
     }
@@ -188,22 +178,25 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
         }
     }
 
-    override fun onBusinessChange(businessEnum: BusinessEnum) {
+    override fun onBusinessChange(businessEnum: Product) {
         super.onBusinessChange(businessEnum)
         val (_, identity, model) = AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
         when (businessEnum) {
-            BusinessEnum.None -> {}
-            BusinessEnum.Taxi -> FunctionBuildConfig.appIdentityMode =
+            Product.NONE -> {}
+            Product.TAXI -> FunctionBuildConfig.appIdentityMode =
                 "${AppIdentityModeUtils.TAXI}_${identity}_${model}"
 
-            BusinessEnum.Bus -> FunctionBuildConfig.appIdentityMode =
+            Product.BUS -> FunctionBuildConfig.appIdentityMode =
                 "${AppIdentityModeUtils.BUS}_${identity}_${model}"
 
-            BusinessEnum.Shuttle -> FunctionBuildConfig.appIdentityMode =
+            Product.SHUTTLE -> FunctionBuildConfig.appIdentityMode =
                 "${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
 
-            BusinessEnum.Charter -> FunctionBuildConfig.appIdentityMode =
+            Product.CHARTER -> FunctionBuildConfig.appIdentityMode =
                 "${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
+
+            Product.SCHEDULED -> FunctionBuildConfig.appIdentityMode =
+                "${AppIdentityModeUtils.SCHEDULED}_${identity}_${model}"
         }
         CallerDevaToolsManager.updateAppChannel()
         // 加入启动统计
@@ -214,8 +207,8 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
         MogoAnalyticUtils.track("app_start_time", mStartParams)
     }
 
-    override fun onBusinessChangeDebug(businessEnum: BusinessEnum) {
-        if (businessEnum == BusinessEnum.None) {
+    override fun onBusinessChangeDebug(businessEnum: Product) {
+        if (businessEnum == Product.NONE) {
             CallerHmiManager.hideToolsView()
             ToggleDebugView.toggleDebugView.dismiss()
             SopView.sopView.dismiss()
@@ -233,7 +226,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
         } else {
             onBusinessChange(businessEnum)
             FunctionBuildConfig.ochdebug = true
-            CallerLogger.d(TAG, "denbug模式进入${LoginStatusEnum.Login}")
+            d(TAG, "denbug模式进入${LoginStatusEnum.Login}")
             LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
             val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
             val fragment = getFragment()
@@ -249,7 +242,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
     }
 
     private fun injectStatusBar() {
-        activity?.let { it ->
+        activity?.let {
             val decorView = it.window.decorView as? FrameLayout ?: return
             val contentView =
                 (decorView.findViewById<View>(android.R.id.content) as? ViewGroup)?.getChildAt(0)
@@ -258,9 +251,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
             decorView.clipToPadding = false
             var statusBarView = decorView.findViewWithTag<View>("status_bar")
             val statusBar = _commonService?.getStatusBarView(it)
-            if(statusBarView==null){
-
-            }else{
+            if(statusBarView!=null){
                 if(statusBar == statusBarView||statusBar==null){
                     return
                 }else{
@@ -280,14 +271,14 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
                     return
                 }
             }
-            CallerLogger.d(TAG, "添加statusBar---${_commonService}")
+            d(TAG, "添加statusBar---${_commonService}")
             decorView.addView(statusBarView, statusBarLP)
         }
     }
 
     private fun removeStatusBar() {
         activity?.let {
-            CallerLogger.d(TAG, "移除statusBar")
+            d(TAG, "移除statusBar")
             val decorView = it.window.decorView as? FrameLayout ?: return
             val statusBar = decorView.findViewWithTag<View>("status_bar")
             statusBar?.let { view ->