diff --git a/OCH/mogo-och-charter-passenger/README.md b/OCH/mogo-och-charter-passenger/README.md index 6175119b78..0f8ee83717 100644 --- a/OCH/mogo-och-charter-passenger/README.md +++ b/OCH/mogo-och-charter-passenger/README.md @@ -4,12 +4,7 @@ src - - androidTest Android 测试代码 - - basecommon 金旅开沃、接驳车 公用代码部分 - - jinlvvan 金旅开沃 独立代码部分 + - androidTest Android 测试代码 - m1 金旅m1 独立代码部分 - - m2 金旅m2 独立代码部分 - main 所有车型公用代码部分 - - shuttle 接驳车独立代码 因为接驳车和金旅开沃代码耦合厉害暂时放入到mogo-och-bus-passenger里面 - 后期会创建独立module和mogo-och-bus-passenger平级 - test 普通代码测试 \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt index 284a3f357c..386c9dc8db 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.step import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.ui.MainPassengerFragment +import com.mogo.och.bus.passenger.ui.MainFragment /** * 网约车-Bus-乘客端 @@ -20,7 +20,7 @@ import com.mogo.och.bus.passenger.ui.MainPassengerFragment class MogoOCHBusPassenger : IMogoOCH { private var mActivity: FragmentActivity? = null private var mContainerId = 0 - private var mPassengerFragment: MainPassengerFragment? = null + private var mPassengerFragment: MainFragment? = null override fun createCoverage(activity: FragmentActivity, containerId: Int) {} override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { mActivity = activity @@ -53,7 +53,7 @@ class MogoOCHBusPassenger : IMogoOCH { private fun showFragment() { if (mPassengerFragment == null) { d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======") - mPassengerFragment = MainPassengerFragment() + mPassengerFragment = MainFragment() mActivity!!.supportFragmentManager.beginTransaction() .add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss() return diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 96ac4a4976..fe0ba0fa50 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -8,12 +8,12 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.model.BusPassengerModel -import com.mogo.och.bus.passenger.ui.BusPassengerFunctionDeviceFragment +import com.mogo.och.bus.passenger.ui.M1DeviceFragment import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager import io.reactivex.disposables.Disposable -class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragment?) : - BusBasePassengerFunctionDevicePresenter(view), +class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) : + BusBasePassengerFunctionDevicePresenter(view), OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback { private var subscribe: Disposable? = null diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt new file mode 100644 index 0000000000..73a0b94195 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -0,0 +1,6 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.och.bus.passenger.ui.M1OrderFragment + +class BusPassengerFunctionOrderPresenter(view: M1OrderFragment?) : + BusBasePassengerFunctionDevicePresenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt index d95f14a8a9..ca3bf3fda2 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt @@ -2,12 +2,12 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.bus.passenger.ui.BusPassengerFunctionFragment +import com.mogo.och.bus.passenger.ui.M1ContainFragment import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager import com.mogo.och.common.module.voice.VoiceNotice -class BusPassengerFunctionPresenter(view: BusPassengerFunctionFragment?) : - BusBasePassengerFunctionDevicePresenter(view), +class BusPassengerFunctionPresenter(view: M1ContainFragment?) : + BusBasePassengerFunctionDevicePresenter(view), OCHPlanningStopSideStatusManager.OCHPlanningActionsCallback { companion object{ private const val TAG = "BusPassengerFunctionPresenter" diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt index d69b123522..a14cf56233 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt @@ -6,12 +6,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.ui.BusPassengerFunctionSoftFragment +import com.mogo.och.bus.passenger.ui.M1SoftFragment import com.mogo.och.common.module.manager.OCHM1LightAirconditionDoorStatusManager import io.reactivex.disposables.Disposable -class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) : - BusBasePassengerFunctionDevicePresenter(view), +class BusPassengerFunctionSoftPresenter(view: M1SoftFragment?) : + BusBasePassengerFunctionDevicePresenter(view), OCHM1LightAirconditionDoorStatusManager.OCHM1LightAirconditionDoorCallback { companion object { private const val TAG = "BusPassengerFunctionSoftPresenter" diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt index d9bd255b92..16fccdb1d8 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt @@ -1,7 +1,6 @@ package com.mogo.och.bus.passenger.presenter -import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.BusPassengerFunctionVideoFragment +import com.mogo.och.bus.passenger.ui.M1VideoFragment -class BusPassengerFunctionVideoPresenter(view: BusPassengerFunctionVideoFragment?) : - BusBasePassengerFunctionDevicePresenter(view) \ No newline at end of file +class BusPassengerFunctionVideoPresenter(view: M1VideoFragment?) : + BusBasePassengerFunctionDevicePresenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index de3913b30b..f4f4ac9f6e 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -7,13 +7,13 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.model.BusPassengerModel -import com.mogo.och.bus.passenger.ui.MainPassengerFragment +import com.mogo.och.bus.passenger.ui.MainFragment import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import java.util.* -class BusPassengerPresenter(view: MainPassengerFragment?) : - BusBasePassengerFunctionDevicePresenter(view), +class BusPassengerPresenter(view: MainFragment?) : + BusBasePassengerFunctionDevicePresenter(view), IBusPassengerControllerStatusCallback, IBusPassengerAutopilotPlanningCallback { override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt similarity index 70% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt index 133b0b38c7..ac35656fe3 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt @@ -16,18 +16,17 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter -import kotlinx.android.synthetic.m1.bus_p_function_fragment.* - +import kotlinx.android.synthetic.m1.m1_contain_fragment.* /** * @author: yangyakun * @date: 2023/1/28 */ -class BusPassengerFunctionFragment : - MvpDialogFragment() { +class M1ContainFragment : + MvpDialogFragment() { var tab: String = VIDEOTAB - var fragmentTag: String = BusPassengerFunctionVideoFragment.TAG + var fragmentTag: String = M1VideoFragment.TAG var fragment: Fragment? = null override fun onCreate(savedInstanceState: Bundle?) { @@ -45,18 +44,23 @@ class BusPassengerFunctionFragment : when (tab) { VIDEOTAB -> { fragment = - childFragmentManager.findFragmentByTag(BusPassengerFunctionVideoFragment.TAG) - ?: BusPassengerFunctionVideoFragment.newInstance() + childFragmentManager.findFragmentByTag(M1VideoFragment.TAG) + ?: M1VideoFragment.newInstance() } SETTINGDEVICETAB -> { fragment = - childFragmentManager.findFragmentByTag(BusPassengerFunctionDeviceFragment.TAG) - ?: BusPassengerFunctionDeviceFragment.newInstance() + childFragmentManager.findFragmentByTag(M1DeviceFragment.TAG) + ?: M1DeviceFragment.newInstance() } SETTINGSOFTTAB -> { fragment = - childFragmentManager.findFragmentByTag(BusPassengerFunctionSoftFragment.TAG) - ?: BusPassengerFunctionSoftFragment.newInstance() + childFragmentManager.findFragmentByTag(M1SoftFragment.TAG) + ?: M1SoftFragment.newInstance() + } + SETTINGORDERTAB -> { + fragment = + childFragmentManager.findFragmentByTag(M1OrderFragment.TAG) + ?: M1OrderFragment.newInstance() } else -> {} } @@ -70,7 +74,7 @@ class BusPassengerFunctionFragment : } } - override fun getLayoutId(): Int = R.layout.bus_p_function_fragment + override fun getLayoutId(): Int = R.layout.m1_contain_fragment override fun getTagName(): String = TAG @@ -96,12 +100,16 @@ class BusPassengerFunctionFragment : CallerLogger.d(M_BUS_P+TAG, "videoListener$isChecked") if (isChecked) { tab = VIDEOTAB - fragmentTag = BusPassengerFunctionVideoFragment.TAG + fragmentTag = M1VideoFragment.TAG cb_bp_setting_soft.isChecked = false cb_bp_setting_device.isChecked = false + cb_bp_setting_order.isChecked = false initFragment() }else{ - if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){ + if(!cb_bp_video_player.isChecked&& + !cb_bp_setting_soft.isChecked&& + !cb_bp_setting_device.isChecked&& + !cb_bp_setting_order.isChecked){ dismiss() } } @@ -111,12 +119,16 @@ class BusPassengerFunctionFragment : CallerLogger.d(M_BUS_P+TAG, "settingDevices$isChecked") if (isChecked) { tab = SETTINGDEVICETAB - fragmentTag = BusPassengerFunctionDeviceFragment.TAG + fragmentTag = M1DeviceFragment.TAG cb_bp_setting_soft.isChecked = false cb_bp_video_player.isChecked = false + cb_bp_setting_order.isChecked = false initFragment() }else{ - if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){ + if(!cb_bp_video_player.isChecked&& + !cb_bp_setting_soft.isChecked&& + !cb_bp_setting_device.isChecked&& + !cb_bp_setting_order.isChecked){ dismiss() } } @@ -126,12 +138,34 @@ class BusPassengerFunctionFragment : CallerLogger.d(M_BUS_P+TAG, "settingSoft$isChecked") if (isChecked) { tab = SETTINGSOFTTAB - fragmentTag = BusPassengerFunctionSoftFragment.TAG + fragmentTag = M1SoftFragment.TAG cb_bp_video_player.isChecked = false cb_bp_setting_device.isChecked = false + cb_bp_setting_order.isChecked = false initFragment() }else{ - if(!cb_bp_video_player.isChecked&&!cb_bp_setting_soft.isChecked&&!cb_bp_setting_device.isChecked){ + if(!cb_bp_video_player.isChecked&& + !cb_bp_setting_soft.isChecked&& + !cb_bp_setting_device.isChecked&& + !cb_bp_setting_order.isChecked){ + dismiss() + } + } + } + private val settingOrder = CompoundButton.OnCheckedChangeListener { _, isChecked -> + CallerLogger.d(M_BUS_P+TAG, "settingOrder$isChecked") + if (isChecked) { + tab = SETTINGORDERTAB + fragmentTag = M1OrderFragment.TAG + cb_bp_video_player.isChecked = false + cb_bp_setting_device.isChecked = false + cb_bp_setting_soft.isChecked = false + initFragment() + }else{ + if(!cb_bp_video_player.isChecked&& + !cb_bp_setting_soft.isChecked&& + !cb_bp_setting_device.isChecked&& + !cb_bp_setting_order.isChecked){ dismiss() } } @@ -185,16 +219,21 @@ class BusPassengerFunctionFragment : cb_bp_video_player.setOnCheckedChangeListener(null) cb_bp_setting_soft.setOnCheckedChangeListener(null) cb_bp_setting_device.setOnCheckedChangeListener(null) + cb_bp_setting_order.setOnCheckedChangeListener(null) cb_bp_video_player.isChecked = false cb_bp_setting_soft.isChecked = false cb_bp_setting_device.isChecked = false + cb_bp_setting_order.isChecked = false cb_bp_video_player.setOnCheckedChangeListener(videoListener) cb_bp_setting_soft.setOnCheckedChangeListener(settingSoft) cb_bp_setting_device.setOnCheckedChangeListener(settingDevices) + cb_bp_setting_order.setOnCheckedChangeListener(settingOrder) + when (tab) { VIDEOTAB -> cb_bp_video_player.isChecked = true SETTINGDEVICETAB -> cb_bp_setting_device.isChecked = true SETTINGSOFTTAB -> cb_bp_setting_soft.isChecked = true + SETTINGORDERTAB -> cb_bp_setting_order.isChecked = true else -> {} } super.onViewStateRestored(savedInstanceState) @@ -204,15 +243,16 @@ class BusPassengerFunctionFragment : const val TAG = "BusPassengerFunctionFragment" const val VIDEOTAB = "VideoTab" - const val SETTINGDEVICETAB = "SettingDeviceTab" const val SETTINGSOFTTAB = "SettingSoftTab" + const val SETTINGDEVICETAB = "SettingDeviceTab" + const val SETTINGORDERTAB = "SettingOrderTab" const val SELECTTAB = "SELECTTAB" @JvmStatic - fun newInstance(): BusPassengerFunctionFragment { + fun newInstance(): M1ContainFragment { val args = Bundle() - val fragment = BusPassengerFunctionFragment() + val fragment = M1ContainFragment() fragment.arguments = args return fragment } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt similarity index 82% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt index 20f53c6359..297a1c14c3 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt @@ -6,16 +6,16 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter import com.mogo.och.common.module.utils.SoundPoolHelper -import kotlinx.android.synthetic.m1.bus_p_function_setting_devices_fragment.* +import kotlinx.android.synthetic.m1.m1_devices_fragment.* /** * @author: yangyakun * @date: 2023/1/28 */ -class BusPassengerFunctionDeviceFragment : - MvpFragment() { +class M1DeviceFragment : + MvpFragment() { - override fun getLayoutId(): Int = R.layout.bus_p_function_setting_devices_fragment + override fun getLayoutId(): Int = R.layout.m1_devices_fragment override fun getTagName(): String = TAG @@ -53,9 +53,9 @@ class BusPassengerFunctionDeviceFragment : companion object { const val TAG = "BusPassengerFunctionDeviceFragment" @JvmStatic - fun newInstance(): BusPassengerFunctionDeviceFragment { + fun newInstance(): M1DeviceFragment { val args = Bundle() - val fragment = BusPassengerFunctionDeviceFragment() + val fragment = M1DeviceFragment() fragment.arguments = args return fragment } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt new file mode 100644 index 0000000000..b924719898 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt @@ -0,0 +1,45 @@ +package com.mogo.och.bus.passenger.ui + +import android.os.Bundle +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay +import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter + +/** + * @author: yangyakun + * @date: 2023/1/28 + */ +class M1OrderFragment : + MvpFragment() { + + private val arrayListOf = ArrayList() + + override fun getLayoutId(): Int { + return R.layout.m1_order_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + + } + + override fun createPresenter(): BusPassengerFunctionOrderPresenter { + return BusPassengerFunctionOrderPresenter(this) + } + + + companion object { + const val TAG = "BusPassengerFunctionOrderFragment" + @JvmStatic + fun newInstance(): M1OrderFragment { + val args = Bundle() + val fragment = M1OrderFragment() + fragment.arguments = args + return fragment + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index f38163ac3a..e8152785d0 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -10,8 +10,6 @@ import android.media.AudioManager import android.os.Bundle import android.view.Gravity import android.view.View -import android.view.animation.Animation -import android.view.animation.AnimationUtils import android.view.animation.LinearInterpolator import android.widget.RadioButton import android.widget.SeekBar @@ -38,7 +36,7 @@ import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.m1.bus_p_function_setting_soft_fragment.* +import kotlinx.android.synthetic.m1.m1_soft_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.TimeUnit @@ -47,10 +45,10 @@ import java.util.concurrent.TimeUnit * @author: yangyakun * @date: 2023/1/28 */ -class BusPassengerFunctionSoftFragment : - MvpFragment() { +class M1SoftFragment : + MvpFragment() { - override fun getLayoutId(): Int = R.layout.bus_p_function_setting_soft_fragment + override fun getLayoutId(): Int = R.layout.m1_soft_fragment override fun getTagName(): String = TAG @@ -672,9 +670,9 @@ class BusPassengerFunctionSoftFragment : const val touchTag = 2 @JvmStatic - fun newInstance(): BusPassengerFunctionSoftFragment { + fun newInstance(): M1SoftFragment { val args = Bundle() - val fragment = BusPassengerFunctionSoftFragment() + val fragment = M1SoftFragment() fragment.arguments = args return fragment } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt index a5359efed0..bf832a2e49 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt @@ -13,20 +13,20 @@ import com.mogo.och.bus.passenger.ui.layoutmanage.CarouselZoomPostLayoutListener import com.mogo.och.bus.passenger.ui.layoutmanage.CenterScrollListener import com.mogo.och.bus.passenger.view.ConsultVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import kotlinx.android.synthetic.m1.bus_p_function_video_fragment.* +import kotlinx.android.synthetic.m1.m1_video_fragment.* import kotlin.math.floor /** * @author: yangyakun * @date: 2023/1/28 */ -class BusPassengerFunctionVideoFragment : - MvpFragment() { +class M1VideoFragment : + MvpFragment() { private val arrayListOf = ArrayList() override fun getLayoutId(): Int { - return R.layout.bus_p_function_video_fragment + return R.layout.m1_video_fragment } override fun getTagName(): String { @@ -145,9 +145,9 @@ class BusPassengerFunctionVideoFragment : companion object { const val TAG = "BusPassengerFunctionVideoFragment" @JvmStatic - fun newInstance(): BusPassengerFunctionVideoFragment { + fun newInstance(): M1VideoFragment { val args = Bundle() - val fragment = BusPassengerFunctionVideoFragment() + val fragment = M1VideoFragment() fragment.arguments = args return fragment } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainPassengerFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt similarity index 86% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainPassengerFragment.kt rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index c9e2b1c664..07d9e0ab70 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainPassengerFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -14,20 +14,20 @@ import com.mogo.eagle.core.utilcode.util.AppStateManager import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter -import kotlinx.android.synthetic.m1.bus_p_fragment.* +import kotlinx.android.synthetic.m1.m1_main_fragment.* import java.lang.ref.WeakReference /** * @author: wangmingjun * @date: 2022/4/12 */ -class MainPassengerFragment : - MvpFragment() { +class MainFragment : + MvpFragment() { - private var bpFunctionGroupDialogFragment: WeakReference? = null + private var bpFunctionGroupDialogFragment: WeakReference? = null override fun getLayoutId(): Int { - return R.layout.bus_p_fragment + return R.layout.m1_main_fragment } override fun getTagName(): String { @@ -36,13 +36,16 @@ class MainPassengerFragment : override fun initViews() { cb_bp_video_player.onClick { - openSettingPage(BusPassengerFunctionFragment.VIDEOTAB) + openSettingPage(M1ContainFragment.VIDEOTAB) } cb_bp_setting_soft.onClick { - openSettingPage(BusPassengerFunctionFragment.SETTINGSOFTTAB) + openSettingPage(M1ContainFragment.SETTINGSOFTTAB) } cb_bp_setting_device.onClick { - openSettingPage(BusPassengerFunctionFragment.SETTINGDEVICETAB) + openSettingPage(M1ContainFragment.SETTINGDEVICETAB) + } + cb_bp_setting_order.onClick { + openSettingPage(M1ContainFragment.SETTINGORDERTAB) } v_debug.setOnLongClickListener { ToggleDebugView.toggleDebugView.toggle(requireContext()) @@ -68,7 +71,7 @@ class MainPassengerFragment : } private fun openSettingPage(tab: String) { - val fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(BusPassengerFunctionFragment.TAG) + val fragmentByTag: Fragment? = childFragmentManager.findFragmentByTag(M1ContainFragment.TAG) if (fragmentByTag is DialogFragment) { if (fragmentByTag.dialog != null && fragmentByTag.dialog!!.isShowing) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "正在展示") @@ -83,10 +86,10 @@ class MainPassengerFragment : } if (bpFunctionGroupDialogFragment?.get() == null) { - bpFunctionGroupDialogFragment = WeakReference(BusPassengerFunctionFragment.newInstance()) + bpFunctionGroupDialogFragment = WeakReference(M1ContainFragment.newInstance()) } val bpFunctionGroup = bpFunctionGroupDialogFragment?.get() - bpFunctionGroup?.arguments?.putString(BusPassengerFunctionFragment.SELECTTAB, tab) + bpFunctionGroup?.arguments?.putString(M1ContainFragment.SELECTTAB, tab) if (bpFunctionGroup != null) { if (bpFunctionGroup.dialog != null && bpFunctionGroup.dialog!!.isShowing) { return diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java index 5826d72403..18ed099f60 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java @@ -51,7 +51,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml new file mode 100644 index 0000000000..f6d0185a78 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml new file mode 100644 index 0000000000..0b05586036 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml similarity index 82% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_fragment.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml index a12be7243c..17fd3837a1 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml @@ -38,11 +38,21 @@ android:id="@+id/cb_bp_setting_device" android:background="@drawable/bus_p_function_bottom_device_bg_selector" android:button="@null" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/cb_bp_setting_order" app:layout_constraintStart_toEndOf="@+id/cb_bp_setting_soft" app:layout_constraintBottom_toBottomOf="parent" android:layout_width="@dimen/dp_181" android:layout_height="@dimen/dp_179"/> + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml similarity index 93% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_fragment.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml index a015255ed1..d5e5f00aaa 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml @@ -192,11 +192,29 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml new file mode 100644 index 0000000000..4ec74e559c --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml new file mode 100644 index 0000000000..fbe3554573 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml new file mode 100644 index 0000000000..498802462e --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml new file mode 100644 index 0000000000..987ee5ec9c --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml new file mode 100644 index 0000000000..9e559fcc54 --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_wait_define.xml @@ -0,0 +1,32 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_temperature_item.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_temperature_item.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/list_video_item_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/list_video_item_normal.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/taxi_p_video_show.xml rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml index b1c760a031..59bc9ebb4f 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml @@ -15,6 +15,12 @@ #A3BDF2 #56C59C #56EFA0 + #4A5375 + #0F1E57 + #225EFF + #3B4056 + #23293B + #485173 #CCFFFFFF #80FFFFFF diff --git a/app/build.gradle b/app/build.gradle index d7f0d4ff9a..ecea90ece4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -225,6 +225,10 @@ android { dimension "project" buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\"" } + yantai { + dimension "project" + buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\"" + } dali { dimension "project" diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle index 27dce97c46..08e8d39083 100644 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ b/app/productFlavors/flavorsFilterConfig.gradle @@ -111,6 +111,52 @@ project.android.variantFilter { variant -> } // endregion } + else if(names.contains("yantai")){// + // region 过滤noop 的flavors 不带och业务的 + if (names.contains("noop")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤sweper 的flavors + if (names.contains("sweeper") && !names.contains("fOchSweeper")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤shuttle 的flavors + if (names.contains("shuttle")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchBus")) { + } else if (names.contains("fOchBusPassenger")) { + } else { + setIgnore(true) + } + } + // endregion + // region 过滤taxi 的flavors + if (names.contains("taxi")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤bus 的flavors + if (names.contains("bus")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤charter 包车 的flavors + if (names.contains("charter")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("ochDriverM1")) { + } else if (names.contains("ochPassengerM1")) { + } else { + setIgnore(true) + } + } + // endregion + } else { setIgnore(true) } diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 7b7e2516e4..f6921d05cc 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -100,6 +100,11 @@ object ConfigStartUp { } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //是否显示 限速UI HmiBuildConfig.isShowLimitingVelocityView = false + } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) { + //是否显示 限速UI + HmiBuildConfig.isShowLimitingVelocityView = false + //白天模式 + FunctionBuildConfig.skinMode = 1 } }