diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt index 22a28ddd8c..a7e1eb3083 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusView.kt @@ -2,15 +2,19 @@ package com.mogo.och.common.module.wigets.map.orderstatus import android.content.Context import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.RelativeLayout import androidx.appcompat.widget.AppCompatImageView +import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.common.module.R +import kotlinx.android.synthetic.main.common_order_status_view.view.iv_order_status /** * */ -class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback { +class OrderStatusView : RelativeLayout, OrderStatusViewModel.IVisualCallback { private val TAG = "VisualView" @@ -25,7 +29,7 @@ class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback ) private fun initView() { - setImageResource(R.drawable.common_status_unorder) + LayoutInflater.from(context).inflate(R.layout.common_order_status_view, this, true) } override fun onAttachedToWindow() { @@ -48,8 +52,20 @@ class OrderStatusView : AppCompatImageView, OrderStatusViewModel.IVisualCallback } } - override fun setImageViewResource(name: Int) { - setImageResource(name) + override fun setImageViewResource(name: Int,ordering:Boolean) { + iv_order_status.setImageResource(name) + if (iv_order_status.layoutParams is RelativeLayout.LayoutParams) { + val temp = iv_order_status.layoutParams as RelativeLayout.LayoutParams + temp.removeRule(RelativeLayout.ALIGN_PARENT_START) + temp.addRule(ALIGN_PARENT_END) + iv_order_status.layoutParams = temp + }else{ + val temp = iv_order_status.layoutParams as RelativeLayout.LayoutParams + temp.removeRule(RelativeLayout.ALIGN_PARENT_END) + temp.addRule(ALIGN_PARENT_START) + iv_order_status.layoutParams = temp + } + } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt index ad8e90818d..82f4b26dfe 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/orderstatus/OrderStatusViewModel.kt @@ -32,16 +32,17 @@ class OrderStatusViewModel : ViewModel(), ILoginCallback { override fun onOpenOrderStatusEnumChange(businessEnum: OpenOrderStatusEnum?) { UiThreadHandler.post({ if (LoginStatusManager.isOpenOrderType()) { - this.viewCallback?.setImageViewResource(R.drawable.common_status_ordinging) + this.viewCallback?.setImageViewResource(R.drawable.common_order_status,true) } else { - this.viewCallback?.setImageViewResource(R.drawable.common_status_unorder) + this.viewCallback?.setImageViewResource(R.drawable.common_unorder_status,false) } + }, UiThreadHandler.MODE.QUEUE) } interface IVisualCallback { - fun setImageViewResource(@DrawableRes name: Int) + fun setImageViewResource(@DrawableRes name: Int,ordering:Boolean) } } \ No newline at end of file diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png new file mode 100755 index 0000000000..869a3eeb4f Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status.png differ diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png new file mode 100755 index 0000000000..f84de094a2 Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_order_status_bg.png differ diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png b/OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png new file mode 100755 index 0000000000..52e9b671fc Binary files /dev/null and b/OCH/common/common/src/main/res/drawable-nodpi/common_unorder_status.png differ diff --git a/OCH/common/common/src/main/res/layout/common_order_status_view.xml b/OCH/common/common/src/main/res/layout/common_order_status_view.xml new file mode 100644 index 0000000000..f471a2180d --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_order_status_view.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt index 2364dcf294..bf4001fb40 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/TaxiUnmannedDriverProvider.kt @@ -4,8 +4,10 @@ import android.content.Context import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics @@ -46,9 +48,20 @@ class TaxiUnmannedDriverProvider : CommonServiceImpl() { } override fun createOchBusinessView(context: Context?): View? { + CallerLogger.d(SceneConstant.M_TAXI + tag, "createOchBusinessView") return context?.let { SwitchBizView(it) } } + companion object{ + fun getFragmentInfo():Fragment?{ + (ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_DRIVER) + .navigation() as? CommonService)?.apply { + return getFragment() + } + return null + } + } + } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt index 0a991bb6f5..616286ca4d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt @@ -3,14 +3,24 @@ package com.mogo.och.unmanned.taxi.ui.bizswitch import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View +import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.commons.module.status.MogoStatusManager +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.utils.FlowBus import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst import kotlinx.android.synthetic.main.unmanned_switch_biz.view.loading_biz +import kotlinx.android.synthetic.main.unmanned_switch_biz.view.order_operation_change +import kotlinx.android.synthetic.main.unmanned_switch_biz.view.taxiServerSelector class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallback { @@ -30,16 +40,42 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac private var viewModel: SwtichBizeModel?=null + private var fragment: LifecycleOwner?=null + init { LayoutInflater.from(context).inflate(R.layout.unmanned_switch_biz, this, true) initView() + initEventBus() } private fun initView(){ + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() loading_biz.setEmptyText(ResourcesUtils.getString(R.string.common_biz_loading)) + order_operation_change.onClick { + if (MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingVerifyMode) { + ToastUtils.showLong("退出验证模式后再接单吧") + return@onClick + } + viewModel?.changeOperationStatus() + } } + private fun initEventBus() { + fragment?.let { + FlowBus.with(TaxiDriverEventConst.TabFragmentEvent.EVENT_TYPE_SHOW_RED_POINT) + .register(it) { show -> + taxiServerSelector.setNextItineraryRedBagVisable( if (show) View.VISIBLE else View.GONE) + } +// FlowBus.with(TaxiDriverEventConst.TabFragmentEvent.EVENT_TYPE_TASK_WITH_ORDER_CHANGED) +// .register(it) { taskWithOrder -> +// nextTaskFragment?.onTaskDataChanged(taskWithOrder) +// } + } + + } + + override fun onAttachedToWindow() { super.onAttachedToWindow() viewModel = findViewTreeViewModelStoreOwner()?.let { @@ -54,7 +90,6 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac override fun showLoadingView(){ startLoading = System.currentTimeMillis() loading_biz.visibility = GONE - } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt index 6117199ee5..31f7ec9af9 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwtichBizeModel.kt @@ -1,6 +1,7 @@ package com.mogo.och.unmanned.taxi.ui.bizswitch import androidx.lifecycle.ViewModel +import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel /** * @author XuXinChao @@ -18,6 +19,10 @@ class SwtichBizeModel : ViewModel() { } + fun changeOperationStatus(){ + TaxiTaskModel.updateCarServingStatus() + } + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { this.viewCallback = viewCallback this.viewCallback?.showLoadingView() diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt new file mode 100644 index 0000000000..276cffad25 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt @@ -0,0 +1,52 @@ +package com.mogo.och.unmanned.taxi.ui.bizswitch + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.map.listener.IMogoMapListener +import com.mogo.och.unmanned.taxi.R +import kotlinx.android.synthetic.main.taxi_select_view_group.view.textNextItinerary + +class TaxiSelectViewGroup @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr),IMogoMapListener { + companion object { + const val TAG = "LoadingMapStatusView" + } + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_select_view_group, this, true) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerLogger.d(TAG,"onAttachedToWindow") + } + + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + + }else{ + + } + + } + + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerLogger.d(TAG,"onDetachedFromWindow") + } + + fun setNextItineraryRedBagVisable(visibility: Int) { + textNextItinerary.setRedBagVisable(visibility) + } + + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt new file mode 100644 index 0000000000..52bc9237a1 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt @@ -0,0 +1,29 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarycurrent + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class ItineraryCurrentModel : ViewModel() { + + private val TAG = ItineraryCurrentModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { + this.viewCallback = viewCallback + } + + interface SwtichLineViewCallback { + + } +} + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt new file mode 100644 index 0000000000..fa36fe5fa2 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt @@ -0,0 +1,53 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarycurrent + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider + +class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineViewCallback { + + + 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) + + + companion object { + const val TAG = "SwitchBizView" + } + + private var viewModel: ItineraryCurrentModel?=null + + private var fragment: LifecycleOwner?=null + + + init { + LayoutInflater.from(context).inflate(R.layout.unmanned_itinerary_current, this, true) + initView() + } + + private fun initView(){ + setBackgroundResource(R.drawable.shape_itinerary_bg_default) + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(ItineraryCurrentModel::class.java) + } + viewModel?.setDistanceCallback(this) + } + +} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt new file mode 100644 index 0000000000..2f93c8d360 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt @@ -0,0 +1,29 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarynext + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class ItineraryNextModel : ViewModel() { + + private val TAG = ItineraryNextModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun setDistanceCallback(viewCallback: SwtichLineViewCallback) { + this.viewCallback = viewCallback + } + + interface SwtichLineViewCallback { + + } +} + diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt new file mode 100644 index 0000000000..a1a75d7974 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt @@ -0,0 +1,52 @@ +package com.mogo.och.unmanned.taxi.ui.itinerarynext + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.och.common.module.wigets.WindowRelativeLayout +import com.mogo.och.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider + +class ItineraryNextView: WindowRelativeLayout, ItineraryNextModel.SwtichLineViewCallback { + + + 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) + + + companion object { + const val TAG = "SwitchBizView" + } + + private var viewModel: ItineraryNextModel?=null + + private var fragment: LifecycleOwner?=null + + + init { + LayoutInflater.from(context).inflate(R.layout.unmanned_itinerary_next, this, true) + initView() + } + + private fun initView() { + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it)[ItineraryNextModel::class.java] + } + viewModel?.setDistanceCallback(this) + } + +} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt index ba227db631..078d80b4ad 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt @@ -11,6 +11,7 @@ import com.mogo.map.listener.IMogoMapListener import com.mogo.och.unmanned.taxi.R import kotlinx.android.synthetic.main.taxi_select_view.view.aciv_check_state import kotlinx.android.synthetic.main.taxi_select_view.view.actv_server_name +import kotlinx.android.synthetic.main.taxi_select_view.view.wait_order_num class TaxiSelectView @JvmOverloads constructor( context: Context, @@ -69,6 +70,9 @@ class TaxiSelectView @JvmOverloads constructor( CallerLogger.d(TAG,"onDetachedFromWindow") } + fun setRedBagVisable(visibility: Int) { + wait_order_num.visibility = visibility + } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png new file mode 100755 index 0000000000..5743583744 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_new_message.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_close.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_close.png new file mode 100755 index 0000000000..0b10612907 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_close.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png new file mode 100755 index 0000000000..dfa74f0a44 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_end_station_point.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png new file mode 100755 index 0000000000..62ec826abb Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_current_start_station_point.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png new file mode 100755 index 0000000000..1eca96d541 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_end_station_point.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_exercise.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_exercise.png new file mode 100755 index 0000000000..12542d0bec Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_exercise.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_nav.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_nav.png new file mode 100755 index 0000000000..7d901eb1d3 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_nav.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png new file mode 100755 index 0000000000..8022b12092 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_order.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png new file mode 100755 index 0000000000..b2c4edba60 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_start_station_point.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml new file mode 100644 index 0000000000..33cd161e8c --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_default.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml new file mode 100644 index 0000000000..190dd17629 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/shape_itinerary_bg_order_count.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml index ddf43327bb..3f184f2f38 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml @@ -21,7 +21,7 @@ android:id="@+id/actv_server_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="false" + tools:checked="true" android:button="@null" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -29,4 +29,15 @@ android:text="@string/task_current_itinerary" android:textColor="@color/taxi_biz_text_color_selector" android:textSize="@dimen/dp_45" /> + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml new file mode 100644 index 0000000000..b2935175a7 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view_group.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml new file mode 100644 index 0000000000..fd6679d196 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml new file mode 100644 index 0000000000..cfc8550727 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_next.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml index aa6dc4acf4..e441e5f713 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml @@ -20,6 +20,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + - + + + + - diff --git a/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml b/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml index 177f69f99e..0ce09bc38c 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml @@ -35,4 +35,6 @@ #CCB9C3E9 #2EACFF #4Dffffff + #4D000000 + #CCCCCC \ No newline at end of file