From 5aa0b1efbda2bc0df473053af75cb8f13f87508c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 28 Dec 2023 13:59:51 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[bus]=20[=E7=BB=93=E6=9E=84=E5=92=8C?= =?UTF-8?q?=E8=BD=A6=E6=A8=A1=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/bus/driver/build.gradle | 7 +- .../mogo/och/bus/bean/BusOrdersResponse.java | 0 .../mogo/och/bus/bean/BusRoutesResponse.java | 0 .../com/mogo/och/bus/bean/BusStationBean.java | 0 .../och/bus/fragment/BaseBusTabFragment.java | 3 +- .../com/mogo/och/bus/model/OrderModel.java | 0 .../com/mogo/och/bus/net/IBascApiService.java | 0 .../com/mogo/och/bus/net/ISAASApiService.java | 0 .../mogo/och/bus/net/OrderServiceManager.kt | 0 .../bus/net/login/OchCommonServiceManager.kt | 0 .../och/bus/net/login/OchLoginServiceApi.java | 0 .../bus/net/login/OchSAASLoginServiceApi.java | 0 .../java/com/mogo/och/bus/view/BizMapView.kt | 59 ++++++++++ .../src/main/res/layout/bus_base_fragment.xml | 4 +- .../src/main/res/layout/bus_jl_bizmap_map.xml | 14 +++ .../src/main/res/layout/bus_m2_bizmap_map.xml | 14 +++ .../bus/passenger/MogoOCHBusPassenger.java | 107 ------------------ ...tlePassenger.kt => MogoOCHBusPassenger.kt} | 4 +- 18 files changed, 98 insertions(+), 114 deletions(-) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/bean/BusOrdersResponse.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/bean/BusRoutesResponse.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/bean/BusStationBean.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/model/OrderModel.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/IBascApiService.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/ISAASApiService.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/OrderServiceManager.kt (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java (100%) rename OCH/bus/driver/src/{jinlvvan => main}/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java (100%) create mode 100644 OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt create mode 100644 OCH/bus/driver/src/main/res/layout/bus_jl_bizmap_map.xml create mode 100644 OCH/bus/driver/src/main/res/layout/bus_m2_bizmap_map.xml delete mode 100644 OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/{MogoOCHShuttlePassenger.kt => MogoOCHBusPassenger.kt} (96%) diff --git a/OCH/bus/driver/build.gradle b/OCH/bus/driver/build.gradle index 6d11764ab4..333947fc29 100644 --- a/OCH/bus/driver/build.gradle +++ b/OCH/bus/driver/build.gradle @@ -45,11 +45,16 @@ android { flavorDimensions "vehicle" productFlavors { - + // 车型：金旅星辰、开沃 小巴业务 jinlvvan { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } + // 车型：金旅m2 小巴业务 + m2 { + dimension "vehicle" + buildConfigField 'int', 'NEW_TEST', '1' + } } } diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusStationBean.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusStationBean.java diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index bedb5d6436..7c570bd3f3 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -43,6 +43,7 @@ import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusRoutesResult; import com.mogo.och.bus.model.OrderModel; import com.mogo.och.bus.util.BDRouteDataTestUtils; +import com.mogo.och.bus.view.BizMapView; import com.mogo.och.bus.view.SlidePanelView; import com.mogo.och.common.module.utils.SoundPoolHelper; @@ -71,7 +72,7 @@ public abstract class BaseBusTabFragment protected RelativeLayout mSettingBtn; protected RelativeLayout mBadcaseBtn; private FrameLayout flStationPanelContainer; - private MapBizView mapBizView; + private BizMapView mapBizView; private Group groupTestPanel; private TrafficDataView mTrafficDataView; // private BusTrafficLightView mTrafficLightView; diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java similarity index 100% rename from OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt new file mode 100644 index 0000000000..47a515da4b --- /dev/null +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt @@ -0,0 +1,59 @@ +package com.mogo.och.bus.view + +import android.content.Context +import android.os.Bundle +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.FrameLayout +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.view.MapBizView +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.map.uicontroller.IMogoMapUIController +import com.mogo.och.bus.R + +class BizMapView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + private lateinit var mapBizView: MapBizView + + init { + if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + LayoutInflater.from(context).inflate(R.layout.bus_m2_bizmap_map, this, true) + }else if(AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){ + LayoutInflater.from(context).inflate(R.layout.bus_jl_bizmap_map, this, true) + }else{ + LayoutInflater.from(context).inflate(R.layout.bus_jl_bizmap_map, this, true) + } + mapBizView = findViewById(R.id.bizMapView) + } + + fun getUI(): IMogoMapUIController? { + return mapBizView.getUI() + } + + fun onCreate(bundle: Bundle?) { + mapBizView.onCreate(bundle) + } + fun onResume() { + mapBizView.onResume() + } + + fun onSaveInstanceState(outState: Bundle){ + mapBizView.onSaveInstanceState(outState) + } + + fun onLowMemory() { + mapBizView.onLowMemory() + } + + fun onPause() { + mapBizView.onPause() + } + + fun onDestroy() { + mapBizView.onDestroy() + } +} \ No newline at end of file diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index 5436ac42db..2f1f084ed3 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -6,10 +6,8 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/dp_72"> - diff --git a/OCH/bus/driver/src/main/res/layout/bus_jl_bizmap_map.xml b/OCH/bus/driver/src/main/res/layout/bus_jl_bizmap_map.xml new file mode 100644 index 0000000000..ffb955a311 --- /dev/null +++ b/OCH/bus/driver/src/main/res/layout/bus_jl_bizmap_map.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/OCH/bus/driver/src/main/res/layout/bus_m2_bizmap_map.xml b/OCH/bus/driver/src/main/res/layout/bus_m2_bizmap_map.xml new file mode 100644 index 0000000000..625b786557 --- /dev/null +++ b/OCH/bus/driver/src/main/res/layout/bus_m2_bizmap_map.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java deleted file mode 100644 index bd4d139df7..0000000000 --- a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.mogo.och.bus.passenger; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; - -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.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils; -import com.mogo.och.bus.passenger.constant.BusPassengerConst; -import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment; -import com.mogo.och.common.module.wigets.media.MediaPlayerActivity; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * 网约车-Bus-乘客端 - * - * Created on 2022/3/29 - */ -@Route(path = BusPassengerConst.PATH) -public class MogoOCHBusPassenger implements IMogoOCH { - private static final String TAG = MogoOCHBusPassenger.class.getSimpleName(); - - private FragmentActivity mActivity; - private int mContainerId; - private BusPassengerRouteFragment mPassengerFragment; - - @Override - public void createCoverage(FragmentActivity activity, int containerId) { - - } - - @Nullable - @Override - public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) { - this.mActivity = activity; - this.mContainerId = containerId; - showFragment(); - - if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode) && activity != null) { - MultiDisplayUtils.INSTANCE.startActWithSecond(activity, MediaPlayerActivity.class); - } - - return null; - } - - @NotNull - @Override - public String getFunctionName() { - return TAG; - } - - @Override - public void onDestroy() { - // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 - if (mActivity == null) return; - mActivity.finish(); - } - - @Override - public void init(Context context) { - } - - /** - * 进入鹰眼模式，设置手势缩放地图失效 - */ - private void stepIntoVrMode() { - CallerLogger.d( M_BUS_P + TAG, "进入vr模式" ); - CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 - } - - private void showFragment() { - FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); - if(mPassengerFragment == null){ - CallerLogger.d(M_BUS_P + TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG); - if (fragmentByTag instanceof BusPassengerRouteFragment){ - mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag; - }else { - mPassengerFragment = new BusPassengerRouteFragment(); - } - if (!mPassengerFragment.isAdded()){ - supportFragmentManager.beginTransaction().add(mContainerId, mPassengerFragment,BusPassengerRouteFragment.TAG).commitAllowingStateLoss(); - } - return; - } - - CallerLogger.d(M_BUS_P + TAG, "准备show fragment"); - supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss(); - } - - private void hideFragment(){ - if (mPassengerFragment != null){ - mActivity.getSupportFragmentManager().beginTransaction().hide(mPassengerFragment).commitAllowingStateLoss(); - } - } - -} diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt similarity index 96% rename from OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt index d58e235823..12a869c9aa 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt @@ -23,7 +23,7 @@ import com.mogo.och.common.module.wigets.media.MediaPlayerActivity * Created on 2022/3/29 */ @Route(path = BusPassengerConst.PATH) -class MogoOCHShuttlePassenger : IMoGoFunctionProvider { +class MogoOCHBusPassenger : IMoGoFunctionProvider { private var mActivity: FragmentActivity? = null private var mContainerId = 0 private var mPM2Fragment: Fragment? = null @@ -99,7 +99,7 @@ class MogoOCHShuttlePassenger : IMoGoFunctionProvider { } companion object { - private val TAG = MogoOCHShuttlePassenger::class.java.simpleName + private val TAG = MogoOCHBusPassenger::class.java.simpleName } } \ No newline at end of file