[6.4.0]

[temp]

OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.java

@@ -1,101 +0,0 @@
-
-package com.mogo.och.bus;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.och.bus.constant.BusConst;
-import com.mogo.och.bus.fragment.BusFragment;
-import com.mogo.och.common.module.biz.constant.OchCommonConst;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * 网约车小巴业务实现入口
- *
- * @author tongchenfei
- */
-@Route(path = OchCommonConst.BUS_DRIVER)
-public class BusProvider implements IMogoOCH {
-
-    private static final String TAG = "BusProvider";
-
-    private BusFragment busFragment;
-    private int containerId;
-    private FragmentActivity activity;
-
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private void stepIntoVrMode() {
-        CallerLogger.d(M_BUS + TAG, "进入vr模式");
-        CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑
-    }
-
-    @Override
-    public void init(Context context) {
-    }
-
-    private void showFragment() {
-        FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
-        if (busFragment == null) {
-            CallerLogger.d(TAG, "准备add fragment======");
-            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG);
-            if (fragmentByTag instanceof BusFragment) {
-                busFragment = (BusFragment) fragmentByTag;
-            } else {
-                busFragment = new BusFragment();
-            }
-            if(!busFragment.isAdded()) {
-                supportFragmentManager.beginTransaction().add(containerId, busFragment, BusFragment.TAG).commitAllowingStateLoss();
-            }
-            return;
-        }
-        CallerLogger.d(TAG, "准备show fragment");
-        supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss();
-    }
-
-    private void hideFragment() {
-        if (busFragment != null) {
-            CallerLogger.d(TAG, "准备hide fragment");
-            activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss();
-        }
-
-    }
-
-    @Override
-    public void createCoverage(FragmentActivity activity, int containerId) {
-
-    }
-
-    @NotNull
-    @Override
-    public String getFunctionName() {
-        return TAG;
-    }
-
-    @Nullable
-    @Override
-    public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
-        this.containerId = integer;
-        this.activity = fragmentActivity;
-        showFragment();
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        //若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        if (activity == null) return;
-        activity.finish();
-    }
-}

OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.kt

@@ -0,0 +1,28 @@
+package com.mogo.och.bus
+
+import android.content.Context
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.och.bus.fragment.BusFragment
+import com.mogo.och.common.module.biz.constant.OchCommonConst
+import com.mogo.och.common.module.biz.provider.CommonService
+
+/**
+ * 网约车小巴业务实现入口
+ *
+ * @author tongchenfei
+ */
+@Route(path = OchCommonConst.BUS_DRIVER)
+class BusProvider : CommonService {
+    private val TAG = "BusProvider"
+    private var busFragment: BusFragment? = null
+    override fun getFragment(): Fragment {
+        return busFragment!!
+    }
+
+    override fun init(context: Context) {
+        d(TAG, "准备show fragment")
+        busFragment = BusFragment()
+    }
+}

OCH/bus/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java

@@ -1,24 +0,0 @@
-package com.mogo.och.bus;
-
-import androidx.annotation.IdRes;
-import androidx.fragment.app.FragmentActivity;
-
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
-
-public
-/**
- * @author congtaowang
- * @since 2021/1/15
- *
- * 网约车抽象接口
- */
-interface IMogoOCH extends IMoGoFunctionProvider {
-
-    /**
-     * 初始化网约车容器
-     *
-     * @param activity
-     * @param containerId 容器ID
-     */
-    void createCoverage(FragmentActivity activity, @IdRes int containerId);
-}