diff --git a/OCH/bus/driver/build.gradle b/OCH/bus/driver/build.gradle index d861cf0864..6d11764ab4 100644 --- a/OCH/bus/driver/build.gradle +++ b/OCH/bus/driver/build.gradle @@ -68,7 +68,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") } diff --git a/OCH/bus/passenger/build.gradle b/OCH/bus/passenger/build.gradle index 391d65936f..2c836f13b4 100644 --- a/OCH/bus/passenger/build.gradle +++ b/OCH/bus/passenger/build.gradle @@ -44,6 +44,21 @@ android { } } + sourceSets { + main { + res.srcDirs = [ + 'src/main/res', + 'src/main/res/m2', + 'src/main/res/jinlv', + ] + java.srcDirs = [ + 'src/main/java', + 'src/main/java/m2', + 'src/main/java/jinlv', + ] + } + } + flavorDimensions "vehicle" productFlavors { // 车型：金旅星辰、开沃 小巴业务 @@ -51,6 +66,11 @@ android { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } + // 车型：金旅m1 小巴业务 + m2 { + dimension "vehicle" + buildConfigField 'int', 'NEW_TEST', '1' + } } } @@ -65,7 +85,7 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') 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 336ba9d4c3..0000000000 --- a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.mogo.och.bus.passenger; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_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.video.VideoPlayerActivity; - -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, VideoPlayerActivity.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/m2/AndroidManifest.xml b/OCH/bus/passenger/src/m2/AndroidManifest.xml new file mode 100644 index 0000000000..ef86a3875d --- /dev/null +++ b/OCH/bus/passenger/src/m2/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt similarity index 65% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt index 3e015512bd..adc783206e 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt @@ -5,15 +5,17 @@ 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.commons.module.status.IMogoStatusChangedListener -import com.mogo.commons.module.status.MogoStatusManager -import com.mogo.commons.module.status.StatusDescriptor -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode +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.MultiDisplayUtils import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.ui.PM2BaseFragment +import com.mogo.och.bus.passenger.passenger.ui.PM2BaseFragment +import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment +import com.mogo.och.common.module.wigets.video.VideoPlayerActivity /** * 网约车-Bus-乘客端 @@ -21,20 +23,20 @@ import com.mogo.och.bus.passenger.ui.PM2BaseFragment * Created on 2022/3/29 */ @Route(path = BusPassengerConst.PATH) -class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { +class MogoOCHShuttlePassenger : IMoGoFunctionProvider { private var mActivity: FragmentActivity? = null private var mContainerId = 0 - private var mPM2Fragment: PM2BaseFragment? = null - override fun createCoverage(activity: FragmentActivity, containerId: Int) {} + private var mPM2Fragment: Fragment? = null + override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { mActivity = activity mContainerId = containerId!! -// if (MogoStatusManager.getInstance().isScreenCoverDismiss){ - showFragment() -// }else{ -// MogoStatusManager.getInstance() -// .registerStatusChangedListener("ochM2Passenger", StatusDescriptor.SCREEN_COVER, this) -// } + showFragment() + if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { + mActivity?.let { + MultiDisplayUtils.startActWithSecond(it, VideoPlayerActivity::class.java) + } + } return null } @@ -63,12 +65,19 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======") - var fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG) + val fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG) - mPM2Fragment = if (fragmentByTag is PM2BaseFragment){ + mPM2Fragment = if (fragmentByTag is Fragment){ fragmentByTag }else{ - PM2BaseFragment() + if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + PM2BaseFragment() + }else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { + BusPassengerRouteFragment() + }else{ + BusPassengerRouteFragment() + } + } if (!mPM2Fragment?.isAdded!!){ @@ -90,16 +99,7 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { } companion object { - private val TAG = MogoOCHBusPassenger::class.java.simpleName + private val TAG = MogoOCHShuttlePassenger::class.java.simpleName } - override fun onStatusChanged(descriptor: StatusDescriptor?, isTrue: Boolean) { - if (descriptor == StatusDescriptor.SCREEN_COVER){ - if (isTrue){ - showFragment() - }else{ - hideFragment() - } - } - } } \ No newline at end of file diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerServiceApi.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerServiceApi.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt similarity index 93% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt index ac8504e5dd..8e4fef8281 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.p_bus_view_blue_tooth.view.* +import kotlinx.android.synthetic.main.p_bus_view_blue_tooth.view.blueView /** * 魔戒蓝牙控件 diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt similarity index 95% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt index 67fbc4b554..13f3a349df 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt @@ -10,7 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.bus_p_traffic_light_view.view.* +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_bg +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_iv +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_time_tv /** * bus乘客端：红绿灯view diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2OperationStatusResponse.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2OperationStatusResponse.java new file mode 100644 index 0000000000..315ca0568e --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2OperationStatusResponse.java @@ -0,0 +1,21 @@ +package com.mogo.och.bus.passenger.passenger.bean; + +import com.mogo.eagle.core.data.BaseData; + +/** + * @author congtaowang + * @since 2021/3/22 + * + * 小巴车运营状态返回参数 + */ +public class PM2OperationStatusResponse extends BaseData { + + public Result data; + + public static class Result { + private String sn; //司机屏sn + private String phone; //司机手机号 + public String plateNumber; //车牌号 + public int driverStatus;//0:已收车，1:已出车 + } +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2QueryLineRequest.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2QueryLineRequest.java new file mode 100644 index 0000000000..ed7d4835c6 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2QueryLineRequest.java @@ -0,0 +1,16 @@ +package com.mogo.och.bus.passenger.passenger.bean; + +public +/** + * @author congtaowang + * @since 2021/3/22 + * + * 根据车机行驶线路站点信息 + */ +class PM2QueryLineRequest { + + private String sn; + public PM2QueryLineRequest(String sn) { + this.sn = sn; + } +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResponse.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResponse.java new file mode 100644 index 0000000000..06d25677a8 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResponse.java @@ -0,0 +1,29 @@ +package com.mogo.och.bus.passenger.passenger.bean; + +import com.mogo.eagle.core.data.BaseData; +import com.mogo.och.data.bean.BusRoutesResult; + +/** + * 网约车小巴路线接口请求响应结果 返回的是对应司机屏的线路信息 + * + * @author tongchenfei + */ +public class PM2RoutesResponse extends BaseData { + private BusRoutesResult data; + + public BusRoutesResult getResult() { + return data; + } + + public void setResult(BusRoutesResult data) { + this.data = data; + } + + @Override + public String toString() { + return "OchBusRoutesResponse{" + + "data=" + data + + '}'; + } + +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResult.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResult.java new file mode 100644 index 0000000000..89e77ee2f1 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2RoutesResult.java @@ -0,0 +1,79 @@ +package com.mogo.och.bus.passenger.passenger.bean; + +import java.util.List; +import java.util.Objects; + +/** + * 网约车小巴路线接口返回接口数据封装 + * + * @author tongchenfei + */ +public class PM2RoutesResult { + private List sites; + private int lineId; + private String name; //线路名称 + private int lineType; //线路类型，0:环形 + private String description; + private int status; + private String runningDur; //运营时间 + private long taskTime; //线路时间班次 + + public List getSites() { + return sites; + } + + public int getLineId() { + return lineId; + } + + public String getName() { + return name; + } + + public int getLineType() { + return lineType; + } + + public String getDescription() { + return description; + } + + public int getStatus() { + return status; + } + + public String getRunningDur() { + return runningDur; + } + + @Override + public String toString() { + return "BusPassengerRoutesResult{" + + "sites=" + sites + + ", lineId=" + lineId + + ", name='" + name + '\'' + + ", lineType=" + lineType + + ", description='" + description + '\'' + + ", status=" + status + + ", runningDur='" + runningDur + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + PM2RoutesResult that = (PM2RoutesResult) o; + return lineId == that.lineId + && lineType == that.lineType + && status == that.status + && sites.equals(that.sites) + && name.equals(that.name) + && runningDur.equals(that.runningDur); + } + + @Override + public int hashCode() { + return Objects.hash(sites, lineId, name, lineType, description, status, runningDur); + } +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2Station.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2Station.java new file mode 100644 index 0000000000..78881be174 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/bean/PM2Station.java @@ -0,0 +1,173 @@ +package com.mogo.och.bus.passenger.passenger.bean; + +import java.util.Objects; + +/** + * 单个网约车小巴车站信息 + * + * @author wangmingjun + */ +public class PM2Station { + + private String name; + private String description; + private String cityCode; + private double lon; //高精坐标 + private double lat; //高精坐标 + private double gcjLon; //高德坐标 + private double gcjLat; //高德坐标 + private int businessType; //站点类型，9:taxi，10:bus + private int status; + private int siteId; + private int seq; + private int drivingStatus;//行驶信息，0初始值；1已经过；2当前站；3未到站 + private int ifStop = 1; // 是否需要停靠、1需要、0不需要 // TODO: 2021/10/19 原来站点里有设计是否需要停靠字段，现设计暂无，默认都需要停靠 + private boolean leaving; + + public void setName(String name) { + this.name = name; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public void setBusinessType(int businessType) { + this.businessType = businessType; + } + + public void setStatus(int status) { + this.status = status; + } + + public void setSiteId(int siteId) { + this.siteId = siteId; + } + + public void setSeq(int seq) { + this.seq = seq; + } + + public void setDrivingStatus(int drivingStatus) { + this.drivingStatus = drivingStatus; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public String getCityCode() { + return cityCode; + } + + public double getGcjLon() { + return gcjLon; + } + + public double getGcjLat() { + return gcjLat; + } + + public int getBusinessType() { + return businessType; + } + + public int getStatus() { + return status; + } + + public int getSiteId() { + return siteId; + } + + public int getSeq() { + return seq; + } + + public int getDrivingStatus() { + return drivingStatus; + } + + public double getLon() { + return lon; + } + + public double getLat() { + return lat; + } + + public void setIfStop(int ifStop) { + this.ifStop = ifStop; + } + + public int getIfStop() { + return ifStop; + } + + public void setLeaving(boolean leaving) { + this.leaving = leaving; + } + + public boolean isLeaving() { + return leaving; + } + + @Override + public String toString() { + return "OchBusStation{" + + "name='" + name + '\'' + + ", description='" + description + '\'' + + ", cityCode='" + cityCode + '\'' + + ", lon=" + lon + + ", lat=" + lat + + ", businessType=" + businessType + + ", status=" + status + + ", siteId=" + siteId + + ", seq=" + seq + + ", drivingStatus=" + drivingStatus + + ", ifStop=" + ifStop + + ", leaving=" + leaving + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + PM2Station that = (PM2Station) o; + return Double.compare(that.lon, lon) == 0 + && Double.compare(that.lat, lat) == 0 + && Double.compare(that.gcjLon, gcjLon) == 0 + && Double.compare(that.gcjLat, gcjLat) == 0 + && businessType == that.businessType + && status == that.status + && siteId == that.siteId + && seq == that.seq + && drivingStatus == that.drivingStatus + && ifStop == that.ifStop + && leaving == that.leaving + && Objects.equals(name, that.name) + && Objects.equals(cityCode, that.cityCode); + } + + @Override + public int hashCode() { + return Objects.hash(name, description, cityCode, lon, lat, gcjLon, gcjLat, businessType, status, siteId, seq, drivingStatus, ifStop, leaving); + } +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/ADASCallback.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/ADASCallback.kt new file mode 100644 index 0000000000..02c13b7666 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/ADASCallback.kt @@ -0,0 +1,10 @@ +package com.mogo.och.bus.passenger.passenger.callback + +/** + * @author: wangmingjun + * @date: 2023/2/15 + */ +interface ADASCallback { + fun updateHDMapStations(stations: MutableList>) + fun removeHDMapStations() +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/AutoPilotStatusCallback.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/AutoPilotStatusCallback.kt new file mode 100644 index 0000000000..87d222acb9 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/AutoPilotStatusCallback.kt @@ -0,0 +1,14 @@ +package com.mogo.och.bus.passenger.passenger.callback + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +interface AutoPilotStatusCallback { + /** + * false: 未开启自驾， true ： 开启自驾 + */ + fun updateAutoStatus(isOpen: Boolean) + + fun updateAutoStatus(status: Int) +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/DrivingInfoCallback.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/DrivingInfoCallback.kt new file mode 100644 index 0000000000..c971fb942a --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/callback/DrivingInfoCallback.kt @@ -0,0 +1,19 @@ +package com.mogo.och.bus.passenger.passenger.callback + +import com.mogo.och.data.bean.BusStationBean + +/** + * @author: wangmingjun + * @date: 2023/2/2 + */ +interface DrivingInfoCallback { + fun updateSpeed(speed: Int) + fun updatePlateNumber(carNum: String) + fun updateLine(lineName: String, lineDuring: String) + fun updateRemainMT(meters : Long, timeInSecond : Long) // 米，秒 + fun changeOperationStatus(loginStatus : Boolean) + fun showNoTaskView(isTrue : Boolean) + fun updateLineStations(stations: MutableList) + fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) + fun clearCustomPolyline() +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/constant/M2Const.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/constant/M2Const.kt new file mode 100644 index 0000000000..102a792310 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/constant/M2Const.kt @@ -0,0 +1,16 @@ +package com.mogo.och.bus.passenger.passenger.constant + +/** + * Created on 2021/12/6 + */ +class M2Const { + companion object { + //站点UUID + const val M2_MAP_STATION_MAKER = "m2_map_station_maker" + + /** + * Marker类型 + */ + const val TYPE_MARKER_M2_LINE = "TYPE_MARKER_M2_LINE" + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ADASModel.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ADASModel.kt new file mode 100644 index 0000000000..92f2916c6f --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ADASModel.kt @@ -0,0 +1,45 @@ +package com.mogo.och.bus.passenger.passenger.model + +import android.content.Context +import com.mogo.och.bus.passenger.passenger.callback.ADASCallback +import com.mogo.och.data.bean.BusStationBean + +/** + * @author: wangmingjun + * @date: 2023/2/2 + */ +class PM2ADASModel private constructor() { + + private var mContext: Context? = null + private var mAdasCallback: ADASCallback? = null + + companion object { + val TAG = PM2ADASModel::class.java.simpleName + val INSTANCE: PM2ADASModel by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) { + PM2ADASModel() + } + } + + fun init(context : Context){ + this.mContext = context + } + + fun setAdasCallback(adasCallback: ADASCallback?){ + this.mAdasCallback = adasCallback + } + + fun updateHDMapStations(stations: MutableList){ + var stationsList = mutableListOf>() + for (i in stations.indices){ + var listLatLng = mutableListOf() // 0: long 1:lat + listLatLng.add(stations[i].lon) + listLatLng.add(stations[i].lat) + stationsList.add(listLatLng) + } + mAdasCallback?.updateHDMapStations(stationsList) + } + + fun removeHDMapStations(){ + mAdasCallback?.removeHDMapStations() + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt new file mode 100644 index 0000000000..3eff2a3f93 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt @@ -0,0 +1,638 @@ +package com.mogo.och.bus.passenger.passenger.model + +import android.content.Context +import android.media.AudioAttributes +import android.media.AudioFocusRequest +import android.media.AudioManager +import android.net.ConnectivityManager +import android.os.Build +import android.os.Handler +import androidx.annotation.RequiresApi +import com.mogo.commons.module.intent.IMogoIntentListener +import com.mogo.commons.module.intent.IntentManager +import com.mogo.commons.voice.AIAssist +import com.mogo.commons.voice.IMogoVoiceCmdCallBack +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener +import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.CoordinateUtils +import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.NetworkUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.constant.BusPassengerConst +import com.mogo.och.bus.passenger.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.bus.passenger.passenger.callback.DrivingInfoCallback +import com.mogo.och.bus.passenger.passenger.model.PM2ServiceManager.driverAppSn +import com.mogo.och.bus.passenger.passenger.network.PM2ModelLoopManager +import com.mogo.och.common.module.bean.dpmsg.* +import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox +import com.mogo.och.common.module.biz.constant.OchCommonConst +import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.common.module.utils.DateTimeUtil +import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.data.bean.BusRoutesResult +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.data.bean.BusTransferData +import io.reactivex.disposables.Disposable +import mogo.telematics.pad.MessagePad +import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse +import kotlin.math.abs + +/** + * @author: wangmingjun + * @date: 2023/1/31 + */ +class PM2DrivingModel private constructor() { + + private var mContext: Context? = null + private var mLocation: MogoLocation? = null + + private var mRoutePoints = mutableListOf() + private var routesResult: BusRoutesResult? = null + + private var mCurrentAutoStatus = -1 + + var mStations = mutableListOf() + private var mNextStationIndex = 0 // A-B要到达站的index + private var isGoingToNextStation = false //是否前往下一站过程中 + + private var mTwoStationsRouts = mutableListOf() + private var mPreRouteIndex = 0 + private var mWipePreIndex = 0 + + private var mDrivingInfoCallback: DrivingInfoCallback? = null //行程信息 + private var mAutoStatusCallback: AutoPilotStatusCallback? = null //自动驾驶状态 + + private var operationStatus: PM2OperationStatusResponse.Result? = null + + @Volatile + private var globalPathTruncation: Disposable? = null + + private val handler = Handler(Handler.Callback { msg -> + if (msg.what == MSG_QUERY_BUS_P_STATION) { + queryDriverOperationStatus() + return@Callback true + } + false + }) + + companion object { + val TAG = PM2DrivingModel::class.java.simpleName + const val MSG_QUERY_BUS_P_STATION = 1001 + val INSTANCE: PM2DrivingModel by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) { + PM2DrivingModel() + } + } + + fun init(context : Context){ + mContext = context + initListener() + queryDriverByLocalDriver() + queryDriverOperationStatus() + startOrStopOrderLoop(true) + } + + private fun queryDriverByLocalDriver() { + //本地去请求司机端 + val msg = TaskDetailsMsg("task") + sendMsgToServer(GsonUtils.toJson(msg)) + } + + private fun initListener() { + //自动驾驶状态监听 + CallerAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener) + + // 定位监听 + CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 10,mMapLocationListener) + + //司乘屏通信监听 + CallerTelematicListenerManager.addListener(TAG,mReceivedMsgListener) + + //自动驾驶轨迹监听 + CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener) + + //网络监听 + IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener) + + } + + private fun sendMsgToServer(msg: String) { + sendMsgToServer( + OchCommonConst.BUSINESS_STRING, + GsonUtils.toJson(msg).toByteArray() + ) + } + + fun releaseListener(){ + //自动驾驶状态监听 + CallerAutoPilotStatusListenerManager.removeListener(TAG) + + // 定位监听 + CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) + + CallerTelematicListenerManager.removeListener(TAG) + + //自动驾驶轨迹监听 + CallerPlanningRottingListenerManager.removeListener(TAG) + } + + fun setDrivingInfoCallback(drivingInfoCallback : DrivingInfoCallback?){ + mDrivingInfoCallback = drivingInfoCallback + } + + fun setAutoStatusCallback(autoPilotStatusCallback: AutoPilotStatusCallback?){ + mAutoStatusCallback = autoPilotStatusCallback + } + + private val mNetWorkIntentListener = IMogoIntentListener { intentStr, _ -> + if (ConnectivityManager.CONNECTIVITY_ACTION == intentStr) { + if (NetworkUtils.isConnected(mContext)) { + queryDriverOperationStatus() + } + } + } + + private val mReceivedMsgListener: IReceivedMsgListener = + object : IReceivedMsgListener{ + @RequiresApi(Build.VERSION_CODES.O) + override fun onReceivedMsg(type: Int, byteArray: ByteArray) {//接收司机端发来的信息 + if (OchCommonConst.BUSINESS_STRING == type){ + val baseMsg = GsonUtils.fromJson(String(byteArray), BaseDPMsg::class.java) + Logger.d( + SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(baseMsg) + ) + + if (baseMsg != null && baseMsg.type == DPMsgType.TYPE_COMMON.type) { + val msg = GsonUtils.fromJson(String(byteArray), AppConnectMsg::class.java) + + if (msg != null && msg.isPlay){ //播报 + speakTTS(msg.msg) + } + + if (msg != null && msg.isViewShow) { //消息盒子显示内容 + pushAppOperationalMsgBox( + DateTimeUtil.getCurrentTimeStamp(),msg.msg) + } + }else if (baseMsg != null && baseMsg.type == DPMsgType.TYPE_TASK_DETAILS.type) { + val msg = GsonUtils.fromJson(String(byteArray), TaskDetailsMsg::class.java) + Logger.d( + SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(msg) + ) + if (msg == null || msg.msg?.isEmpty() == true) { + updateLocalOrder() + return + } + val result = GsonUtils.fromJson(msg.msg, BusTransferData::class.java) + mDrivingInfoCallback?.changeOperationStatus(result.loginStatus == 1) + if (result != null && result.routesResult == null){ + updateLocalOrder() + } + + if (routesResult == null || + (result != null && result.routesResult?.writeVersion!! > routesResult!!.writeVersion)) { + routesResult = result.routesResult + updatePassengerRouteInfo(routesResult!!) + } + + } + } + } + } + + @RequiresApi(Build.VERSION_CODES.O) + private fun speakTTS(msg: String) { + + var mAudioManager = mContext?.getSystemService(Context.AUDIO_SERVICE) as AudioManager + var mAudioAttributes = AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_MEDIA) //设置声音的用途 + .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) //设置声音的类型 + .build() + var mAudioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK) //设置焦点类型 + .setAudioAttributes(mAudioAttributes) //设置声音属性 + .setAcceptsDelayedFocusGain(false) //设置接受延迟获取焦点，需要设置OnAudioFocusChangeListener来监听焦点的获取 + .build() + mAudioManager.requestAudioFocus(mAudioFocusRequest) //抢占焦点 + + AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(msg,AIAssist.LEVEL0,object : IMogoVoiceCmdCallBack{ + override fun onSpeakEnd(speakText: String?) { + mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest) + } + + override fun onSpeakError(speakText: String?, errorMsg: String?) { + mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest) + } + + override fun onSpeakSelectTimeOut(speakText: String?) { + mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest) + } + }) + } + + private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener = + object : IMoGoChassisLocationGCJ02Listener{ + override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { + if (null == mogoLocation) return + mLocation = mogoLocation + updateSpeed(mogoLocation) + } + } + + private val moGoAutopilotPlanningListener = object : IMoGoPlanningRottingListener{ + + @Synchronized + override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) { + d(SceneConstant.M_BUS_P + TAG, "och-rotting==globalPathResp = " + GsonUtils.toJson(globalPathResp)) + globalPathResp?.let { + d(SceneConstant.M_BUS_P + TAG, "och-rotting==wayPointsSize = " + it.wayPointsList.size) + + if (globalPathTruncation != null && !globalPathTruncation!!.isDisposed) { + d(SceneConstant.M_BUS_P + TAG, "1s内不可以接受轨迹") + return@let + } + + globalPathTruncation = RxUtils.createSubscribe(1_000) { + d(SceneConstant.M_BUS_P + TAG, "可以接受轨迹") + } + d(SceneConstant.M_BUS_P + TAG, "接受轨迹中") + it.wayPointsList?.let {list-> + updateRoutePoints(list) + } + } + } + + } + + @Synchronized + fun updateRoutePoints(routePoints: List) { + mRoutePoints.clear() + val latLngModels = CoordinateCalculateRouteUtil + .coordinateConverterWgsToGcjLocations(mContext, routePoints) + d(SceneConstant.M_BUS_P + TAG, "och-rotting==latLngModels = " + latLngModels.size) + mRoutePoints.addAll(latLngModels) + + if (isGoingToNextStation){ + mTwoStationsRouts.clear() + startRemainRouteInfo() + } + } + + private fun updateSpeed(mogoLocation: MogoLocation) { + // km/h + val speedKM = (abs(mogoLocation.gnssSpeed) * 3.6f).toInt() + + mDrivingInfoCallback?.updateSpeed(speedKM) + } + + private val mAutoPilotStatusListener: IMoGoAutopilotStatusListener = + object : IMoGoAutopilotStatusListener { + + override fun onAutopilotStatusResponse(state: Int) { + super.onAutopilotStatusResponse(state) + d(SceneConstant.M_BUS_P+ TAG, "onAutopilotStatusResponse ===== $state") + if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != state){ + //美化模式下且行程中 + if (FunctionBuildConfig.isDemoMode && + mNextStationIndex>= 0 && mNextStationIndex <= mStations.size - 1 + && isGoingToNextStation){ + mAutoStatusCallback?.updateAutoStatus(true) + }else{//非美化模式下 + mAutoStatusCallback?.updateAutoStatus(false) + } + }else{//自驾状态 2 + mAutoStatusCallback?.updateAutoStatus(true) + } + } + + } + + private fun queryDriverOperationDelay() { + handler.sendEmptyMessageDelayed( + MSG_QUERY_BUS_P_STATION, + BusPassengerConst.QUERY_BUS_P_STATION_DELAY + ) + } + + private fun queryDriverOperationStatus() { + mContext?.let { + PM2ServiceManager.queryDriverOperationStatus( + it, + object : OchCommonServiceCallback { + override fun onSuccess(data: PM2OperationStatusResponse?) { + if (data?.data == null) return + if (data.data.driverStatus != operationStatus?.driverStatus + || data.data.plateNumber != operationStatus?.plateNumber + ) { + d( + SceneConstant.M_BUS_P + TAG, + "queryDriverOperationStatus ===== 车牌或者登陆状态有变更" + ) + mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1) + } + operationStatus = data.data as PM2OperationStatusResponse.Result +// mDrivingInfoCallback?.updatePlateNumber(data.data.plateNumber) + } + + override fun onError() { + if (!NetworkUtils.isConnected(mContext)) { + ToastUtils.showShort(mContext!!.getString(R.string.network_error_tip)) + } else { + ToastUtils.showShort(mContext!!.getString(R.string.request_error_tip)) + } +// queryDriverOperationDelay() + queryDriverByLocalDriver() + } + + override fun onFail(code: Int, msg: String) { + //延迟3s再次查询 + queryDriverOperationDelay() + } + }) + } + } + + fun queryDriverSiteByCoordinate(){ + mContext?.let { + PM2ServiceManager.queryDriverSiteByCoordinate(it, + object : OchCommonServiceCallback { + override fun onSuccess(data: PM2RoutesResponse?) { + + if (data == null || data.result == null) { + if (routesResult != null) { + routesResult = null + updateLocalOrder() + d( + SceneConstant.M_BUS_P + TAG, + "queryDriverSiteByCoordinate= result is null" + ) + return + } + return + } + if (data.result != null && data.result.equals(routesResult)) { + d( + SceneConstant.M_BUS_P + TAG, + "queryDriverSiteByCoordinate= not update" + ) + return + } + + if (routesResult != null && + routesResult!!.writeVersion < data.result.writeVersion + ) { + routesResult = data.result + } + + if (routesResult == null) { + routesResult = data.result + } + updatePassengerRouteInfo(data.result) + } + + override fun onError() { + d( + SceneConstant.M_BUS_P + TAG, + "queryDriverSiteByCoordinate = onError =" + + ", sn = " + driverAppSn + ) + queryDriverByLocalDriver() + } + + override fun onFail(code: Int, msg: String?) { + d(SceneConstant.M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg) + if (code == 1003) { + queryDriverOperationDelay() + } + if (driverAppSn.isEmpty()) { + return + } + if (code == 1003) { + routesResult = null + isGoingToNextStation = false + startOrStopCalculateRouteInfo(false) + return + } + } + + }) + } + } + + private fun updateLocalOrder(){ + mRoutePoints.clear() + routesResult = null + mNextStationIndex = 0 + isGoingToNextStation = false + startOrStopCalculateRouteInfo(false) + mDrivingInfoCallback?.showNoTaskView(true) + } + + private fun updatePassengerRouteInfo(result: BusRoutesResult) { + + if (result == null) { + updateLocalOrder() + return + } + + if (routesResult != null && routesResult!!.lineId != result.lineId){ + d(SceneConstant.M_BUS_P+ TAG, "lineId change= clearCustomPolyline") + mDrivingInfoCallback?.clearCustomPolyline() + } + + d(SceneConstant.M_BUS_P+ TAG, "queryDriverSiteByCoordinate= update") + routesResult = result + + mDrivingInfoCallback?.updateLine(result.name, result.runningDur) + if (result.sites != null) { + mDrivingInfoCallback?.showNoTaskView(false) + val stations: List = result.sites + mStations.clear() + mStations.addAll(stations) + mDrivingInfoCallback?.updateLineStations(mStations) + for (i in stations.indices) { + val station: BusStationBean = stations[i] + if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED + && station.isLeaving && i + 1 < stations.size) { + mDrivingInfoCallback?.updateStationsInfo(stations as MutableList, i + 1, false) + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") +// if (mNextStationIndex != i + 1) { + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--start ") + mTwoStationsRouts.clear() + startRemainRouteInfo() +// } + isGoingToNextStation = true + mNextStationIndex = i + 1 + return + } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--mNextStationIndex = $mNextStationIndex , i = $i") + d(SceneConstant.M_BUS_P+ TAG,"och-rotting--arrived ") + mPreRouteIndex = 0 + isGoingToNextStation = false + startOrStopCalculateRouteInfo(false) + mDrivingInfoCallback?.updateStationsInfo(stations as MutableList, i, true) + return + }else{ +// d(SceneConstant.M_BUS_P+TAG,"och-rotting--BusStationBean = " + GsonUtils.toJson(station)) + } + } + } + + } + + fun loopRouteAndWipe(){ + if (mRoutePoints != null && mRoutePoints.size > 0 && mLocation != null) { + val haveArrivedIndex = CoordinateCalculateRouteUtil + .getArrivedPointIndexNew( + mWipePreIndex, + mRoutePoints, + mLocation!! + ) + mWipePreIndex = haveArrivedIndex + d(SceneConstant.M_BUS_P + TAG, + "thread = " + Thread.currentThread().name + " haveArrivedIndex== " + haveArrivedIndex + ) +// if (mAutopilotPlanningCallback != null) { +// val routePoints = CoordinateCalculateRouteUtil +// .coordinateConverterLocationToLatLng(mContext, mRoutePoints) +// mAutopilotPlanningCallback.routeResult(routePoints, haveArrivedIndex) +// } + } + } + + private fun startRemainRouteInfo() { + //开启实时计算剩余距离，剩余时间，预计时间 + startOrStopCalculateRouteInfo(true) + } + + fun dynamicCalculateRouteInfo(){ + //计算当前位置和下一站的剩余点集合 + //计算剩余点总里程和时间 + d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size) + //计算当前位置和下一站的剩余点集合 + //计算剩余点总里程和时间 + if (mTwoStationsRouts.size == 0) { + calculateTwoStationsRoute() + } + + if (mTwoStationsRouts.size > 0 && mLocation != null) { + val lastPointsMap = CoordinateCalculateRouteUtil + .getRemainPointListByCompareNew(mPreRouteIndex, mTwoStationsRouts, mLocation!!) + for (index in lastPointsMap.keys) { + mPreRouteIndex = index + break + } + for (lastPoints in lastPointsMap.values) { + d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastPoints.size() = " + lastPoints.size) + var lastSumLength = 0f + lastSumLength = if (lastPoints.size == 1) { //只是最后一个点，计算当前位置和最后一个点的距离 + if (mNextStationIndex <= mStations.size - 1 && mNextStationIndex >= 0) { + val stationNext: BusStationBean = mStations[mNextStationIndex] + CoordinateUtils.calculateLineDistance( + stationNext.gcjLon, stationNext.gcjLat, + mLocation!!.longitude, mLocation!!.latitude + ) + } else { + CoordinateUtils.calculateLineDistance( + lastPoints[0].longitude, lastPoints[0].latitude, + mLocation!!.longitude, mLocation!!.latitude + ) + } + } else { + CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints) + } + val lastTime = lastSumLength / BusPassengerConst.SHUTTLE_AVERAGE_SPEED * 3.6 //秒 + d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastSumLength = $lastSumLength") + mDrivingInfoCallback?.updateRemainMT( + lastSumLength.toLong(), + lastTime.toLong() + ) + } + } + } + + private fun calculateTwoStationsRoute() { + //找出前往站对应的轨迹点，拿出两站点的集合 + d(SceneConstant.M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size) + if (mRoutePoints.size > 0) { + if (mStations.size > 1) { //两个站点及以上要计算两个站点间的轨迹路线 + if (mNextStationIndex <= mStations.size - 1 && mNextStationIndex - 1 >= 0) { + mTwoStationsRouts.clear() + val stationNext: BusStationBean = mStations[mNextStationIndex] + val stationCur: BusStationBean = mStations[mNextStationIndex - 1] + //当前站在轨迹中对应的点 + val currentRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew( + 0, mRoutePoints, stationCur.gcjLon, stationCur.gcjLat + ) + //要前往的站在轨迹中对应的点 + val nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew( + currentRouteIndex, + mRoutePoints, + stationNext.gcjLon, + stationNext.gcjLat + ) + + d(SceneConstant.M_BUS_P + TAG, "och-rotting==currentRouteIndex = " + currentRouteIndex + + "， nextRouteIndex = " + nextRouteIndex) + + if (currentRouteIndex < nextRouteIndex) { //如果找到的next在起点的轨迹前面，直接舍弃这个轨迹，不显示 + mTwoStationsRouts.addAll( + mRoutePoints.subList( + currentRouteIndex, + nextRouteIndex + 1 + ) + ) + } + } + } + } + } + + /** + * 开始轮询计算剩余里程和时间 + * @param isStart + */ + fun startOrStopCalculateRouteInfo(isStart: Boolean) { + d(SceneConstant.M_BUS_P+ TAG, "startOrStopCalculateRouteInfo() $isStart") + if (isStart) { + PM2ModelLoopManager.startCalculateRouteInfoLoop() + } else { + mTwoStationsRouts.clear() + PM2ModelLoopManager.stopCalculateRouteInfLoop() + } + } + + /** + * 实时轨迹擦除 + * @param isStart + */ + private fun startOrStopRouteAndWipe(isStart: Boolean) { + if (isStart) { + PM2ModelLoopManager.startOrStopRouteAndWipe() + } else { + mWipePreIndex = 0 + PM2ModelLoopManager.stopOrStopRouteAndWipe() + } + } + + private fun startOrStopOrderLoop(start: Boolean) { + d(SceneConstant.M_BUS_P + TAG, "startOrStopOrderLoop() $start") + if (start) { + PM2ModelLoopManager.startQueryDriverLineLoop() + } else { + PM2ModelLoopManager.stopQueryDriverLineLoop() + } + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt new file mode 100644 index 0000000000..f3c9406e08 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2ServiceManager.kt @@ -0,0 +1,107 @@ +package com.mogo.och.bus.passenger.passenger.model + +import android.content.Context +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.debug.DebugConfig +import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest +import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse +import com.mogo.och.bus.passenger.passenger.network.PassengerSAASServiceApi +import com.mogo.och.bus.passenger.passenger.network.PassengerServiceApi +import com.mogo.och.common.module.biz.constant.OchCommonConst +import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl +import com.mogo.och.common.module.biz.network.interceptor.transformTry + +/** + * Created on 2022/3/31 + */ +object PM2ServiceManager { + + private var mBusPassengerSaasServiceApi = + MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(PassengerSAASServiceApi::class.java) + + private var mBusPassengerServiceApi = + MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(PassengerServiceApi::class.java) + + + private var driverSnCache = "" + /** + * 获取Bus司机端的sn + * @return + */ + public val driverAppSn: String + get(){ + val serverToken = getServerToken() + if (serverToken != driverSnCache && serverToken.isNotEmpty()) { + driverSnCache = serverToken + } + return driverSnCache + } + + /** + * 查询绑定行驶的小巴车路线 + * @param context + * @param callback + */ + @JvmStatic + fun queryDriverSiteByCoordinate( + context: Context, callback: OchCommonServiceCallback? + ) { + if (DebugConfig.getProjectFlavor().contains("saas")){ + mBusPassengerSaasServiceApi.queryDriverSiteByCoordinate( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + driverAppSn + ).transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + }else{ + mBusPassengerServiceApi.queryDriverSiteByCoordinate( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + BusPassengerQueryLineRequest( + driverAppSn + ) + ).transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + } + }//2023-12-07 10:13:32 + + /** + * 查询司机端出车收车状态，以及车牌号 + * @param context + * @param callback + */ + @JvmStatic + fun queryDriverOperationStatus( + context: Context, + callback: OchCommonServiceCallback? + ) { + mBusPassengerServiceApi.queryDriverOperationStatus( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + driverAppSn + ) + .transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus=sn =$driverAppSn")) + if (DebugConfig.getProjectFlavor().contains("saas")){ + mBusPassengerSaasServiceApi.queryDriverOperationStatus( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + driverAppSn + ) + .transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus")) + }else{ + mBusPassengerServiceApi.queryDriverOperationStatus( + MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + driverAppSn + ) + .transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus")) + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ModelLoopManager.kt similarity index 97% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ModelLoopManager.kt index b430a966a1..adede242a0 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ModelLoopManager.kt @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.network +package com.mogo.och.bus.passenger.passenger.network import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.model.PM2DrivingModel +import com.mogo.och.bus.passenger.passenger.model.PM2DrivingModel import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ServiceApi.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ServiceApi.java new file mode 100644 index 0000000000..1b2b778829 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PM2ServiceApi.java @@ -0,0 +1,40 @@ +package com.mogo.och.bus.passenger.passenger.network; + +import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse; +import com.mogo.och.bus.passenger.passenger.bean.PM2QueryLineRequest; +import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse; + +import io.reactivex.Observable; +import retrofit2.http.Body; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.POST; +import retrofit2.http.Query; + +/** + * Created on 2022/3/31 + * + * Bus乘客端接口定义 + */ +public interface PM2ServiceApi { + /** + * 查询bus司机端绑定路线 + * @return 接口返回数据 + */ + @Headers( {"Content-Type:application/json;charset=UTF-8"} ) + @POST( "/och-shuttle-cabin/api/business/v1/passenger/lineDataWithDriver/query" ) + Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body PM2QueryLineRequest request); + + /** + * 查询司机端的登陆状态 + * @param sn + * @return + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) +// @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query") + @GET("/och-shuttle-cabin/api/business/v1/passenger/loginStatus") + Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + + +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerSAASServiceApi.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerSAASServiceApi.java new file mode 100644 index 0000000000..b19cb287f2 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerSAASServiceApi.java @@ -0,0 +1,38 @@ +package com.mogo.och.bus.passenger.passenger.network; + +import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse; +import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse; + +import io.reactivex.Observable; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.Query; + +/** + * Created on 2022/3/31 + * + * Bus乘客端接口定义 + */ +public interface PassengerSAASServiceApi { + /** + * 查询bus司机端绑定路线 + * @return 接口返回数据 + */ + @Headers( {"Content-Type:application/json;charset=UTF-8"} ) +// @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" ) + @GET( "/och-bus-cabin/api/business/v1/driver/bus/lineDataWithDriver/query" ) + Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + + /** + * 查询司机端的登陆状态 + * @param sn + * @return + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) +// @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus") + @GET("/och-bus-cabin/api/business/v1/loginStatus") + Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + + +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerServiceApi.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerServiceApi.java new file mode 100644 index 0000000000..836f4fd22f --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/network/PassengerServiceApi.java @@ -0,0 +1,40 @@ +package com.mogo.och.bus.passenger.passenger.network; + +import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest; +import com.mogo.och.bus.passenger.passenger.bean.PM2OperationStatusResponse; +import com.mogo.och.bus.passenger.passenger.bean.PM2RoutesResponse; + +import io.reactivex.Observable; +import retrofit2.http.Body; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.POST; +import retrofit2.http.Query; + +/** + * Created on 2022/3/31 + * + * Bus乘客端接口定义 + */ +public interface PassengerServiceApi { + /** + * 查询bus司机端绑定路线 + * @return 接口返回数据 + */ + @Headers( {"Content-Type:application/json;charset=UTF-8"} ) + @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" ) + Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request); + + /** + * 查询司机端的登陆状态 + * @param sn + * @return + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) +// @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query") + @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus") + Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + + +} diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2ADASPresenter.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2ADASPresenter.kt new file mode 100644 index 0000000000..92ab97f630 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2ADASPresenter.kt @@ -0,0 +1,41 @@ +package com.mogo.och.bus.passenger.passenger.presenter + +import androidx.lifecycle.LifecycleOwner +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.passenger.callback.ADASCallback +import com.mogo.och.bus.passenger.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER +import com.mogo.och.bus.passenger.passenger.model.PM2ADASModel +import com.mogo.och.bus.passenger.passenger.ui.PM2HPMapFragment + +class PM2ADASPresenter(view: PM2HPMapFragment?) : + Presenter(view), ADASCallback { + + init { + PM2ADASModel.INSTANCE.init(context) + initListener() + } + + private fun initListener() { + PM2ADASModel.INSTANCE.setAdasCallback(this) + } + + private fun removeListener() { + PM2ADASModel.INSTANCE.setAdasCallback(null) + } + + override fun onDestroy(owner: LifecycleOwner) { + super.onDestroy(owner) + removeListener() + } + + override fun updateHDMapStations(stations: MutableList>) { + for (i in stations.indices){ + mView?.setMapMaker(M2_MAP_STATION_MAKER+i,stations[i]) + } + + } + + override fun removeHDMapStations() { + mView?.removeMapMaker(M2_MAP_STATION_MAKER) + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2DrivingPresenter.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2DrivingPresenter.kt new file mode 100644 index 0000000000..3a2cfe3107 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2DrivingPresenter.kt @@ -0,0 +1,143 @@ +package com.mogo.och.bus.passenger.passenger.presenter + +import androidx.lifecycle.LifecycleOwner +import com.amap.api.maps.model.LatLng +import com.mogo.commons.mvp.Presenter +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.bus.passenger.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.bus.passenger.passenger.callback.DrivingInfoCallback +import com.mogo.och.bus.passenger.passenger.model.PM2ADASModel +import com.mogo.och.bus.passenger.passenger.model.PM2DrivingModel +import com.mogo.och.bus.passenger.passenger.ui.PM2DrivingInfoFragment +import com.mogo.och.data.bean.BusStationBean + +class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : + Presenter(view), DrivingInfoCallback, AutoPilotStatusCallback { + + init { + PM2DrivingModel.INSTANCE.init(context) + PM2ADASModel.INSTANCE.init(context) + initListener() + } + + override fun onDestroy(owner: LifecycleOwner) { + super.onDestroy(owner) + destroyListener() + PM2DrivingModel.INSTANCE.releaseListener() + } + + private fun initListener(){ + PM2DrivingModel.INSTANCE.setDrivingInfoCallback(this) + PM2DrivingModel.INSTANCE.setAutoStatusCallback(this) + } + + private fun destroyListener(){ + PM2DrivingModel.INSTANCE.setDrivingInfoCallback(null) + PM2DrivingModel.INSTANCE.setAutoStatusCallback(null) + } + + override fun updateSpeed(speed: Int) { +// CallerLogger.d( +// SceneConstant.M_BUS_P + "speed = ",speed.toString() +// ) + ThreadUtils.runOnUiThread { + mView?.updateSpeed(speed) + } + } + + override fun updatePlateNumber(carNum: String) { + ThreadUtils.runOnUiThread { + mView?.updateCarPlateNum(carNum) + } + } + + override fun updateLine(lineName: String, lineDuring: String) { + ThreadUtils.runOnUiThread { + mView?.updateTaskName(lineName) + mView?.updateTaskDuringTime(lineDuring) + } + } + + override fun updateRemainMT(meters: Long, timeInSecond: Long) { + ThreadUtils.runOnUiThread { + mView?.updateRemainMT(meters, timeInSecond) //米，秒 + } + } + + override fun changeOperationStatus(loginStatus: Boolean) { + ThreadUtils.runOnUiThread { + mView?.changeOperationStatus(loginStatus) + } + } + + override fun showNoTaskView(isTrue: Boolean) { + ThreadUtils.runOnUiThread { + mView?.showNoTaskView(!isTrue) + } + if (isTrue){ + PM2ADASModel.INSTANCE.removeHDMapStations() + } + } + + override fun updateLineStations(stations: MutableList) { + + val stationsList = mutableListOf() + val stationsListPass = mutableListOf() + var startStation: LatLng? = null + var endStation: LatLng? = null + + for (i in stations.indices){ + val station = stations[i] + val latLng = LatLng(station.gcjLat,station.gcjLon) + if(i==0){ + startStation = latLng + continue + } + if(i==stations.size-1){ + endStation = latLng + continue + } + if(station.drivingStatus==1){//行驶信息，0初始值；1已经过；2当前站；3未到站 + stationsListPass.add(latLng) + }else if(station.drivingStatus==2){ + if(station.isLeaving){ + stationsListPass.add(latLng) + }else{ + stationsList.add(latLng) + } + }else{ + stationsList.add(latLng) + } + + } + + ThreadUtils.runOnUiThread { + mView?.updateLineStations(stationsList,stationsListPass,startStation,endStation) + } + PM2ADASModel.INSTANCE.updateHDMapStations(stations) + } + + override fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { + ThreadUtils.runOnUiThread { + mView?.updateStationsInfo(stations,i,isArrived) + } + } + + override fun clearCustomPolyline() { + ThreadUtils.runOnUiThread { + mView?.clearCustomPolyline() + } + } + + override fun updateAutoStatus(isOpen: Boolean) { + ThreadUtils.runOnUiThread { + mView?.updateAutoStatus(isOpen) + } + } + + override fun updateAutoStatus(status: Int) { + + } + + +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2Presenter.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2Presenter.kt new file mode 100644 index 0000000000..b614c3458b --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2Presenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.passenger.ui.PM2BaseFragment + +class PM2Presenter(view: PM2BaseFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2VideoPresenter.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2VideoPresenter.kt new file mode 100644 index 0000000000..0407807008 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/presenter/PM2VideoPresenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.passenger.ui.video.PM2VideoFragment + +class PM2VideoPresenter(view: PM2VideoFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java new file mode 100644 index 0000000000..3c79925efa --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/provider/M2StatusViewManager.java @@ -0,0 +1,33 @@ +package com.mogo.och.bus.passenger.passenger.provider; + +import android.content.Context; +import android.view.View; + +import com.mogo.och.bus.passenger.passenger.ui.widget.M2StatusBarView; +import androidx.annotation.NonNull; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.data.constants.MogoServicePaths; +import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 根据优先级控制显示 window view. + */ +@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER ) +public class M2StatusViewManager implements IStatusViewLayout { + + + @NonNull + @Override + public View getStatusView(Context context) { + return new M2StatusBarView(context); + } + + @Override + public void init(Context context) { + + } +} diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt similarity index 88% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt index bb8aaf4a23..ff1a90270f 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2BaseFragment.kt @@ -1,11 +1,9 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.bus.passenger.passenger.ui -import android.provider.Settings -import android.view.Surface import com.mogo.commons.mvp.MvpFragment import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.PM2Presenter -import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment +import com.mogo.och.bus.passenger.passenger.presenter.PM2Presenter +import com.mogo.och.bus.passenger.passenger.ui.video.PM2VideoFragment /** * @author: wangmingjun @@ -19,7 +17,7 @@ class PM2BaseFragment : private var videoFragment : PM2VideoFragment? = null override fun getLayoutId(): Int { - return R.layout.p_m2_fragment + return R.layout.bus_p_m2_fragment } override fun getTagName(): String { diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt similarity index 75% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt index cac0e2f22a..a573be4e8d 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.bus.passenger.passenger.ui import android.graphics.BitmapFactory import android.graphics.drawable.AnimationDrawable @@ -12,11 +12,25 @@ import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.PM2DrivingPresenter +import com.mogo.och.bus.passenger.passenger.presenter.PM2DrivingPresenter import com.mogo.och.common.module.utils.DateTimeUtil.* import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.data.bean.BusStationBean -import kotlinx.android.synthetic.m2.p_m2_driving_info_fragment.* +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.auto_tv +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.clg_distance_left_time +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.group_not_select_line +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.group_stationinfo +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.iv_animal_list +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.line_during_tv +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.line_name_tv +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.overMapView +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.speed_tv +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.station_name_tv +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_arrived_notice +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_distance +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_left_time +import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.tv_next_station_title + import me.jessyan.autosize.utils.AutoSizeUtils import kotlin.math.ceil import kotlin.math.roundToInt @@ -28,10 +42,10 @@ import kotlin.math.roundToInt class PM2DrivingInfoFragment : MvpFragment() { - val stationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.m2_map_staton_icon) - val stationPassIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.m2_map_staton_arrived_icon) - val startStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.m2_map_start_icon) - val endStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.m2_map_end_icon) + val stationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_staton_icon) + val stationPassIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_staton_arrived_icon) + val startStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_start_icon) + val endStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.bus_p_m2_map_end_icon) /** * 改变自动驾驶状态 @@ -39,7 +53,7 @@ class PM2DrivingInfoFragment : * @param status 2 - running 1 - enable 2 - disable */ override fun getLayoutId(): Int { - return R.layout.p_m2_driving_info_fragment + return R.layout.bus_p_m2_driving_info_fragment } override fun getTagName(): String { @@ -52,12 +66,12 @@ class PM2DrivingInfoFragment : true } - line_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color)) - station_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color)) + line_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_line_name_tv_color)) + station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_line_name_tv_color)) speed_tv.setVertrial(true) val intArrayOf = intArrayOf( - requireContext().resources.getColor(R.color.shuttle_color_43cefe), - requireContext().resources.getColor(R.color.shuttle_color_1466fb) + requireContext().resources.getColor(R.color.bus_p_m2_color_43cefe), + requireContext().resources.getColor(R.color.bus_p_m2_color_1466fb) ) speed_tv.setmColorList(intArrayOf) @@ -150,7 +164,7 @@ class PM2DrivingInfoFragment : } private fun updateNoOrderUI() { - line_name_tv.text = resources.getString(R.string.m2_p_not_select_line_content) + line_name_tv.text = resources.getString(R.string.bus_p_m2_not_select_line_content) updateNoStationView() overMapView?.let { it.clearSiteMarkers() @@ -164,10 +178,10 @@ class PM2DrivingInfoFragment : } } private fun updateNoStationView(){ - station_name_tv.setTextColor(resources.getColor(R.color.m2_next_tv_color)) - station_name_tv.text = resources.getString(R.string.m2_p_empty_tv) - tv_distance.text = resources.getString(R.string.m2_p_empty_remain_km) - tv_left_time.text = resources.getString(R.string.m2_p_empty_remain_minute) + station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_next_tv_color)) + station_name_tv.text = resources.getString(R.string.bus_p_m2_empty_tv) + tv_distance.text = resources.getString(R.string.bus_p_m2_empty_remain_km) + tv_left_time.text = resources.getString(R.string.bus_p_m2_empty_remain_minute) noLineShow() } @@ -177,11 +191,11 @@ class PM2DrivingInfoFragment : fun updateAutoStatus(isAutoPilot: Boolean) { if (isAutoPilot){ - context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_p_white_color)) } - context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.auto_button_bg) } + context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.bus_p_m2_white_color)) } + context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bus_p_m2_auto_button_bg) } }else{ - context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_color_7094ad)) } - context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) } + context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.bus_p_m2_color_7094ad)) } + context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bus_p_m2_bg_p_m2_auto) } } } @@ -212,16 +226,16 @@ class PM2DrivingInfoFragment : fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean){ if (stations.size == 0) return if (0<= i && i() override fun getLayoutId(): Int { - return R.layout.p_m2_video_fragment + return R.layout.bus_p_m2_video_fragment } diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2BlueToothView.kt similarity index 66% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2BlueToothView.kt index 94d9bc69af..54377e1c4d 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2BlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.bus.passenger.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m2.p_m2_view_blue_tooth.view.* +import kotlinx.android.synthetic.main.bus_p_m2_view_blue_tooth.view.blueView /** * 魔戒蓝牙控件 @@ -20,15 +20,15 @@ class M2BlueToothView @JvmOverloads constructor( ) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener { init { - LayoutInflater.from(context).inflate(R.layout.p_m2_view_blue_tooth, this, true) + LayoutInflater.from(context).inflate(R.layout.bus_p_m2_view_blue_tooth, this, true) } override fun mofangStatus(status: Boolean) { ThreadUtils.runOnUiThread { if (status) { - blueView.setImageResource(R.drawable.m2_blue_tooth_close) + blueView.setImageResource(R.drawable.bus_p_m2_blue_tooth_close) } else { - blueView.setImageResource(R.drawable.m2_blue_tooth_open) + blueView.setImageResource(R.drawable.bus_p_m2_blue_tooth_open) } } } diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2PTrafficLightView.kt similarity index 89% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2PTrafficLightView.kt index 8560ce030b..b769b88f7d 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2PTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.bus.passenger.passenger.ui.widget import android.content.Context import android.util.AttributeSet @@ -10,7 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m2.m2_p_traffic_light_view.view.* +import kotlinx.android.synthetic.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_bg +import kotlinx.android.synthetic.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_iv +import kotlinx.android.synthetic.main.bus_p_m2_traffic_light_view.view.m2_p_traffic_light_time_tv /** * bus乘客端：红绿灯view @@ -34,7 +36,7 @@ class M2PTrafficLightView @JvmOverloads constructor( } private fun init(context: Context?) { - LayoutInflater.from(context).inflate(R.layout.m2_p_traffic_light_view, this, true) + LayoutInflater.from(context).inflate(R.layout.bus_p_m2_traffic_light_view, this, true) } override fun onAttachedToWindow() { @@ -134,15 +136,15 @@ class M2PTrafficLightView @JvmOverloads constructor( UiThreadHandler.post { when (lightId) { TrafficLightEnum.RED -> { - m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_red_nor) + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_m2_light_red_nor) this@M2PTrafficLightView.visibility = VISIBLE } TrafficLightEnum.YELLOW -> { - m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_yellow_nor) + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_m2_light_yellow_nor) this@M2PTrafficLightView.visibility = VISIBLE } TrafficLightEnum.GREEN -> { - m2_p_traffic_light_iv.setBackgroundResource(R.drawable.m2_light_green_nor) + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_m2_light_green_nor) this@M2PTrafficLightView.visibility = VISIBLE } else -> this@M2PTrafficLightView.visibility = GONE @@ -169,11 +171,11 @@ class M2PTrafficLightView @JvmOverloads constructor( val layoutParams = layoutParams if (layoutParams is MarginLayoutParams) { val lp = layoutParams - lp.width = resources.getDimension(R.dimen.m2_p_light_width).toInt() + lp.width = resources.getDimension(R.dimen.dp_60).toInt() setLayoutParams(lp) m2_p_traffic_light_time_tv.visibility = VISIBLE m2_p_traffic_light_bg.layoutParams.width = - resources.getDimension(R.dimen.m2_p_light_width).toInt() + resources.getDimension(R.dimen.dp_60).toInt() } } } \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2StatusBarView.kt similarity index 92% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2StatusBarView.kt index 932bd2f659..4455fbd417 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2StatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.bus.passenger.passenger.ui.widget import android.annotation.* import android.content.Context @@ -18,7 +18,8 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m2.p_m2_view_status_bar.view.* +import kotlinx.android.synthetic.main.bus_p_m2_view_status_bar.view.progress +import kotlinx.android.synthetic.main.bus_p_m2_view_status_bar.view.tv_power_cos import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -39,7 +40,7 @@ class M2StatusBarView @JvmOverloads constructor( private var oldBmsSoc: Float = -1.0f init { - LayoutInflater.from(context).inflate(R.layout.p_m2_view_status_bar, this, true) + LayoutInflater.from(context).inflate(R.layout.bus_p_m2_view_status_bar, this, true) setBackgroundColor(Color.parseColor("#80FFFFFF")) isClickable = true isFocusable = true diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2TurnLightView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2TurnLightView.kt new file mode 100644 index 0000000000..f280b6eb1f --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/M2TurnLightView.kt @@ -0,0 +1,199 @@ +package com.mogo.och.bus.passenger.passenger.ui.widget + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AlphaAnimation +import android.view.animation.Animation +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager +import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.bus.passenger.R +import com.mogo.och.common.module.manager.lightmanager.TurnLightManager +import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.left_nor_image +import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.left_select_image +import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.right_nor_image +import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.right_select_image +import kotlinx.android.synthetic.main.bus_p_m2_turn_light_status.view.turn_light_layout + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +class M2TurnLightView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), + IMoGoTurnLightListener, TurnLightManager.TurnLightListener { + + + companion object { + private const val TAG = "TurnLightViewStatus" + } + + private var isLeftLight: Boolean = false + private var isRightLight: Boolean = false + private var isDisappear: Boolean = false + + init { + LayoutInflater.from(context) + .inflate(R.layout.bus_p_m2_turn_light_status, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerTurnLightListenerManager.addListener(TAG,this) + + TurnLightManager.addTurnLightStatusChangeListener(TAG,this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerChassisLamplightListenerManager.removeListener(TAG) + CallerTurnLightListenerManager.removeListener(TAG) + } + + override fun hideTurnLightView() { + ThreadUtils.runOnUiThread{ + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + + override fun statusChange(newStatus: TurnLightManager.TurnLightStatus) { + ThreadUtils.runOnUiThread { + setTurnLight(newStatus) + } + } + + /** + * 转向灯动画 + */ + private fun setTurnLight(directionLight: TurnLightManager.TurnLightStatus) { + if (!isAttachedToWindow) { + return + } + //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 + when (directionLight) { + TurnLightManager.TurnLightStatus.TURN_LIGHT_LEFT -> { //左转向 + if (!isLeftLight) { + isLeftLight = true + isRightLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.VISIBLE + right_select_image.visibility = View.GONE + right_select_image.clearAnimation() + setAnimation(left_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_RIGHT -> { //右转向 + if (!isRightLight) { + isRightLight = true + isLeftLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.GONE + right_select_image.visibility = View.VISIBLE + left_select_image.clearAnimation() + setAnimation(right_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_NONE -> { //消失 + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + } + + //显示背景 + private fun showNormalAnimation() { + val appearAnimation = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 300 + val appearAnimationImage = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 500 + turn_light_layout.startAnimation(appearAnimation) + left_nor_image.startAnimation(appearAnimationImage) + right_nor_image.startAnimation(appearAnimationImage) + + turn_light_layout.visibility = View.VISIBLE + left_nor_image.visibility = View.VISIBLE + right_nor_image.visibility = View.VISIBLE + } + + //消失动画，当转向等数据为空时候 + private fun animationDisappear() { + left_select_image.visibility = View.GONE + right_select_image.visibility = View.GONE + left_select_image.clearAnimation() + right_select_image.clearAnimation() + + left_nor_image.clearAnimation() + right_nor_image.clearAnimation() + turn_light_layout.clearAnimation() + + val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) + disappearAnimationLeft.duration = 300 + + val disappearAnimationBg = AlphaAnimation(1.0f, 0f) + disappearAnimationBg.duration = 500 + + left_nor_image.startAnimation(disappearAnimationLeft) + right_nor_image.startAnimation(disappearAnimationLeft) + turn_light_layout.startAnimation(disappearAnimationBg) + + disappearAnimationLeft.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + left_nor_image.visibility = View.GONE + right_nor_image.visibility = View.GONE + } + }) + + disappearAnimationBg.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + turn_light_layout.visibility = View.GONE + } + }) + } + + //实现图片闪烁效果 + private fun setAnimation(imageView: ImageView) { + val animationSet = AnimatorSet() + val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) + val valueAnimatorDisappear = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) + valueAnimator.duration = 1000 + valueAnimatorDisappear.duration = 800 + valueAnimator.repeatCount = -1 + valueAnimatorDisappear.repeatCount = -1 + animationSet.playTogether(valueAnimatorDisappear, valueAnimator) + animationSet.start() + } + +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt new file mode 100644 index 0000000000..8fe325db3e --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -0,0 +1,137 @@ +package com.mogo.och.bus.passenger.passenger.ui.widget.video + +import android.content.Context +import android.media.AudioManager +import android.util.AttributeSet +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import com.shuyu.gsyvideoplayer.utils.GSYVideoType +import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer +import me.jessyan.autosize.utils.AutoSizeUtils + +/** + * @author: wangmingjun + * @date: 2023/2/17 + * 隐藏所有控件的player + */ +class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { + constructor(context: Context?) : super(context) + constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + + init { + hideWidget() + GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9) + GSYVideoType.setRenderType(GSYVideoType.GLSURFACE) + } + + override fun hideAllWidget() { + Logger.d(ImageAndVideoRotation.TAG, "hideAllWidget") +// hideWidget() + } + + override fun changeUiToNormal() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToNormal-hide") + hideWidget() + } + + override fun changeUiToPreparingShow() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToPreparingShow-hide") + hideWidget() + } + + override fun changeUiToPlayingShow() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToPlayingShow") + setCacheImageViewGone() + } + + override fun changeUiToPauseShow() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToPauseShow-hide") + startPlayLogic() +// hideWidget() + } + + override fun changeUiToCompleteShow() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToCompleteShow") + setCacheImageViewGone() + } + + override fun changeUiToPlayingBufferingShow() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToPlayingBufferingShow -hide") + hideWidget() + } + + override fun changeUiToError() { + Logger.d(ImageAndVideoRotation.TAG, "changeUiToError-hide") + hideWidget() + } + + private fun hideWidget(){ + setViewShowState(mBottomContainer, INVISIBLE) + setViewShowState(mProgressBar, INVISIBLE) + setViewShowState(mCurrentTimeTextView, INVISIBLE) + setViewShowState(mTotalTimeTextView, INVISIBLE) + setViewShowState(mBottomProgressBar, INVISIBLE) + setViewShowState(mBackButton, INVISIBLE) + setViewShowState(mStartButton, INVISIBLE) + + setViewShowState(mThumbImageViewLayout, VISIBLE) + setViewShowState(mThumbImageView, VISIBLE) + + setViewShowState(mTopContainer, INVISIBLE) + + setViewShowState(mLoadingProgressBar, INVISIBLE) + setViewShowState( + mLockScreen, INVISIBLE + ) + + setIsTouchWiget(false) + isFocusableInTouchMode = false + } + + fun setCacheImageViewVisible() { + Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewVISIBLE") + setViewShowState(mThumbImageViewLayout, VISIBLE) +// setViewShowState(mThumbImageView, VISIBLE) + } + + fun setCacheImageViewGone() { + Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewGONE") + setViewShowState(mThumbImageViewLayout, INVISIBLE) +// setViewShowState(mThumbImageView, INVISIBLE) + } + + //失去焦点声音压低 + override fun onLossTransientCanDuck() { +// setStreamVolume(0.2f) + setNeedMute(true) + } + + //获取焦点声音恢复 + override fun onGankAudio() { +// setStreamVolume(5.0f) + setNeedMute(false) + } + + private fun setStreamVolume(percent: Float){ + var mAudioManager = mContext?.getSystemService(Context.AUDIO_SERVICE) as AudioManager + var maxVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC) + var volume = (percent * maxVolume).toInt() + if (volume < 0 ){ + volume = 0 + } + mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC,volume,0) + } + + private fun setNeedMute(isMute: Boolean){ + gsyVideoManager?.player?.setNeedMute(isMute) + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + if (!mIfCurrentIsFullscreen) { + val dp2px = AutoSizeUtils.dp2px(context, 16f) + this.outlineProvider = TextureVideoViewOutlineProvider(dp2px.toFloat()) + this.clipToOutline = true + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceImageView.kt similarity index 76% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceImageView.kt index cf0d030989..6ec0d9d997 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceImageView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.bus.passenger.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context @@ -31,13 +31,13 @@ class AdvanceImageView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setImagePath(path: String){ - imageView?.setImageResource(R.drawable.m2_p_video_holder) + imageView?.setImageResource(R.drawable.bus_p_m2_p_video_holder) imageView?.let { Glide.with(context).asBitmap().load(path) .apply( RequestOptions().useUnlimitedSourceGeneratorsPool(true) - .placeholder(R.drawable.m2_p_video_holder) - .error(R.drawable.m2_p_video_holder) - .fallback(R.drawable.m2_p_video_holder) + .placeholder(R.drawable.bus_p_m2_p_video_holder) + .error(R.drawable.bus_p_m2_p_video_holder) + .fallback(R.drawable.bus_p_m2_p_video_holder) .centerCrop() ) .into(it) } diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvancePagerAdapter.kt new file mode 100644 index 0000000000..422bb1aa15 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -0,0 +1,212 @@ +package com.mogo.och.bus.passenger.passenger.ui.widget.video + +import android.content.Context +import android.view.View +import android.view.ViewGroup +import androidx.viewpager.widget.PagerAdapter +import androidx.viewpager.widget.ViewPager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.CountDownTimer +import com.mogo.och.common.module.wigets.video.RotationItem +import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack + +/** + * @author: wangmingjun + * @date: 2023/2/6 + */ +class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter(), + ViewPager.OnPageChangeListener { + + private val mContext: Context = context + private val mViewPager: ViewPager = viewPager + + private var dataList = mutableListOf() + private var viewList = mutableListOf() + + private var lastPosition = -1 + + private var current = 0 + private val time = 5000 + private var pause = false + private var countDownTimer: CountDownTimer? = null + + fun setData(list: MutableList) { + if (list.isEmpty()) return + dataList.addAll(list) + + viewList.clear() + + list.forEach { + addView(it) + } + + mViewPager.addOnPageChangeListener(this) + + notifyDataSetChanged() + + mViewPager.currentItem = 0 + + if (viewList.size > 0) { + if (viewList[mViewPager.currentItem] is AdvanceVideoView) {//有人反应第一个是视频不播放这边优化了一下 + Logger.d(ImageAndVideoRotation.TAG, "第一个是视频") + val video = viewList[mViewPager.currentItem] as AdvanceVideoView + video.setVideo(gsySampleCallBack) + + } else if (viewList[mViewPager.currentItem] is AdvanceImageView) { + Logger.d(ImageAndVideoRotation.TAG, "startTimer()_1") + current = 0//换页重新计算时间 + startTimer() + } + } + } + + override fun getCount(): Int { + return dataList.size + } + + override fun isViewFromObject(view: View, `object`: Any): Boolean { + return view === `object` + } + + override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { + container.removeView(viewList[position]) + } + + override fun instantiateItem(container: ViewGroup, position: Int): Any { + val view: View = viewList[position] + container.addView(view) + return view + + } + + override fun getItemPosition(`object`: Any): Int { + return POSITION_NONE + } + + private fun addView(item: RotationItem) { + if (item.type == 1) { // 表示视频 + val videoView = AdvanceVideoView(mContext) + videoView.setVideoPath(item.path,item.cacheImgPath) + viewList.add(videoView) + } else { // 表示图片 + val imageView = AdvanceImageView(mContext) + imageView.setImagePath(item.path) + viewList.add(imageView) + } + } + + fun setPause() { + pause = true + if (viewList.size > 0 && viewList[mViewPager.currentItem] is AdvanceVideoView) { + val videoView = viewList[mViewPager.currentItem] as AdvanceVideoView + videoView.setPause() + } + } + + fun setResume() { + pause = false + if (viewList.size > 0 && viewList[mViewPager.currentItem] is AdvanceVideoView) { + val videoView = viewList[mViewPager.currentItem] as AdvanceVideoView + videoView.setResume() + } + } + + override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { + } + + override fun onPageSelected(position: Int) { + } + + override fun onPageScrollStateChanged(state: Int) { + // 由于viewpager的预加载机制onPageSelected这里面加载videoview 放的跟玩一样 等操作完成后再播放videoview就香了 很丝滑 + if (state == 0) { //静止，什么都没做 + val currentItem = mViewPager.currentItem + Logger.d( + ImageAndVideoRotation.TAG, + "state = $state currentItem = $currentItem lastPosition = $lastPosition") + + if (viewList.size > 1) { //多于1，才会循环跳转 + + if (viewList[mViewPager.currentItem] is AdvanceVideoView) { + + val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) + videoView.setCacheImageViewVisible() + videoView.setVideo(gsySampleCallBack) + + } else if (viewList[mViewPager.currentItem] is AdvanceImageView) { + Logger.d(ImageAndVideoRotation.TAG, "startTimer()") + current = 0//换页重新计算时间 + startTimer() + } + lastPosition = mViewPager.currentItem + } + } + } + + private var gsySampleCallBack = object : GSYSampleCallBack() { + + override fun onPrepared(url: String?, vararg objects: Any?) { + Logger.d(ImageAndVideoRotation.TAG, "onPrepared--$url") + } + + override fun onAutoComplete(url: String?, vararg objects: Any?) { + Logger.d(ImageAndVideoRotation.TAG, "onAutoComplete()-$url") + if (viewList[mViewPager.currentItem] is AdvanceVideoView){ + val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) + if (viewList.size == 1){ + videoView.startPlay(url) + }else{ + videoView.onVideoReset() + goNextItemView() + } + } + } + + override fun onPlayError(url: String?, vararg objects: Any?) { + super.onPlayError(url, *objects) + Logger.d(ImageAndVideoRotation.TAG, "onPlayError()-$url") + if (viewList[mViewPager.currentItem] is AdvanceVideoView){ + val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) + videoView.onVideoReset() +// videoView.setCacheImageViewVisible() + videoView.clearLocalErrorVideo() + goNextItemView() + } + } + } + + private fun startTimer() { + if (countDownTimer != null){ + countDownTimer?.cancel() + countDownTimer = null + } + countDownTimer = object : CountDownTimer(5000,1000){ + override fun onTick(millisUntilFinished: Long) { + d(SceneConstant.M_BUS_P + "startTimer", "倒计时秒 = ${millisUntilFinished/1000}" ) + } + + override fun onFinish() { + d(ImageAndVideoRotation.TAG + "startTimer", "5s到，跳转") + goNextItemView() + } + + }.start() + } + + /** + * view 跳转 + */ + private fun goNextItemView() { + if (mViewPager.currentItem == viewList.size - 1) {//已经到最后一个 + mViewPager.post { + mViewPager.setCurrentItem(0, true) + } + } else { + mViewPager.post { + mViewPager.setCurrentItem(mViewPager.currentItem + 1, true) + } + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceVideoView.kt similarity index 98% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt rename to OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceVideoView.kt index fdb12a594f..f6bc20e3cd 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceVideoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.bus.passenger.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context @@ -91,7 +91,7 @@ class AdvanceVideoView @JvmOverloads constructor( Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") // ThreadUtils.runOnUiThread { // Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") - cacheImage?.setImageResource(R.drawable.m2_p_video_holder) + cacheImage?.setImageResource(R.drawable.bus_p_m2_p_video_holder) // cacheImage?.let { //暂时去掉加载首帧图，加载视频时，用本地默认图 // Glide.with(context).asBitmap().load(cacheImageUrl) // .apply( diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceViewPager.kt new file mode 100644 index 0000000000..7bcb5ac291 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/AdvanceViewPager.kt @@ -0,0 +1,24 @@ +package com.mogo.och.bus.passenger.passenger.ui.widget.video + +import android.content.Context +import android.util.AttributeSet +import android.view.MotionEvent +import androidx.viewpager.widget.ViewPager + +/** + * @author: wangmingjun + * @date: 2023/2/21 + */ +class AdvanceViewPager: ViewPager{ + + constructor(context: Context) : super(context) + constructor(context: Context,attrs: AttributeSet?) : super(context,attrs) + + override fun onTouchEvent(ev: MotionEvent?): Boolean { + return false + } + + override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean { + return false + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/ImageAndVideoRotation.kt new file mode 100644 index 0000000000..651b840c14 --- /dev/null +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/widget/video/ImageAndVideoRotation.kt @@ -0,0 +1,50 @@ +package com.mogo.och.bus.passenger.passenger.ui.widget.video + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.widget.RelativeLayout +import com.mogo.och.bus.passenger.passenger.ui.widget.video.AdvancePagerAdapter +import com.mogo.och.bus.passenger.passenger.ui.widget.video.AdvanceViewPager +import com.mogo.och.common.module.wigets.video.RotationItem + +/** + * @author: wangmingjun + * @date: 2023/2/6 + */ +class ImageAndVideoRotation @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : RelativeLayout(context, attrs) { + + private var viewPager: AdvanceViewPager? = null + private var pagerAdapter: AdvancePagerAdapter? = null + + companion object { + const val TAG = "ImageAndVideoRotation" + } + + init { + initView() + } + + @SuppressLint("ClickableViewAccessibility") + private fun initView() { + viewPager = AdvanceViewPager(context) + pagerAdapter = AdvancePagerAdapter(context, viewPager!!) + viewPager?.adapter = pagerAdapter + + addView(viewPager, LayoutParams(-1, -1)) + } + + fun setData(list: MutableList){ + pagerAdapter?.setData(list) + } + + fun setPause(){ + pagerAdapter?.setPause() + } + + fun setResume(){ + pagerAdapter?.setResume() + } +} \ No newline at end of file diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_end_tag_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_end_tag_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_start_tag_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_start_tag_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_line_logo.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_line_logo.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrived_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrived_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_end_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_end_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_start_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_start_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_unarrived_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_unarrived_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_right_route_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_right_route_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_route_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_route_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_status_bar_logo.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_status_bar_logo.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_un_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_un_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_un_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_un_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/card_split_line_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/card_split_line_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_arrived_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_arrived_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_un_arrived_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_un_arrived_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/live_view_loading_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/live_view_loading_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/route_line_name_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/route_line_name_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_0.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_0.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_1.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_1.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_2.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_2.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/station_arrow.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_p_speak_icon_arrived.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_p_speak_icon_arrived.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_status_bar.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_status_bar.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bottom_radius_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bottom_radius_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/brakelight_background_daytime.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_checked.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_checked.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_normal.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_normal.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_progress_bar_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_select.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_select.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_unselect.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_unselect.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/progress_item_round.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/progress_item_round.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/roma_bus_p_bg_selector.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/roma_bus_p_bg_selector.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/video_btn_selector.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/video_btn_selector.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_driver_monitor_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_driver_monitor_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_map_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_map_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_no_data_common_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_stations_common_item.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_traffic_light_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_blue_tooth.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_blue_tooth.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/view_turn_light_status_daytime.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/colors.xml b/OCH/bus/passenger/src/main/res/jinlv/values/colors.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/colors.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/colors.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml b/OCH/bus/passenger/src/main/res/jinlv/values/dimens.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/dimens.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/strings.xml b/OCH/bus/passenger/src/main/res/jinlv/values/strings.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/strings.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/strings.xml diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arrived_road.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arrived_road.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arriving_road.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_arriving_road.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_custom_corner.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_amap_custom_corner.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_0.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_0.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_1.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_1.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_2.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_arrived_an_2.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_auto_button_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_auto_button_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bg_driving_info_image.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bg_driving_info_image.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_close.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_blue_tooth_open.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bottom_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_bottom_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_card_split.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_card_split.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_clock_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_clock_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_drive_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_drive_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_line_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_line_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_time_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_img_time_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_green_nor.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_red_nor.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_light_yellow_nor.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_lightyellow_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_lightyellow_nor.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_name.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_name.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_noselect.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_noselect.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_tile.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_line_tile.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_car_icon.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_car_icon.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_end_icon.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_end_icon.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_start_icon.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_start_icon.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_arrived_icon.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_arrived_icon.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_icon.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_map_staton_icon.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_p_video_holder.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_p_video_holder.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_sky_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_sky_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_status_bar_logo.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_left.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_left.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_right.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_bottom_right.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_left.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_left.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_right.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_video_top_right.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_open.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_open.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png b/OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png rename to OCH/bus/passenger/src/main/res/m2/drawable-nodpi/bus_p_m2_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_arrived_notice.xml similarity index 76% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_arrived_notice.xml index 648b1a9c96..f9fea1ec61 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_arrived_notice.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_distance_lefttime.xml similarity index 76% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_distance_lefttime.xml index a7412494a3..75670794d2 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_distance_lefttime.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_info.xml similarity index 85% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_info.xml index 61904389a3..b99cfe6efd 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_info.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_selector.xml similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_driving_selector.xml diff --git a/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_arrived_station.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_arrived_station.xml new file mode 100644 index 0000000000..1824c74bbf --- /dev/null +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_arrived_station.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_auto.xml similarity index 79% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_auto.xml index 0497ff212e..0c40c7ee4b 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_auto.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_traffic_light.xml similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_p_m2_traffic_light.xml diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_pnc.xml similarity index 68% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_pnc.xml index 0357ebb192..cf40e4a77b 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_bg_pnc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_brakelight_background_daytime.xml similarity index 69% rename from OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_brakelight_background_daytime.xml index 1fe46ae5ff..42320a2531 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml +++ b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_brakelight_background_daytime.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml b/OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_power_seekbar_style.xml similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml rename to OCH/bus/passenger/src/main/res/m2/drawable/bus_p_m2_power_seekbar_style.xml diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml similarity index 86% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml index 846769ef18..a290ef869b 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_driving_info_fragment.xml @@ -10,17 +10,17 @@ android:id="@+id/overMapView" android:layout_width="0dp" android:layout_height="match_parent" - app:carDrawable="@drawable/m2_map_car_icon" + app:carDrawable="@drawable/bus_p_m2_map_car_icon" app:isClearArrived="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintWidth_percent="0.6" - app:mapStyleExtraPath="@string/m2_over_map_style_extra_path" - app:mapStylePath="@string/m2_over_map_style_path" + app:mapStyleExtraPath="@string/bus_p_m2_over_map_style_extra_path" + app:mapStylePath="@string/bus_p_m2_over_map_style_path" app:resetDrawableMarginBottom="@dimen/dp_54" app:resetDrawableMarginRight="@dimen/dp_34" - app:compassDrawable="@drawable/amap_custom_corner_m2" - app:arrivedDrawable="@drawable/m2_amap_arrived_road" - app:unArrivedDrawable="@drawable/m2_amap_arriving_road" + app:compassDrawable="@drawable/bus_p_m2_amap_custom_corner" + app:arrivedDrawable="@drawable/bus_p_m2_amap_arrived_road" + app:unArrivedDrawable="@drawable/bus_p_m2_amap_arriving_road" app:mapTilt="0" app:leftPadding="200" app:topPadding="150" @@ -31,7 +31,7 @@ android:layout_width="0dp" android:scaleType="fitXY" android:layout_height="match_parent" - android:src="@drawable/bg_driving_info_image" + android:src="@drawable/bus_p_m2_bg_driving_info_image" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_percent="0.516"/> @@ -46,7 +46,7 @@ android:id="@+id/iv_line_name_container" android:layout_width="@dimen/dp_661" android:layout_height="@dimen/dp_92" - android:src="@drawable/shuttle_p_line_name" + android:src="@drawable/bus_p_m2_line_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -56,7 +56,7 @@ android:layout_width="@dimen/dp_32" android:layout_height="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_14" - android:src="@drawable/shuttle_p_line_tile" + android:src="@drawable/bus_p_m2_line_tile" app:layout_constraintBottom_toBottomOf="@+id/line_name_tv" app:layout_constraintEnd_toStartOf="@+id/line_name_tv" app:layout_constraintHorizontal_chainStyle="packed" @@ -72,7 +72,7 @@ android:marqueeRepeatLimit="marquee_forever" android:maxWidth="@dimen/dp_600" android:singleLine="true" - android:textColor="@color/m2_line_name_tv_color" + android:textColor="@color/bus_p_m2_line_name_tv_color" android:textSize="@dimen/dp_36" android:textStyle="bold" app:customGap="0.2" @@ -97,14 +97,14 @@ app:layout_constraintEnd_toEndOf="@+id/m2_p_not_select_line_content" app:layout_constraintBottom_toTopOf="@+id/m2_p_not_select_line_content" android:layout_marginBottom="@dimen/dp_14" - android:src="@drawable/shuttle_p_line_noselect" /> + android:src="@drawable/bus_p_m2_line_noselect" /> @@ -139,7 +139,7 @@ android:id="@+id/iv_animal_list" android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_32" - android:src="@drawable/bg_p_m2_arrived_station" + android:src="@drawable/bus_p_m2_bg_p_m2_arrived_station" android:visibility="gone" android:layout_marginStart="@dimen/dp_7" /> @@ -152,8 +152,8 @@ android:marqueeRepeatLimit="marquee_forever" android:gravity="left" android:singleLine="true" - android:text="@string/m2_p_empty_tv" - android:textColor="@color/shuttle_color_17417B" + android:text="@string/bus_p_m2_empty_tv" + android:textColor="@color/bus_p_m2_color_17417B" android:textSize="@dimen/dp_56" android:textStyle="bold" app:customGap="0.2" @@ -175,7 +175,7 @@ android:layout_width="@dimen/dp_200" android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_8" - android:background="@drawable/bg_driving_distance_lefttime" + android:background="@drawable/bus_p_m2_bg_driving_distance_lefttime" app:layout_constraintStart_toStartOf="@+id/tv_next_station_title" app:layout_constraintTop_toBottomOf="@+id/station_name_tv" /> @@ -183,7 +183,7 @@ android:id="@+id/bg_distance_lefttime_split" android:layout_width="@dimen/dp_1" android:layout_height="@dimen/dp_23" - android:background="@color/shuttle_color_6617417B" + android:background="@color/bus_p_m2_color_6617417B" app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime" app:layout_constraintEnd_toEndOf="@+id/bg_distance_lefttime" app:layout_constraintStart_toStartOf="@+id/bg_distance_lefttime" @@ -194,7 +194,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="--" - android:textColor="@color/shuttle_color_2d3e5f" + android:textColor="@color/bus_p_m2_color_2d3e5f" android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime" app:layout_constraintEnd_toStartOf="@+id/bg_distance_lefttime_split" @@ -206,7 +206,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="--" - android:textColor="@color/shuttle_color_2d3e5f" + android:textColor="@color/bus_p_m2_color_2d3e5f" android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime" app:layout_constraintEnd_toEndOf="@+id/bg_distance_lefttime" @@ -219,10 +219,10 @@ android:id="@+id/tv_arrived_notice" android:layout_width="@dimen/dp_200" android:layout_height="@dimen/dp_48" - android:background="@drawable/bg_driving_arrived_notice" + android:background="@drawable/bus_p_m2_bg_driving_arrived_notice" android:gravity="center" - android:text="@string/m2_p_arrived_station_title" - android:textColor="@color/shuttle_color_34A61F" + android:text="@string/bus_p_m2_arrived_station_title" + android:textColor="@color/bus_p_m2_color_34A61F" android:textStyle="bold" android:layout_marginTop="@dimen/dp_8" android:textSize="@dimen/dp_26" @@ -238,7 +238,7 @@ android:layout_width="0dp" android:layout_height="@dimen/dp_181" android:scaleType="fitXY" - android:src="@drawable/shuttle_p_card_split" + android:src="@drawable/bus_p_m2_card_split" app:layout_constraintEnd_toEndOf="@+id/cl_left_container" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -251,7 +251,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_50" android:text="0" - android:textColor="@color/m2_p_speed_tv_color" + android:textColor="@color/bus_p_m2_speed_tv_color" android:textSize="@dimen/dp_70" android:textStyle="bold" app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg" @@ -263,9 +263,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_8" - android:text="@string/m2_p_speed_unit_txt" + android:text="@string/bus_p_m2_speed_unit_txt" app:layout_constraintBaseline_toBaselineOf="@+id/speed_tv" - android:textColor="@color/m2_line_during_tv_color" + android:textColor="@color/bus_p_m2_line_during_tv_color" app:layout_constraintBottom_toBottomOf="@+id/speed_tv" android:textSize="@dimen/dp_18" app:layout_constraintStart_toEndOf="@+id/speed_tv" /> @@ -275,17 +275,17 @@ android:layout_width="@dimen/dp_83" android:layout_height="@dimen/dp_48" android:layout_marginTop="@dimen/dp_21" - android:background="@drawable/bg_p_m2_auto" + android:background="@drawable/bus_p_m2_bg_p_m2_auto" android:gravity="center" - android:text="@string/m2_p_auto_tv" - android:textColor="@color/shuttle_color_7094ad" + android:text="@string/bus_p_m2_auto_tv" + android:textColor="@color/bus_p_m2_color_7094ad" android:layout_marginBottom="@dimen/dp_34" android:textSize="@dimen/dp_24" app:layout_constraintLeft_toLeftOf="@+id/speed_tv" app:layout_constraintBottom_toBottomOf="parent" /> - @@ -340,7 +340,7 @@ app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg" app:layout_constraintStart_toEndOf="@+id/view_split" android:layout_marginEnd="@dimen/dp_90" - android:textColor="@color/shuttle_color_17417B" + android:textColor="@color/bus_p_m2_color_17417B" android:includeFontPadding="false" android:textSize="@dimen/dp_52" /> @@ -355,7 +355,7 @@ android:layout_marginBottom="-3dp" app:layout_constraintBottom_toTopOf="@+id/viewTextClockWeek" app:layout_constraintStart_toEndOf="@+id/view_split" - android:textColor="@color/shuttle_color_17417B" + android:textColor="@color/bus_p_m2_color_17417B" android:includeFontPadding="false" android:textSize="@dimen/dp_26" /> @@ -371,7 +371,7 @@ app:layout_constraintBottom_toBottomOf="@+id/view_split" app:layout_constraintStart_toEndOf="@+id/view_split" android:layout_marginEnd="@dimen/dp_90" - android:textColor="@color/shuttle_color_17417B" + android:textColor="@color/bus_p_m2_color_17417B" android:includeFontPadding="false" android:textSize="@dimen/dp_26" /> diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml similarity index 93% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml index 54c8669265..2944a93384 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml @@ -15,7 +15,7 @@ app:layout_constraintLeft_toLeftOf="parent"/> + app:background_resource="@drawable/bus_p_m2_bg_pnc" /> @@ -109,28 +109,28 @@ app:layout_constraintLeft_toLeftOf="parent"/> @@ -28,7 +28,7 @@ android:layout_height="match_parent" android:textSize="@dimen/dp_22" android:textStyle="bold" - android:textColor="@color/m2_light_tv_color" + android:textColor="@color/bus_p_m2_color_2d3e5f" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:gravity="center" /> diff --git a/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_turn_light_status.xml similarity index 85% rename from OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_turn_light_status.xml index b782ef1f60..ec5a62ef4d 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_turn_light_status.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - android:background="@drawable/brakelight_background_daytime" + android:background="@drawable/bus_p_m2_brakelight_background_daytime" android:layout_gravity="top|center_horizontal" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -22,7 +22,7 @@ android:layout_height="@dimen/dp_30" android:layout_gravity="left|center_vertical" android:layout_marginLeft="@dimen/dp_12" - android:src="@drawable/m2_zuozhuan_un_open" /> + android:src="@drawable/bus_p_m2_zuozhuan_un_open" /> + android:src="@drawable/bus_p_m2_youzhuan_un_open" /> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_fragment.xml similarity index 85% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_fragment.xml index 6c82b8c9dc..66e95d9087 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_fragment.xml @@ -5,7 +5,7 @@ - diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_view.xml similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_video_view.xml diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_blue_tooth.xml similarity index 89% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_blue_tooth.xml index 69ae14c394..6f8a5129f0 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_blue_tooth.xml @@ -9,7 +9,7 @@ android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_26" android:scaleType="fitXY" - android:src="@drawable/m2_blue_tooth_open" + android:src="@drawable/bus_p_m2_blue_tooth_open" tools:ignore="ContentDescription" /> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_status_bar.xml similarity index 91% rename from OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml rename to OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_status_bar.xml index dc4f1090d5..163bee4257 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml +++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_view_status_bar.xml @@ -26,7 +26,7 @@ app:layout_constraintStart_toEndOf="@+id/wifiStateView" android:layout_width="@dimen/dp_15" android:layout_height="@dimen/dp_22" - android:src="@drawable/m2_blue_tooth_open" + android:src="@drawable/bus_p_m2_blue_tooth_open" android:layout_gravity="center" android:layout_marginStart="@dimen/dp_32" /> @@ -44,7 +44,7 @@ android:minHeight="@dimen/dp_8" android:layout_marginRight="4dp" android:background="@null" - android:progressDrawable="@drawable/m2_power_seekbar_style" /> + android:progressDrawable="@drawable/bus_p_m2_power_seekbar_style" /> @@ -62,7 +62,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:src="@drawable/m2_status_bar_logo" + android:src="@drawable/bus_p_m2_status_bar_logo" android:scaleType="fitXY" android:layout_width="@dimen/dp_94" android:layout_height="@dimen/dp_25"/> diff --git a/OCH/shuttle/passenger/src/m2/res/raw/star_marker.nt3d b/OCH/bus/passenger/src/main/res/m2/raw/star_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/raw/star_marker.nt3d rename to OCH/bus/passenger/src/main/res/m2/raw/star_marker.nt3d diff --git a/OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d b/OCH/bus/passenger/src/main/res/m2/raw/station_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d rename to OCH/bus/passenger/src/main/res/m2/raw/station_marker.nt3d diff --git a/OCH/bus/passenger/src/main/res/m2/values/colors.xml b/OCH/bus/passenger/src/main/res/m2/values/colors.xml new file mode 100644 index 0000000000..3c583e6cd4 --- /dev/null +++ b/OCH/bus/passenger/src/main/res/m2/values/colors.xml @@ -0,0 +1,26 @@ + + + #FFFFFF + #0B1E38 + #BBDAFB + #0B1E38 + #5D7199 + #A5D8FF + #1B2546 + #23355D + #8895B7 + + + #C8EFFF + #203555 + #17417B + #2D3E5F + #34A61F + #AEEDB8 + #43CEFE + #1466FB + #7094AD + + #99AFC9E7 + #6617417B + \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/res/m2/values/dimens.xml b/OCH/bus/passenger/src/main/res/m2/values/dimens.xml new file mode 100644 index 0000000000..55344e5192 --- /dev/null +++ b/OCH/bus/passenger/src/main/res/m2/values/dimens.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/OCH/bus/passenger/src/main/res/m2/values/strings.xml b/OCH/bus/passenger/src/main/res/m2/values/strings.xml new file mode 100644 index 0000000000..7ee723e068 --- /dev/null +++ b/OCH/bus/passenger/src/main/res/m2/values/strings.xml @@ -0,0 +1,14 @@ + + + KM/H + m2_map_style.data + m2_map_style_extra.data + AUTO + 已到站 + 暂无站点 + 前方到站 + —公里 + —分钟 + 请按秩序下车 + 暂无路线 + \ No newline at end of file diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index f28ba4dcbd..ba54bb07a1 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") androidTestImplementation rootProject.ext.dependencies.androidxjunit diff --git a/OCH/charter/passenger/build.gradle b/OCH/charter/passenger/build.gradle index e84da8b7da..ef7833ad2b 100644 --- a/OCH/charter/passenger/build.gradle +++ b/OCH/charter/passenger/build.gradle @@ -59,7 +59,7 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') diff --git a/OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/charter/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/charter/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt b/OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt rename to OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt b/OCH/charter/passenger/src/test/java/passenger/Model.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt rename to OCH/charter/passenger/src/test/java/passenger/Model.kt diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt b/OCH/charter/passenger/src/test/java/passenger/ModelX.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt rename to OCH/charter/passenger/src/test/java/passenger/ModelX.kt diff --git a/OCH/mogo-och-common-module/.gitignore b/OCH/common/common/.gitignore similarity index 100% rename from OCH/mogo-och-common-module/.gitignore rename to OCH/common/common/.gitignore diff --git a/OCH/mogo-och-common-module/build.gradle b/OCH/common/common/build.gradle similarity index 95% rename from OCH/mogo-och-common-module/build.gradle rename to OCH/common/common/build.gradle index d45239d994..6ee9002e13 100644 --- a/OCH/mogo-och-common-module/build.gradle +++ b/OCH/common/common/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.material testImplementation 'junit:junit:4.12' - testImplementation project(path: ':OCH:mogo-och-common-module') + testImplementation project(path: ':OCH:common:common') androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation rootProject.ext.dependencies.amapnavi3dmap @@ -60,7 +60,7 @@ dependencies { implementation rootProject.ext.dependencies.litezxing - api project(":OCH:mogo-och-data") + api project(":OCH:common:data") if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogocommons diff --git a/OCH/mogo-och-common-module/consumer-rules.pro b/OCH/common/common/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-common-module/consumer-rules.pro rename to OCH/common/common/consumer-rules.pro diff --git a/OCH/mogo-och-common-module/proguard-rules.pro b/OCH/common/common/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-common-module/proguard-rules.pro rename to OCH/common/common/proguard-rules.pro diff --git a/OCH/mogo-och-common-module/src/androidTest/java/com/mogo/och/common/module/ExampleInstrumentedTest.kt b/OCH/common/common/src/androidTest/java/com/mogo/och/common/module/ExampleInstrumentedTest.kt similarity index 100% rename from OCH/mogo-och-common-module/src/androidTest/java/com/mogo/och/common/module/ExampleInstrumentedTest.kt rename to OCH/common/common/src/androidTest/java/com/mogo/och/common/module/ExampleInstrumentedTest.kt diff --git a/OCH/mogo-och-common-module/src/debug/AndroidManifest.xml b/OCH/common/common/src/debug/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-common-module/src/debug/AndroidManifest.xml rename to OCH/common/common/src/debug/AndroidManifest.xml diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/BizBroadcastReceiver.kt diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/location/MogoLocationExit.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/location/MogoLocationExit.kt similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/location/MogoLocationExit.kt rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/location/MogoLocationExit.kt diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/utils/CollectionUtils.java b/OCH/common/common/src/debug/java/com/mogo/och/common/module/utils/CollectionUtils.java similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/utils/CollectionUtils.java rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/utils/CollectionUtils.java diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/utils/SimpleInterceptor.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/utils/SimpleInterceptor.kt similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/utils/SimpleInterceptor.kt rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/utils/SimpleInterceptor.kt diff --git a/OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt similarity index 100% rename from OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt rename to OCH/common/common/src/debug/java/com/mogo/och/common/module/view/DebugFloatWindow.kt diff --git a/OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml b/OCH/common/common/src/debug/res/drawable/baseline_close_24.xml similarity index 100% rename from OCH/mogo-och-common-module/src/debug/res/drawable/baseline_close_24.xml rename to OCH/common/common/src/debug/res/drawable/baseline_close_24.xml diff --git a/OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml b/OCH/common/common/src/debug/res/drawable/common_close.xml similarity index 100% rename from OCH/mogo-och-common-module/src/debug/res/drawable/common_close.xml rename to OCH/common/common/src/debug/res/drawable/common_close.xml diff --git a/OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml b/OCH/common/common/src/debug/res/layout/debug_view.xml similarity index 100% rename from OCH/mogo-och-common-module/src/debug/res/layout/debug_view.xml rename to OCH/common/common/src/debug/res/layout/debug_view.xml diff --git a/OCH/mogo-och-common-module/src/main/AndroidManifest.xml b/OCH/common/common/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/AndroidManifest.xml rename to OCH/common/common/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/OchCommonApi.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/OchCommonApi.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/OchCommonApi.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/OchCommonApi.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/DriverStatusQueryRespBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/DriverStatusQueryRespBean.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/DriverStatusQueryRespBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/DriverStatusQueryRespBean.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginReqBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginReqBean.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginReqBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginReqBean.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginRespBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginRespBean.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginRespBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginRespBean.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginSmsReqBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginSmsReqBean.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginSmsReqBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLoginSmsReqBean.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLogoutReqBean.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLogoutReqBean.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLogoutReqBean.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/bean/TaxiLogoutReqBean.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ILoginCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ILoginCallback.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ILoginCallback.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ILoginCallback.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ILoginViewCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ILoginViewCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ILoginViewCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ILoginViewCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ITaxiLoginCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ITaxiLoginCallback.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/callback/ITaxiLoginCallback.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/callback/ITaxiLoginCallback.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/DataBaseMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/DataBaseMsg.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/DataBaseMsg.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/DataBaseMsg.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OperateDoorMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OperateDoorMsg.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OperateDoorMsg.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OperateDoorMsg.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OrderCloseMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OrderCloseMsg.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OrderCloseMsg.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OrderCloseMsg.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/LoginStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/LoginStatusManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/LoginStatusManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/LoginStatusManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/TaxiLoginStatusEnum.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/TaxiLoginStatusEnum.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/TaxiLoginStatusEnum.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/TaxiLoginStatusEnum.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/LoginDefaultManage.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/LoginDefaultManage.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/LoginDefaultManage.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/LoginDefaultManage.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonNetInterceptor.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonRetryException.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonRetryException.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonRetryException.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/OchCommonRetryException.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/RetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/RetryWithTime.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/network/interceptor/RetryWithTime.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/RetryWithTime.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginStatusDefaultPresenter.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginStatusDefaultPresenter.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginStatusDefaultPresenter.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginStatusDefaultPresenter.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginService.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/LoginService.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginService.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/LoginService.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/IShadow.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/IShadow.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/IShadow.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/callback/IShadow.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/DriverMoFangFunctionManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/LanSocketManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java similarity index 89% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java index 12c407c763..906e0f45f7 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java @@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; import com.zhjt.mogo.adas.data.bean.AutopilotStatistics; +import com.zhjt.mogo.adas.data.bean.UnableLaunchData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; import java.util.ArrayList; @@ -28,6 +29,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo private static final String TAG = OCHAdasAbilityManager.class.getSimpleName(); private boolean isAutopilotAbility; + private UnableLaunchData unableLaunchData; private ArrayList unableAutopilotReasons; private String startFailedCode = ""; private String startFailedMessage = ""; @@ -44,6 +46,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo public void init(Context context) { this.isAutopilotAbility = CallerAutopilotActionsListenerManager.INSTANCE.isAutopilotAbility(); + this.unableLaunchData = CallerAutopilotActionsListenerManager.INSTANCE.getUnableLaunchData(); this.unableAutopilotReasons = CallerAutopilotActionsListenerManager.INSTANCE.getUnableAutopilotReasons(); initListeners(); } @@ -56,6 +59,9 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo return isAutopilotAbility; } + public String getOriginalData() { + return unableLaunchData == null ? "" : unableLaunchData.getJson(); + } public String getAutopilotUnAbilityReason(){ try { if(unableAutopilotReasons==null||unableAutopilotReasons.isEmpty()){ @@ -97,10 +103,11 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } @Override - public void onAutopilotAbility(boolean isAutopilotAbility, @Nullable ArrayList unableAutopilotReasons) { + public void onAutopilotAbility(boolean isAutopilotAbility,@Nullable UnableLaunchData unableLaunchData, @Nullable ArrayList unableAutopilotReasons) { this.isAutopilotAbility = isAutopilotAbility; + this.unableLaunchData = unableLaunchData; this.unableAutopilotReasons = unableAutopilotReasons; - Logger.d(TAG, "是否可以启动自动驾驶=" + isAutopilotAbility + " 原因=" + (unableAutopilotReasons == null ? null : unableAutopilotReasons.toString())); + Logger.d(TAG, "是否可以启动自动驾驶=" + isAutopilotAbility + " 原因=" + (unableAutopilotReasons == null ? null : unableAutopilotReasons.toString()) + " 原始数据=" + (unableLaunchData == null ? null : unableLaunchData.getJson())); if (unableAutopilotReasons != null && getMapVersion() < 30600) { //刹车变化回调 Logger.d(TAG,"onAutopilotAbility = " + isAutopilotAbility + diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/IBeautifyModeCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/beautifymode/IBeautifyModeCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/IBeautifyModeCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/beautifymode/IBeautifyModeCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/debug/DebugWatchDogPresenter.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorStatusManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorStatusManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorStatusManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/TaxiDoorStateManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/TaxiDoorStateManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/TaxiDoorStateManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/TaxiDoorStateManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/DoorStateCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/DoorStateCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/DoorStateCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/DoorStateCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/LightAirconditionDoorCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/LightAirconditionDoorCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/LightAirconditionDoorCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/callback/LightAirconditionDoorCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/AirconditionStatus.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/DoorStatus.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/HeaterStatue.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/devicemanage/data/LightStatus.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/DistanceDegree.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/IDistanceListener.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/StationAndIndex.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryCache.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryCache.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryCache.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryCache.kt diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/BreakLightManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/BreakLightManager.kt new file mode 100644 index 0000000000..b5789f43b2 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/BreakLightManager.kt @@ -0,0 +1,21 @@ +package com.mogo.och.common.module.manager.lightmanager + +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager + +object BreakLightManager : IMoGoChassisLamplightListener { + private const val TAG = "BreakLightManager" + init { + CallerChassisLamplightListenerManager.addListener(TAG, this) + } + + // 刹车灯 + override fun onAutopilotBrakeLightData(brakeLight: Boolean) { + super.onAutopilotBrakeLightData(brakeLight) + } + + enum class BreakLightStatus{ + BREAK_LIGHT, + BREAK_NONE, + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/TurnLightManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/TurnLightManager.kt new file mode 100644 index 0000000000..68f9033c22 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/lightmanager/TurnLightManager.kt @@ -0,0 +1,66 @@ +package com.mogo.och.common.module.manager.lightmanager + +import chassis.Chassis +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager +import java.util.concurrent.ConcurrentHashMap +import kotlin.properties.Delegates + +object TurnLightManager : IMoGoChassisLamplightListener { + private const val TAG = "TurnLightManager" + + private val lightStatusChange: ConcurrentHashMap = + ConcurrentHashMap() + + private var turnLightStatus:TurnLightStatus by Delegates.observable(TurnLightStatus.TURN_LIGHT_NONE) { _, oldValue, newValue -> + if (oldValue != newValue) { + if(lightStatusChange.size>0){ + lightStatusChange.forEach { + it.value.statusChange(newValue) + } + } + } + } + + init { + CallerChassisLamplightListenerManager.addListener(TAG, this) + } + + fun addTurnLightStatusChangeListener(tag: String, listener: TurnLightListener) { + if (lightStatusChange.containsKey(tag)) { + return + } + lightStatusChange[tag] = listener + listener.statusChange(turnLightStatus) + } + + + // 转向灯 + override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) { + super.onAutopilotLightSwitchData(lightSwitch) + lightSwitch?.let { + when (it.number) { + Chassis.LightSwitch.LIGHT_LEFT_VALUE -> { + turnLightStatus = TurnLightStatus.TURN_LIGHT_LEFT + } + Chassis.LightSwitch.LIGHT_RIGHT_VALUE -> { + turnLightStatus = TurnLightStatus.TURN_LIGHT_RIGHT + } + Chassis.LightSwitch.LIGHT_NONE_VALUE -> { + turnLightStatus = TurnLightStatus.TURN_LIGHT_NONE + } + else -> {} + } + } + } + + interface TurnLightListener{ + fun statusChange(newStatus: TurnLightStatus) + } + + enum class TurnLightStatus{ + TURN_LIGHT_LEFT, + TURN_LIGHT_RIGHT, + TURN_LIGHT_NONE, + } +} \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/loopmanager/BizLoopManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/loopmanager/BizLoopManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/loopmanager/BizLoopManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/loopmanager/BizLoopManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/loopmanager/LoopInfo.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/loopmanager/LoopInfo.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/loopmanager/LoopInfo.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/loopmanager/LoopInfo.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OrderChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OrderChainLogManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OrderChainLogManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OrderChainLogManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/OCHPlanningActionsCallback.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideStatus.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/ICommonNaviChangedCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/map/ICommonNaviChangedCallback.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/ICommonNaviChangedCallback.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/map/ICommonNaviChangedCallback.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/AnimatorDrawableUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/AnimatorDrawableUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/AnimatorDrawableUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/AnimatorDrawableUtil.java diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt new file mode 100644 index 0000000000..22c8cf6ca2 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BigFrameAnimatorContainer.kt @@ -0,0 +1,239 @@ +package com.mogo.och.common.module.utils + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.drawable.BitmapDrawable +import android.os.Handler +import android.os.Looper +import android.os.Message +import android.widget.ImageView +import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import java.lang.ref.SoftReference +import java.util.concurrent.ArrayBlockingQueue +import java.util.concurrent.Future + +class BigFrameAnimatorContainer (resId: Int, + fps: Int, + imageView: ImageView, + isOnce: Boolean = false,// 一次性的 true 值播放一次 false 重复播放 + initFirstFrame:Boolean = true, + width:Int = -1, + height:Int = -1){ + private val TAG = "BigFrameAnimatorContainer" + private lateinit var mFrames: IntArray // 帧数组 + private var mIndex = 0 // 当前帧 + private var mShouldRun = false // 开始/停止播放用 + private var mIsRunning = false // 动画是否正在播放，防止重复播放 + private var mSoftReferenceImageView: SoftReference? = null // 软引用ImageView，以便及时释放掉 + private var mHandler: Handler? = null + private var mDelayMillis = 0 + private var mOnAnimationStoppedListener: OnAnimationStoppedListener? = null//播放停止监听 + var isOnce:Boolean = false + + private val readQueue = ArrayBlockingQueue>(8,true) + private val writeQueue = ArrayBlockingQueue>(8,true) + + private var currentPoll:Pair?=null + + private var decodeImage: Future<*>?=null + + + init { + createAnimation(imageView, getData(resId), fps,initFirstFrame,width,height) + this.isOnce = isOnce + } + + private fun createAnimation( + imageView: ImageView, + frames: IntArray, + fps: Int, + initFirstFrame: Boolean, + width: Int, + height: Int + ) { + mHandler = object: Handler(Looper.myLooper()!!){ + override fun handleMessage(msg: Message) { + super.handleMessage(msg) + CallerLogger.d(TAG,"消息类型：${msg.what}") + if(msg.what==0){ + val imageView = mSoftReferenceImageView!!.get() + if (!mShouldRun || imageView == null) { + mIsRunning = false + if (mOnAnimationStoppedListener != null) { + mOnAnimationStoppedListener!!.AnimationStopped() + } + return + } + mIsRunning = true + //新开线程去读下一帧 + if (imageView.isShown) { + if (!mShouldRun) { + mIsRunning = false + CallerLogger.d(TAG,"暂停播放") + if (mOnAnimationStoppedListener != null) { + mOnAnimationStoppedListener!!.AnimationStopped() + } + return + } + mHandler?.sendEmptyMessageDelayed(0,mDelayMillis.toLong()) + if(currentPoll!=null){ + writeQueue.offer(currentPoll) + currentPoll = null + } + currentPoll = readQueue.poll() + if(currentPoll!=null){ + val bitmap = currentPoll!!.first + imageView.setImageBitmap(bitmap) + }else{ + CallerLogger.d(TAG,"加载过慢了") + } + } + } + } + } + mFrames = frames + mIndex = -1 + mSoftReferenceImageView = SoftReference(imageView) + mShouldRun = false + mIsRunning = false + mDelayMillis = 1000 / fps //帧动画时间间隔，毫秒 + CallerLogger.d(TAG,"两帧时间:${mDelayMillis}") + if(initFirstFrame) { + imageView.setImageResource(mFrames[0]) + } + var widthImage = -1 + var heightImage = -1 + var config = Bitmap.Config.ARGB_8888 + if(width>0&&height>0){ + widthImage = width + heightImage = height + }else{ + try { + val bmp = (imageView.drawable as BitmapDrawable).bitmap + widthImage = bmp.width + heightImage = bmp.height + config = bmp.config + }catch (e:Exception){ + throw RuntimeException("请设置图片或传递大小") + } + } + // 当图片大小类型相同时进行复用，避免频繁GC + + for (i in 0..7) { + val mBitmap = Bitmap.createBitmap(widthImage, heightImage, config) + val mBitmapOptions = BitmapFactory.Options() + //设置Bitmap内存复用 + mBitmapOptions.inBitmap = mBitmap //Bitmap复用内存块，类似对象池，避免不必要的内存分配和回收 + mBitmapOptions.inMutable = true //解码时返回可变Bitmap + mBitmapOptions.inSampleSize = 1 //缩放比例 + writeQueue.add(Pair(mBitmap,mBitmapOptions)) + } + + decodeImage = ThreadUtils.getIoPool().submit { + while (true) { + val startTime = System.currentTimeMillis() + val (bitmap1, options) = writeQueue.take() + val index: Int = next + val imageRes: Int = mFrames[index] + var bitmap: Bitmap? = null + try { + bitmap = BitmapFactory.decodeResource( + imageView.resources, + imageRes, + options + ) + options.inBitmap = bitmap + } catch (e: Exception) { + e.printStackTrace() + } + if (bitmap != null) { + readQueue.put(Pair(bitmap, options)) + } + val dexTime = System.currentTimeMillis() - startTime + CallerLogger.d(TAG, "decode用时：${dexTime}ms index ${index}") + } + } + } + + //循环读取下一帧 + private val next: Int + get() { + mIndex++ + if (mIndex >= mFrames.size){ + mIndex = 0 + } + return mIndex + } + + @Synchronized + fun reStart(){ + mIndex = 0 + mIsRunning = false + start() + } + + fun release(){ + mShouldRun = false + decodeImage?.cancel(true) + } + + /** + * 播放动画，同步锁防止多线程读帧时，数据安全问题 + */ + @Synchronized + fun start() { + mShouldRun = true + if (mIsRunning) return + mHandler?.removeCallbacksAndMessages(null) + mHandler?.sendEmptyMessage(0) + } + + /** + * 停止播放 + */ + @Synchronized + fun stop() { + mShouldRun = false + } + + fun isPlaying():Boolean{ + return mShouldRun + } + + /** + * 设置停止播放监听 + * @param listener 设置监听 + */ + fun setOnAnimStopListener(listener: OnAnimationStoppedListener?) { + mOnAnimationStoppedListener = listener + } + + /** + * 从xml中读取帧数组 + * @param resId + * @return + */ + fun getData(resId: Int): IntArray { + val array = AbsMogoApplication.getApp().resources.obtainTypedArray(resId) + val len = array.length() + val intArray = IntArray(array.length()) + for (i in 0 until len) { + intArray[i] = array.getResourceId(i, 0) + } + array.recycle() + return intArray + } + + fun setData(mFrames: IntArray){ + this.mFrames = mFrames + } + + /** + * 停止播放监听 + */ + interface OnAnimationStoppedListener { + fun AnimationStopped() + } +} \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/DateTimeUtil.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DimenUtil.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/DimenUtil.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/DimenUtil.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FieldUtils.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FieldUtils.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FieldUtils.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FieldUtils.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FlowBus.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlowBus.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FlowBus.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlowBus.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/NumberFormatUtil.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/OCHThreadPoolManager.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/OCHThreadPoolManager.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/OCHThreadPoolManager.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/OCHThreadPoolManager.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/PermissionUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/PermissionUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/PermissionUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/PermissionUtil.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/PinYinUtil.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/PinYinUtil.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/PinYinUtil.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/PinYinUtil.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/RxUtils.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/BindQRCodeDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/BindQRCodeDialog.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/BindQRCodeDialog.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/BindQRCodeDialog.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/CountDownTimerExt.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CountDownTimerExt.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/CountDownTimerExt.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/CountDownTimerExt.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MineGradientDrawable.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/MineGradientDrawable.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MineGradientDrawable.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/MineGradientDrawable.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHBorderShadowLayout.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHBorderShadowLayout.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHBorderShadowLayout.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHBorderShadowLayout.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCornerCustomCardView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHCornerCustomCardView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCornerCustomCardView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHCornerCustomCardView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRadiusImageView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHRadiusImageView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRadiusImageView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHRadiusImageView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHRoundConstraintLayout.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHShapeBlurView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHShapeBlurView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHShapeBlurView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHShapeBlurView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/BaseSurfaceView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/BaseSurfaceView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/BaseSurfaceView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/BaseSurfaceView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameFinishCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameFinishCallback.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameFinishCallback.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameFinishCallback.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBitmap.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBitmap.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBitmap.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBitmap.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBlockingQueue.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBlockingQueue.java similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBlockingQueue.java rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/sfv/LinkedBlockingQueue.java diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/AdsDatas.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/AdsDatas.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/AdsDatas.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/AdsDatas.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/ImageVideoRotationView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/ImageVideoRotationView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/ImageVideoRotationView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/ImageVideoRotationView.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerFragment.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerFragment.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerFragment.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerFragment.kt diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt similarity index 100% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt rename to OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt diff --git a/OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml b/OCH/common/common/src/main/res/anim/count_down_rotate.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/anim/count_down_rotate.xml rename to OCH/common/common/src/main/res/anim/count_down_rotate.xml diff --git a/OCH/mogo-och-common-module/src/main/res/color/taxi_login_get_code_text_color.xml b/OCH/common/common/src/main/res/color/taxi_login_get_code_text_color.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/color/taxi_login_get_code_text_color.xml rename to OCH/common/common/src/main/res/color/taxi_login_get_code_text_color.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_debug_view_password.png b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_debug_view_password.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_debug_view_password.png rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_debug_view_password.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_00.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_01.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_02.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_03.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_04.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_05.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_06.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_07.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_08.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_09.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_10.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_11.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_12.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_13.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_14.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_15.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_16.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_17.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_18.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_19.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_20.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_21.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_22.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_23.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_24.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_25.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_26.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_27.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_28.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_29.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_30.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_31.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_34.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_35.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_36.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_37.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_38.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_39.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_40.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_41.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_42.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_43.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_44.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_45.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_46.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_47.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_48.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_49.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_50.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_51.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_52.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_53.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_54.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_55.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_56.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_57.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_58.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_59.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_60.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_61.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_62.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_63.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_64.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_65.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_66.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_67.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_68.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_69.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_70.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_71.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_01.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_02.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_03.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_04.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_05.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_06.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_07.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_08.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_09.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_10.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_11.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_12.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_13.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_14.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_15.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_16.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp b/OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp rename to OCH/common/common/src/main/res/drawable-nodpi/charter_p_xiaozhi_think_normal_17.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/count_down_bg.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_bg.png rename to OCH/common/common/src/main/res/drawable-nodpi/count_down_bg.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/count_down_rotate_bg.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png rename to OCH/common/common/src/main/res/drawable-nodpi/count_down_rotate_bg.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/driver_mofang_function_bg.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png rename to OCH/common/common/src/main/res/drawable-nodpi/driver_mofang_function_bg.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/video_holder.png b/OCH/common/common/src/main/res/drawable-nodpi/video_holder.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/video_holder.png rename to OCH/common/common/src/main/res/drawable-nodpi/video_holder.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0000.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0001.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0002.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0003.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0004.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0005.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0006.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0007.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0008.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0009.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0010.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0011.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0012.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0013.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0014.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0015.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0016.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0017.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0018.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0019.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0020.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0021.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0022.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0023.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0024.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0025.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0026.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0027.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0028.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0029.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0030.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0031.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0032.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0033.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0034.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0035.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0036.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0037.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0038.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0039.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0040.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0041.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0042.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0043.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0044.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0045.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0046.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0047.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png b/OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png rename to OCH/common/common/src/main/res/drawable-nodpi/xiaozhi_normal_0048.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/bus_ic_login_bg.webp b/OCH/common/common/src/main/res/drawable-xhdpi/bus_ic_login_bg.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/bus_ic_login_bg.webp rename to OCH/common/common/src/main/res/drawable-xhdpi/bus_ic_login_bg.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/icon_qr_center_logo.png b/OCH/common/common/src/main/res/drawable-xhdpi/icon_qr_center_logo.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/icon_qr_center_logo.png rename to OCH/common/common/src/main/res/drawable-xhdpi/icon_qr_center_logo.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_ic_login_bg.webp b/OCH/common/common/src/main/res/drawable-xhdpi/taxi_ic_login_bg.webp similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_ic_login_bg.webp rename to OCH/common/common/src/main/res/drawable-xhdpi/taxi_ic_login_bg.webp diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png b/OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png rename to OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png b/OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png rename to OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png b/OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png rename to OCH/common/common/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/bind_driver_qr_bg.xml b/OCH/common/common/src/main/res/drawable/bind_driver_qr_bg.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/bind_driver_qr_bg.xml rename to OCH/common/common/src/main/res/drawable/bind_driver_qr_bg.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_bg.xml b/OCH/common/common/src/main/res/drawable/charter_p_debugview_bg.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_bg.xml rename to OCH/common/common/src/main/res/drawable/charter_p_debugview_bg.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_cancle.xml b/OCH/common/common/src/main/res/drawable/charter_p_debugview_cancle.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_cancle.xml rename to OCH/common/common/src/main/res/drawable/charter_p_debugview_cancle.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_edit_bg.xml b/OCH/common/common/src/main/res/drawable/charter_p_debugview_edit_bg.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_edit_bg.xml rename to OCH/common/common/src/main/res/drawable/charter_p_debugview_edit_bg.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_submit.xml b/OCH/common/common/src/main/res/drawable/charter_p_debugview_submit.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/charter_p_debugview_submit.xml rename to OCH/common/common/src/main/res/drawable/charter_p_debugview_submit.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_toast_shape.xml b/OCH/common/common/src/main/res/drawable/charter_p_toast_shape.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/charter_p_toast_shape.xml rename to OCH/common/common/src/main/res/drawable/charter_p_toast_shape.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml b/OCH/common/common/src/main/res/drawable/driver_connect_statis.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml rename to OCH/common/common/src/main/res/drawable/driver_connect_statis.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_animation_bkg_top.xml b/OCH/common/common/src/main/res/drawable/start_autopilot_animation_bkg_top.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_animation_bkg_top.xml rename to OCH/common/common/src/main/res/drawable/start_autopilot_animation_bkg_top.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml b/OCH/common/common/src/main/res/drawable/start_autopilot_tip_bkg_top.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml rename to OCH/common/common/src/main/res/drawable/start_autopilot_tip_bkg_top.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_bg_selector.xml b/OCH/common/common/src/main/res/drawable/taxi_login_bg_selector.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_bg_selector.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_bg_selector.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_enable.xml b/OCH/common/common/src/main/res/drawable/taxi_login_enable.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_enable.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_enable.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_get_code_text_color.xml b/OCH/common/common/src/main/res/drawable/taxi_login_get_code_text_color.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_get_code_text_color.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_get_code_text_color.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml b/OCH/common/common/src/main/res/drawable/taxi_login_phone_error.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_error.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_phone_error.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml b/OCH/common/common/src/main/res/drawable/taxi_login_phone_normal.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_phone_normal.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_phone_normal.xml diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml b/OCH/common/common/src/main/res/drawable/taxi_login_unenable.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable/taxi_login_unenable.xml rename to OCH/common/common/src/main/res/drawable/taxi_login_unenable.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml b/OCH/common/common/src/main/res/layout/activity_video_player.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml rename to OCH/common/common/src/main/res/layout/activity_video_player.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/bind_driver_qr_view.xml b/OCH/common/common/src/main/res/layout/bind_driver_qr_view.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/bind_driver_qr_view.xml rename to OCH/common/common/src/main/res/layout/bind_driver_qr_view.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/charter_p_view_toast.xml b/OCH/common/common/src/main/res/layout/charter_p_view_toast.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/charter_p_view_toast.xml rename to OCH/common/common/src/main/res/layout/charter_p_view_toast.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml b/OCH/common/common/src/main/res/layout/dialog_bus_commit.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml rename to OCH/common/common/src/main/res/layout/dialog_bus_commit.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/fragment_video_player.xml b/OCH/common/common/src/main/res/layout/fragment_video_player.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/fragment_video_player.xml rename to OCH/common/common/src/main/res/layout/fragment_video_player.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/m1_debugview_pass.xml b/OCH/common/common/src/main/res/layout/m1_debugview_pass.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/m1_debugview_pass.xml rename to OCH/common/common/src/main/res/layout/m1_debugview_pass.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml b/OCH/common/common/src/main/res/layout/start_autopilot_animation_view.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml rename to OCH/common/common/src/main/res/layout/start_autopilot_animation_view.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/taxi_common_amap_navi_view.xml b/OCH/common/common/src/main/res/layout/taxi_common_amap_navi_view.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/taxi_common_amap_navi_view.xml rename to OCH/common/common/src/main/res/layout/taxi_common_amap_navi_view.xml diff --git a/OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml b/OCH/common/common/src/main/res/layout/taxi_login_view.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml rename to OCH/common/common/src/main/res/layout/taxi_login_view.xml diff --git a/OCH/mogo-och-common-module/src/main/res/raw/startautopilot.wav b/OCH/common/common/src/main/res/raw/startautopilot.wav similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/raw/startautopilot.wav rename to OCH/common/common/src/main/res/raw/startautopilot.wav diff --git a/OCH/mogo-och-common-module/src/main/res/values/arrays.xml b/OCH/common/common/src/main/res/values/arrays.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/values/arrays.xml rename to OCH/common/common/src/main/res/values/arrays.xml diff --git a/OCH/mogo-och-common-module/src/main/res/values/attrs.xml b/OCH/common/common/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/values/attrs.xml rename to OCH/common/common/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-common-module/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/values/colors.xml rename to OCH/common/common/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-common-module/src/main/res/values/strings.xml b/OCH/common/common/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/values/strings.xml rename to OCH/common/common/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-common-module/src/main/res/values/styles.xml b/OCH/common/common/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/values/styles.xml rename to OCH/common/common/src/main/res/values/styles.xml diff --git a/OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt similarity index 100% rename from OCH/mogo-och-common-module/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt rename to OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt diff --git a/OCH/mogo-och-data/.gitignore b/OCH/common/data/.gitignore similarity index 100% rename from OCH/mogo-och-data/.gitignore rename to OCH/common/data/.gitignore diff --git a/OCH/mogo-och-data/build.gradle b/OCH/common/data/build.gradle similarity index 100% rename from OCH/mogo-och-data/build.gradle rename to OCH/common/data/build.gradle diff --git a/OCH/mogo-och-data/consumer-rules.pro b/OCH/common/data/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-data/consumer-rules.pro rename to OCH/common/data/consumer-rules.pro diff --git a/OCH/mogo-och-data/proguard-rules.pro b/OCH/common/data/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-data/proguard-rules.pro rename to OCH/common/data/proguard-rules.pro diff --git a/OCH/mogo-och-data/src/main/AndroidManifest.xml b/OCH/common/data/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-data/src/main/AndroidManifest.xml rename to OCH/common/data/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java similarity index 100% rename from OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java rename to OCH/common/data/src/main/java/com/mogo/och/data/bean/BusRoutesResult.java diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java similarity index 100% rename from OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java rename to OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt b/OCH/common/data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt similarity index 100% rename from OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt b/OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt similarity index 100% rename from OCH/mogo-och-data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt rename to OCH/common/data/src/main/java/com/mogo/och/data/manager/cache/CacheDataManager.kt diff --git a/OCH/shuttle/driver/build.gradle b/OCH/shuttle/driver/build.gradle index b4f05214d9..49905dadd6 100644 --- a/OCH/shuttle/driver/build.gradle +++ b/OCH/shuttle/driver/build.gradle @@ -58,8 +58,8 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper - implementation project(":OCH:mogo-och-common-module") - implementation project(":OCH:mogo-och-data") + implementation project(":OCH:common:common") + implementation project(":OCH:common:data") compileOnly project(":libraries:mogo-map") } diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index e10e559cf5..db47636500 100644 --- a/OCH/shuttle/passenger/build.gradle +++ b/OCH/shuttle/passenger/build.gradle @@ -44,6 +44,21 @@ android { } } + sourceSets { + main { + res.srcDirs = [ + 'src/main/res', + 'src/main/res/m2', + 'src/main/res/jinlv', + ] + java.srcDirs = [ + 'src/main/java', + 'src/main/java/m2', + 'src/main/java/jinlv', + ] + } + } + flavorDimensions "vehicle" productFlavors { // 车型：金旅星辰、开沃 小巴业务 @@ -71,7 +86,7 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') diff --git a/OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/shuttle/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/shuttle/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java deleted file mode 100644 index 6848df9720..0000000000 --- a/OCH/shuttle/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_TAXI_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.video.VideoPlayerActivity; - -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)) { - MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class); - } - return null; - } - - @NotNull - @Override - public String getFunctionName() { - return null; - } - - @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_TAXI_P + TAG, "进入vr模式" ); - CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 - } - - private void showFragment() { - FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); - if(mPassengerFragment == null){ - CallerLogger.d(M_TAXI_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_TAXI_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/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt deleted file mode 100644 index a822623d22..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.och.bus.passenger.ui.widget - -import android.content.Context -import android.util.AttributeSet -import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus - -/** - * @author: wangmingjun - * @date: 2023/2/13 - */ -class BusPTurnLightView @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null -) : TurnLightViewStatus(context, attrs) { - - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png deleted file mode 100644 index d8d0663d02..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png deleted file mode 100644 index c9daea21c9..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png deleted file mode 100644 index b16a3dd0b8..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png deleted file mode 100755 index 3a779659d3..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png deleted file mode 100644 index 528cd4dc66..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png deleted file mode 100644 index a680b6ea18..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png deleted file mode 100644 index 114c7a2ba7..0000000000 Binary files a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml deleted file mode 100644 index 528233f84c..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml deleted file mode 100644 index 97458b6d07..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml deleted file mode 100644 index 6382b0256a..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml deleted file mode 100644 index a007c6d711..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml deleted file mode 100644 index 4bcd3db004..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - #5D7199 - #CCE9EFFC - #C7D2E1 - #2D3E5F - #203555 - #2D3E5F - #596A8A - #D8E5F8 - #FFB327 - #2D3E5F - #0043FF - #276AFE - #0043FF - #276AFE - #FFC125 - #FF8131 - #31BFF2 - #3257E9 - #FFFFFF - #CDDBF6 - #2D3E5F - #0043FF - #2D3E5F - #E6E9EFFC - #33394C63 - #2D3E5F - #33394C63 - - #43CEFE - #1466FB - - #17417B - #6617417B - #A9B6CA - #1F82FB - - #992D3E5F - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml deleted file mode 100644 index 7e055aedf1..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 750dp - 804dp - 40dp - 40dp - 48dp - 40dp - 110dp - 224dp - 422dp - 3dp - - 158dp - 90dp - 45dp - 158dp - 90dp - 45dp - 90dp - 90dp - 3dp - - 224dp - 50dp - 50dp - 34dp - 130dp - 38dp - - 38dp - - 90dp - 27dp - - 4dp - 10dp - 20dp - 60dp - 30dp - 20dp - 50dp - 6dp - 38dp - 36dp - 80dp - 100dp - 80dp - 60dp - 6dp - - 685dp - 309dp - 50dp - 10dp - 44dp - 55dp - 40dp - - 495dp - 309dp - - 584dp - 550dp - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml deleted file mode 100644 index cf8142edc1..0000000000 --- a/OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - KM/H - 您已收车 - 暂无班次 - 暂无线路 - 起 - 终 - 已到站： - 前方到站： - - 请按秩序下车 - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/AndroidManifest.xml b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml index ef86a3875d..8eb912b35e 100644 --- a/OCH/shuttle/passenger/src/m2/AndroidManifest.xml +++ b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.mogo.och.shuttle.passenger"> diff --git a/OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java b/OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java deleted file mode 100644 index 6af58e3bb1..0000000000 --- a/OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java +++ /dev/null @@ -1,56 +0,0 @@ -import com.mogo.och.bus.passenger.model.PM2DrivingModel; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.List; - -import mogo.telematics.pad.MessagePad; - -/** - * @author: wangmingjun - * @date: 2022/4/13 - */ -public class BPRouteDataTestUtils { - - //13号路口起-13号路口终 -// static String jsonStr ="{\n" + -// " \"models\": [\n" + -// " {\n" + -// " \"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19927760268911,\"lon\":116.73512607061035,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19927736555187,\"lon\":116.73498243020299,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19927135941599,\"lon\":116.73482951462647,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199260672670036,\"lon\":116.73468429259535,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199251260349946,\"lon\":116.73453933465,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19924691997577,\"lon\":116.7343756435551,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199247953493625,\"lon\":116.73421240809087,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19924986849947,\"lon\":116.73400425509712,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199249431152175,\"lon\":116.73378579041055,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199248921305724,\"lon\":116.73357811807278,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19925012387371,\"lon\":116.73337650020184,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199252270195075,\"lon\":116.73318223781153,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1992521615169,\"lon\":116.73298632625203,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19925202633083,\"lon\":116.73279582043983,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199261230205735,\"lon\":116.73263403473568,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199327991681926,\"lon\":116.73251962434813,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19944850496711,\"lon\":116.73249661840195,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199582026896415,\"lon\":116.73251038561487,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199743326352014,\"lon\":116.73253087453938,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199908347167394,\"lon\":116.73255070500186,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200065950595445,\"lon\":116.7325720694418,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20022747460407,\"lon\":116.73259461416663,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200384057310536,\"lon\":116.73261575018056,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20053849777916,\"lon\":116.73263451936387,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200696919444624,\"lon\":116.7326540541723,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2008524952796,\"lon\":116.7326743511824,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20101429705625,\"lon\":116.73269393580199,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20118279997041,\"lon\":116.73271564378308,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201342388452076,\"lon\":116.73273653366076,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201476063822355,\"lon\":116.73275292393079,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20163479199852,\"lon\":116.73277440686762,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20181243476041,\"lon\":116.7328052766508,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201991767093304,\"lon\":116.7328453845644,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20215573733484,\"lon\":116.73287624009339,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202313648759784,\"lon\":116.73289887933315,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202434745374454,\"lon\":116.7329182210956,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20253164952098,\"lon\":116.73297539811277,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20258043275509,\"lon\":116.73312335324984,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20258233576585,\"lon\":116.73331077089557,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20257107560234,\"lon\":116.73351244039137,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202561578580514,\"lon\":116.73370176209845,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20256256788661,\"lon\":116.73391325024126,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20255633158834,\"lon\":116.73413195000244,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202543311179575,\"lon\":116.73436614303907,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20253067346457,\"lon\":116.73458032609663,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20251776111356,\"lon\":116.73477082198242,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202503997557805,\"lon\":116.73498624001282,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20249129260376,\"lon\":116.73518976336872,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247877796589,\"lon\":116.73537786253135,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20246651610268,\"lon\":116.73559239130266,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20245754388014,\"lon\":116.73574239922202,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20244749208,\"lon\":116.73589674090469,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243806550113,\"lon\":116.73607057284322,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243550556816,\"lon\":116.73628106525871,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243654127756,\"lon\":116.7364949950665,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243738221016,\"lon\":116.7367061649993,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243672476754,\"lon\":116.73691115930336,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243590788176,\"lon\":116.73710722104272,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202436434375336,\"lon\":116.73730688607075,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243749821501,\"lon\":116.73750140347998,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243625962803,\"lon\":116.73771330926793,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202434515480725,\"lon\":116.73791895606205,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2024326561388,\"lon\":116.73815206945737,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20243092086137,\"lon\":116.73838655528765,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202430876006126,\"lon\":116.73861890759498,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20242914053177,\"lon\":116.73882029918758,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20242843336561,\"lon\":116.73904465495175,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20242661219026,\"lon\":116.73922453252953,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202426462811076,\"lon\":116.7393708046956,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20242687134937,\"lon\":116.73954685547025,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20242694967377,\"lon\":116.73975021183773,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202424630601236,\"lon\":116.73999740812975,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202422502184625,\"lon\":116.74028266774337,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202419634158936,\"lon\":116.7405942561498,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241975959762,\"lon\":116.7409069557092,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241920524113,\"lon\":116.74120156191647,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241765540262,\"lon\":116.74149288504978,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241569149764,\"lon\":116.7418080096762,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202414529497084,\"lon\":116.74210262897205,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241419532155,\"lon\":116.74241767661879,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202413879360954,\"lon\":116.7427571218185,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241287045245,\"lon\":116.7431284691325,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241214965105,\"lon\":116.74343354359334,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241141271715,\"lon\":116.7437220210538,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2024080520075,\"lon\":116.74399113498052,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202391714280026,\"lon\":116.74427625698272,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20238163805639,\"lon\":116.74452083315958,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202379293010274,\"lon\":116.74475703837204,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202379007817086,\"lon\":116.7449961645494,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20237814181231,\"lon\":116.7452036063558,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202375477619896,\"lon\":116.74539567654291,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2023632396621,\"lon\":116.74555457589031,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20229396554444,\"lon\":116.7456716047369,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20217800547467,\"lon\":116.74574081942625,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202047498095304,\"lon\":116.74573659255675,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20188573786706,\"lon\":116.74571018281719,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201738240263026,\"lon\":116.74568463148606,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20157507049073,\"lon\":116.74565525041498,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20137985142042,\"lon\":116.745619970576,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201187335613575,\"lon\":116.74558631350607,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20098251429043,\"lon\":116.74555055587679,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2007748533628,\"lon\":116.74551426934663,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20057082986032,\"lon\":116.74547749663195,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20036944224329,\"lon\":116.74544156175533,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20016365229035,\"lon\":116.74540577510051,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1999958572445,\"lon\":116.74537505807076,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19984100521566,\"lon\":116.7453433678602,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1996863960282,\"lon\":116.74529675648621,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19953919567943,\"lon\":116.74525916493474,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19940587189373,\"lon\":116.74523402869453,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19929047792381,\"lon\":116.74518617038383,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922141745155,\"lon\":116.74506912884067,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19920798885308,\"lon\":116.744896716334,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19920912644279,\"lon\":116.74467216715483,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199209186509314,\"lon\":116.74448257515108,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19920910709997,\"lon\":116.74430613406223,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1992100786082,\"lon\":116.74410888316238,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921081961254,\"lon\":116.74391968819582,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921040855518,\"lon\":116.7437082083402,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921085053439,\"lon\":116.74346931155634,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921197237373,\"lon\":116.74325149697013,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921248248983,\"lon\":116.74301103786591,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1992139724646,\"lon\":116.74277237066539,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199215818352386,\"lon\":116.74253219408898,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199216175018876,\"lon\":116.74228853120842,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199215970354246,\"lon\":116.74204663206451,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199216627492966,\"lon\":116.74183871233049,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19921789170398,\"lon\":116.74165788334192,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922000138535,\"lon\":116.74144512197054,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199221559127494,\"lon\":116.741249370491,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922287231889,\"lon\":116.7410525810756,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922229019589,\"lon\":116.74085266662037,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.1992216995901,\"lon\":116.74061957723823,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922263073874,\"lon\":116.74041638149129,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922478093337,\"lon\":116.7402123910757,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199227066091595,\"lon\":116.74003419421553,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199228634241756,\"lon\":116.73985841944678,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19922951636012,\"lon\":116.7397079274105,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199252095329484,\"lon\":116.73956265582487,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199346162997905,\"lon\":116.73944690416265,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199470799628024,\"lon\":116.73941941053417,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19962513314346,\"lon\":116.7394280706812,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199780626058924,\"lon\":116.73944255215424,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199961525343376,\"lon\":116.73945856750177,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20016196947193,\"lon\":116.73947572081121,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200384479551936,\"lon\":116.7394949225795,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200595083817475,\"lon\":116.73951027963179,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200792203321086,\"lon\":116.73952526850614,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200985930701684,\"lon\":116.73954125209579,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20115978977055,\"lon\":116.73955610094161,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201321019536124,\"lon\":116.7395695239138,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20147117943043,\"lon\":116.7395823299481,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20163699848565,\"lon\":116.73959633422596,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20178484338371,\"lon\":116.7396085776486,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201962185646316,\"lon\":116.73962351991214,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2021018923927,\"lon\":116.7396354059821,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2022137620686,\"lon\":116.73964348380458,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20232600820075,\"lon\":116.73961190446633,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20241090270993,\"lon\":116.73951649703137,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20245777783807,\"lon\":116.73937664238166,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20246906634823,\"lon\":116.73920146119093,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202470916682884,\"lon\":116.73898763065634,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247034830421,\"lon\":116.73878158418357,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20246978204673,\"lon\":116.73857680142473,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247082638905,\"lon\":116.73834517890637,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202471943178196,\"lon\":116.7381047689514,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247131648035,\"lon\":116.73787761484981,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202470799473765,\"lon\":116.73766230702478,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247013054322,\"lon\":116.73743619407796,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20246999515433,\"lon\":116.73724916823292,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247199652478,\"lon\":116.73704888970806,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202473960263525,\"lon\":116.73684083235807,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202474504753205,\"lon\":116.73665462440796,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20247501354581,\"lon\":116.73650710371837,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20246541231906,\"lon\":116.73635807696789,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.202426768984274,\"lon\":116.73622283382787,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20236638788854,\"lon\":116.73610589402243,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20227106919894,\"lon\":116.73600895001849,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2021428343084,\"lon\":116.73596816020945,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20197815580698,\"lon\":116.73594623645097,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20181789535303,\"lon\":116.73593148707488,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201667906886954,\"lon\":116.73591743008926,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.201505897730755,\"lon\":116.7359002912543,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20135083580946,\"lon\":116.73588579696379,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20118617904595,\"lon\":116.73586970398149,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20102374028594,\"lon\":116.73585314703226,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20085554043743,\"lon\":116.73583763953049,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20069451888229,\"lon\":116.73582073901778,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.200530837344964,\"lon\":116.73580314359012,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.2003608457064,\"lon\":116.73578183888779,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20021770046798,\"lon\":116.73575292592922,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.20003454701824,\"lon\":116.7357174959358,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19986125116602,\"lon\":116.73569499961796,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19969408518737,\"lon\":116.73567725223492,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19955533048882,\"lon\":116.73566375985422,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19943174810538,\"lon\":116.73564927714162,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19933167546824,\"lon\":116.735595995086,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.199280357603875,\"lon\":116.73546293260645,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19927848361656,\"lon\":116.73531579486274,\"speed\":0.0},{\"altitude\":0.0,\"angle\":0.0,\"duration\":0,\"lat\":40.19928127892504,\"lon\":116.73505848474375,\"speed\": 0.0\n" + -// " }\n" + -// " ]\n" + -// "}"; - - //洱海轨迹 - static String jsonStr ="{\n" + - " \"models\": [\n" + - " {\n" + - "\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87506159122434,\"longitude_\":100.13463113454593,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874963432017065,\"longitude_\":100.13431083742782,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87481475105022,\"longitude_\":100.13402921175965,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874646001578594,\"longitude_\":100.13381071517328,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874280379177108,\"longitude_\":100.13344505101841,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87422474353087,\"longitude_\":100.13336522063217,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.8741846037573,\"longitude_\":100.13326081770579,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874169301193604,\"longitude_\":100.133157732712,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87417865388365,\"longitude_\":100.13305383003687,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87424355168725,\"longitude_\":100.13288988207758,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87441186213399,\"longitude_\":100.1326293335985,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874490698935094,\"longitude_\":100.13247594955229,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874551609777672,\"longitude_\":100.13227787460397,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874574232444672,\"longitude_\":100.1320943662068,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874574936235152,\"longitude_\":100.13109176087639,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874553271326842,\"longitude_\":100.13095333429315,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874468877309848,\"longitude_\":100.1307193884582,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874449652750723,\"longitude_\":100.1306199898516,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874449487671647,\"longitude_\":100.13046154976821,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87448439242463,\"longitude_\":100.13030173580755,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874554236422213,\"longitude_\":100.13013644761386,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874657614202334,\"longitude_\":100.1299792051648,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.874777620037,\"longitude_\":100.12985830283493,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.8749211786138,\"longitude_\":100.12975642056448,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.875123187810807,\"longitude_\":100.12965486650492,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.875282658783302,\"longitude_\":100.12960819854966,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87555277290776,\"longitude_\":100.12954493830546,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.875686392944456,\"longitude_\":100.12948797177033,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87609150201856,\"longitude_\":100.12914349760804,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87645852877848,\"longitude_\":100.1289124421148,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87667085149294,\"longitude_\":100.1288070141346,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.877063427631544,\"longitude_\":100.12866094818,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87751767381502,\"longitude_\":100.1286538378911,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87776644058061,\"longitude_\":100.12861180318971,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.87866240134362,\"longitude_\":100.12843614360035,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.879103098247672,\"longitude_\":100.12837521690956,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.879326467139197,\"longitude_\":100.12832846342278,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.8800083487784,\"longitude_\":100.12811951944514,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88019070137511,\"longitude_\":100.12802255167708,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.880357426115513,\"longitude_\":100.12787083439976,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.880481954487596,\"longitude_\":100.1276940858994,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.880653097994426,\"longitude_\":100.12740127585158,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.880758517533007,\"longitude_\":100.12730743064938,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.880799507331627,\"longitude_\":100.12724835914499,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88098572681533,\"longitude_\":100.12658255210448,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.881039332211476,\"longitude_\":100.1263847771375,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.881100185621683,\"longitude_\":100.12625820340021,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.881198711287677,\"longitude_\":100.12611952057267,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88133930457031,\"longitude_\":100.12599337741426,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.881467122690022,\"longitude_\":100.12592180492642,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88159423650277,\"longitude_\":100.12588048516646,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.882012210316635,\"longitude_\":100.12584119198453,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88240347787595,\"longitude_\":100.12581569076075,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.882530989675523,\"longitude_\":100.1258417579907,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88266718412272,\"longitude_\":100.1258996456634,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.882846062879587,\"longitude_\":100.12604302069693,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.883143169798704,\"longitude_\":100.12643363872347,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.883316147374213,\"longitude_\":100.12660436351877,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.883516631635977,\"longitude_\":100.12670006660859,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.884412161186358,\"longitude_\":100.12681096840119,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88456077756699,\"longitude_\":100.12680626559008,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88490956874977,\"longitude_\":100.12672087342608,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.885302490381278,\"longitude_\":100.12667304829165,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.885521440240353,\"longitude_\":100.1266801970379,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.885748782438256,\"longitude_\":100.12673442989593,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.886184311775366,\"longitude_\":100.12689928223388,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.886371044711435,\"longitude_\":100.12693222015717,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.886556923046193,\"longitude_\":100.12691593845197,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.887058969863556,\"longitude_\":100.1267783886852,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.887547354704896,\"longitude_\":100.12664214250168,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.887745630547965,\"longitude_\":100.12661296296805,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.887952855908765,\"longitude_\":100.12663469253742,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88838254724211,\"longitude_\":100.1267432660041,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88867177268486,\"longitude_\":100.12674878070436,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.888948154040733,\"longitude_\":100.12668867979535,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.889119678251383,\"longitude_\":100.12661519197152,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.88965548111457,\"longitude_\":100.12632103004057,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.890440398289833,\"longitude_\":100.12572932612804,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.890595726487316,\"longitude_\":100.12569393173928,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.89083685708941,\"longitude_\":100.12572825271758,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.89092017694698,\"longitude_\":100.12571880871474,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.891037856897587,\"longitude_\":100.12567497177714,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.891761687561317,\"longitude_\":100.12513259535619,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.891885118463794,\"longitude_\":100.1250643533811,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.89201181287785,\"longitude_\":100.1250211908644,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.892633993404484,\"longitude_\":100.12487357365991,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.892723272763575,\"longitude_\":100.12483263537747,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.892820100842155,\"longitude_\":100.12471361851891,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.89291347694438,\"longitude_\":100.12434808103623,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.892985029043015,\"longitude_\":100.12422953782732,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.89308490178189,\"longitude_\":100.12416612695728,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.893360731467585,\"longitude_\":100.12410368114618,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.894308353220502,\"longitude_\":100.12396602611501,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.895020251951685,\"longitude_\":100.12387330229565,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0},{\"altitude_\":0.0,\"heading_\":0.0,\"latitude_\":25.895317877980734,\"longitude_\":100.12387135197324,\"memoizedIsInitialized\":-1,\"unknownFields\":{\"fields\":{},\"fieldsDescending\":{}},\"memoizedSize\":-1,\"memoizedHashCode\":0" - + - " }\n" + - " ]\n" + - "}"; - - public static void converToRouteData(){ - List list = new ArrayList<>(); - - try { - JSONObject jsonObject = new JSONObject(jsonStr); - JSONArray jsonElements = jsonObject.getJSONArray("models"); - for (int i = 0; i < jsonElements.length(); i++) { - JSONObject s = jsonElements.getJSONObject(i); - MessagePad.Location.Builder builder = MessagePad.Location.newBuilder(); - builder.setLatitude(s.getDouble("latitude_")); - builder.setLongitude(s.getDouble("longitude_")); - list.add(builder.build()); - } - PM2DrivingModel.Companion.getINSTANCE().updateRoutePoints(list); - - } catch (JSONException e) { - e.printStackTrace(); - } - } -} diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt deleted file mode 100644 index 17d5780835..0000000000 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.mogo.och.bus.passenger.ui.widget - -import android.content.Context -import android.util.AttributeSet -import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus - -/** - * @author: wangmingjun - * @date: 2023/2/13 - */ -class M2TurnLightView @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null -) : TurnLightViewStatus(context, attrs) { - - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png deleted file mode 100644 index 593db1abc5..0000000000 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml deleted file mode 100644 index 6ea3fc81b6..0000000000 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png deleted file mode 100644 index bc9fed952d..0000000000 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png deleted file mode 100644 index 8732508ded..0000000000 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png and /dev/null differ diff --git a/OCH/shuttle/passenger/src/m2/res/values/colors.xml b/OCH/shuttle/passenger/src/m2/res/values/colors.xml deleted file mode 100644 index 40e7769b2b..0000000000 --- a/OCH/shuttle/passenger/src/m2/res/values/colors.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - #FFFFFF - #0B1E38 - #2D3E5F - - #BBDAFB - #0B1E38 - #5D7199 - #0B1E38 - #6B7EA6 - #2D3E5F - #A5D8FF - #1B2546 - #23355D - #374E7F - - #FFFFA28B - #FFDA1100 - #FF60FFD3 - #FF006D43 - #FFFFE198 - #FFFF9B00 - #59FFFFFF - #8895B7 - - - #C8EFFF - #203555 - #99AFC9E7 - #6617417B - #17417B - #2D3E5F - #34A61F - #AEEDB8 - #43CEFE - #1466FB - #7094AD - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/values/dimens.xml b/OCH/shuttle/passenger/src/m2/res/values/dimens.xml deleted file mode 100644 index ca8e0dcfc1..0000000000 --- a/OCH/shuttle/passenger/src/m2/res/values/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 60dp - 40dp - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/values/strings.xml b/OCH/shuttle/passenger/src/m2/res/values/strings.xml deleted file mode 100644 index 8a8f6658ec..0000000000 --- a/OCH/shuttle/passenger/src/m2/res/values/strings.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - KM/H - 您已收车 - 暂无路线 - 起 - 终 - 到达站： - 下一站： - 始发站： - 请携带好随身物品下车。 - 欢迎乘坐蘑菇车联自动驾驶车。 - - m2_map_style.data - m2_map_style_extra.data - AUTO - 下一站： - 已到站 - 暂无站点 - —公里 | —分钟 - 前方到站 - —公里 - —分钟 - 请按秩序下车 - 暂无路线 - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/AndroidManifest.xml b/OCH/shuttle/passenger/src/main/AndroidManifest.xml index 3e64218ab9..549784ca83 100644 --- a/OCH/shuttle/passenger/src/main/AndroidManifest.xml +++ b/OCH/shuttle/passenger/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.och.shuttle.passenger"> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/assets/m2_map_style.data b/OCH/shuttle/passenger/src/main/assets/m2_map_style.data similarity index 100% rename from OCH/shuttle/passenger/src/m2/assets/m2_map_style.data rename to OCH/shuttle/passenger/src/main/assets/m2_map_style.data diff --git a/OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data b/OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data similarity index 100% rename from OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data rename to OCH/shuttle/passenger/src/main/assets/m2_map_style_extra.data diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java deleted file mode 100644 index fb146e17c3..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.och.bus.passenger; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -/** - * 网约车抽象接口 - * - * Created on 2022/3/29 - */ -interface IMogoOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); -} diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt deleted file mode 100644 index 4ad4e9a2ba..0000000000 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.bus.passenger.utils - -import android.content.res.Resources - -/** - * @author: wangmingjun - * @date: 2022/1/21 - */ -object DimenUtil{ - fun dp2px(value:Float):Float{ - return (0.5f + value * Resources.getSystem().displayMetrics.density) - } -} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt new file mode 100644 index 0000000000..9167b387ac --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/MogoOCHShuttlePassenger.kt @@ -0,0 +1,105 @@ +package com.mogo.och.shuttle.passenger + +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.api.base.IMoGoFunctionProvider +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode +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.MultiDisplayUtils +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst +import com.mogo.och.common.module.wigets.video.VideoPlayerActivity +import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment +import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment + +/** + * 网约车-Bus-乘客端 + * + * Created on 2022/3/29 + */ +@Route(path = BusPassengerConst.PATH) +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, VideoPlayerActivity::class.java) + } + } + return null + } + + override val functionName: String + get() = "och-bus-passenger-m2" + + override fun onDestroy() { + // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 + mActivity?.finish() + } + + 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 + } + 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() + } + } + + companion object { + private val TAG = MogoOCHShuttlePassenger::class.java.simpleName + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt similarity index 91% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt index 88fbdc0127..dc0bb741a3 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/constant/BusPassengerConst.kt @@ -1,6 +1,4 @@ -package com.mogo.och.bus.passenger.constant - -import com.mogo.commons.debug.DebugConfig +package com.mogo.och.shuttle.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 97% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java index 3cad825966..1f9bc9c159 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/utils/BusPassengerMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils; +package com.mogo.och.shuttle.passenger.utils; import android.content.Context; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 80% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java index d50adb656a..15a89f2b66 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.adapter; +package com.mogo.och.shuttle.passenger.adapter; import android.content.Context; import android.text.TextUtils; @@ -11,16 +11,16 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.shuttle.passenger.R; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.data.bean.BusStationBean; import java.util.List; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; -import static com.mogo.och.bus.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_ARRIVING; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_LEAVING; +import static com.mogo.och.shuttle.passenger.constant.BusPassengerConst.STATION_STATUS_STOPPED; /** * @author: wangmingjun @@ -39,7 +39,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter { - bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_red_nor) + bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_red_nor) this@BusPassengerTrafficLightView.visibility = VISIBLE } TrafficLightEnum.YELLOW -> { - bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_yellow_nor) + bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_yellow_nor) this@BusPassengerTrafficLightView.visibility = VISIBLE } TrafficLightEnum.GREEN -> { - bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_green_nor) + bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_green_nor) this@BusPassengerTrafficLightView.visibility = VISIBLE } else -> this@BusPassengerTrafficLightView.visibility = GONE @@ -156,7 +158,7 @@ class BusPassengerTrafficLightView @JvmOverloads constructor( val layoutParams = layoutParams if (layoutParams is MarginLayoutParams) { val lp = layoutParams - lp.width = resources.getDimension(R.dimen.bus_p_traffic_light_icon_size).toInt() + lp.width = resources.getDimension(R.dimen.shuttle_p_jl_traffic_light_icon_size).toInt() setLayoutParams(lp) bus_p_traffic_light_time_tv.visibility = GONE bus_p_traffic_light_bg.layoutParams.width = @@ -169,11 +171,11 @@ class BusPassengerTrafficLightView @JvmOverloads constructor( val layoutParams = layoutParams if (layoutParams is MarginLayoutParams) { val lp = layoutParams - lp.width = resources.getDimension(R.dimen.bus_p_route_traffic_light_view_width).toInt() + lp.width = resources.getDimension(R.dimen.shuttle_p_jl_route_traffic_light_view_width).toInt() setLayoutParams(lp) bus_p_traffic_light_time_tv.visibility = VISIBLE bus_p_traffic_light_bg.layoutParams.width = - resources.getDimension(R.dimen.bus_p_traffic_light_bg_width).toInt() + resources.getDimension(R.dimen.shuttle_p_jl_traffic_light_bg_width).toInt() } } } \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java similarity index 88% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java index 7f525d0464..643da8a824 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui; +package com.mogo.och.shuttle.passenger.ui; /** * @author xiaoyuzhou diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 96% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java index 42210cbcaf..d7b712d6ea 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.layoutmanager; +package com.mogo.och.shuttle.passenger.ui.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt similarity index 95% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt index ccaa6d6019..7a1c0df493 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.mapdirectionview +package com.mogo.och.shuttle.passenger.ui.mapdirectionview import android.content.Context import android.os.Bundle @@ -27,9 +27,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis 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.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.IBusPassengerMapDirectionView -import com.mogo.och.bus.passenger.utils.BusPassengerMapAssetStyleUtil +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.ui.IBusPassengerMapDirectionView +import com.mogo.och.shuttle.passenger.utils.BusPassengerMapAssetStyleUtil /** * 乘客屏小地图 @@ -72,7 +72,7 @@ class BusPassengerMapDirectionView @JvmOverloads constructor( private fun initView(context: Context) { d(SceneConstant.M_BUS_P + TAG, "initView") - val smpView = LayoutInflater.from(context).inflate(R.layout.bus_p_map_view, this) + val smpView = LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_map_view, this) mAMapNaviView = smpView.findViewById(R.id.bus_p_line_amap_view) as TextureMapView initAMapView() @@ -96,11 +96,11 @@ class BusPassengerMapDirectionView @JvmOverloads constructor( // 设置 锚点 图标 mCarMarker = mAMap.addMarker( - MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_car)) + MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_car)) .anchor(0.5f, 0.5f) ) - mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_arrived) - mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_un_arrive) + mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrow_arrived) + mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrow_un_arrive) // 加载自定义样式 val customMapStyleOptions = CustomMapStyleOptions() @@ -312,11 +312,11 @@ class BusPassengerMapDirectionView @JvmOverloads constructor( val size = mLineStationsList.size val mStartMarker = mAMap.addMarker( MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_start_point)) + .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_start_point)) ) val mEndMarker = mAMap.addMarker( MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_end_point)) + .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_end_point)) ) mStartMarker.position = mLineStationsList[0] mLineMarkers.add(0, mStartMarker) @@ -324,14 +324,14 @@ class BusPassengerMapDirectionView @JvmOverloads constructor( if (currentIndex <= i && i < size - 1 && i > 0) { //未到达 val unArrivedMarker = mAMap.addMarker( MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_unarrived_point)) + .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_unarrived_point)) ) unArrivedMarker.position = mLineStationsList[i] mLineMarkers.add(i, unArrivedMarker) } else if (i in 1 until currentIndex) { val arrivedMarker = mAMap.addMarker( MarkerOptions() - .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrived_point)) + .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrived_point)) ) arrivedMarker.position = mLineStationsList[i] mLineMarkers.add(i, arrivedMarker) diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt similarity index 91% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt index c1be106fb8..3b2df2feec 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.mapdirectionview +package com.mogo.och.shuttle.passenger.ui.mapdirectionview import androidx.lifecycle.ViewModel import com.amap.api.maps.model.LatLng @@ -11,14 +11,14 @@ class MapDirectionViewModel: ViewModel(), ITrajectoryListener { private val TAG = MapDirectionViewModel::class.java.simpleName - private var viewCallback:ItineraryViewCallback?=null + private var viewCallback: ItineraryViewCallback?=null init { TrajectoryAndDistanceManager.addTrajectoryListener(TAG,this) } - fun setDistanceCallback(viewCallback:ItineraryViewCallback){ + fun setDistanceCallback(viewCallback: ItineraryViewCallback){ this.viewCallback = viewCallback } diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt new file mode 100644 index 0000000000..17f9179559 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt @@ -0,0 +1,199 @@ +package com.mogo.och.shuttle.passenger.ui.widget + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AlphaAnimation +import android.view.animation.Animation +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager +import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.common.module.manager.lightmanager.TurnLightManager +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +class BusPTurnLightView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), + IMoGoTurnLightListener, TurnLightManager.TurnLightListener { + + + companion object { + private const val TAG = "TurnLightViewStatus" + } + + private var isLeftLight: Boolean = false + private var isRightLight: Boolean = false + private var isDisappear: Boolean = false + + init { + LayoutInflater.from(context) + .inflate(R.layout.shuttle_p_jl_turn_light_status, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerTurnLightListenerManager.addListener(TAG,this) + + TurnLightManager.addTurnLightStatusChangeListener(TAG,this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerChassisLamplightListenerManager.removeListener(TAG) + CallerTurnLightListenerManager.removeListener(TAG) + } + + override fun hideTurnLightView() { + ThreadUtils.runOnUiThread{ + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + + override fun statusChange(newStatus: TurnLightManager.TurnLightStatus) { + ThreadUtils.runOnUiThread { + setTurnLight(newStatus) + } + } + + /** + * 转向灯动画 + */ + private fun setTurnLight(directionLight: TurnLightManager.TurnLightStatus) { + if (!isAttachedToWindow) { + return + } + //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 + when (directionLight) { + TurnLightManager.TurnLightStatus.TURN_LIGHT_LEFT -> { //左转向 + if (!isLeftLight) { + isLeftLight = true + isRightLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.VISIBLE + right_select_image.visibility = View.GONE + right_select_image.clearAnimation() + setAnimation(left_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_RIGHT -> { //右转向 + if (!isRightLight) { + isRightLight = true + isLeftLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.GONE + right_select_image.visibility = View.VISIBLE + left_select_image.clearAnimation() + setAnimation(right_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_NONE -> { //消失 + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + } + + //显示背景 + private fun showNormalAnimation() { + val appearAnimation = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 300 + val appearAnimationImage = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 500 + turn_light_layout.startAnimation(appearAnimation) + left_nor_image.startAnimation(appearAnimationImage) + right_nor_image.startAnimation(appearAnimationImage) + + turn_light_layout.visibility = View.VISIBLE + left_nor_image.visibility = View.VISIBLE + right_nor_image.visibility = View.VISIBLE + } + + //消失动画，当转向等数据为空时候 + private fun animationDisappear() { + left_select_image.visibility = View.GONE + right_select_image.visibility = View.GONE + left_select_image.clearAnimation() + right_select_image.clearAnimation() + + left_nor_image.clearAnimation() + right_nor_image.clearAnimation() + turn_light_layout.clearAnimation() + + val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) + disappearAnimationLeft.duration = 300 + + val disappearAnimationBg = AlphaAnimation(1.0f, 0f) + disappearAnimationBg.duration = 500 + + left_nor_image.startAnimation(disappearAnimationLeft) + right_nor_image.startAnimation(disappearAnimationLeft) + turn_light_layout.startAnimation(disappearAnimationBg) + + disappearAnimationLeft.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + left_nor_image.visibility = View.GONE + right_nor_image.visibility = View.GONE + } + }) + + disappearAnimationBg.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + turn_light_layout.visibility = View.GONE + } + }) + } + + //实现图片闪烁效果 + private fun setAnimation(imageView: ImageView) { + val animationSet = AnimatorSet() + val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) + val valueAnimatorDisappear = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) + valueAnimator.duration = 1000 + valueAnimatorDisappear.duration = 800 + valueAnimator.repeatCount = -1 + valueAnimatorDisappear.repeatCount = -1 + animationSet.playTogether(valueAnimatorDisappear, valueAnimator) + animationSet.start() + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java similarity index 91% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java index 9869a9e135..a39d34927b 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2OperationStatusResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java similarity index 83% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java index 5569730773..62594f2813 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2QueryLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; public /** diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java similarity index 93% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java index 32306a33c1..cc302cdca5 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.bean.BusRoutesResult; diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java similarity index 97% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java index 1f26b5346d..d120747432 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2RoutesResult.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.List; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java similarity index 98% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java index ec903b7e93..767da50f10 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/bean/PM2Station.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt similarity index 79% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt index 217f03740f..b5b490e29d 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/ADASCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt similarity index 83% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt index efb7410ba2..44b2075170 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/AutoPilotStatusCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt similarity index 92% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt index 61589fce33..88ab043327 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/callback/DrivingInfoCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.shuttle.passenger.callback import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt similarity index 85% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt index 65d482b5fd..fd9097ad64 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/constant/M2Const.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.constant +package com.mogo.och.shuttle.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt similarity index 91% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt index 87c68dda4f..3994625de7 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ADASModel.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context -import com.mogo.och.bus.passenger.callback.ADASCallback +import com.mogo.och.shuttle.passenger.callback.ADASCallback import com.mogo.och.data.bean.BusStationBean /** diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt similarity index 97% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt index d91c62fc57..4e5f1a568f 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context import android.media.AudioAttributes @@ -12,7 +12,6 @@ import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -32,14 +31,14 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse -import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.bus.passenger.callback.DrivingInfoCallback -import com.mogo.och.bus.passenger.constant.BusPassengerConst -import com.mogo.och.bus.passenger.model.PM2ServiceManager.driverAppSn -import com.mogo.och.bus.passenger.network.PM2ModelLoopManager +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse +import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.passenger.model.PM2ServiceManager.driverAppSn +import com.mogo.och.shuttle.passenger.network.PM2ModelLoopManager import com.mogo.och.common.module.bean.dpmsg.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox import com.mogo.och.common.module.biz.constant.OchCommonConst diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt similarity index 88% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt index f23b75ea3f..99f133a0d2 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2ServiceManager.kt @@ -1,13 +1,13 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.shuttle.passenger.model import android.content.Context import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.network.MoGoRetrofitFactory -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse -import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse -import com.mogo.och.bus.passenger.network.PM2ServiceApi +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse +import com.mogo.och.shuttle.passenger.bean.PM2QueryLineRequest +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse +import com.mogo.och.shuttle.passenger.network.PM2ServiceApi import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt new file mode 100644 index 0000000000..8f3082bce1 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ModelLoopManager.kt @@ -0,0 +1,127 @@ +package com.mogo.och.shuttle.passenger.network + +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.shuttle.passenger.constant.BusPassengerConst +import com.mogo.och.shuttle.passenger.model.PM2DrivingModel +import io.reactivex.Observable +import io.reactivex.ObservableOnSubscribe +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.disposables.Disposable +import io.reactivex.schedulers.Schedulers +import java.util.concurrent.TimeUnit + +/** + * @author: wangmingjun + * @date: 2023/2/1 + */ +object PM2ModelLoopManager { + + private val TAG: String = PM2ModelLoopManager::class.java.getSimpleName() + + private var mQueryLineDisposable: Disposable? = null //心跳轮询 + private var mRouteWipeDisposable: CompositeDisposable? = null //估计擦除 + private var mCalculateRouteDisposable: CompositeDisposable? = null //每隔2s计算一次剩余里程和时间 + + + fun startOrStopRouteAndWipe() { + i(SceneConstant.M_BUS_P + TAG, "startOrStopRouteWipe()") + if (mRouteWipeDisposable != null) return + if (mRouteWipeDisposable == null) { + mRouteWipeDisposable = CompositeDisposable() + } + val disposable = startLoopRouteAndWipe() + .doOnSubscribe { } + .doOnError { } + .delay( + BusPassengerConst.LOOP_LINE_1S, + TimeUnit.MILLISECONDS, + true + ) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。 + .subscribeOn(Schedulers.io()) + .repeat() // repeat保证请求成功后能够重新订阅。 + .retry() // retry保证请求失败后能重新订阅 + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { } + mRouteWipeDisposable!!.add(disposable) + } + + fun stopOrStopRouteAndWipe() { + if (mRouteWipeDisposable != null) { + mRouteWipeDisposable!!.dispose() + mRouteWipeDisposable = null + } + } + + fun startQueryDriverLineLoop() { + if (mQueryLineDisposable != null && !mQueryLineDisposable!!.isDisposed) { + return + } + i(SceneConstant.M_BUS_P + TAG, "startQueryDriverLineLoop()") + mQueryLineDisposable = Observable.interval( + BusPassengerConst.LOOP_DELAY, + BusPassengerConst.LOOP_LINE_2S, TimeUnit.MILLISECONDS + ) + .map { aLong: Long -> aLong + 1 } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { aLong: Long? -> + PM2DrivingModel.INSTANCE.queryDriverSiteByCoordinate() + } + } + + fun stopQueryDriverLineLoop() { + if (mQueryLineDisposable != null) { + i(SceneConstant.M_BUS_P + TAG, "stopQueryDriverLineLoop()") + mQueryLineDisposable!!.dispose() + mQueryLineDisposable = null + } + } + + fun startCalculateRouteInfoLoop() { + i(SceneConstant.M_BUS_P + TAG, "startCalculateRouteInfoLoop()") + if (mCalculateRouteDisposable != null) return + if (mCalculateRouteDisposable == null) { + mCalculateRouteDisposable = CompositeDisposable() + } + val disposable = startLoopCalculateRouteInfo() + .doOnSubscribe { } + .doOnError { } + .delay( + BusPassengerConst.LOOP_LINE_2S, + TimeUnit.MILLISECONDS, + true + ) // 设置delayError为true，表示出现错误的时候也需要延迟5s进行通知，达到无论是请求正常还是请求失败，都是5s后重新订阅，即重新请求。 + .subscribeOn(Schedulers.io()) + .repeat() // repeat保证请求成功后能够重新订阅。 + .retry() // retry保证请求失败后能重新订阅 + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { } + mCalculateRouteDisposable!!.add(disposable) + } + + fun stopCalculateRouteInfLoop() { + if (mCalculateRouteDisposable != null) { + i(SceneConstant.M_BUS_P + TAG, "stopCalculateRouteInfLoop()") + mCalculateRouteDisposable!!.dispose() + mCalculateRouteDisposable = null + } + } + + private fun startLoopRouteAndWipe(): Observable { + return Observable.create(ObservableOnSubscribe { emitter -> + if (emitter.isDisposed) return@ObservableOnSubscribe + PM2DrivingModel.INSTANCE.loopRouteAndWipe() + emitter.onComplete() + }) + } + + private fun startLoopCalculateRouteInfo(): Observable { + return Observable.create(ObservableOnSubscribe { emitter -> + if (emitter.isDisposed) return@ObservableOnSubscribe + PM2DrivingModel.INSTANCE.dynamicCalculateRouteInfo() + emitter.onComplete() + }) + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java similarity index 82% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java index 9a0f63e23e..8797caf27e 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/network/PM2ServiceApi.java @@ -1,8 +1,8 @@ -package com.mogo.och.bus.passenger.network; +package com.mogo.och.shuttle.passenger.network; -import com.mogo.och.bus.passenger.bean.PM2OperationStatusResponse; -import com.mogo.och.bus.passenger.bean.PM2QueryLineRequest; -import com.mogo.och.bus.passenger.bean.PM2RoutesResponse; +import com.mogo.och.shuttle.passenger.bean.PM2OperationStatusResponse; +import com.mogo.och.shuttle.passenger.bean.PM2QueryLineRequest; +import com.mogo.och.shuttle.passenger.bean.PM2RoutesResponse; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt similarity index 74% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt index b3d6ab2894..4e28ee57de 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2ADASPresenter.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.callback.ADASCallback -import com.mogo.och.bus.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER -import com.mogo.och.bus.passenger.model.PM2ADASModel -import com.mogo.och.bus.passenger.ui.PM2HPMapFragment +import com.mogo.och.shuttle.passenger.callback.ADASCallback +import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER +import com.mogo.och.shuttle.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.passenger.ui.PM2HPMapFragment class PM2ADASPresenter(view: PM2HPMapFragment?) : Presenter(view), ADASCallback { diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt similarity index 91% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt index 54986df014..419f50e7ac 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2DrivingPresenter.kt @@ -1,14 +1,14 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback -import com.mogo.och.bus.passenger.callback.DrivingInfoCallback -import com.mogo.och.bus.passenger.model.PM2ADASModel -import com.mogo.och.bus.passenger.model.PM2DrivingModel -import com.mogo.och.bus.passenger.ui.PM2DrivingInfoFragment +import com.mogo.och.shuttle.passenger.callback.AutoPilotStatusCallback +import com.mogo.och.shuttle.passenger.callback.DrivingInfoCallback +import com.mogo.och.shuttle.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.passenger.model.PM2DrivingModel +import com.mogo.och.shuttle.passenger.ui.PM2DrivingInfoFragment import com.mogo.och.data.bean.BusStationBean class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt similarity index 53% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt index e55cc469d1..450109ef98 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2Presenter.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.PM2BaseFragment +import com.mogo.och.shuttle.passenger.ui.PM2BaseFragment class PM2Presenter(view: PM2BaseFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt similarity index 53% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt index b62879bf4b..247a9ea7f1 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/presenter/PM2VideoPresenter.kt @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.shuttle.passenger.presenter import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.ui.video.PM2VideoFragment +import com.mogo.och.shuttle.passenger.ui.video.PM2VideoFragment class PM2VideoPresenter(view: PM2VideoFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java similarity index 86% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java index 8966090d91..49b0288cd3 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/provider/M2StatusViewManager.java @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.provider; +package com.mogo.och.shuttle.passenger.provider; import android.content.Context; import android.view.View; -import com.mogo.och.bus.passenger.ui.widget.M2StatusBarView; +import com.mogo.och.shuttle.passenger.ui.widget.M2StatusBarView; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt new file mode 100644 index 0000000000..c84ad52e02 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2BaseFragment.kt @@ -0,0 +1,70 @@ +package com.mogo.och.shuttle.passenger.ui + +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2Presenter +import com.mogo.och.shuttle.passenger.ui.video.PM2VideoFragment + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2BaseFragment : + MvpFragment() { + + private var drivingFragment : PM2DrivingInfoFragment? = null + private var hdMapFragment : PM2HPMapFragment? = null + private var videoFragment : PM2VideoFragment? = null + + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + //横竖屏 +// setScreenDirection() + + //隐藏小地图 + initFragment() + } + +// private fun setScreenDirection() { +// var ro = Settings.System.getInt(context?.contentResolver, +// Settings.System.USER_ROTATION,Surface.ROTATION_270) +// if (ro != Surface.ROTATION_270){ +// ro = Surface.ROTATION_270 +// } +// Settings.System.putInt(context?.contentResolver, +// Settings.System.USER_ROTATION,ro) +// } + + /** + * 初始化行程信息，高静地图，宣传 三个fragment + */ + private fun initFragment() { + + if (drivingFragment == null) drivingFragment = PM2DrivingInfoFragment() + childFragmentManager.beginTransaction().add(R.id.driving_fragment, drivingFragment!!) + .show(drivingFragment!!).commitAllowingStateLoss() + + if (hdMapFragment == null) hdMapFragment = PM2HPMapFragment() + childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!) + .show(hdMapFragment!!).commitAllowingStateLoss() + + if (videoFragment == null) videoFragment = PM2VideoFragment() + childFragmentManager.beginTransaction().add(R.id.video_fragment, videoFragment!!) + .show(videoFragment!!).commitAllowingStateLoss() + } + + override fun createPresenter(): PM2Presenter { + return PM2Presenter(this) + } + + companion object { + public val TAG = PM2BaseFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt new file mode 100644 index 0000000000..4872a904f3 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt @@ -0,0 +1,300 @@ +package com.mogo.och.shuttle.passenger.ui + +import android.graphics.BitmapFactory +import android.graphics.drawable.AnimationDrawable +import android.os.Bundle +import android.view.View +import androidx.core.content.ContextCompat +import com.amap.api.maps.model.LatLng +import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView +import com.mogo.eagle.core.function.view.SiteMarkerBean +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2DrivingPresenter +import com.mogo.och.common.module.utils.DateTimeUtil.* +import com.mogo.och.common.module.utils.NumberFormatUtil +import com.mogo.och.data.bean.BusStationBean +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.auto_tv +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.clg_distance_left_time +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.group_not_select_line +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.group_stationinfo +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.iv_animal_list +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.line_during_tv +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.line_name_tv +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.overMapView +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.speed_tv +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.station_name_tv +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_arrived_notice +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_distance +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_left_time +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_next_station_title + +import me.jessyan.autosize.utils.AutoSizeUtils +import kotlin.math.ceil +import kotlin.math.roundToInt + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2DrivingInfoFragment : + MvpFragment() { + + val stationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.shuttle_p_m2_map_staton_icon) + val stationPassIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.shuttle_p_m2_map_staton_arrived_icon) + val startStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.shuttle_p_m2_map_start_icon) + val endStationIcon = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.shuttle_p_m2_map_end_icon) + + /** + * 改变自动驾驶状态 + * + * @param status 2 - running 1 - enable 2 - disable + */ + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_driving_info_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + speed_tv.setOnLongClickListener { + context?.let { ToggleDebugView.toggleDebugView.toggle(it) } + true + } + + line_name_tv.setTextColor(resources.getColor(R.color.shuttle_p_m2_line_name_tv_color)) + station_name_tv.setTextColor(resources.getColor(R.color.shuttle_p_m2_line_name_tv_color)) + speed_tv.setVertrial(true) + val intArrayOf = intArrayOf( + requireContext().resources.getColor(R.color.shuttle_p_m2_color_43cefe), + requireContext().resources.getColor(R.color.shuttle_p_m2_color_1466fb) + ) + speed_tv.setmColorList(intArrayOf) + +// current_time_tv.onClick { + +// //测试V2X消息 +// CallerMsgBoxManager.saveMsgBox( +// MsgBoxBean( +// MsgBoxType.V2X, +// V2XMsg( +// "6666", +// "超速行驶", +// "" +// ) +// ) +// ) +// +// val noticeTrafficStylePushData = NoticeTrafficStylePushData() +// noticeTrafficStylePushData.content= "测试公告布局" +// val noticeFromCloudMsg = NoticeFrCloudMsg(null, noticeTrafficStylePushData, 1) +// CallerMsgBoxManager.saveMsgBox( +// MsgBoxBean( +// MsgBoxType.NOTICE, noticeFromCloudMsg) +// ) +// BPRouteDataTestUtils.converToRouteData() +// } + } + + override fun initViews(savedInstanceState: Bundle?) { + super.initViews(savedInstanceState) + overMapView?.let { + it.onCreateView(savedInstanceState) + val radius = AutoSizeUtils.dp2px(requireContext(), 16f) + it.outlineProvider = TextureVideoViewOutlineProvider(radius.toFloat()) + it.clipToOutline = true + } + } + + override fun onResume() { + super.onResume() + overMapView?.let{ + it.onResume() + } + } + + override fun onPause() { + super.onPause() + overMapView?.let{ + it.onPause() + } + } + + override fun onDestroy() { + super.onDestroy() + overMapView?.let{ + it.onDestroy() + } + } + + fun updateSpeed(speed: Int){ + speed_tv.text = speed.toString() + } + + fun updateCarPlateNum(plateNum : String){ + + } + + fun updateTaskName(name: String){ + line_name_tv.text = name + } + + fun updateTaskDuringTime(time : String){ + line_during_tv.text = time + } + + fun changeOperationStatus(status:Boolean){ + if (!status){ + updateNoOrderUI() + } + } + + fun showNoTaskView(haveTask: Boolean){ + setLineInfoView(haveTask) + } + + private fun setLineInfoView(isShow: Boolean){ + if (!isShow){ + updateNoOrderUI() + } + } + + private fun updateNoOrderUI() { + line_name_tv.text = resources.getString(R.string.shuttle_p_m2_not_select_line_content) + updateNoStationView() + overMapView?.let { + it.clearSiteMarkers() + } + clearCustomPolyline() + } + + fun clearCustomPolyline(){ + overMapView?.let { + it.clearCustomPolyline() + } + } + private fun updateNoStationView(){ + station_name_tv.setTextColor(resources.getColor(R.color.shuttle_p_m2_next_tv_color)) + station_name_tv.text = resources.getString(R.string.shuttle_p_m2_empty_tv) + tv_distance.text = resources.getString(R.string.shuttle_p_m2_empty_remain_km) + tv_left_time.text = resources.getString(R.string.shuttle_p_m2_empty_remain_minute) + noLineShow() + } + + override fun createPresenter(): PM2DrivingPresenter { + return PM2DrivingPresenter(this) + } + + fun updateAutoStatus(isAutoPilot: Boolean) { + if (isAutoPilot){ + context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_p_m2_white_color)) } + context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.shuttle_p_m2_auto_button_bg) } + }else{ + context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_p_m2_color_7094ad)) } + context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.shuttle_p_m2_bg_p_m2_auto) } + } + } + + fun updateLineStations( + stations: MutableList, + stationsPass: MutableList, + startStation: LatLng?, + endStation: LatLng? + ){ + overMapView?.let { + val stationsList: MutableList = mutableListOf() + startStation?.let { start-> + stationsList.add(SiteMarkerBean(start,startStationIcon,0.5f,0.5f)) + } + for (stationsPass in stationsPass) { + stationsList.add(SiteMarkerBean(stationsPass,stationPassIcon,0.5f,0.5f)) + } + for (stationsPass in stations) { + stationsList.add(SiteMarkerBean(stationsPass,stationIcon,0.5f,0.5f)) + } + endStation?.let {end-> + stationsList.add(SiteMarkerBean(end,endStationIcon,0.5f,0.5f)) + } + it.drawSiteMarkers(stationsList) + } + } + + fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean){ + if (stations.size == 0) return + if (0<= i && i 0) { + if (meters / 1000 < 1) { + disUnit = "米" + remainDis = meters.toFloat().roundToInt().toString() + } else { + disUnit = "公里" + remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) + } + } + + val time = ceil(timeInSecond / 60f).toInt() + + "$remainDis$disUnit".also { tv_distance.text = it } + "${time}分钟".also { tv_left_time.text = it } + } + + fun noLineShow(){ + // 没有线路展示 + group_not_select_line.visibility = View.VISIBLE + // 下一个站点 + group_stationinfo.visibility = View.GONE + // 距离和剩余大概时间 + clg_distance_left_time.visibility = View.GONE + // 到达站点 + tv_arrived_notice.visibility = View.GONE + + iv_animal_list.visibility = View.GONE + } + // 有线路正在到站点 + fun haveLineAndArriveingStation(){ + group_not_select_line.visibility = View.GONE + group_stationinfo.visibility = View.VISIBLE + clg_distance_left_time.visibility = View.VISIBLE + tv_arrived_notice.visibility = View.GONE + iv_animal_list.visibility = View.GONE + } + // 有线路到达站点 + private fun haveLineAndArrivedStation(){ + group_not_select_line.visibility = View.GONE + group_stationinfo.visibility = View.VISIBLE + clg_distance_left_time.visibility = View.GONE + tv_arrived_notice.visibility = View.VISIBLE + iv_animal_list.visibility = View.VISIBLE + val animationDrawable = iv_animal_list.drawable as AnimationDrawable + animationDrawable.start() + } + + companion object { + private val TAG = PM2DrivingInfoFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt new file mode 100644 index 0000000000..a404d073b5 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt @@ -0,0 +1,127 @@ +package com.mogo.och.shuttle.passenger.ui + +import android.os.Bundle +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.map.overlay.core.Level +import com.mogo.map.overlay.point.Point +import com.mogo.map.MapDataWrapper +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE +import com.mogo.och.shuttle.passenger.presenter.PM2ADASPresenter +import com.mogo.och.common.module.utils.OCHThreadPoolManager +import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mapBizView + +import java.util.* + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2HPMapFragment : + MvpFragment() { + /** + * 改变自动驾驶状态 + * + * @param status 2 - running 1 - enable 2 - disable + */ + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_hpmap_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + } + + override fun initViews(savedInstanceState: Bundle?) { + super.initViews(savedInstanceState) + mapBizView.onCreate(savedInstanceState) + } + + override fun onResume() { + super.onResume() + mapBizView.onResume() + } + + override fun onLowMemory() { + super.onLowMemory() + mapBizView.onLowMemory() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mapBizView.onSaveInstanceState(outState) + } + + override fun onPause() { + super.onPause() + mapBizView.onPause() + } + + override fun onDestroyView() { + mapBizView.onDestroy() + super.onDestroyView() + } + + override fun createPresenter(): PM2ADASPresenter { + return PM2ADASPresenter(this) + } + + companion object { + private val TAG = PM2HPMapFragment::class.java.simpleName + } + + fun setMapMaker( + uuid: String, + station: MutableList, + ) { + //开启线程执行起终点marker设置 + val setMapMarkerRunnable = Runnable { + d( + "setMapMaker= " + Thread.currentThread().name, + uuid + "=latitude=" + station[1] + ",longitude=" + station[0] + ) + + val builder = Point.Options.Builder( + TYPE_MARKER_M2_LINE, + Level.MAP_MARKER + ) + .setId(uuid) + .anchor(0.5f, 0.5f) + .set3DMode(true) + .isUseGps(true) + .controlAngle(true) + .icon3DRes(R.raw.star_marker) + .longitude(station[0]) + .latitude(station[1]) + MapDataWrapper.getCenterLineInfo( + station[0], station[1], -1f + ) { + // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空 + it?.let{ + builder.rotate(it.angle.toFloat()) + } + } + val overlayManager = getOverlayManager() + overlayManager?.showOrUpdatePoint(builder.build()) + } + OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable) + } + + fun removeMapMaker( + uuid: String, + ) { + //开启线程移除起终点marker设置 + val removeMapMarkerRunnable = Runnable { + d("RemoveMapMaker=" + Thread.currentThread().name, uuid) + val overlayManager = getOverlayManager() + overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE) + } + OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt new file mode 100644 index 0000000000..9752b6b86a --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/video/PM2VideoFragment.kt @@ -0,0 +1,64 @@ +package com.mogo.och.shuttle.passenger.ui.video + +import com.google.gson.reflect.TypeToken +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.shuttle.passenger.presenter.PM2VideoPresenter +import com.mogo.och.common.module.wigets.video.AdsDatas +import com.mogo.och.common.module.wigets.video.RotationItem +import kotlinx.android.synthetic.main.shuttle_p_m2_video_fragment.imageVideoRotationView + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2VideoFragment : + MvpFragment() { + + private var arrayListOf = mutableListOf() + + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_video_fragment + } + + + override fun createPresenter(): PM2VideoPresenter { + return PM2VideoPresenter(this) + } + + companion object { + private val TAG = PM2VideoFragment::class.java.simpleName + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + initResourceData() + imageVideoRotationView.setData(arrayListOf) + } + + override fun onPause() { + super.onPause() + imageVideoRotationView.setPause() + } + + override fun onResume() { + super.onResume() + imageVideoRotationView.setResume() + } + + private fun initResourceData() { + + try { + arrayListOf.clear() + var datas: AdsDatas = GsonUtils.fromJson(FunctionBuildConfig.tempConfig,object : TypeToken() {}.type) + arrayListOf.addAll(datas.ads) + } catch (e: Exception) { + e.printStackTrace() + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt new file mode 100644 index 0000000000..42d43b81db --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2BlueToothView.kt @@ -0,0 +1,36 @@ +package com.mogo.och.shuttle.passenger.ui.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener +import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.shuttle.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_m2_view_blue_tooth.view.blueView + +/** + * 魔戒蓝牙控件 + * 放置于StatusBar右侧位置 + */ +class M2BlueToothView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener { + + init { + LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_blue_tooth, this, true) + } + + override fun mofangStatus(status: Boolean) { + ThreadUtils.runOnUiThread { + if (status) { + blueView.setImageResource(R.drawable.shuttle_p_m2_blue_tooth_close) + } else { + blueView.setImageResource(R.drawable.shuttle_p_m2_blue_tooth_open) + } + } + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt new file mode 100644 index 0000000000..17e0c7e594 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2PTrafficLightView.kt @@ -0,0 +1,181 @@ +package com.mogo.och.shuttle.passenger.ui.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import com.mogo.eagle.core.data.enums.DataSourceType +import com.mogo.eagle.core.data.enums.TrafficLightEnum +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.shuttle.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_bg +import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_iv +import kotlinx.android.synthetic.main.shuttle_p_m2_traffic_light_view.view.m2_p_traffic_light_time_tv + +/** + * bus乘客端：红绿灯view + * + * Created on 2022/3/14 + */ +class M2PTrafficLightView @JvmOverloads constructor( + context: Context?, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr), IMoGoTrafficLightListener { + + companion object { + private const val TAG = "M2PTrafficLightView" + } + + private var mCurrentLightId = TrafficLightEnum.BLACK + + init { + init(context) + } + + private fun init(context: Context?) { + LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_traffic_light_view, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerTrafficLightListenerManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerTrafficLightListenerManager.removeListener(TAG) + } + + /** + * 展示红绿灯预警 + * + * @param checkLightId 0-都是默认，1-红，2-黄，3-绿 + * @param lightSource 1:云端下发；2:自车感知 + */ + override fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) { + super.showTrafficLight(checkLightId, lightSource) + mCurrentLightId = checkLightId + updateTrafficLightIcon(checkLightId) + } + + /** + * 关闭红绿灯预警展示，并重制灯态 + */ + override fun disableTrafficLight() { + super.disableTrafficLight() + UiThreadHandler.post { + mCurrentLightId = TrafficLightEnum.BLACK + this@M2PTrafficLightView.visibility = GONE + } + } + + /** + * @param redNum 红灯倒计时 + * @param yellowNum 黄灯倒计时 + * @param greenNum 绿灯倒计时 + */ + override fun changeCountdownTrafficLightNum(redNum: Int, yellowNum: Int, greenNum: Int) { + super.changeCountdownTrafficLightNum(redNum, yellowNum, greenNum) + resetView() + when (mCurrentLightId) { + TrafficLightEnum.RED -> changeCountdownRed(redNum) + TrafficLightEnum.YELLOW -> changeCountdownYellow(yellowNum) + TrafficLightEnum.GREEN -> changeCountdownGreen(greenNum) + else -> UiThreadHandler.post { m2_p_traffic_light_time_tv.text = "" } + } + } + + override fun changeCountdownRed(redNum: Int) { + super.changeCountdownRed(redNum) + UiThreadHandler.post { + if (redNum > 0) { + resetView() + m2_p_traffic_light_time_tv.text = redNum.toString() + } else { + disableTrafficLightCountDown() + m2_p_traffic_light_time_tv.text = "" + } + } + } + + override fun changeCountdownGreen(greenNum: Int) { + super.changeCountdownGreen(greenNum) + UiThreadHandler.post { + if (greenNum > 0) { + resetView() + m2_p_traffic_light_time_tv.text = greenNum.toString() + } else { + disableTrafficLightCountDown() + m2_p_traffic_light_time_tv.text = "" + } + } + } + + override fun changeCountdownYellow(yellowNum: Int) { + super.changeCountdownYellow(yellowNum) + UiThreadHandler.post { + if (yellowNum > 0) { + resetView() + m2_p_traffic_light_time_tv.text = yellowNum.toString() + } else { + disableTrafficLightCountDown() + m2_p_traffic_light_time_tv.text = "" + } + } + } + + /** + * 更新红绿灯icon + * + * @param lightId 0-都是默认，1-红，2-黄，3-绿 + */ + private fun updateTrafficLightIcon(lightId: TrafficLightEnum) { + UiThreadHandler.post { + when (lightId) { + TrafficLightEnum.RED -> { + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_m2_light_red_nor) + this@M2PTrafficLightView.visibility = VISIBLE + } + TrafficLightEnum.YELLOW -> { + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_m2_light_yellow_nor) + this@M2PTrafficLightView.visibility = VISIBLE + } + TrafficLightEnum.GREEN -> { + m2_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_m2_light_green_nor) + this@M2PTrafficLightView.visibility = VISIBLE + } + else -> this@M2PTrafficLightView.visibility = GONE + } + } + } + + override fun disableTrafficLightCountDown() { + super.disableTrafficLightCountDown() + UiThreadHandler.post { + val layoutParams = layoutParams + if (layoutParams is MarginLayoutParams) { + val lp = layoutParams + lp.width = resources.getDimension(R.dimen.dp_40).toInt() + setLayoutParams(lp) + m2_p_traffic_light_time_tv.visibility = GONE + m2_p_traffic_light_bg.layoutParams.width = + resources.getDimension(R.dimen.dp_40).toInt() + } + } + } + + private fun resetView() { + val layoutParams = layoutParams + if (layoutParams is MarginLayoutParams) { + val lp = layoutParams + lp.width = resources.getDimension(R.dimen.dp_60).toInt() + setLayoutParams(lp) + m2_p_traffic_light_time_tv.visibility = VISIBLE + m2_p_traffic_light_bg.layoutParams.width = + resources.getDimension(R.dimen.dp_60).toInt() + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt new file mode 100644 index 0000000000..9d837d88bb --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2StatusBarView.kt @@ -0,0 +1,110 @@ +package com.mogo.och.shuttle.passenger.ui.widget + +import android.annotation.* +import android.content.Context +import android.graphics.Color +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.constraintlayout.widget.ConstraintLayout +import chassis.ChassisStatesOuterClass +import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener +import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener +import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener +import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystemListenerManager +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager +import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager +import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.och.shuttle.passenger.R +import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress +import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos +import kotlinx.coroutines.* +import me.jessyan.autosize.utils.AutoSizeUtils + +/** + * @author: wangmingjun + * @date: 2023/2/14 + */ +class M2StatusBarView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener, + IMoGoBatteryManagementSystemListener { + + companion object { + const val TAG = "M2StatusBarView" + } + + @Volatile + private var oldBmsSoc: Float = -1.0f + + init { + LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_status_bar, this, true) + setBackgroundColor(Color.parseColor("#80FFFFFF")) + isClickable = true + isFocusable = true + } + + + @SuppressLint("ClickableViewAccessibility") + override fun onAttachedToWindow() { + super.onAttachedToWindow() + post { + val params: ViewGroup.LayoutParams = getLayoutParams() + params.height = AutoSizeUtils.dp2px(context,40f) + layoutParams = params + } + //添加view控制 + CallerHmiViewControlListenerManager.addListener(TAG,this) + // 添加换肤监听 + CallerSkinModeListenerManager.addListener(TAG, this) + //电量 + CallerBatteryManagementSystemListenerManager.addListener(TAG,this) + + progress?.also { + it.progress = 50 + } + tv_power_cos?.also { + it.text = "50%" + } + } + + override fun onSkinModeChange(skinMode: Int) { + when (skinMode) { + 0 -> setStatusBarDarkOrLight(false) + 1 -> setStatusBarDarkOrLight(true) + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerHmiViewControlListenerManager.removeListener(TAG) + CallerSkinModeListenerManager.removeListener(TAG) + CallerDevaToolsManager.hideStatusBar() + } + + @SuppressLint("SetTextI18n") + override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) { + if (ClickUtils.isClickTooFrequent(this,1000)) { + return + } + val bmsSoc = states.bmsSoc + try { + if (oldBmsSoc != bmsSoc ) { + scope.launch { + if(bmsSoc >1){ + progress?.also { it.progress = bmsSoc.toInt() } + tv_power_cos?.also { it.text = "${bmsSoc.toInt()}%" } + }else{ + val power = (bmsSoc * 100).toInt() + progress?.also { it.progress = power } + tv_power_cos?.also {it.text = "$power%" } + } + } + } + } finally { + oldBmsSoc = bmsSoc + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt new file mode 100644 index 0000000000..663976a36c --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/M2TurnLightView.kt @@ -0,0 +1,199 @@ +package com.mogo.och.shuttle.passenger.ui.widget + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AlphaAnimation +import android.view.animation.Animation +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTurnLightListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager +import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.shuttle.passenger.R +import com.mogo.och.common.module.manager.lightmanager.TurnLightManager +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_nor_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.left_select_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_nor_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.right_select_image +import kotlinx.android.synthetic.main.shuttle_p_jl_turn_light_status.view.turn_light_layout + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +class M2TurnLightView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), + IMoGoTurnLightListener, TurnLightManager.TurnLightListener { + + + companion object { + private const val TAG = "TurnLightViewStatus" + } + + private var isLeftLight: Boolean = false + private var isRightLight: Boolean = false + private var isDisappear: Boolean = false + + init { + LayoutInflater.from(context) + .inflate(R.layout.shuttle_p_m2_turn_light_status, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerTurnLightListenerManager.addListener(TAG,this) + + TurnLightManager.addTurnLightStatusChangeListener(TAG,this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerChassisLamplightListenerManager.removeListener(TAG) + CallerTurnLightListenerManager.removeListener(TAG) + } + + override fun hideTurnLightView() { + ThreadUtils.runOnUiThread{ + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + + override fun statusChange(newStatus: TurnLightManager.TurnLightStatus) { + ThreadUtils.runOnUiThread { + setTurnLight(newStatus) + } + } + + /** + * 转向灯动画 + */ + private fun setTurnLight(directionLight: TurnLightManager.TurnLightStatus) { + if (!isAttachedToWindow) { + return + } + //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 + when (directionLight) { + TurnLightManager.TurnLightStatus.TURN_LIGHT_LEFT -> { //左转向 + if (!isLeftLight) { + isLeftLight = true + isRightLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.VISIBLE + right_select_image.visibility = View.GONE + right_select_image.clearAnimation() + setAnimation(left_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_RIGHT -> { //右转向 + if (!isRightLight) { + isRightLight = true + isLeftLight = false + isDisappear = false + showNormalAnimation() + left_select_image.visibility = View.GONE + right_select_image.visibility = View.VISIBLE + left_select_image.clearAnimation() + setAnimation(right_select_image) + } + } + TurnLightManager.TurnLightStatus.TURN_LIGHT_NONE -> { //消失 + if (!isDisappear) { + isDisappear = true + isLeftLight = false + isRightLight = false + animationDisappear() + } + } + } + } + + //显示背景 + private fun showNormalAnimation() { + val appearAnimation = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 300 + val appearAnimationImage = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 500 + turn_light_layout.startAnimation(appearAnimation) + left_nor_image.startAnimation(appearAnimationImage) + right_nor_image.startAnimation(appearAnimationImage) + + turn_light_layout.visibility = View.VISIBLE + left_nor_image.visibility = View.VISIBLE + right_nor_image.visibility = View.VISIBLE + } + + //消失动画，当转向等数据为空时候 + private fun animationDisappear() { + left_select_image.visibility = View.GONE + right_select_image.visibility = View.GONE + left_select_image.clearAnimation() + right_select_image.clearAnimation() + + left_nor_image.clearAnimation() + right_nor_image.clearAnimation() + turn_light_layout.clearAnimation() + + val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) + disappearAnimationLeft.duration = 300 + + val disappearAnimationBg = AlphaAnimation(1.0f, 0f) + disappearAnimationBg.duration = 500 + + left_nor_image.startAnimation(disappearAnimationLeft) + right_nor_image.startAnimation(disappearAnimationLeft) + turn_light_layout.startAnimation(disappearAnimationBg) + + disappearAnimationLeft.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + left_nor_image.visibility = View.GONE + right_nor_image.visibility = View.GONE + } + }) + + disappearAnimationBg.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(p0: Animation?) { + } + + override fun onAnimationStart(p0: Animation?) { + } + + override fun onAnimationEnd(p0: Animation?) { + turn_light_layout.visibility = View.GONE + } + }) + } + + //实现图片闪烁效果 + private fun setAnimation(imageView: ImageView) { + val animationSet = AnimatorSet() + val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) + val valueAnimatorDisappear = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) + valueAnimator.duration = 1000 + valueAnimatorDisappear.duration = 800 + valueAnimator.repeatCount = -1 + valueAnimatorDisappear.repeatCount = -1 + animationSet.playTogether(valueAnimatorDisappear, valueAnimator) + animationSet.start() + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt similarity index 98% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 9408aba57d..22b19e955f 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.media.AudioManager diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt new file mode 100644 index 0000000000..7967e593b7 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceImageView.kt @@ -0,0 +1,45 @@ +package com.mogo.och.shuttle.passenger.ui.widget.video + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.widget.ImageView +import android.widget.RelativeLayout +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.mogo.och.shuttle.passenger.R + +/** + * @author: wangmingjun + * @date: 2023/2/6 + */ +class AdvanceImageView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : RelativeLayout(context, attrs) { + + private var imageView: ImageView? = null + + init { + initView() + } + + private fun initView() { + imageView = ImageView(context) + imageView?.scaleType = ImageView.ScaleType.FIT_XY + addView(imageView, LayoutParams(-1, -1)) + } + + @SuppressLint("CheckResult") + fun setImagePath(path: String){ + imageView?.setImageResource(R.drawable.shuttle_p_m2_p_video_holder) + imageView?.let { Glide.with(context).asBitmap().load(path) + .apply( + RequestOptions().useUnlimitedSourceGeneratorsPool(true) + .placeholder(R.drawable.shuttle_p_m2_p_video_holder) + .error(R.drawable.shuttle_p_m2_p_video_holder) + .fallback(R.drawable.shuttle_p_m2_p_video_holder) + .centerCrop() + ) + .into(it) } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt similarity index 99% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt index 2d68d3b34d..f5e47f2d6e 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.view.View diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt new file mode 100644 index 0000000000..18179b3065 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceVideoView.kt @@ -0,0 +1,254 @@ +package com.mogo.och.shuttle.passenger.ui.widget.video + +import android.annotation.SuppressLint +import android.content.Context +import android.net.Uri +import android.util.AttributeSet +import android.widget.ImageView +import android.widget.RelativeLayout +import com.mogo.eagle.core.utilcode.download.* +import com.mogo.eagle.core.utilcode.download.callback.* +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.FileUtils +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.shuttle.passenger.R +import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder +import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack +import java.io.File + +/** + * @author: wangmingjun + * @date: 2023/2/8 + */ +class AdvanceVideoView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : RelativeLayout(context, attrs) { + + private var videoRelativeLayout: RelativeLayout? = null + private var cacheImage: ImageView? = null + + private var videoViewPlayer: AdvanceGSYVideoPlayer? = null + private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null + private var mOnCompletionListener: GSYSampleCallBack? = null + private var downloadVideoName = "" + private var fileNetPath: String? = "" + private var cacheImageUrl: String? = "" + private var mVideoDirPath: String? = "" + + init { + mVideoDirPath = context.filesDir.absolutePath + File.separator + "video" + File.separator +// mVideoDirPath = Config.downLoadPath + initView() + } + + private fun initView() { + initVideoView() + initCacheImgView() + } + + private fun initCacheImgView() { + cacheImage = ImageView(context) + cacheImage?.scaleType = ImageView.ScaleType.FIT_XY +// addView(cacheImage, LayoutParams(-1, -1)) + } + + private fun initVideoView() { + videoRelativeLayout = RelativeLayout(context) + val outLayout = LayoutParams(-1, -1) + addView(videoRelativeLayout, outLayout) + + if (videoViewPlayer === null) { + //视频播放控件 + videoViewPlayer = AdvanceGSYVideoPlayer(context) + } + + val layoutParams = LayoutParams(-1, -1) + //设置videoview占满父view播放 + layoutParams.addRule(ALIGN_PARENT_LEFT) + layoutParams.addRule(ALIGN_PARENT_RIGHT) + layoutParams.addRule(ALIGN_PARENT_TOP) + layoutParams.addRule(ALIGN_PARENT_BOTTOM) + + videoRelativeLayout?.addView(videoViewPlayer, layoutParams) + } + + fun setVideoPath(path: String, cacheImageUrl: String) { + // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v + // https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4 + this.fileNetPath = path + this.cacheImageUrl = cacheImageUrl + val pathList = path.split("/") + if (pathList.isNotEmpty()) { + this.downloadVideoName = pathList[pathList.size - 1] + } + } + + private fun loadCacheImg() { + // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图* +// OCHThreadPoolManager.getsInstance().execute { +// var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath) + Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") +// ThreadUtils.runOnUiThread { +// Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") + cacheImage?.setImageResource(R.drawable.shuttle_p_m2_p_video_holder) +// cacheImage?.let { //暂时去掉加载首帧图，加载视频时，用本地默认图 +// Glide.with(context).asBitmap().load(cacheImageUrl) +// .apply( +// RequestOptions().useUnlimitedSourceGeneratorsPool(true) +// .placeholder(R.drawable.m2_p_video_holder) +// .error(R.drawable.m2_p_video_holder) +// .fallback(R.drawable.m2_p_video_holder) +// .centerCrop() +// ) +// .into(it) +// } + videoViewPlayer?.thumbImageView = cacheImage +// setCacheImageViewVisible() +// } +// } + } + + fun clearLocalErrorVideo() { + if (downloadVideoName.isNotEmpty() + && FileUtils.isFileExists(mVideoDirPath + downloadVideoName) + ) { + FileUtils.delete(mVideoDirPath + downloadVideoName) + } + } + + @SuppressLint("CheckResult") + fun setCacheImageViewVisible() { + UiThreadHandler.post { +// cacheImage?.visibility = VISIBLE + videoViewPlayer?.setCacheImageViewVisible() + } + } + + fun setCacheImageViewGone() { + UiThreadHandler.post { +// cacheImage?.visibility = GONE + videoViewPlayer?.setCacheImageViewGone() + } + + } + + fun setVideo(onCompletionListener: GSYSampleCallBack) { + loadCacheImg() + Logger.d(ImageAndVideoRotation.TAG, "setVideo") + mOnCompletionListener = onCompletionListener + //判断是否已经下载 + if (downloadVideoName.isNotEmpty()) { + Logger.d( + ImageAndVideoRotation.TAG, + "video local url = $mVideoDirPath$downloadVideoName" + ) + if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) { + Logger.d(ImageAndVideoRotation.TAG, "have cache startPlay") + startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString()) + return + } + startDownLoadVideo() + } + } + + private fun startDownLoadVideo() { + //下载视频， 下载成功后再播放 + Logger.d(ImageAndVideoRotation.TAG, "startDownLoadVideo") + FileUtils.createFileDir(mVideoDirPath) + val downloadUrl = fileNetPath + val downloadDir = mVideoDirPath + if (downloadUrl != null && downloadDir != null) { + DownloadUtils.downLoad( + context, downloadUrl, downloadDir, downloadVideoName, downListener + ) + } + } + + fun startPlay(localVideoPath: String?) { + if (localVideoPath === "") return + try { + Logger.d(ImageAndVideoRotation.TAG, "startPlay") + gsyVideoOptionBuilder = GSYVideoOptionBuilder() + gsyVideoOptionBuilder +// ?.setUrl("file:///mnt/sdcard/downloads/$downloadVideoName") + ?.setUrl(localVideoPath) // "/data/user/0/com.mogo.launcher.f/files/video/" + ?.setPlayTag(downloadVideoName) + ?.setCacheWithPlay(false) + ?.setThumbPlay(false) + ?.build(videoViewPlayer) + + videoViewPlayer?.isFocusableInTouchMode = false + videoViewPlayer?.setVideoAllCallBack(mOnCompletionListener) + videoViewPlayer?.startPlayLogic() + } catch (e: Exception) { + Logger.d(ImageAndVideoRotation.TAG, "startPlay e = ${e.message}") + } + } + + fun onVideoReset() { + videoViewPlayer?.onVideoReset() + mOnCompletionListener = null + } + + fun setPause() { + if (videoViewPlayer !== null) { + videoViewPlayer?.onVideoPause() + } + } + + fun setResume() { + if (videoViewPlayer !== null) { + videoViewPlayer?.onVideoResume() + } + } + + private val downListener = object : IDownloadListener { + override fun onStart(url: String) { + setCacheImageViewVisible() + Logger.d(ImageAndVideoRotation.TAG, "download-onStart") + } + +// override fun onPause(url: String, threadBean: ThreadBean?) { +// Logger.d(ImageAndVideoRotation.TAG, "download-onPause") +//// UiThreadHandler.postDelayed(Runnable { +//// startDownLoadVideo() +//// },DOWNLOAD_DELAY) +// // todo 测试下网络断掉是否会走onpause，且网络回复也不会继续下载 +// } + + override fun onProgress(url: String, downloaded: Long, total: Long) { + Logger.d(ImageAndVideoRotation.TAG, "download-onProgress== ${ (downloaded * 1.0f * 100/total).toInt() }") + } + + override fun onFinished(url: String, path: String) { + Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url") + if (url.equals(fileNetPath)) { //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题 + //下载完成 + ThreadUtils.runOnUiThread { + startPlay(Uri.fromFile(File(path)).toString()) + } + } else {//如果当前文件不存在再次去下载当前的 + Logger.d( + ImageAndVideoRotation.TAG, "download-onFinished = not current" + + ",currentUrl = $fileNetPath " + ) + if (FileUtils.isFileExists(path)) { + Logger.d(ImageAndVideoRotation.TAG, "have download startPlay") + ThreadUtils.runOnUiThread { + startPlay(Uri.fromFile(File(path)).toString()) + } + return + } else { + startDownLoadVideo() + } + } + } + + override fun onError(url: String, error: String?) { + Logger.d(ImageAndVideoRotation.TAG, "download-onError-$error") + //出错再次下载 + startDownLoadVideo() + } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt similarity index 90% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt index 1ec09195c3..699247294b 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/AdvanceViewPager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.content.Context import android.util.AttributeSet diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt similarity index 95% rename from OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt rename to OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt index 02205dd945..bf7a667726 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt +++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/widget/video/ImageAndVideoRotation.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget.video +package com.mogo.och.shuttle.passenger.ui.widget.video import android.annotation.SuppressLint import android.content.Context diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml new file mode 100644 index 0000000000..cb17f7f2c3 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml similarity index 50% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml index 4dca66c4fe..13b479db48 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml @@ -1,6 +1,6 @@ - - + + diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml similarity index 85% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml index aa1eeaecd0..78d4679853 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml @@ -8,7 +8,7 @@ \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml new file mode 100644 index 0000000000..5590838117 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml new file mode 100644 index 0000000000..2516df8c8e --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml new file mode 100644 index 0000000000..4982506777 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml index d911e5b4a2..fff8c5c193 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml @@ -16,7 +16,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> - @@ -24,12 +24,12 @@ android:id="@+id/no_order_data_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/bus_p_speed_txt_color" - android:textSize="@dimen/bus_p_no_data_size" + android:textColor="@color/shuttle_p_jl_speed_txt_color" + android:textSize="@dimen/shuttle_p_jl_no_data_size" android:layout_marginTop="50dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv" - android:text="@string/bus_p_no_out"/> + android:text="@string/shuttle_p_jl_no_out"/> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml similarity index 82% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml index 0215d426e2..6b44d9a4cb 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml @@ -1,9 +1,9 @@ + android:background="@drawable/shuttle_p_jl_right_route_bg"> @@ -76,12 +76,12 @@ android:id="@+id/bus_p_speed_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/bus_p_route_info_margin_left" + android:layout_marginLeft="@dimen/shuttle_p_jl_route_info_margin_left" android:layout_marginTop="@dimen/dp_90" android:includeFontPadding="false" android:letterSpacing="-0.05" android:text="0" - android:textSize="@dimen/bus_p_speed_txt_size" + android:textSize="@dimen/shuttle_p_jl_speed_txt_size" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -91,12 +91,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_10" - android:layout_marginRight="@dimen/bus_p_route_info_margin_right" + android:layout_marginRight="@dimen/shuttle_p_jl_route_info_margin_right" android:layout_marginBottom="@dimen/dp_20" android:includeFontPadding="false" - android:text="@string/bus_p_speed_unit_txt" - android:textColor="@color/bus_p_speed_txt_color" - android:textSize="@dimen/bus_p_speed_unit_txt_size" + android:text="@string/shuttle_p_jl_speed_unit_txt" + android:textColor="@color/shuttle_p_jl_speed_txt_color" + android:textSize="@dimen/shuttle_p_jl_speed_unit_txt_size" app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/bus_p_speed_tv" /> @@ -105,27 +105,25 @@ android:layout_width="@dimen/dp_100" android:layout_height="@dimen/dp_58" android:layout_marginTop="@dimen/dp_10" - android:src="@drawable/auto_close" + android:src="@drawable/shuttle_p_jl_auto_close" app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv" app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv" /> - + app:layout_constraintTop_toTopOf="@+id/auto_status_iv" /> @@ -139,7 +137,7 @@ android:format24Hour="HH:mm" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_66" app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/dividing_line_1" @@ -154,7 +152,7 @@ android:format24Hour="yyyy年MM月dd日" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toLeftOf="@+id/textClockHourMin" app:layout_constraintTop_toBottomOf="@+id/textClockHourMin" /> @@ -169,7 +167,7 @@ android:format24Hour="EEEE" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toLeftOf="@+id/textClockDate" app:layout_constraintTop_toBottomOf="@+id/textClockDate" /> @@ -180,7 +178,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_50" - android:src="@drawable/card_split_line_bg" + android:src="@drawable/shuttle_p_jl_split_line_bg" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/dividing_line_1" /> @@ -190,8 +188,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_104" - android:text="@string/bus_p_cur_station_title" - android:textColor="@color/bus_p_line_name_color" + android:text="@string/shuttle_p_jl_cur_station_title" + android:textColor="@color/shuttle_p_jl_line_name_color" android:textSize="@dimen/dp_38" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv" @@ -201,7 +199,7 @@ android:id="@+id/speak_arrived_iv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_40" - android:src="@drawable/bg_p_speak_icon_arrived" + android:src="@drawable/shuttle_p_jl_bg_speak_icon_arrived" app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_title" app:layout_constraintLeft_toRightOf="@+id/bus_p_cur_station_title" app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_title" /> @@ -211,11 +209,11 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_57" android:layout_marginRight="@dimen/dp_90" - android:background="@drawable/cur_station_arrived_bg" + android:background="@drawable/shuttle_p_jl_cur_station_arrived_bg" android:gravity="center" android:paddingLeft="@dimen/dp_30" android:paddingRight="@dimen/dp_30" - android:text="@string/bus_p_cur_station_arrived_tip" + android:text="@string/shuttle_p_jl_cur_station_arrived_tip" android:textColor="@android:color/white" android:textSize="@dimen/dp_30" android:textStyle="bold" @@ -229,14 +227,14 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_36" android:text="-- --" - android:textColor="@color/bus_p_clock_17417B" + android:textColor="@color/shuttle_p_jl_clock_17417B" android:textSize="@dimen/dp_56" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title" app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" /> - diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml similarity index 92% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml index 3bd9615a30..60d2419315 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="--" - android:textSize="@dimen/bus_p_station_txt_size" + android:textSize="@dimen/shuttle_p_jl_station_txt_size" android:includeFontPadding = "false" android:singleLine="true" android:ellipsize="marquee" @@ -17,7 +17,7 @@ android:layout_marginRight="@dimen/dp_60" android:layout_marginTop="@dimen/dp_68" android:textStyle="bold" - android:textColor="@color/bus_p_station_txt_color" + android:textColor="@color/shuttle_p_jl_station_txt_color" android:layout_marginLeft="@dimen/dp_90" app:customGap="0.5" app:useCustomGap="true" @@ -51,7 +51,7 @@ android:layout_width="@dimen/dp_60" android:layout_height="@dimen/dp_61" android:scaleType="centerInside" - android:src="@drawable/bus_p_point_blue" + android:src="@drawable/shuttle_p_jl_point_blue" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@+id/bus_p_station" app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/> diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml similarity index 56% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml index 5a0db32bc0..41eacc318b 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml @@ -2,22 +2,22 @@ diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_turn_light_status.xml similarity index 84% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_turn_light_status.xml index f206e99831..dfbed02b59 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_turn_light_status.xml @@ -9,7 +9,7 @@ android:id="@+id/turn_light_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/brakelight_background_daytime" + android:background="@drawable/shuttle_p_jl_brakelight_background_daytime" android:layout_gravity="top|center_horizontal" android:paddingLeft="@dimen/dp_10" android:paddingRight="@dimen/dp_10" @@ -24,7 +24,7 @@ android:layout_height="@dimen/dp_32" android:layout_gravity="left|center_vertical" android:layout_marginLeft="@dimen/dp_5" - android:src="@drawable/bus_p_zuozhuan_un_open" /> + android:src="@drawable/shuttle_p_jl_zuozhuan_un_open" /> + android:src="@drawable/shuttle_p_jl_youzhuan_un_open" /> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_blue_tooth.xml similarity index 88% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_blue_tooth.xml index 69ae14c394..5bb43874e5 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_blue_tooth.xml @@ -9,7 +9,7 @@ android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_26" android:scaleType="fitXY" - android:src="@drawable/m2_blue_tooth_open" + android:src="@drawable/shuttle_p_jl_blue_tooth_open" tools:ignore="ContentDescription" /> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml similarity index 87% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml index fef63bbd25..2be462cb64 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_view_status_bar.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" tools:ignore="MissingDefaultResource" - android:background="@drawable/bg_status_bar"> + android:background="@drawable/shuttle_p_jl_bg_status_bar"> - @@ -38,7 +38,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" android:layout_marginLeft="@dimen/dp_40" - android:src="@drawable/bus_p_status_bar_logo" + android:src="@drawable/shuttle_p_jl_status_bar_logo" android:scaleType="fitXY" android:layout_width="@dimen/dp_94" android:layout_height="@dimen/dp_25"/> diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml new file mode 100644 index 0000000000..6620187e95 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml @@ -0,0 +1,24 @@ + + + #5D7199 + #CCE9EFFC + #C7D2E1 + #203555 + #FFB327 + #2D3E5F + #276AFE + #CDDBF6 + #2D3E5F + #2D3E5F + + #43CEFE + #1466FB + + #17417B + #6617417B + #A9B6CA + #1F82FB + + #992D3E5F + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml new file mode 100644 index 0000000000..07076fd91d --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml @@ -0,0 +1,29 @@ + + + 750dp + 804dp + 40dp + 48dp + 422dp + + 158dp + 90dp + 45dp + 158dp + 90dp + 45dp + 90dp + 90dp + 3dp + + 34dp + + 38dp + + 90dp + 27dp + + 10dp + 38dp + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml b/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml new file mode 100644 index 0000000000..4170e113bf --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml @@ -0,0 +1,10 @@ + + + KM/H + 您已收车 + 暂无班次 + 暂无线路 + 已到站： + 前方到站： + 请按秩序下车 + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png new file mode 100644 index 0000000000..f4d80f4cc7 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png new file mode 100644 index 0000000000..a9aae488fb Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png new file mode 100644 index 0000000000..6f0795edaf Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png new file mode 100644 index 0000000000..62ed7bb92d Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png new file mode 100644 index 0000000000..34f7c0e1f2 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png new file mode 100644 index 0000000000..8b4b214814 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png new file mode 100644 index 0000000000..fb4ddc5279 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png new file mode 100644 index 0000000000..a829d5b88d Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png new file mode 100644 index 0000000000..0c292d2cf3 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png new file mode 100644 index 0000000000..cec9275411 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png new file mode 100644 index 0000000000..5446226be7 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png new file mode 100644 index 0000000000..a380c3f3b7 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png new file mode 100644 index 0000000000..7412ab3c90 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png new file mode 100644 index 0000000000..dd78f6fc9e Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png new file mode 100644 index 0000000000..ba735834b6 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png new file mode 100644 index 0000000000..3135524a79 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png new file mode 100644 index 0000000000..e873c2b85e Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png new file mode 100644 index 0000000000..8046782601 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png rename to OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png new file mode 100644 index 0000000000..beed2f2ad2 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png new file mode 100644 index 0000000000..bda5e1d105 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png new file mode 100644 index 0000000000..44070336fa Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png new file mode 100644 index 0000000000..b9c841cc83 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png new file mode 100644 index 0000000000..39ffc9052f Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png new file mode 100644 index 0000000000..c970699aac Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png new file mode 100644 index 0000000000..39be18953c Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png new file mode 100644 index 0000000000..d90c5a2b71 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png new file mode 100644 index 0000000000..d8c5951e43 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png new file mode 100644 index 0000000000..7b72c07390 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000..1f6ea692f5 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png new file mode 100644 index 0000000000..5e1fb2c752 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png new file mode 100644 index 0000000000..19ae887a57 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png new file mode 100644 index 0000000000..3fb0a40ce3 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png new file mode 100644 index 0000000000..dbc80b2254 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png new file mode 100644 index 0000000000..bbd2c12d90 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png new file mode 100644 index 0000000000..7c0dcaabe1 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png new file mode 100644 index 0000000000..9bbda22cb7 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png new file mode 100644 index 0000000000..7c33fddbd9 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml similarity index 78% rename from OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml rename to OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml index f6917017e5..b26187608d 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml new file mode 100644 index 0000000000..0924ac7748 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml new file mode 100644 index 0000000000..d7e80d7738 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml new file mode 100644 index 0000000000..38b5f30517 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml new file mode 100644 index 0000000000..21a6524032 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml new file mode 100644 index 0000000000..826ca50b64 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml new file mode 100644 index 0000000000..4189fb8509 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml new file mode 100644 index 0000000000..5a27da20e0 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml new file mode 100644 index 0000000000..38d10320ae --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml new file mode 100644 index 0000000000..ba372d59df --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml new file mode 100644 index 0000000000..3ac0c761ba --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml new file mode 100644 index 0000000000..52e19ded8c --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml @@ -0,0 +1,378 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml new file mode 100644 index 0000000000..9dbd6a2a9c --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml new file mode 100644 index 0000000000..5c9a902baa --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml new file mode 100644 index 0000000000..83567814d2 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml @@ -0,0 +1,36 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml new file mode 100644 index 0000000000..a1699ac360 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml new file mode 100644 index 0000000000..66e95d9087 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_view.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_view.xml new file mode 100644 index 0000000000..9d75478ee1 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_video_view.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml new file mode 100644 index 0000000000..61448bf16d --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml new file mode 100644 index 0000000000..2aac7be30f --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/raw/star_marker.nt3d b/OCH/shuttle/passenger/src/main/res/m2/raw/star_marker.nt3d new file mode 100644 index 0000000000..c6e546fc31 Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/raw/star_marker.nt3d differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/raw/station_marker.nt3d b/OCH/shuttle/passenger/src/main/res/m2/raw/station_marker.nt3d new file mode 100644 index 0000000000..a00207ba3f Binary files /dev/null and b/OCH/shuttle/passenger/src/main/res/m2/raw/station_marker.nt3d differ diff --git a/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml b/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml new file mode 100644 index 0000000000..71557ca79b --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/values/colors.xml @@ -0,0 +1,26 @@ + + + #FFFFFF + #0B1E38 + #BBDAFB + #0B1E38 + #5D7199 + #A5D8FF + #1B2546 + #23355D + #8895B7 + + + #C8EFFF + #203555 + #17417B + #2D3E5F + #34A61F + #AEEDB8 + #43CEFE + #1466FB + #7094AD + + #99AFC9E7 + #6617417B + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/values/dimens.xml b/OCH/shuttle/passenger/src/main/res/m2/values/dimens.xml new file mode 100644 index 0000000000..55344e5192 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/values/dimens.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/m2/values/strings.xml b/OCH/shuttle/passenger/src/main/res/m2/values/strings.xml new file mode 100644 index 0000000000..d2faf78c18 --- /dev/null +++ b/OCH/shuttle/passenger/src/main/res/m2/values/strings.xml @@ -0,0 +1,14 @@ + + + KM/H + m2_map_style.data + m2_map_style_extra.data + AUTO + 已到站 + 暂无站点 + 前方到站 + —公里 + —分钟 + 请按秩序下车 + 暂无路线 + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 deleted file mode 100644 index 15b31ed247..0000000000 Binary files a/OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 and /dev/null differ diff --git a/OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/shuttle/passenger/src/test/java/passenger/ExampleUnitTest.java similarity index 100% rename from OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java rename to OCH/shuttle/passenger/src/test/java/passenger/ExampleUnitTest.java diff --git a/OCH/sweeper/driver/build.gradle b/OCH/sweeper/driver/build.gradle index eac550da21..0cd431d266 100644 --- a/OCH/sweeper/driver/build.gradle +++ b/OCH/sweeper/driver/build.gradle @@ -61,7 +61,7 @@ dependencies { annotationProcessor rootProject.ext.dependencies.androidxroomcompiler implementation rootProject.ext.dependencies.localbroadcastmanager - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") androidTestImplementation rootProject.ext.dependencies.androidxjunit diff --git a/OCH/taxi/driver/build.gradle b/OCH/taxi/driver/build.gradle index f2013570c2..587fbd7f97 100644 --- a/OCH/taxi/driver/build.gradle +++ b/OCH/taxi/driver/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") } diff --git a/OCH/taxi/passenger/build.gradle b/OCH/taxi/passenger/build.gradle index 50cd35f289..1a3fde2f56 100644 --- a/OCH/taxi/passenger/build.gradle +++ b/OCH/taxi/passenger/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap implementation rootProject.ext.dependencies.amapsearch - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') diff --git a/OCH/taxi/unmanned-driver/build.gradle b/OCH/taxi/unmanned-driver/build.gradle index 3a25a857ef..e7839f2dce 100644 --- a/OCH/taxi/unmanned-driver/build.gradle +++ b/OCH/taxi/unmanned-driver/build.gradle @@ -65,7 +65,7 @@ dependencies { annotationProcessor"android.arch.persistence.room:compiler:1.1.1" kapt"android.arch.persistence.room:compiler:1.1.1" - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") } diff --git a/OCH/taxi/unmanned-passenger/build.gradle b/OCH/taxi/unmanned-passenger/build.gradle index 50cd35f289..1a3fde2f56 100644 --- a/OCH/taxi/unmanned-passenger/build.gradle +++ b/OCH/taxi/unmanned-passenger/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap implementation rootProject.ext.dependencies.amapsearch - implementation project(":OCH:mogo-och-common-module") + implementation project(":OCH:common:common") compileOnly project(":libraries:mogo-map") implementation project(':core:mogo-core-res') diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java deleted file mode 100644 index c33547d928..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.och.taxi.passenger; - -import androidx.annotation.IdRes; -import androidx.fragment.app.FragmentActivity; - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; - -/** - * - * @author congtaowang - * @since 2021/1/15 - * - * 网约车抽象接口 - */ -public interface IMogoOCH extends IMoGoFunctionProvider { - - /** - * 初始化网约车容器 - * - * @param activity - * @param containerId 容器ID - */ - void createCoverage(FragmentActivity activity, @IdRes int containerId); -} diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index 2f93c78131..e0fafca338 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; @@ -24,7 +25,7 @@ import org.jetbrains.annotations.Nullable; * 网约车-出租车-乘客端 */ @Route(path = TaxiPassengerConst.PATH) -public class MogoOCHTaxiPassenger implements IMogoOCH { +public class MogoOCHTaxiPassenger implements IMoGoFunctionProvider { private static final String TAG = "MogoOCHTaxiPassenger"; private TaxiPassengerBaseFragment ochTaxiPassengerFragment; @@ -70,11 +71,6 @@ public class MogoOCHTaxiPassenger implements IMogoOCH { } } - @Override - public void createCoverage(FragmentActivity activity, int containerId) { - - } - @NotNull @Override public String getFunctionName() { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index c2e5e832e6..5ea50da4ad 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -63,8 +63,8 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : when (TaxiPassengerModel.curOrderStatus) { TaxiPassengerOrderStatusEnum.OnTheWayToStart -> { // 10 接驾中 - mView?.showOrHideStartAutopilotView(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideCheckAndStartAutopilotView(2) + mView?.showOrHideArrivedEndLayout(isShow = false) overMapViewClear() } @@ -72,55 +72,56 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : TaxiPassengerOrderStatusEnum.ArriveAtStart -> { // 20 司机到达上车点 mView?.showOrHideArrivedEndLayout(isShow = false) - mView?.showOrHidePressengerCheckPager(true) - mView?.showOrHideStartAutopilotView(isShow = false) + + mView?.showOrHideCheckAndStartAutopilotView(0) overMapViewClear() } TaxiPassengerOrderStatusEnum.UserArriveAtStart -> { // 30 乘客到达上车点 mView?.showOrHideArrivedEndLayout(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) - mView?.showOrHideStartAutopilotView(isShow = true) + + mView?.showOrHideCheckAndStartAutopilotView(1) overMapViewClear() } TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> { // 服务中（去往目的地） mView?.showOrHideArrivedEndLayout(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) - mView?.showOrHideStartAutopilotView(isShow = false) + + mView?.showOrHideCheckAndStartAutopilotView(2) + mView?.tipXiaoZhi() overMapViewShow() } TaxiPassengerOrderStatusEnum.ArriveAtEnd -> { // 50 到达终点 乘客可以评价 mView?.showOrHideArrivedEndLayout(true) - mView?.showOrHidePressengerCheckPager(isShow = false) - mView?.showOrHideStartAutopilotView(isShow = false) + + mView?.showOrHideCheckAndStartAutopilotView(2) overMapViewClear() } TaxiPassengerOrderStatusEnum.JourneyCompleted -> { // 60 行程完成 - mView?.showOrHideStartAutopilotView(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideCheckAndStartAutopilotView(2) + mView?.showOrHideArrivedEndLayout(false) overMapViewClear() } TaxiPassengerOrderStatusEnum.Cancel -> { // 70 取消订单 - mView?.showOrHideStartAutopilotView(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideCheckAndStartAutopilotView(2) + mView?.showOrHideArrivedEndLayout(isShow = false) overMapViewClear() } TaxiPassengerOrderStatusEnum.None -> { // 00 默认状态，在不同任务之间切换时使用 - mView?.showOrHideStartAutopilotView(isShow = false) - mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideCheckAndStartAutopilotView(2) + mView?.showOrHideArrivedEndLayout(isShow = false) overMapViewClear() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java index 97c9108e3a..8104aaee3d 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java @@ -19,15 +19,15 @@ import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView; @Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER ) public class StatusViewManager implements IStatusViewLayout { - + private StatusBarView statusBarView; @NonNull @Override public View getStatusView(Context context) { - return new StatusBarView(context); + return statusBarView; } @Override public void init(Context context) { - + statusBarView = new StatusBarView(context); } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index f746767108..a1f770f638 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -2,15 +2,17 @@ package com.mogo.och.taxi.passenger.ui import android.os.Bundle import android.view.View +import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DeviceUtils -import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.utils.FrameAnimatorContainer @@ -18,12 +20,22 @@ import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter -import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView import com.mogo.och.taxi.passenger.ui.bottom.BottomBar -import com.mogo.och.taxi.passenger.ui.check.TaxiPassengerCheckView -import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView -import kotlinx.android.synthetic.main.taxi_p_base_fragment.* -import java.lang.ref.WeakReference +import com.mogo.och.taxi.passenger.ui.statusview.StatusBarView +import io.reactivex.disposables.Disposable +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.bottom +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.chekAndStartAutopilotView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.ck_setting +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.clSettingView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.infoVideoView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.itinerary +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mapBizView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.pcnActionView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaDistanceView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaPView +import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.rv_location_center /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 @@ -37,25 +49,15 @@ class TaxiPassengerBaseFragment() : MvpFragment(), IMogoMapListener, TaxiPassengerTaxiView { - /** - * 到达目的地 - */ - private var mArrivedEndView: WeakReference? = null - - /** - * 手机号后四位验证 - */ - private var mArrivedCheckView: WeakReference? = null - - /** - * 启动自驾页面 - */ - private var mStartAutopilotView: WeakReference? = null - private var createProgressDialogAnim: FrameAnimatorContainer?=null + private var tipXiaoZhiDelay: Disposable?=null + + private var statusBarView: StatusBarView? = null + + override fun getLayoutId(): Int { - return R.layout.taxi_p_base_fragment + return R.layout.taxt_u_p_base_fragment } override fun getTagName(): String { @@ -72,6 +74,14 @@ class TaxiPassengerBaseFragment() : overMapView.onCreateView(savedInstanceState) overMapView.hideResetView() + (ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_VIEW_MANAGER) + .navigation() as? IStatusViewLayout)?.apply { + val statusView = getStatusView(requireContext()) + if (statusView is StatusBarView) { + statusBarView = statusView + } + } + // createProgressDialogAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 20,aciv_xiaozhi_normal) // createProgressDialogAnim?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ // override fun AnimationStopped() { @@ -237,34 +247,39 @@ class TaxiPassengerBaseFragment() : overMapView.setDebugMode(true) } - /** - * 显示或者隐藏乘客可点击自动驾驶页面 - * 乘客验证成功，页面显示，按钮置于不可点击 - * 司机端确认可点击开启自动驾驶, 按钮置为可点击 - * 订单前往目的地，页面消失 - * - * @param isShow - */ - fun showOrHideStartAutopilotView(isShow: Boolean) { - if (isShow) { - exitFullVideoScreen(false) - if (mStartAutopilotView == null || mStartAutopilotView!!.get() == null) { - mStartAutopilotView = WeakReference(StartAutopilotView(requireContext())) + fun showOrHideCheckAndStartAutopilotView(status:Int){ + when (status) { + 0 -> { + chekAndStartAutopilotView.visibility = View.VISIBLE + statusBarView?.visibility = View.GONE + chekAndStartAutopilotView.resetCheckView() } - mStartAutopilotView?.get()?.let { - OverlayViewUtils.showOverlayView(activity, it) + 1 -> { + chekAndStartAutopilotView.visibility = View.VISIBLE + statusBarView?.visibility = View.GONE + chekAndStartAutopilotView.startAnimation2StartAutopilit() } - } else { - mStartAutopilotView?.get()?.let { - OverlayViewUtils.dismissOverlayView(it) - RxUtils.createSubscribe(30_000) { - VoiceNotice.showNotice("想和我对话的时候可以直接戳我，也可以对我说\\'你好小智\\'！", AIAssist.LEVEL2) - } + 2 -> { + chekAndStartAutopilotView.visibility = View.GONE + statusBarView?.visibility = View.VISIBLE + chekAndStartAutopilotView.resetCheckView() } - mStartAutopilotView = null + else -> {} } } + fun tipXiaoZhi(){ + RxUtils.disposeSubscribe(tipXiaoZhiDelay) + tipXiaoZhiDelay = RxUtils.createSubscribe(30_000) { + VoiceNotice.showNotice( + "想和我对话的时候可以直接戳我，也可以对我说\\'你好小智\\'！", + AIAssist.LEVEL2 + ) + } + } + + + /** * 显示或者隐藏到达乘客站点的洁面 * ① 取消订单 可有可无 @@ -277,20 +292,13 @@ class TaxiPassengerBaseFragment() : fun showOrHideArrivedEndLayout(isShow: Boolean) { if (isShow) { exitFullVideoScreen(true) - if (mArrivedEndView == null || mArrivedEndView!!.get() == null) { - mArrivedEndView = WeakReference(ArrivedView(context)) - } - mArrivedEndView?.get()?.let { - OverlayViewUtils.showOverlayView(activity, it, R.style.och_window_anim_alpha) - RxUtils.createSubscribe(500) { - it.setDataAndStartAnimation() - VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) - } + arrivedView.visibility = View.VISIBLE + RxUtils.createSubscribe(500) { + arrivedView.setDataAndStartAnimation() + VoiceNotice.showNotice("已到达目的地，带好随身物品，右侧下车更安全！期待下次再见", AIAssist.LEVEL2) } } else { - mArrivedEndView?.get()?.let { - OverlayViewUtils.dismissOverlayView(it) - } + arrivedView.visibility = View.GONE } } @@ -304,33 +312,6 @@ class TaxiPassengerBaseFragment() : overMapView?.clearCustomPolyline() } - /** - * ① 取消订单 到达上车点后乘客取消订单 隐藏乘客验证页面 - * ② 司机到达上车点 到达上车点 展示乘客验证页面 - * ③ 乘客到达上车点 手机号验证成功后 隐藏乘客验证页面 - * ④ debug 使用 - */ - fun showOrHidePressengerCheckPager( - isShow: Boolean, - ) { - try { - if (isShow) { - exitFullVideoScreen(false) - if (mArrivedCheckView == null || mArrivedCheckView!!.get() == null) { - mArrivedCheckView = WeakReference(TaxiPassengerCheckView(context)) - } - OverlayViewUtils.showOverlayView(activity, mArrivedCheckView!!.get()) - } else { - if (mArrivedCheckView == null || mArrivedCheckView!!.get() == null) { - return - } - OverlayViewUtils.dismissOverlayView(mArrivedCheckView!!.get()) - } - } catch (e: Exception) { - e.printStackTrace() - } - } - fun showOverMapView() { bottom.setCheckIndex(BottomBar.SelectView.OVERMAPVIEW) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 96f1b8918a..0867f74bd6 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -3,26 +3,21 @@ package com.mogo.och.taxi.passenger.ui.arrived import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View import androidx.lifecycle.ViewModelProvider -import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.kotlin.onClick 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.OverlayViewUtils import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout -import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder -import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close -import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation -import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.iv_xiaozhi_belt -import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.svp_frame -import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.v_video_right_rear_view - +import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_bg +import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_close +import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.actv_endstation +import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.v_video_right_rear_view /** * @@ -45,26 +40,16 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { private var taxiPxiaozhiLove: FrameAnimatorContainer?=null + private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") - LayoutInflater.from(context).inflate(R.layout.taxi_p_arrived_end_panel, this, true) - svp_frame.setBackgroundResource(R.drawable.tail_ani_0000) - svp_frame.setIsTouchWiget(false) - svp_frame.setIsTouchWigetFull(false) - svp_frame.enableshowProgressDialog = false - svp_frame.enableDoubleClick = false - GSYVideoManager.instance().enableRawPlay(AbsMogoApplication.getApp()) - val url = "android.resource://" + context.packageName + "/" + R.raw.end_video - gsyVideoOptionBuilder.setUrl(url) - .setCacheWithPlay(false) - .setPlayTag("TaxiPassengerArrivedView") - .build(svp_frame) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_arrived_end_panel, this, true) aciv_close.onClick { - OverlayViewUtils.dismissOverlayView(this) + visibility = View.GONE } - taxiPxiaozhiLove = FrameAnimatorContainer(R.array.xiaozhi_love, 48,iv_xiaozhi_belt) + taxiPxiaozhiLove = FrameAnimatorContainer(R.array.arrived_dest, 18,aciv_bg) taxiPxiaozhiLove?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { d(SceneConstant.M_TAXI_P + TAG, "动画暂停") @@ -72,42 +57,35 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { }) } + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + d(SceneConstant.M_TAXI_P + TAG, "展示---:${isVisible}") + if(isVisible){ + v_video_right_rear_view.resetView() + taxiPxiaozhiLove?.reStart() + }else{ + v_video_right_rear_view.resetView() + taxiPxiaozhiLove?.stop() + RxUtils.disposeSubscribe(subscribe) + } + } + override fun onAttachedToWindow() { super.onAttachedToWindow() val viewModel = ViewModelProvider(this).get(ArrivedViewModel::class.java) viewModel.setViewCallback(this) - taxiPxiaozhiLove?.reStart() - v_video_right_rear_view.resetView() } override fun onDetachedFromWindow() { - svp_frame.setBackgroundResource(R.drawable.tail_ani_0000) - svp_frame.setVideoAllCallBack(null) - svp_frame.onVideoReset() - svp_frame.release() - taxiPxiaozhiLove?.stop() - v_video_right_rear_view.resetView() - super.onDetachedFromWindow() - subscribe?.let { - if (!it.isDisposed) { - it.dispose() - } - } } /** * 设置目的地重置星星状态 */ fun setDataAndStartAnimation() { - svp_frame.setVideoAllCallBack(object : GSYSampleCallBack() { - override fun onAutoComplete(url: String?, vararg objects: Any?) { - svp_frame.setBackgroundResource(R.drawable.tail_ani_0090) - } - }) - svp_frame.startPlayLogic() - RxUtils.createSubscribe(60_000) { - OverlayViewUtils.dismissOverlayView(this@ArrivedView) + subscribe = RxUtils.createSubscribe(60_000) { + visibility = View.GONE } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt index 655a132350..a60c102356 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt @@ -9,7 +9,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.api.autopilot.IMoGoBackCameraVideoListener import com.mogo.eagle.core.function.api.autopilot.IMoGoRoboBusJinlvM1StitchedVideoListener -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.setIsSubscribeBackCameraVideoVideo +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerBackCameraVideoListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StitchedVideoListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -17,8 +17,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_right_rear_cam.view.actv_cam_position_group -import kotlinx.android.synthetic.main.taxi_p_right_rear_cam.view.v_video_right_rear +import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.actv_cam_position_group +import kotlinx.android.synthetic.main.taxt_u_p_right_rear_cam.view.v_video_right_rear /** * @@ -43,23 +43,33 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") - LayoutInflater.from(context).inflate(R.layout.taxi_p_right_rear_cam, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_right_rear_cam, this, true) } override fun onAttachedToWindow() { super.onAttachedToWindow() - setIsSubscribeBackCameraVideoVideo(1, true) - CallerBackCameraVideoListenerManager.addListener(TAG, this) - CallerRoboBusJinlvM1StitchedVideoListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() - setIsSubscribeBackCameraVideoVideo(1, false) - CallerBackCameraVideoListenerManager.removeListener(this) - CallerRoboBusJinlvM1StitchedVideoListenerManager.removeListener(this) } + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + d(SceneConstant.M_TAXI_P + TAG, "展示--可见") + CallerAutoPilotControlManager.setIsSubscribeBackCameraVideoVideo(1, true) + CallerBackCameraVideoListenerManager.addListener(TAG, this) + CallerRoboBusJinlvM1StitchedVideoListenerManager.addListener(TAG, this) + }else{ + d(SceneConstant.M_TAXI_P + TAG, "展示--不可见") + CallerAutoPilotControlManager.setIsSubscribeBackCameraVideoVideo(1, false) + CallerBackCameraVideoListenerManager.removeListener(this) + CallerRoboBusJinlvM1StitchedVideoListenerManager.removeListener(this) + } + } + + companion object { const val TAG = "RightRearCamView" } @@ -74,7 +84,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, fun resetView(){ actv_cam_position_group.visibility = GONE - v_video_right_rear.setImageResource(R.drawable.taxi_p_right_rear_cam) + v_video_right_rear.setImageResource(R.drawable.taxt_u_p_right_rear_cam) } override fun onBackCameraVideo(data: ByteArray) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt index 49681bafa2..66a536c7e5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt @@ -5,9 +5,9 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_bottom_bar.view.actv_overmap -import kotlinx.android.synthetic.main.taxi_p_bottom_bar.view.actv_precisionmap -import kotlinx.android.synthetic.main.taxi_p_bottom_bar.view.actv_video +import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_overmap +import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_video +import kotlinx.android.synthetic.main.taxt_u_p_bottom_bar.view.actv_precisionmap class BottomBar @JvmOverloads constructor( context: Context, @@ -20,8 +20,8 @@ class BottomBar @JvmOverloads constructor( init { isClickable = true - LayoutInflater.from(context).inflate(R.layout.taxi_p_bottom_bar, this, true) - setBackgroundResource(R.drawable.taxi_p_bottom_bar_bg) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_bottom_bar, this, true) + setBackgroundResource(R.drawable.taxt_u_p_bottom_bar_bg) actv_precisionmap.setOnClickListener { setCheckIndex(SelectView.PRECISIONMAP) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt index 78dd252f72..04bb90cad4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt @@ -7,8 +7,8 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.m1_bottom_check.view.aciv_center_image -import kotlinx.android.synthetic.main.m1_bottom_check.view.actv_title +import kotlinx.android.synthetic.main.taxt_u_p_bottom_check.view.aciv_center_image +import kotlinx.android.synthetic.main.taxt_u_p_bottom_check.view.actv_title open class BottomCheckView @JvmOverloads constructor( context: Context, @@ -31,7 +31,7 @@ open class BottomCheckView @JvmOverloads constructor( private var isCheck = false init { - LayoutInflater.from(context).inflate(R.layout.m1_bottom_check, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_bottom_check, this, true) try { val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView) backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt new file mode 100644 index 0000000000..7c57146120 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -0,0 +1,110 @@ +package com.mogo.och.taxi.passenger.ui.checkstartautopilot + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.utils.BigFrameAnimatorContainer +import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout +import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.aciv_check_autopilot +import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.checkPhoneNumber +import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.startAutopilotClose +import kotlinx.android.synthetic.main.taxt_u_p_check_startautopilot.view.startAutopilotView + +/** + * V2X预警事件view：通过FloatWindow呈现，无需加入到自定义layout中 + * + * Created on 2022/3/16 + */ +class ChekAndStartAutopilotView : WindowRelativeLayout, + ChekAndStartAutopilotViewModel.CheckCallback { + + constructor(context: Context?) : super(context) + + constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super( + context, + attributeSet, + defStyleAttr + ) + + constructor( + context: Context?, + attributeSet: AttributeSet, + defStyleAttr: Int, + defStyleRes: Int + ) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private var viewModel: ChekAndStartAutopilotViewModel? = null + + private var aniCheck2StartAutopilotView: BigFrameAnimatorContainer? = null + + private fun initView(context: Context) { + d(SceneConstant.M_TAXI_P + TAG, "initView") + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_check_startautopilot, this, true) + aniCheck2StartAutopilotView = + BigFrameAnimatorContainer(R.array.check2startautopilt, 32, aciv_check_autopilot, false) + + startAutopilotClose.onClick { + visibility = View.GONE + } + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if (isVisible) { + //aniCheck2StartAutopilotView?.start() + } else { + //aniCheck2StartAutopilotView?.stop() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(ChekAndStartAutopilotViewModel::class.java) + } + viewModel?.setStartAutopilotCallback(this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + } + + + companion object { + const val TAG = "TaxiPassengerCheckView" + } + + init { + try { + initView(context) + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun dismissWindow() { + visibility = View.GONE + } + + fun resetCheckView() { + checkPhoneNumber.visibility = View.VISIBLE + startAutopilotView.visibility = View.GONE + startAutopilotClose.visibility = View.GONE + } + + fun startAnimation2StartAutopilit() { + checkPhoneNumber.visibility = View.GONE + startAutopilotView.visibility = View.VISIBLE + startAutopilotClose.visibility = View.VISIBLE + } + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt new file mode 100644 index 0000000000..e1a04314dd --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotViewModel.kt @@ -0,0 +1,48 @@ +package com.mogo.och.taxi.passenger.ui.checkstartautopilot + +import androidx.lifecycle.ViewModel +import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean +import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback +import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum +import com.mogo.och.taxi.passenger.model.TaxiPassengerModel + +class ChekAndStartAutopilotViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { + + private val TAG = ChekAndStartAutopilotViewModel::class.java.simpleName + + private var viewCallback: CheckCallback? = null + + init { + TaxiPassengerModel.setOrderStatusCallback(TAG,this) + } + + fun setStartAutopilotCallback(viewCallback: CheckCallback) { + this.viewCallback = viewCallback + } + + override fun onCurrentOrderStatusChanged(order: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean?) { + super.onCurrentOrderStatusChanged(order) + when (order?.orderStatus) { + TaxiPassengerOrderStatusEnum.ArriveAtStart.code -> { + // 显示手机号验证 + } + TaxiPassengerOrderStatusEnum.UserArriveAtStart.code -> { + // 显示启动自驾 + } + else -> { + viewCallback?.dismissWindow() + } + } + } + + override fun onCleared() { + super.onCleared() + this.viewCallback = null + TaxiPassengerModel.setOrderStatusCallback(TAG, null) + } + + interface CheckCallback { + fun dismissWindow() + } + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt new file mode 100644 index 0000000000..25d3926962 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/CheckView.kt @@ -0,0 +1,106 @@ +package com.mogo.och.taxi.passenger.ui.checkstartautopilot.check + +import android.content.Context +import android.graphics.Typeface +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.TextAppearanceSpan +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.widget.NumberCheckView +import io.reactivex.disposables.Disposable +import kotlinx.android.synthetic.main.taxt_u_p_check.view.numberCheckView +import kotlinx.android.synthetic.main.taxt_u_p_check.view.tv_passenger_count +import kotlinx.android.synthetic.main.taxt_u_p_check.view.tv_passenger_end +import kotlinx.android.synthetic.main.taxt_u_p_check.view.tv_passenger_start + +/** + * V2X预警事件view：通过FloatWindow呈现，无需加入到自定义layout中 + * + * Created on 2022/3/16 + */ +class CheckView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 +) : ConstraintLayout( + context, attrs, defStyleAttr +), ChekViewModel.CheckCallback, NumberCheckView.SubmitListener { + + + private var submitThrottle: Disposable? = null + + private var viewModel: ChekViewModel? = null + + companion object { + const val TAG = "CheckView" + } + + + private fun initView(context: Context) { + d(SceneConstant.M_TAXI_P + TAG, "initView") + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_check, this, true) + numberCheckView.submitListener = this + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if (isVisible) { + viewModel?.setOrderInfo() + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(ChekViewModel::class.java) + } + viewModel?.setStartAutopilotCallback(this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + } + + init { + try { + initView(context) + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun setOrderInfo( + startSiteAddr: String?, + endSiteAddr: String?, + passengerNum: String?, + phone: String? + ) { + val sb = SpannableStringBuilder("乘客数：$passengerNum 位") // 包装字体内容 + sb.setSpan( + TextAppearanceSpan( + "default", + Typeface.NORMAL, 100, + ContextCompat.getColorStateList(context, R.color.taxi_p_378EFB), null + ), + 4, 5, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + tv_passenger_count.text = sb + tv_passenger_start.text = "起 点 : $startSiteAddr" + tv_passenger_end.text = "终 点 : $endSiteAddr" + numberCheckView.resetNum(phone ?: "") + } + + override fun trySubmit(number: String) { + RxUtils.disposeSubscribe(submitThrottle) + submitThrottle = RxUtils.createSubscribe(1_000) { + viewModel?.checkAndUpdateStatus(number) + } + } +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt similarity index 66% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt index a7ca88b125..9588ecd2a2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/ChekViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/check/ChekViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.check +package com.mogo.och.taxi.passenger.ui.checkstartautopilot.check import androidx.lifecycle.ViewModel import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean @@ -6,25 +6,23 @@ import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { +class ChekViewModel : ViewModel() { private val TAG = ChekViewModel::class.java.simpleName private var viewCallback: CheckCallback? = null init { - TaxiPassengerModel.setOrderStatusCallback(TAG,this) } fun setStartAutopilotCallback(viewCallback: CheckCallback) { this.viewCallback = viewCallback - setOrderInfo() } fun checkAndUpdateStatus(phone: String) { TaxiPassengerModel.checkPhoneAndUpdateStatus(phone) } - private fun setOrderInfo() { + fun setOrderInfo() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { order -> viewCallback?.setOrderInfo(order.orderStartSite?.siteName, @@ -32,17 +30,9 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { } } - override fun onCurrentOrderStatusChanged(order: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean?) { - super.onCurrentOrderStatusChanged(order) - if(order == null || order.orderStatus != TaxiPassengerOrderStatusEnum.UserArriveAtStart.code) { - this.viewCallback?.dismissWindow() - } - } - override fun onCleared() { super.onCleared() this.viewCallback = null - TaxiPassengerModel.setOrderStatusCallback(TAG, null) } interface CheckCallback { @@ -50,8 +40,6 @@ class ChekViewModel : ViewModel(), IOCHTaxiPassengerOrderStatusCallback { endSiteAddr: String?, passengerNum: String?, phone: String?) - - fun dismissWindow() } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt similarity index 65% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt index 732172250c..b6b5f2cd77 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt @@ -1,38 +1,27 @@ -package com.mogo.och.taxi.passenger.ui.startautopilot +package com.mogo.och.taxi.passenger.ui.checkstartautopilot.startautopilot -import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.core.content.ContextCompat -import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.ViewModelProvider -import com.elegant.utils.UiThreadHandler -import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.utilcode.kotlin.onClick 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.OverlayViewUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.devicemanage.data.DoorPosition import com.mogo.och.common.module.manager.devicemanage.data.DoorState import com.mogo.och.common.module.utils.FrameAnimatorContainer -import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout -import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_left_door -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_right_door -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_orderinfo -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_left_door -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_rear_right_door -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.iv_xiaozhi_belt -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.starting_autopilot_view_close -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_btn_bg -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_autopilot_starting -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.taxi_p_start_autopilot -import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.cl_car_type +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_front_left_door +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_front_right_door +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_orderinfo +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_rear_left_door +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.actv_rear_right_door +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.taxi_p_autopilot_btn_bg +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.taxi_p_autopilot_starting +import kotlinx.android.synthetic.main.taxt_u_p_start_autopilot_view.view.taxi_p_start_autopilot /** * @author: yangyakun @@ -50,25 +39,15 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( - context, - attributeSet, - defStyleAttr + context, attributeSet, defStyleAttr ) - constructor( - context: Context, - attributeSet: AttributeSet, - defStyleAttr: Int, - defStyleRes: Int - ) : super(context, attributeSet, defStyleAttr, defStyleRes) - companion object { private val TAG = StartAutopilotView::class.java.simpleName } private var taxiPStartAutopilot: FrameAnimatorContainer? = null private var taxiPStartAutopilotCar: FrameAnimatorContainer? = null - private var taxiPXiaozhiBelt: FrameAnimatorContainer? = null init { @@ -76,11 +55,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } private fun initView() { - LayoutInflater.from(context).inflate(R.layout.taxi_p_start_autopilot_view, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_start_autopilot_view, this, true) taxiPStartAutopilotCar = FrameAnimatorContainer( - R.array.taxi_p_start_autopilot_car, - 20, - taxi_p_autopilot_starting + R.array.taxi_p_start_autopilot_car, 20, taxi_p_autopilot_starting ) taxiPStartAutopilotCar?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { @@ -89,10 +66,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } }) taxiPStartAutopilot = FrameAnimatorContainer( - R.array.taxi_p_start_autopilot, - 15, - taxi_p_autopilot_btn_bg, - false + R.array.taxi_p_start_autopilot, 15, taxi_p_autopilot_btn_bg, true ) taxiPStartAutopilot?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener { @@ -100,13 +74,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "可以启动自驾动画暂停") } }) - taxiPXiaozhiBelt = FrameAnimatorContainer(R.array.xiaozhi_belt, 20, iv_xiaozhi_belt) - taxiPXiaozhiBelt?.setOnAnimStopListener(object : - FrameAnimatorContainer.OnAnimationStoppedListener { - override fun AnimationStopped() { - CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "小智动画暂停") - } - }) } override fun setOrderInfo(show: String) { @@ -161,18 +128,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu } } - override fun onVisibilityChanged(changedView: View, visibility: Int) { - super.onVisibilityChanged(changedView, visibility) - if (changedView != this) { - return - } - if (HdMapBuildConfig.currentCarVrIconRes == R.raw.hq_h9) { - cl_car_type.setBackgroundResource(R.drawable.taxi_p_start_panel__hq_bg) - } else { - cl_car_type.setBackgroundResource(R.drawable.taxi_p_start_panel__df_bg) - } - } - override fun onAttachedToWindow() { super.onAttachedToWindow() CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onAttachedToWindow") @@ -183,11 +138,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu startAutopiloting() viewModel.startAutopilot() } - starting_autopilot_view_close.onClick { - unableStartAutopilot() - OverlayViewUtils.dismissOverlayView(this) - } - taxiPXiaozhiBelt?.start() } /** @@ -199,7 +149,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003) taxi_p_autopilot_btn_bg.setImageResource(R.drawable.image_00000_0) taxi_p_start_autopilot.background = - ContextCompat.getDrawable(context, R.drawable.taxi_p_start_autopilot_txt_btn_bg) + ContextCompat.getDrawable(context, R.drawable.taxt_u_p_start_autopilot_txt_btn_bg) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } @@ -241,7 +191,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu ableStartAutopilot() } - private fun goneAllDoorState(){ + private fun goneAllDoorState() { actv_front_left_door.visibility = GONE actv_front_right_door.visibility = GONE actv_rear_left_door.visibility = GONE @@ -251,7 +201,6 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu override fun onDetachedFromWindow() { CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onDetachedFromWindow") unableStartAutopilot() - taxiPXiaozhiBelt?.stop() goneAllDoorState() super.onDetachedFromWindow() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt index deef98392e..05f49aa724 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.passenger.ui.startautopilot +package com.mogo.och.taxi.passenger.ui.checkstartautopilot.startautopilot import androidx.lifecycle.ViewModel import com.mogo.commons.voice.AIAssist diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index de0d755249..9b806bfa8b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt @@ -10,11 +10,11 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment -import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive -import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info -import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_overmap_debug -import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check -import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_arrive +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_order_info +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_overmap_debug +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_phone_check +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_start_autopilot import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -30,7 +30,7 @@ class DebugView @JvmOverloads constructor( } init { - LayoutInflater.from(context).inflate(R.layout.taxi_p_debug, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_debug, this, true) visibility = GONE } @@ -54,10 +54,10 @@ class DebugView @JvmOverloads constructor( fragment?.showOrHideArrivedEndLayout(true) } tv_show_phone_check.onClick { - fragment?.showOrHidePressengerCheckPager(isShow = true) + fragment?.showOrHideCheckAndStartAutopilotView(0) } tv_show_start_autopilot.onClick { - fragment?.showOrHideStartAutopilotView(true) + fragment?.showOrHideCheckAndStartAutopilotView(1) } tv_show_order_info.onClick { fragment?.showOrHideServingOrderFragment(true) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt index 3eb347961b..de2a33f9fb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt @@ -5,6 +5,9 @@ import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.ScaleDrawable import android.os.Build +import android.os.Handler +import android.os.Looper +import android.os.Message import android.util.AttributeSet import android.view.Gravity import android.view.LayoutInflater @@ -12,15 +15,15 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_arrived_time -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_distance -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_distance_unit -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_endstation -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_speed_value -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_surplus_time -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_surplus_time_unit -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.progress_distance +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_arrived_time +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance_unit +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_endstation +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time_unit +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.progress_distance import me.jessyan.autosize.utils.AutoSizeUtils class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback { @@ -36,7 +39,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) private fun initView() { - LayoutInflater.from(context).inflate(R.layout.taxi_p_itinerary, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_itinerary, this, true) setDrawable(true) progress_distance.progress = 0 @@ -60,7 +63,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF) val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED) val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4) - val bottomColor = ContextCompat.getColor(context, R.color.taxi_p_66476FBE) + val bottomColor = ContextCompat.getColor(context, android.R.color.transparent) gradientDrawable.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor) gradientDrawable.orientation = GradientDrawable.Orientation.LEFT_RIGHT @@ -86,9 +89,6 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback viewModel?.setDistanceCallback(this) } - override fun setSpeed(speedValue:String){ - actv_speed_value.text = speedValue - } override fun setEndStation(endStation:String){ if(endStation.length>9){ actv_endstation.text = "${endStation.subSequence(0,9)}…" diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt index 25dfc96139..9bc4fad09c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -17,8 +17,7 @@ import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import kotlin.math.abs import kotlin.math.ceil -class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, - IOCHTaxiPassengerOrderStatusCallback { +class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback { private val TAG = OrderInfoViewModel::class.java.simpleName @@ -31,7 +30,6 @@ class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, disUnit = AbsMogoApplication.getApp().getString(R.string.taxi_p_distance_unit_km) surplusTimeUnit = AbsMogoApplication.getApp().getString(R.string.taxi_p_surplustime) // 设置起点和终点marker和实时车辆位置 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 4, this) TaxiPassengerModel.setOrderStatusCallback(TAG,this) } @@ -45,22 +43,12 @@ class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, TaxiPassengerModel.setOrderStatusCallback(TAG,null) } - override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - mogoLocation?.let { - UiThreadHandler.post { - val speedKM = (abs(it.gnssSpeed) * 3.6f).toInt() - viewCallback?.setSpeed(speedKM.toString()) - } - } - } - interface ItineraryViewCallback{ fun setDistanceInfo(surplusdistance:String,distanceUnit:String, surplusTime:String,surplusTimeUnit:String, arrivedTime:String,alreadyGone:Int,distance:Int ) fun setEndStation(endStation:String) - fun setSpeed(speedValue:String) } override fun onCurrentOrderStatusChanged(order: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean?) { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt new file mode 100644 index 0000000000..2c05bcc1cb --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt @@ -0,0 +1,51 @@ +package com.mogo.och.taxi.passenger.ui.speed + +import android.content.Context +import android.os.Build +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.och.taxi.passenger.R + +class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { + + private val TAG = "ItineraryView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_speed, this, true) + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 4, this) + }else{ + CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) + } + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { + + } + + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt index c1a34b2e2d..a5b5183bd7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt @@ -17,8 +17,8 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.debug.DebugEvent -import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon -import kotlinx.android.synthetic.main.taxi_p_statusview.view.vShowDebugView +import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.vShowDebugView +import kotlinx.android.synthetic.main.taxt_u_p_statusview.view.iv_biz_icon import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.EventBus import java.lang.ref.WeakReference @@ -55,8 +55,8 @@ class StatusBarView @JvmOverloads constructor( } init { - LayoutInflater.from(context).inflate(R.layout.taxi_p_statusview, this, true) - setBackgroundResource(R.drawable.taxi_p_status_bg) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_statusview, this, true) + setBackgroundResource(R.drawable.taxt_u_p_status_bg) isClickable = true isFocusable = true } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt index b27eeb0c21..463deba210 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt @@ -8,7 +8,7 @@ import android.widget.RelativeLayout import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_blue_tooth.view.mofangView +import kotlinx.android.synthetic.main.taxt_u_p_blue_tooth.view.mofangView /** * 魔戒蓝牙控件 @@ -28,7 +28,7 @@ class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusLis constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) init { - LayoutInflater.from(context).inflate(R.layout.taxi_p_blue_tooth, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_blue_tooth, this, true) } @@ -43,11 +43,11 @@ class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusLis } override fun onMoFangConnected() { - mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_close) + mofangView.setImageResource(R.drawable.taxt_u_p_blue_tooth_close) } override fun onMoFangDisconnected() { - mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_open) + mofangView.setImageResource(R.drawable.taxt_u_p_blue_tooth_open) } @SuppressLint("SetTextI18n") diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt index 7baaf6247b..868ddda43b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt @@ -26,7 +26,10 @@ import com.mogo.eagle.core.utilcode.util.BrightnessUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.wigets.MineGradientDrawable import com.mogo.och.taxi.passenger.R -import kotlinx.android.synthetic.main.taxi_p_setting_view.view.* +import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_light_bar +import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.sb_voice_bar +import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.tvSoundPer +import kotlinx.android.synthetic.main.taxt_u_p_setting_view.view.tvVoicePer import me.jessyan.autosize.utils.AutoSizeUtils class TaxiPSettingView @JvmOverloads constructor( @@ -41,7 +44,7 @@ class TaxiPSettingView @JvmOverloads constructor( } init { - LayoutInflater.from(context).inflate(R.layout.taxi_p_setting_view, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_setting_view, this, true) initView() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt index 776188dbc4..d44f0895cd 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt @@ -40,7 +40,7 @@ internal class InfoVideoView @JvmOverloads constructor( } init { - LayoutInflater.from(context).inflate(R.layout.taxi_p_mogo_video_layout, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_mogo_video_layout, this, true) initView() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java index bdf79d44b1..8b33830ddb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java @@ -42,7 +42,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter { if(onThumbImageClilckListener!=null){ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index ab1ae3cb54..40e3308603 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -60,7 +60,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag) override fun init(context: Context) { - mEnlargeImageRes = R.drawable.taxi_p_change_full + mEnlargeImageRes = R.drawable.taxt_u_p_change_full super.init(context) start = findViewById(R.id.start) coverImage = findViewById(R.id.thumbImage) @@ -80,7 +80,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { aivStartPlay.scaleX = 0.8f aivStartPlay.scaleY = 0.8f - mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.bg_taxi_p_video_index,0.66f,0.66f) + mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.taxt_u_p_bg_video_index,0.66f,0.66f) } private fun addDrageAnchor(){ @@ -108,7 +108,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { titleTextView.layoutParams = layoutParams1 aivStartPlay.scaleX = 1f aivStartPlay.scaleY = 1f - val drawable = ActivityCompat.getDrawable(context, R.drawable.bg_taxi_p_video_index) + val drawable = ActivityCompat.getDrawable(context, R.drawable.taxt_u_p_bg_video_index) mProgressBar.thumb = drawable if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { mProgressBar.maxHeight = 6 @@ -127,7 +127,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } override fun getLayoutId(): Int { - return R.layout.taxi_p_video_show + return R.layout.taxt_u_p_video_show } override fun updateStartImage() { @@ -423,7 +423,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { cloneParams(this, gsyVideoPlayer) val frameLayout = FrameLayout(context) if (gsyVideoPlayer.fullscreenButton != null) { - gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxi_p_change_normal) + gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxt_u_p_change_normal) gsyVideoPlayer.fullscreenButton.setOnClickListener { v -> if (mBackFromFullScreenListener == null) { clearFullscreenLayout(gsyVideoPlayer) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt similarity index 56% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt index dad6f5f563..52e10e7c17 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/NumberCheckView.kt @@ -1,88 +1,79 @@ -package com.mogo.och.taxi.passenger.ui.check +package com.mogo.och.taxi.passenger.widget import android.content.Context -import android.graphics.Typeface -import android.text.Spannable -import android.text.SpannableStringBuilder -import android.text.style.TextAppearanceSpan import android.util.AttributeSet import android.view.LayoutInflater import android.view.View +import android.widget.FrameLayout import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import androidx.lifecycle.ViewModelProvider import com.mogo.commons.voice.AIAssist -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.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.OverlayViewUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView -import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.iv_zhi_normal -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_count -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_end -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_passenger_start -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_back -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_eight -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_first -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_five -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_four -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_fourth -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_nine -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_one -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_second -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_seven -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_six -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_submit -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_third -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_three -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_two -import kotlinx.android.synthetic.main.taxi_p_passenger_check_panel.view.tv_taxi_passenger_number_zero +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_back +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_eight +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_first +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_five +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_four +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_fourth +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_nine +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_one +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_second +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_seven +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_six +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_submit +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_third +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_three +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_two +import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_zero -/** - * V2X预警事件view：通过FloatWindow呈现，无需加入到自定义layout中 - * - * Created on 2022/3/16 - */ -class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, - ChekViewModel.CheckCallback { - - constructor(context: Context?) : super(context) - - constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet) - - constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) - - constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) +class NumberCheckView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr), View.OnClickListener { private var index = 0 private var phone = "" private val numSelect = arrayOfNulls(4) private val numSelectTextView = arrayOfNulls(4) - private lateinit var viewModel:ChekViewModel - private var taxiPxiaozhiCheck: FrameAnimatorContainer?=null + var submitListener: SubmitListener? = null + companion object { + const val TAG = "NumberCheckView" + } + + init { + try { + initView(context) + } catch (e: Exception) { + e.printStackTrace() + } + } + + fun resetNum(phone:String){ + this.phone = phone + for(i in numSelect.indices){ + numSelect[i] = null + } + numSelectTextView.forEach { + it?.text = "" + } + } private fun initView(context: Context) { d(SceneConstant.M_TAXI_P + TAG, "initView") - LayoutInflater.from(context).inflate(R.layout.taxi_p_passenger_check_panel, this, true) + LayoutInflater.from(context).inflate(R.layout.taxt_u_p_check_number, this, true) keyBoardLogic() numSelectTextView[0] = tv_taxi_passenger_number_first numSelectTextView[1] = tv_taxi_passenger_number_second numSelectTextView[2] = tv_taxi_passenger_number_third numSelectTextView[3] = tv_taxi_passenger_number_fourth - - taxiPxiaozhiCheck = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,iv_zhi_normal) - taxiPxiaozhiCheck?.setOnAnimStopListener(object : FrameAnimatorContainer.OnAnimationStoppedListener{ - override fun AnimationStopped() { - CallerLogger.d(SceneConstant.M_TAXI_P + ArrivedView.TAG, "动画暂停") - } - }) } private fun keyBoardLogic() { @@ -135,19 +126,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, VoiceNotice.showNotice("验证失败！再检查一下吧～", AIAssist.LEVEL2) return } - viewModel.checkAndUpdateStatus(numberStr) - } - - override fun onAttachedToWindow() { - super.onAttachedToWindow() - viewModel = ViewModelProvider(this).get(ChekViewModel::class.java) - viewModel.setStartAutopilotCallback(this) - taxiPxiaozhiCheck?.start() - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - taxiPxiaozhiCheck?.stop() + submitListener?.trySubmit(numberStr) } private fun selectIndex(i: Int) { @@ -201,7 +180,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, private fun changeStyle() { numSelectTextView.forEachIndexed { indexIn, textView -> if(indexIn==index){ - numSelectTextView[index]!!.setBackgroundResource(R.drawable.bg_taxi_p_checked_input_background) + numSelectTextView[index]!!.setBackgroundResource(R.drawable.taxt_u_p_bg_checked_input_background) numSelectTextView[index]!!.setTextColor( ContextCompat.getColor( @@ -217,7 +196,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, ) ) }else{ - numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.bg_taxi_p_check_input_background) + numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.taxt_u_p_bg_check_input_background) numSelectTextView[indexIn]!!.setTextColor( ContextCompat.getColor( context, @@ -235,41 +214,9 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener, ) } } - } - companion object { - const val TAG = "TaxiPassengerCheckView" - } - - init { - try { - initView(context) - } catch (e: Exception) { - e.printStackTrace() - } - } - - override fun setOrderInfo(startSiteAddr: String?, endSiteAddr: String?, passengerNum: String?, phone: String?) { - this.phone = phone?:"" - val sb = SpannableStringBuilder("乘客数：$passengerNum 位") // 包装字体内容 - sb.setSpan( - TextAppearanceSpan("default", - Typeface.NORMAL,100, - ContextCompat.getColorStateList(context,R.color.taxi_p_check_passenger_number) ,null ), - 4, 5, Spannable.SPAN_INCLUSIVE_INCLUSIVE) - tv_passenger_count.text = sb - tv_passenger_start.text = "起 点 : $startSiteAddr" - tv_passenger_end.text = "终 点 : $endSiteAddr" - for(i in numSelect.indices){ - numSelect[i] = null - } - numSelectTextView.forEach { - it?.text = "" - } - } - - override fun dismissWindow() { - OverlayViewUtils.dismissOverlayView(this) + interface SubmitListener { + fun trySubmit(number: String) } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/anim/alpha_show_hide.xml b/OCH/taxi/unmanned-passenger/src/main/res/anim/alpha_show_hide.xml deleted file mode 100644 index ceac4e6062..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/anim/alpha_show_hide.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/anim/left_to_right.xml b/OCH/taxi/unmanned-passenger/src/main/res/anim/left_to_right.xml deleted file mode 100644 index dfe499b9b6..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/anim/left_to_right.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/anim/right_to_left.xml b/OCH/taxi/unmanned-passenger/src/main/res/anim/right_to_left.xml deleted file mode 100644 index 39b17e037e..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/anim/right_to_left.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/anim/alpha_hide_show.xml b/OCH/taxi/unmanned-passenger/src/main/res/anim/taxt_u_p_alpha_hide_show.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/anim/alpha_hide_show.xml rename to OCH/taxi/unmanned-passenger/src/main/res/anim/taxt_u_p_alpha_hide_show.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_hide_f.xml b/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_hide_f.xml deleted file mode 100644 index 599149e9a7..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_hide_f.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_show_f.xml b/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_show_f.xml deleted file mode 100644 index 8c6acc7439..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/animator/alpha_hide_show_f.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml b/OCH/taxi/unmanned-passenger/src/main/res/color/taxt_u_p_autopilot_text_color_selector.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml rename to OCH/taxi/unmanned-passenger/src/main/res/color/taxt_u_p_autopilot_text_color_selector.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_000.png new file mode 100755 index 0000000000..74a4c5e4af Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_000.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_001.png new file mode 100755 index 0000000000..b7f21f36fe Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_001.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_002.png new file mode 100755 index 0000000000..38a3136774 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_002.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_003.png new file mode 100755 index 0000000000..6b2907e603 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_003.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_004.png new file mode 100755 index 0000000000..7fcee78355 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_004.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_005.png new file mode 100755 index 0000000000..5e9288feb3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_005.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_006.png new file mode 100755 index 0000000000..36c1ec59c0 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_006.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_007.png new file mode 100755 index 0000000000..62ad267832 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_007.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_008.png new file mode 100755 index 0000000000..18792970b7 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_008.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_009.png new file mode 100755 index 0000000000..0030431924 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_009.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_010.png new file mode 100755 index 0000000000..fc2e148799 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_010.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_011.png new file mode 100755 index 0000000000..7e6ab36853 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_011.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_012.png new file mode 100755 index 0000000000..243fd76de6 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_012.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_013.png new file mode 100755 index 0000000000..54a9ead48f Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_013.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_014.png new file mode 100755 index 0000000000..1621f6c3c0 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_014.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_015.png new file mode 100755 index 0000000000..5e05685b23 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_015.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_016.png new file mode 100755 index 0000000000..d92df4dae1 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_016.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_017.png new file mode 100755 index 0000000000..fc00c1663a Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_017.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_018.png new file mode 100755 index 0000000000..6cdbc829a7 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_018.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_019.png new file mode 100755 index 0000000000..f6000a6ecb Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_019.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_020.png new file mode 100755 index 0000000000..919d7c7eb0 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_020.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_021.png new file mode 100755 index 0000000000..8dd2931f67 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_021.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_022.png new file mode 100755 index 0000000000..7a20d4323a Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_022.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_023.png new file mode 100755 index 0000000000..50619ff795 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_023.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_024.png new file mode 100755 index 0000000000..155e2be21c Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_024.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_025.png new file mode 100755 index 0000000000..c593e58003 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_025.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_026.png new file mode 100755 index 0000000000..df82030191 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_026.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_027.png new file mode 100755 index 0000000000..3a0cde8527 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_027.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_028.png new file mode 100755 index 0000000000..365984024c Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_028.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_029.png new file mode 100755 index 0000000000..a75ccba67d Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_029.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_030.png new file mode 100755 index 0000000000..837184707c Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_030.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_031.png new file mode 100755 index 0000000000..f8839167d3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_031.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_032.png new file mode 100755 index 0000000000..a9bb3dea99 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_032.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_033.png new file mode 100755 index 0000000000..57f2ca8c8a Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_033.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_034.png new file mode 100755 index 0000000000..a79e282695 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_034.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_035.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_035.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_035.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_036.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_036.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_036.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_037.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_037.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_037.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_038.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_038.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_038.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_039.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_039.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_039.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_040.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_040.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_040.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_041.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_041.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_041.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_042.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_042.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_042.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_043.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_043.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_043.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_044.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_044.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_044.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_045.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_045.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_045.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_046.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_046.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_046.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_047.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_047.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_047.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_048.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_048.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_048.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_049.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_049.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_049.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_050.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_050.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_050.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_051.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_051.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_051.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_052.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_052.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_052.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_053.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_053.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_053.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_054.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_054.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_054.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_055.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_055.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_055.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_056.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_056.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_056.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_057.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_057.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_057.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_058.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_058.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_058.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_059.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_059.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_059.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_060.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_060.png new file mode 100755 index 0000000000..4283785414 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/check2startautopilt_060.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00000.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00000.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000_0.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00000_0.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00000_0.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00000_0.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00001.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00001.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00001.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00002.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00002.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00002.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00003.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00003.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00003.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00004.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00004.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00004.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00005.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00005.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00005.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00006.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00006.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00006.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00007.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00007.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00007.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00008.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00008.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00008.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00009.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00009.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00009.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00010.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00010.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00010.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00011.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00011.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00011.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00012.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00012.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00012.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00013.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00013.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00013.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00014.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00014.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00014.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00015.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00015.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00015.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00016.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00016.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00016.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00017.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00017.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00017.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00018.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00018.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00018.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00019.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00019.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00019.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00020.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00020.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00020.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00021.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00021.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00021.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00022.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00022.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00022.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00023.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00023.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00023.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00024.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00024.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00024.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00025.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00025.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00025.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00026.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00026.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00026.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00027.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00027.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00027.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00028.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00028.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00028.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00029.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00029.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00029.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00030.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00030.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00030.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00031.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00031.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00031.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00032.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00032.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00032.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00033.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00033.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00033.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00034.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/image_00034.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/image_00034.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00000.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00000.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00000.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00001.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00001.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00001.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00002.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00002.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00002.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00003.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00003.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00003.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00004.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00004.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00004.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00005.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00005.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00005.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00006.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00006.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00006.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00007.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00007.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00007.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00008.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00008.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00008.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00009.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00009.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00009.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00010.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00010.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00010.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00011.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00011.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00011.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00012.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00012.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00012.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00013.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/light_00013.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/light_00013.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/tail_ani_0000.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/tail_ani_0000.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/tail_ani_0000.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/tail_ani_0000.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/tail_ani_0090.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/tail_ani_0090.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/tail_ani_0090.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/tail_ani_0090.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp new file mode 100644 index 0000000000..50f20ef2e8 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_close.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_close.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_glide.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_arrived_glide.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bg_checked_input_background.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bg_checked_input_background.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bg_video_index.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bg_video_index.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_close.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_blue_tooth_open.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_bar_bg.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_bar_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_bar_select_bg.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_bar_select_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_overmap_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_overmap_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_overmap_press.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_overmap_press.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_precisionmap_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_precisionmap_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_precisionmap_press.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_precisionmap_press.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_video_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_video_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_video_press.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_bottom_video_press.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_change_full.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_change_full.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_change_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_change_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_end_boll.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_end_boll.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_input_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_input_bg.png new file mode 100644 index 0000000000..705ec70021 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_input_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_logo.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_logo.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_panel_bg.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_panel_bg.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_start_boll.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_start_boll.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_start_end_line.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_check_start_end_line.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_front_left_door_bg.9.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_front_left_door_bg.9.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_front_right_door_bg.9.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_front_right_door_bg.9.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_function_voice_humb.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_function_voice_humb.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_function_voice_humb.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_function_voice_humb.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png new file mode 100755 index 0000000000..a626a703f3 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_light_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_increase_set.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_light_increase_set.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_increase_set.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_light_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_set.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_light_set.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_light_set.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_voice_increase_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_increase_set.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_voice_increase_set.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_increase_set.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_voice_set.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_set.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/iv_voice_set.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_iv_voice_set.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_location_center.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_location_center.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_arrow_arrived.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_arrow_arrived.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_arrow_un_arrive.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_mogo_logo.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_mogo_logo.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_mogo_video_play.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_mogo_video_play.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_pnc_bg.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_pnc_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_rear_left_door_bg.9.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_rear_left_door_bg.9.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_rear_right_door_bg.9.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_rear_right_door_bg.9.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_right_rear_cam.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_right_rear_cam.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_checked.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_roma_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_checked.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_normal.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_view_bg.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_view_bg.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_setting_view_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_start_panel__df_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_start_panel__df_bg.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_start_panel__df_bg.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_start_panel__df_bg.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_start_panel__hq_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_start_panel__hq_bg.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_start_panel__hq_bg.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_start_panel__hq_bg.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_status_bg.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_video_holder.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_video_holder.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_video_light_bg.webp similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.webp rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_video_light_bg.webp diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_000.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_000.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_000.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_001.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_001.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_001.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_002.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_002.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_002.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_003.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_003.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_003.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_004.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_004.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_004.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_005.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_005.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_005.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_006.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_006.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_006.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_007.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_007.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_007.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_008.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_008.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_008.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_009.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_009.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_009.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_010.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_010.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_010.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_011.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_011.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_011.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_012.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_012.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_012.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_013.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_013.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_013.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_014.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_014.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_014.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_015.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_015.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_015.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_016.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_016.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_016.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_017.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_017.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_017.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_018.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_018.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_018.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_019.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_019.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_019.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_020.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_020.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_020.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_021.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_021.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_021.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_022.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_022.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_022.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_023.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_023.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_023.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_024.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_024.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_024.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_025.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_025.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_025.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_026.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_026.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_026.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_027.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_027.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_027.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_028.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_028.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_028.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_029.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_029.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_029.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_030.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_030.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_030.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_031.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_031.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_031.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_032.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_032.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_032.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_033.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_033.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_033.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_034.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_034.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_034.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_035.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_035.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_035.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_036.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_036.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_036.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_037.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_037.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_037.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_038.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_038.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_038.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_039.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_039.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_039.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_040.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_040.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_040.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_041.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_041.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_041.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_042.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_042.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_042.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_043.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_043.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_043.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_044.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_044.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_044.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_045.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_045.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_045.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_046.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_046.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_046.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_047.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_047.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_047.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_048.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_belt_048.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_belt_048.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_00.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_00.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_00.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_00.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_01.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_01.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_01.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_01.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_02.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_02.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_02.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_02.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_03.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_03.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_03.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_03.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_04.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_04.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_04.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_04.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_05.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_05.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_05.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_05.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_06.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_06.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_06.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_06.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_07.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_07.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_07.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_07.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_08.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_08.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_08.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_08.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_09.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_09.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_09.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_09.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_10.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_10.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_10.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_10.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_11.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_11.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_11.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_11.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_12.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_12.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_12.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_12.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_13.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_13.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_13.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_13.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_14.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_14.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_14.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_14.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_15.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_15.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_15.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_15.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_16.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_16.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_16.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_16.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_17.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_17.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_17.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_17.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_18.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_18.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_18.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_18.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_19.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_19.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_19.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_19.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_20.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_20.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_20.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_20.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_21.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_21.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_21.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_21.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_22.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_22.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_22.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_22.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_23.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_23.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_23.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_23.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_24.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_24.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_24.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_24.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_25.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_25.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_25.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_25.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_26.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_26.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_26.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_26.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_27.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_27.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_27.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_27.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_28.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_28.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_28.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_28.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_29.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_29.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_29.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_29.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_30.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_30.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_30.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_30.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_31.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_31.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_31.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_31.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_32.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_32.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_32.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_32.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_33.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_33.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_33.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_33.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_34.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_34.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_34.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_34.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_35.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_35.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_35.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_35.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_36.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_36.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_36.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_36.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_37.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_37.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_37.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_37.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_38.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_38.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_38.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_38.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_39.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_39.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_39.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_39.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_40.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_40.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_40.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_40.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_41.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_41.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_41.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_41.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_42.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_42.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_42.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_42.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_43.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_43.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_43.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_43.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_44.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_44.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_44.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_44.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_45.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_45.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_45.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_45.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_46.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_46.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_46.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_46.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_47.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_47.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_47.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_47.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_48.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_48.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_48.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_48.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_49.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_49.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_49.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_49.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_50.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_50.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_50.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_50.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_51.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_51.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_51.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_51.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_52.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_52.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_52.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_52.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_53.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_53.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_53.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_53.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_54.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_54.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_54.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_54.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_55.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_55.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_55.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_55.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_56.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_56.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_56.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_56.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_57.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_57.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_57.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_57.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_58.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_58.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_58.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_58.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_59.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_59.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_59.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_59.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_60.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_60.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_60.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_60.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_61.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_61.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_61.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_61.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_62.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_62.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_62.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_62.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_63.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_63.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_63.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_63.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_64.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_64.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_64.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_64.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_65.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_65.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_65.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_65.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_66.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_66.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_66.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_66.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_67.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_67.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_67.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_67.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_68.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_68.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_68.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_68.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_69.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_69.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_69.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_69.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_70.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_70.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_70.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_70.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_71.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_71.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_71.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_71.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_72.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_72.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_72.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_72.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_73.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_73.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_73.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_73.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_74.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_74.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_74.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_74.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_75.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_75.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_75.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_75.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_76.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_76.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_76.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_76.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_77.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_77.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_77.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_77.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_78.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_78.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_78.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_78.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_79.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_79.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_79.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_79.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_80.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_80.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_80.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_80.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_81.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_81.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_81.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_81.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_82.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_82.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_82.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_82.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_83.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_83.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_83.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_83.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_84.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_84.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_84.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_84.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_85.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_85.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_85.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_85.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_86.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_86.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_86.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_86.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_87.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_87.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_87.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_87.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_88.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_88.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_88.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_88.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_89.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_89.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_89.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_89.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_90.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_90.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_90.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_90.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_91.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_91.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_91.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_91.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_92.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_92.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_92.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_92.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_93.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_93.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_93.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_93.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_94.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_94.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_94.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_94.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_95.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_95.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_95.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_95.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_96.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_96.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_love_96.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_love_96.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_safety_belt.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_safety_belt.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/xiaozhi_safety_belt.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/xiaozhi_safety_belt.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png deleted file mode 100755 index b5ed8c603b..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png deleted file mode 100644 index 72c0f0fc40..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml deleted file mode 100644 index f51169b6b9..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_setting_selector.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_setting_selector.xml deleted file mode 100644 index 8058cbece5..0000000000 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_setting_selector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_check_input_background.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_check_input_background.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_keyboard_background.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_keyboard_background.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg_top.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_bg_top.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_light_bg_shape.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_bg_video_light_bg_shape.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml similarity index 73% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml index 1c98f8cad6..a22cae0b5a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_function_voice_right_process_humb.xml @@ -1,7 +1,7 @@ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_roma_bg_selector.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_roma_bg_selector.xml new file mode 100644 index 0000000000..cfe368d7fd --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_roma_bg_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_setting_selector.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_setting_selector.xml new file mode 100644 index 0000000000..00b43aa368 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_setting_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_bottom_bg.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_txt_btn_bg.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_start_autopilot_txt_btn_bg.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_video_order_process.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_order_process.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_video_order_process.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_video_seekbar_style.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_video_seekbar_style.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_xiaozhibelt_info.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_xiaozhibelt_info.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_xiaozhibelt_info_ball.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml rename to OCH/taxi/unmanned-passenger/src/main/res/drawable/taxt_u_p_xiaozhibelt_info_ball.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/font/din.ttf b/OCH/taxi/unmanned-passenger/src/main/res/font/taxt_u_p_din.ttf similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/font/din.ttf rename to OCH/taxi/unmanned-passenger/src/main/res/font/taxt_u_p_din.ttf diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml similarity index 57% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml index 086e795a01..4743a49e13 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml @@ -7,8 +7,8 @@ android:layout_height="match_parent" tools:ignore="MissingDefaultResource"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml similarity index 77% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index ff44f994ee..9541e4e4db 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -8,19 +8,19 @@ android:id="@+id/overMapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:arrivedDrawable="@drawable/taxi_overmap_arrived" + app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived" app:bottomPadding="160" - app:carDrawable="@drawable/taxi_p_map_car" - app:compassDrawable="@drawable/taxi_p_map_car_light" - app:endPointDrawable="@drawable/taxi_p_map_view_dir_end" + app:carDrawable="@drawable/taxt_u_p_map_car" + app:compassDrawable="@drawable/taxt_u_p_map_car_light" + app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end" app:leftPadding="800" app:mapStyleExtraPath="style_extra.data" app:mapStylePath="style.data" app:resetDrawable="@null" app:rightPadding="160" - app:startPointDrawable="@drawable/taxi_p_map_view_dir_start" + app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start" app:topPadding="160" - app:unArrivedDrawable="@drawable/taxi_overmap_arriving" /> + app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" /> + + + app:roma_close="@drawable/taxt_u_p_roma_bg_selector" + app:roma_open="@drawable/taxt_u_p_roma_checked" /> @@ -148,11 +157,24 @@ android:layout_height="@dimen/dp_160" app:layout_constraintBottom_toBottomOf="parent" /> + + + + + @@ -168,8 +190,9 @@ + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_blue_tooth.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml similarity index 89% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_blue_tooth.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml index ae7dafde3a..645469b91b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_blue_tooth.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_blue_tooth.xml @@ -9,7 +9,7 @@ android:layout_width="@dimen/dp_54" android:layout_height="@dimen/dp_54" android:scaleType="fitXY" - android:src="@drawable/taxi_p_blue_tooth_close" + android:src="@drawable/taxt_u_p_blue_tooth_close" tools:ignore="ContentDescription" /> \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml similarity index 86% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_bottom_bar.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml index db389e16c1..568510a85a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_bottom_bar.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_160" xmlns:app="http://schemas.android.com/apk/res-auto" - tools:background="@drawable/taxi_p_bottom_bar_bg" + tools:background="@drawable/taxt_u_p_bottom_bar_bg" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" tools:ignore="MissingDefaultResource"> @@ -13,7 +13,7 @@ android:format12Hour="M月d日 " android:format24Hour="M月d日 " android:gravity="center" - android:fontFamily="@font/din" + android:fontFamily="@font/taxt_u_p_din" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -28,7 +28,7 @@ android:format12Hour="HH:mm" android:format24Hour="HH:mm" android:gravity="center" - android:fontFamily="@font/din" + android:fontFamily="@font/taxt_u_p_din" app:layout_constraintStart_toEndOf="@+id/cl_order_time" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -41,7 +41,7 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_number.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_number.xml new file mode 100644 index 0000000000..cb866a480e --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_number.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_startautopilot.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_startautopilot.xml new file mode 100644 index 0000000000..77b0238ba9 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_check_startautopilot.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_debug.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_debug.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml similarity index 68% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml index 8d5f3e34e3..817fd4263c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml @@ -2,81 +2,60 @@ + android:layout_width="@dimen/dp_866" + android:layout_height="@dimen/dp_467" + android:background="@drawable/taxt_u_p_itinerary_bg" + app:layout_constraintEnd_toEndOf="parent" /> - - + android:layout_height="wrap_content"/> - + android:layout_height="wrap_content"/> + - @@ -164,7 +143,7 @@ android:layout_height="@dimen/dp_20" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_66" - android:layout_marginStart="@dimen/dp_58" + android:layout_marginStart="@dimen/dp_38" android:layout_marginEnd="@dimen/dp_58" android:progress="20" android:maxHeight="@dimen/dp_10" diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/list_video_item_light.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_list_video_item_light.xml similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/list_video_item_light.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_list_video_item_light.xml index eaca7d4b4a..a53dc544a0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/list_video_item_light.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_list_video_item_light.xml @@ -22,7 +22,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:background="@drawable/bg_taxi_p_video_light_bg_shape" + android:background="@drawable/taxt_u_p_bg_video_light_bg_shape" android:layout_width="1682dp" android:layout_height="@dimen/dp_991" /> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_mogo_video_layout.xml similarity index 96% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_mogo_video_layout.xml index fd94d513d7..204df9b1f3 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_mogo_video_layout.xml @@ -5,7 +5,7 @@ android:id="@+id/infoContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/taxi_p_video_light_bg" + android:background="@drawable/taxt_u_p_video_light_bg" tools:ignore="MissingDefaultResource"> \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_passenger_check_panel.xml similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_passenger_check_panel.xml index fe1331decf..4254b5102a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_passenger_check_panel.xml @@ -5,7 +5,7 @@ android:id="@+id/cl_contain" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/taxi_p_passenger_check_panel_bg" + android:background="@drawable/taxt_u_p_check_panel_bg" tools:ignore="MissingDefaultResource"> @@ -92,7 +92,7 @@ android:id="@+id/iv_passenger_start_end_line" android:layout_width="@dimen/dp_1" android:layout_height="@dimen/dp_78" - android:src="@drawable/taxi_p_passenger_check_start_end_line" + android:src="@drawable/taxt_u_p_check_start_end_line" app:layout_constraintEnd_toEndOf="@+id/iv_passenger_end_boll" app:layout_constraintStart_toStartOf="@+id/iv_passenger_end_boll" app:layout_constraintBottom_toTopOf="@+id/iv_passenger_end_boll" /> @@ -103,7 +103,7 @@ android:layout_height="@dimen/dp_14" android:layout_marginBottom="@dimen/dp_382" android:layout_marginStart="@dimen/dp_181" - android:src="@drawable/taxi_p_passenger_check_end_boll" + android:src="@drawable/taxt_u_p_check_end_boll" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> @@ -132,7 +132,7 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_216" - android:background="@drawable/taxi_p_passenger_check_input_bg"> + android:background="@drawable/taxt_u_p_check_input_bg"> + android:background="@drawable/taxt_u_p_setting_view_bg"> @@ -34,7 +34,7 @@ android:layout_marginStart="@dimen/dp_141" android:layout_marginTop="@dimen/dp_24" android:splitTrack="false" - android:thumb="@drawable/taxi_p_function_voice_right_process_humb" + android:thumb="@drawable/taxt_u_p_function_voice_right_process_humb" android:thumbOffset="@dimen/dp_2" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" @@ -46,7 +46,7 @@ android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_531" android:layout_marginTop="@dimen/dp_28" - android:src="@drawable/iv_light_increase_set" + android:src="@drawable/taxt_u_p_iv_light_increase_set" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" /> @@ -80,7 +80,7 @@ android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_89" android:layout_marginTop="@dimen/dp_29" - android:src="@drawable/iv_voice_set" + android:src="@drawable/taxt_u_p_iv_voice_set" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" /> @@ -91,7 +91,7 @@ android:layout_marginStart="@dimen/dp_141" android:layout_marginTop="@dimen/dp_24" android:splitTrack="false" - android:thumb="@drawable/taxi_p_function_voice_right_process_humb" + android:thumb="@drawable/taxt_u_p_function_voice_right_process_humb" android:thumbOffset="@dimen/dp_2" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" @@ -103,7 +103,7 @@ android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_531" android:layout_marginTop="@dimen/dp_28" - android:src="@drawable/iv_voice_increase_set" + android:src="@drawable/taxt_u_p_iv_voice_increase_set" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" /> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_speed.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_speed.xml new file mode 100644 index 0000000000..0fe00d11d6 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_speed.xml @@ -0,0 +1,48 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml similarity index 58% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml index 28aa18dd53..acf089a793 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml @@ -5,7 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/cl_car_type" - android:background="@drawable/taxi_p_start_panel__df_bg" tools:ignore="MissingDefaultResource"> - - @@ -60,7 +49,7 @@ @@ -71,85 +60,11 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginBottom="@dimen/dp_59" tools:text="用户：1234882382 目的地：环球贸易中心" - android:textColor="@android:color/white" + android:textColor="@color/taxi_p_333333" android:textSize="@dimen/dp_44" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - - - - - - - - - - - - - - @@ -191,7 +106,7 @@ android:text="左前车门未关" android:textSize="@dimen/dp_35" android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_front_left_door_bg" + android:background="@drawable/taxt_u_p_front_left_door_bg" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -207,7 +122,7 @@ android:text="左后车门未关" android:textSize="@dimen/dp_35" android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_rear_left_door_bg" + android:background="@drawable/taxt_u_p_rear_left_door_bg" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -222,7 +137,7 @@ android:text="右后车门未关" android:textSize="@dimen/dp_35" android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_rear_right_door_bg" + android:background="@drawable/taxt_u_p_rear_right_door_bg" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml similarity index 94% rename from OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_statusview.xml rename to OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml index 5b75be9662..e19c1ce706 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_statusview.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_statusview.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/dp_120" - android:background="@drawable/taxi_p_status_bg" + android:background="@drawable/taxt_u_p_status_bg" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" tools:ignore="MissingDefaultResource"> @@ -37,7 +37,7 @@ android:layout_marginEnd="@dimen/dp_93" android:layout_width="@dimen/dp_54" android:layout_height="@dimen/dp_54" - android:src="@drawable/taxi_p_blue_tooth_open" + android:src="@drawable/taxt_u_p_blue_tooth_open" android:layout_gravity="center"/> @@ -38,7 +38,7 @@ android:id="@+id/layout_top" android:layout_width="match_parent" android:layout_height="120dp" - android:background="@drawable/bg_taxi_p_video_bg_top" + android:background="@drawable/taxt_u_p_bg_video_bg_top" app:layout_constraintTop_toTopOf="parent"> + android:src="@drawable/taxt_u_p_change_full" /> + android:progressDrawable="@drawable/taxt_u_p_video_seekbar_style" + android:thumb="@drawable/taxt_u_p_bg_video_index" /> @drawable/xiaozhi_belt_048 + + + + @drawable/check2startautopilt_000 + @drawable/check2startautopilt_001 + @drawable/check2startautopilt_002 + @drawable/check2startautopilt_003 + @drawable/check2startautopilt_004 + @drawable/check2startautopilt_005 + @drawable/check2startautopilt_006 + @drawable/check2startautopilt_007 + @drawable/check2startautopilt_008 + @drawable/check2startautopilt_009 + + @drawable/check2startautopilt_010 + @drawable/check2startautopilt_011 + @drawable/check2startautopilt_012 + @drawable/check2startautopilt_013 + @drawable/check2startautopilt_014 + @drawable/check2startautopilt_015 + @drawable/check2startautopilt_016 + @drawable/check2startautopilt_017 + @drawable/check2startautopilt_018 + + + + @drawable/check2startautopilt_000 + @drawable/check2startautopilt_001 + @drawable/check2startautopilt_002 + @drawable/check2startautopilt_003 + @drawable/check2startautopilt_004 + @drawable/check2startautopilt_005 + @drawable/check2startautopilt_006 + @drawable/check2startautopilt_007 + @drawable/check2startautopilt_008 + @drawable/check2startautopilt_009 + + @drawable/check2startautopilt_010 + @drawable/check2startautopilt_011 + @drawable/check2startautopilt_012 + @drawable/check2startautopilt_013 + @drawable/check2startautopilt_014 + @drawable/check2startautopilt_015 + @drawable/check2startautopilt_016 + @drawable/check2startautopilt_017 + @drawable/check2startautopilt_018 + @drawable/check2startautopilt_019 + + @drawable/check2startautopilt_020 + @drawable/check2startautopilt_021 + @drawable/check2startautopilt_022 + @drawable/check2startautopilt_023 + @drawable/check2startautopilt_024 + @drawable/check2startautopilt_025 + @drawable/check2startautopilt_026 + @drawable/check2startautopilt_027 + @drawable/check2startautopilt_028 + @drawable/check2startautopilt_029 + + + @drawable/check2startautopilt_030 + @drawable/check2startautopilt_031 + @drawable/check2startautopilt_032 + @drawable/check2startautopilt_033 + @drawable/check2startautopilt_034 + @drawable/check2startautopilt_035 + @drawable/check2startautopilt_036 + @drawable/check2startautopilt_037 + @drawable/check2startautopilt_038 + @drawable/check2startautopilt_039 + + @drawable/check2startautopilt_040 + @drawable/check2startautopilt_041 + @drawable/check2startautopilt_042 + @drawable/check2startautopilt_043 + @drawable/check2startautopilt_044 + @drawable/check2startautopilt_045 + @drawable/check2startautopilt_046 + @drawable/check2startautopilt_047 + @drawable/check2startautopilt_048 + + @drawable/check2startautopilt_050 + @drawable/check2startautopilt_051 + @drawable/check2startautopilt_052 + @drawable/check2startautopilt_053 + @drawable/check2startautopilt_054 + @drawable/check2startautopilt_055 + @drawable/check2startautopilt_056 + @drawable/check2startautopilt_057 + @drawable/check2startautopilt_058 + + @drawable/check2startautopilt_060 + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 0a3d6c731f..94e732c3f5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -45,9 +45,13 @@ #76D7FF #255BAA #80F8FF + #464646 + #378EFB + #191E3C #2B364B #005D6A8C #5D6A8C + #333333 #995D6A8C #B37E90BF diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml index 7c3458d9bc..797c62c3cf 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml @@ -5,19 +5,19 @@ @@ -25,15 +25,15 @@