diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt index 488b0e456c..42bffcea82 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt @@ -1,9 +1,7 @@ package com.mogo.och.charter.passenger.bean.response -import com.amap.api.maps.model.LatLng import com.mogo.eagle.core.data.BaseData -import com.mogo.och.common.module.bean.dpmsg.LineSite -import java.util.* +import com.mogo.eagle.core.data.map.MogoLocation /** * @@ -16,6 +14,12 @@ data class TrajectoriesResponse(val data: List?) : BaseData(){ fun exchangeData(): com.amap.api.maps.model.LatLng{ return com.amap.api.maps.model.LatLng(latitude!!,longitude!!) } + fun exchangeDataMogoLocation(): MogoLocation{ + val mogoLocation = MogoLocation() + mogoLocation.latitude = latitude!! + mogoLocation.longitude = longitude!! + return mogoLocation + } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 27377ea3fd..cf692f1253 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -559,7 +559,7 @@ object CharterPassengerModel { .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe { millisUntilFinished -> - if (millisUntilFinished <= 300L) { + if (millisUntilFinished <= 900L) { orderInfo?.let { val isPlayed = SharedPrefs.getInstance(mContext) .getBoolean("${it.orderNo}$min5Speak", false) @@ -568,10 +568,10 @@ object CharterPassengerModel { OCHSocketMessageManager.pushAppOperationalMsgBox( DateTimeUtil.getCurrentTimeStamp(), AbsMogoApplication.getApp() - .getString(R.string.charter_p_end_order_5min), 2 + .getString(R.string.charter_p_end_order_15min), 2 ) - VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack()) - d(M_BUS_P + TAG, "倒计时5分钟${it.orderNo}") + VoiceManager.surplus15min(VoiceFocusManager.getVoiceCmdCallBack()) + d(M_BUS_P + TAG, "倒计时15分钟${it.orderNo}") SharedPrefs.getInstance(mContext) .putBoolean("${it.orderNo}$min5Speak", true) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt index 05c43d3f2e..ebdd6568b3 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt @@ -8,6 +8,7 @@ import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -35,6 +36,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.manager.devicemanage.callback.LightAirconditionDoorCallback +import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.wigets.toast.ToastCharterUtils @@ -241,12 +243,14 @@ class BusPassengerPresenter(view: MainFragment?) : M_BUS_P + TAG, "getLineTrajectory轨迹点：${data.data.size}" ) - val trajectoryList = mutableListOf() + val trajectoryListMogoLocation = mutableListOf() it.forEach { latLngMain -> - trajectoryList.add(latLngMain.exchangeData()) + trajectoryListMogoLocation.add(latLngMain.exchangeDataMogoLocation()) } + val indexInStation = + getStationMiddleTrajectory(trajectoryListMogoLocation, sites) drawStationInfo(sites) - mView?.drawOverMapViewTrajectory(trajectoryList) + mView?.drawOverMapViewTrajectory(indexInStation) } } } @@ -258,6 +262,69 @@ class BusPassengerPresenter(view: MainFragment?) : } + private fun getStationMiddleTrajectory( + trajectoryList: MutableList, + sites: List + ):MutableList { + if(sites.size<2){ + var temp:LatLng + val indexPoint = mutableListOf() + trajectoryList.forEach { + temp = LatLng(it.latitude,it.longitude) + indexPoint.add(temp) + } + return indexPoint + } + + val firstStation = sites.first() + val firstMogoLocation = MogoLocation() + firstMogoLocation.longitude = firstStation.GcjLon!! + firstMogoLocation.latitude = firstStation.GcjLat!! + val firstNearestPointInfo = CoordinateCalculateRouteUtil.getNearestPointInfo( + 0, + trajectoryList.size, trajectoryList.toList(), firstMogoLocation, 2 + ) + + val lastStation = sites.last() + val lastMogoLocation = MogoLocation() + lastMogoLocation.longitude = lastStation.GcjLon!! + lastMogoLocation.latitude = lastStation.GcjLat!! + val lastNearestPointInfo = CoordinateCalculateRouteUtil.getNearestPointInfo( + firstNearestPointInfo.first, + trajectoryList.size, trajectoryList.toList(), firstMogoLocation, 2 + ) + + val firstIndex = if(firstNearestPointInfo.third>15){ + 0 + }else{ + if(firstNearestPointInfo.second==true){// 最近点是下一个点 + firstNearestPointInfo.first + }else{// 最近点是上一个点 + firstNearestPointInfo.first+1 + } + } + + val lastIndex = if(lastNearestPointInfo.third>15){ + trajectoryList.size-1 + }else{ + if(firstNearestPointInfo.second==true){// 最近点是下一个点 + firstNearestPointInfo.first-1 + }else{// 最近点是上一个点 + firstNearestPointInfo.first + } + } + + val subList = trajectoryList.subList(firstIndex, lastIndex) + val indexPoint = mutableListOf() + var temp:LatLng + subList.forEach { + temp = LatLng(it.latitude,it.longitude) + indexPoint.add(temp) + } + return indexPoint + + } + fun drawStationInfo(sites: List) { val stationsList: MutableList = mutableListOf() val stationsNameList: MutableList = mutableListOf() diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt index 5d3fb74f75..b9e2224053 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt @@ -13,7 +13,6 @@ import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_open_door import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_setting import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_stop_site import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time -import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time_press class BottomBar @JvmOverloads constructor( context: Context, @@ -66,11 +65,9 @@ class BottomBar @JvmOverloads constructor( return } if(checkIndex == SelectView.ORDERINFO){ - cl_order_time_press.visibility = VISIBLE - cl_order_time.setCheck(true) + cl_order_time.setCheckItem(true) }else{ - cl_order_time_press.visibility = GONE - cl_order_time.setCheck(false) + cl_order_time.setCheckItem(false) } if(checkIndex == SelectView.SETTING){ actv_setting.setCheckItem(true) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt index f7c19c6dab..c934dd9baa 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt @@ -3,7 +3,10 @@ package com.mogo.och.charter.passenger.ui.bottom import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View +import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -33,55 +36,75 @@ open class BottomOrderInfoView @JvmOverloads constructor( private const val TAG = "BottomOrderInfoView" } + private var backageViewId: Int = -1 + private var backageView: AppCompatImageView? = null + + private var isCheck = false + private var leftTime = -1L + private var viewState:ViewState = ViewState.Normal + init { LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_orderinfo, this, true) try { + val typedArray = + context.obtainStyledAttributes(attrs, R.styleable.CharterPBottomSelectView) + backageViewId = typedArray.getResourceId( + R.styleable.CharterPBottomSelectView_charterPBackageViewId, + -1 + ) + typedArray.recycle() initView(context) } catch (e: Exception) { e.printStackTrace() } - tag = UUID.randomUUID().toString() } - fun setCheck(isCheck:Boolean){ - if(isCheck){ - actv_order_end_time.setTextColor(context.getColor(android.R.color.white)) - actv_order_null.setTextColor(context.getColor(android.R.color.white)) - actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white)) - }else{ - actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1)) - actv_order_null.setTextColor(context.getColor(R.color.charter_p_090f28)) - actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28)) + fun setCheckItem(isCheck: Boolean) { + if (isCheck != this.isCheck) { + this.isCheck = isCheck + notifiBackageView() } } + private fun initView(context: Context) { setViewByOrderStatus(CharterPassengerModel.getCurrentOrderStatus()) } override fun onAttachedToWindow() { super.onAttachedToWindow() - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onAttachedToWindow$tag") - CharterPassengerModel.setOrderLeftTimeListeners(tag.toString(),this) - CharterPassengerModel.setStatusChangeListener(tag.toString(),this) + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onAttachedToWindow") + CharterPassengerModel.setOrderLeftTimeListeners(TAG, this) + CharterPassengerModel.setStatusChangeListener(TAG, this) + + parent?.let { + if (parent is ConstraintLayout) { + if (backageViewId > 0) { + backageView = (parent as ConstraintLayout).findViewById(backageViewId) + } + } + } } override fun onDetachedFromWindow() { super.onDetachedFromWindow() - CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onDetachedFromWindow$tag") - CharterPassengerModel.setOrderLeftTimeListeners(tag.toString(),null) - CharterPassengerModel.setStatusChangeListener(tag.toString(),null) + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDetachedFromWindow") + CharterPassengerModel.setOrderLeftTimeListeners(TAG, null) + CharterPassengerModel.setStatusChangeListener(TAG, null) } private fun setViewByOrderStatus(currentOrderStatus: OrderStatusEnum) { when (currentOrderStatus) { OrderStatusEnum.Nothing, OrderStatusEnum.NoOrderUse, - OrderStatusEnum.NoOrderUnuse ->{ + OrderStatusEnum.NoOrderUnuse -> { actv_order_null.visibility = VISIBLE clg_order_info.visibility = GONE - actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time) + actv_order_end_time.text = + AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time) + leftTime = -1 } + OrderStatusEnum.OrderNoLine, OrderStatusEnum.OrdersWithLine -> { actv_order_null.visibility = GONE @@ -91,19 +114,73 @@ open class BottomOrderInfoView @JvmOverloads constructor( } override fun setOrderTimeCallBack(timeInSecond: Long) { - if(timeInSecond>0){ - val arriveTime = DateTimeUtil.second2Time(timeInSecond) - actv_order_end_time.text = arriveTime - } UiThreadHandler.post { + if (timeInSecond > 0) { + val arriveTime = DateTimeUtil.second2Time(timeInSecond) + actv_order_end_time.text = arriveTime + leftTime = timeInSecond + notifiBackageView() + } setViewByOrderStatus(CharterPassengerModel.getCurrentOrderStatus()) } } + private fun notifiBackageView() { + if (isCheck) { + backageView?.visibility = View.VISIBLE + actv_order_null.setTextColor(context.getColor(android.R.color.white)) + actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white)) + if(leftTime<900){ + actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c)) + if(viewState!=ViewState.Near900){ + viewState = ViewState.Near900 + updateState() + } + }else{ + actv_order_end_time.setTextColor(context.getColor(android.R.color.white)) + if(viewState!=ViewState.Normal){ + viewState = ViewState.Normal + updateState() + } + } + } else { + actv_order_null.setTextColor(context.getColor(R.color.charter_p_090f28)) + actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28)) + if(leftTime<900){ + actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_ff6d2c)) + if(leftTime<300){//0-300s + backageView?.visibility = View.VISIBLE + if(viewState!=ViewState.Near300){ + viewState = ViewState.Near300 + updateState() + } + }else{//300s-900s + backageView?.visibility = View.GONE + } + }else{ + backageView?.visibility = View.GONE + actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1)) + } + } + } + + private fun updateState(){ + when (viewState) { + ViewState.Normal -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_bg) + ViewState.Near300 -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near300s_bg) + ViewState.Near900 -> backageView?.setImageResource(R.drawable.charter_p_bottom_bar_select_near900s_bg) + } + } + + override fun onStatusChange(currentStatus: OrderStatusEnum) { UiThreadHandler.post { setViewByOrderStatus(currentStatus) } } + + enum class ViewState{ + Normal,Near300,Near900 + } } diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png new file mode 100644 index 0000000000..d6a104beca Binary files /dev/null and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near300s_bg.png differ diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png new file mode 100644 index 0000000000..7faf986665 Binary files /dev/null and b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_near900s_bg.png differ diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml index ebeaab801e..aed841ff58 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml @@ -95,6 +95,7 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml deleted file mode 100644 index 94182aa4d0..0000000000 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml index b53b633f6c..031e97bb88 100644 --- a/OCH/charter/passenger/src/main/res/values/color.xml +++ b/OCH/charter/passenger/src/main/res/values/color.xml @@ -53,4 +53,5 @@ #40FFFFFF #F0E0EFFF #66000000 + #FF6D2C \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/values/strings.xml b/OCH/charter/passenger/src/main/res/values/strings.xml index 45ef99f32e..e86b7390eb 100644 --- a/OCH/charter/passenger/src/main/res/values/strings.xml +++ b/OCH/charter/passenger/src/main/res/values/strings.xml @@ -27,7 +27,7 @@ 靠边停车成功 请安全员登录司机屏 - 包车将在5分钟后结束，结束后我们将自动为您寻找停车点 + 包车将在15分钟后结束，结束后我们将自动为您寻找停车点 距离（KM） diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt index bf1bc8d602..498a9ef234 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt @@ -74,15 +74,15 @@ object VoiceManager { } fun surplus5min(){ - surplus5min(null) + surplus15min(null) } - fun surplus5min(callBack: IMogoTTSCallback?=null) { + fun surplus15min(callBack: IMogoTTSCallback?=null) { val contenxt = AbsMogoApplication.getApp() val list: MutableList = ArrayList() - val chineseTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_zh), LanguageType.CHINESE) - val engTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_en), LanguageType.ENGLISH) - val koreanTTS = LangTtsEntity(contenxt.getString(R.string.surplus5_order_ko), LanguageType.KOREAN) + val chineseTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_zh), LanguageType.CHINESE) + val engTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_en), LanguageType.ENGLISH) + val koreanTTS = LangTtsEntity(contenxt.getString(R.string.surplus15_order_ko), LanguageType.KOREAN) list.add(chineseTTS) list.add(engTTS) list.add(koreanTTS) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt index 788f31e491..92f993947d 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt @@ -5,8 +5,11 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.R import com.mogo.och.common.module.manager.DriverMoFangFunctionManager +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager +import com.mogo.och.common.module.utils.SoundPoolHelper import kotlinx.android.synthetic.main.driver_mofang_function_view.view.* /** @@ -43,6 +46,14 @@ class DriverMoFangFunctionView @JvmOverloads constructor( DriverMoFangFunctionManager.driverMoFangFunctionManager.sendOperatorSetHornByDriver() true } + openDoorIv.onClick { + LightAirconditionDoorManager.go2OpenDoor(true) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.beep) + } + closeDoorIv.onClick { + LightAirconditionDoorManager.go2OpenDoor(false) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.beep) + } } } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png old mode 100644 new mode 100755 index ba8d48e24a..269069f2e7 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png old mode 100644 new mode 100755 index 1728ad0b4a..f0ca7da50f Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png old mode 100644 new mode 100755 index b0c8eb25ba..00b42eff51 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/driver_mofang_function_bg.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png old mode 100644 new mode 100755 index 1cf6ad1798..7f3748a0f1 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png old mode 100644 new mode 100755 index a477bcd438..4c669a603b Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png new file mode 100755 index 0000000000..123f9add3c Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png new file mode 100755 index 0000000000..9a6589861a Binary files /dev/null and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png old mode 100644 new mode 100755 index 65884ac663..96430e7f34 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png old mode 100644 new mode 100755 index 4e4cf034ba..a5ccee1396 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png old mode 100644 new mode 100755 index b820701bb9..c46f827f5d Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png old mode 100644 new mode 100755 index ae7623ede6..46f494b568 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png and b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml new file mode 100644 index 0000000000..0fa53e8afb --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/layout/driver_mofang_function_view.xml b/OCH/mogo-och-common-module/src/main/res/layout/driver_mofang_function_view.xml index 1e2a59046c..b014e4aed3 100644 --- a/OCH/mogo-och-common-module/src/main/res/layout/driver_mofang_function_view.xml +++ b/OCH/mogo-och-common-module/src/main/res/layout/driver_mofang_function_view.xml @@ -1,16 +1,16 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/values/strings.xml b/OCH/mogo-och-common-module/src/main/res/values/strings.xml index 132b2e8eb1..16d624ac59 100644 --- a/OCH/mogo-och-common-module/src/main/res/values/strings.xml +++ b/OCH/mogo-och-common-module/src/main/res/values/strings.xml @@ -23,9 +23,9 @@ The next station is %1$s 전방에서 역에 도착하는 %1$s - 5分钟后包车就要结束了，稍后小助手会自动为您寻找停车点 - There are 5 minutes left from the end of chartering. Please arrange your time reasonably - 전세버스 종료 후 5분 남았습니다. 여행 시간을 합리적으로 안배해 주십시오 + 15分钟后包车就要结束了，稍后小助手会自动为您寻找停车点 + There are 15 minutes left from the end of chartering. Please arrange your time reasonably + 전세버스 종료 후 15분 남았습니다. 여행 시간을 합리적으로 안배해 주십시오 感谢您体验\'蘑菇车联\'自动驾驶小巴车，本次旅程已结束，我们下次乘车再见 Thank you for experiencing the self-driving minibus. See you next time