[6.4.0]

[temp]

OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt

@@ -11,8 +11,10 @@ import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.step
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils
 import com.mogo.och.common.module.biz.constant.OchCommonConst
+import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.shuttle.passenger.constant.BusPassengerConst
 import com.mogo.och.common.module.wigets.media.MediaPlayerActivity
 import com.mogo.och.shuttle.passenger.model.TicketModel
@@ -25,80 +27,25 @@ import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment
  * Created on 2022/3/29
  */
 @Route(path = OchCommonConst.SHUTTLE_PASSENGER)
-class MogoOCHShuttlePassenger : IMoGoFunctionProvider {
-    private var mActivity: FragmentActivity? = null
-    private var mContainerId = 0
-    private var mPM2Fragment: Fragment? = null
-
-    override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
-        mActivity = activity
-        mContainerId = containerId!!
-        showFragment()
-        if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
-            mActivity?.let {
-                MultiDisplayUtils.startActWithSecond(it, MediaPlayerActivity::class.java)
-            }
-        }
-        TicketModel.load()
-        return null
-    }
-
-    override val functionName: String
-        get() = "och-bus-passenger-m2"
-
-    override fun onDestroy() {
-        // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        mActivity?.finish()
-    }
+class MogoOCHShuttlePassenger : CommonService {
+    private lateinit var mPM2Fragment: Fragment
 
     override fun init(context: Context) {
-    }
-
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private fun stepIntoVrMode() {
-        d(SceneConstant.M_TAXI_P + TAG, "进入vr模式")
-        stepInDayMode() //白天模式 状态栏字体颜色变黑
-    }
-
-    private fun showFragment() {
-        val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager
-        if (mPM2Fragment == null) {
-
-            d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
-
-            val fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG)
-
-            mPM2Fragment = if (fragmentByTag is Fragment){
-                fragmentByTag
-            }else{
-                if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
-                    PM2BaseFragment()
-                }else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
-                    BusPassengerRouteFragment()
-                }else{
-                    BusPassengerRouteFragment()
-                }
-
-            }
-
-            if (!mPM2Fragment?.isAdded!!){
-                supportFragmentManager?.beginTransaction()
-                    ?.add(mContainerId, mPM2Fragment!!, PM2BaseFragment.TAG)?.commitAllowingStateLoss()
-            }
-            return
+        TicketModel.load()
+        mPM2Fragment = if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+            PM2BaseFragment()
+        }else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            BusPassengerRouteFragment()
+        }else{
+            BusPassengerRouteFragment()
         }
-        d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
-        supportFragmentManager?.beginTransaction()?.show(mPM2Fragment!!)
-            ?.commitAllowingStateLoss()
     }
 
-    private fun hideFragment() {
-        if (mPM2Fragment != null) {
-            mActivity?.supportFragmentManager?.beginTransaction()?.hide(mPM2Fragment!!)
-                ?.commitAllowingStateLoss()
+    override fun getFragment(): Fragment {
+        if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+            MultiDisplayUtils.startActWithSecond(ActivityUtils.getTopActivity(), MediaPlayerActivity::class.java)
         }
+        return mPM2Fragment
     }
 
     companion object {