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 616286ca4d..eace2154aa 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 @@ -19,8 +19,6 @@ 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 { @@ -52,26 +50,9 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac 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) -// } - } } @@ -92,45 +73,4 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac loading_biz.visibility = GONE } - - /** - * 初始化数据 - */ - override fun loadLineData() { - - } - - - // 展示选择任务页面 - override fun showSwitchTaskInfo() { - val endLoading = System.currentTimeMillis() - - val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 - CallerLogger.d(TAG,"展示任务 lading 展示了 ${dex}毫秒") - - ThreadUtils.runOnUiThreadDelayed({ - loading_biz.visibility = GONE - },dex,ThreadUtils.MODE.QUEUE) - } - - // 展示选择线路页面 - override fun showSwtichLineView() { - val endLoading = System.currentTimeMillis() - val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 - CallerLogger.d(TAG,"展示线路 lading 展示了 ${dex}毫秒") - ThreadUtils.runOnUiThreadDelayed({ - loading_biz.visibility = GONE - },dex,ThreadUtils.MODE.QUEUE) - - } - // 展示正在进行的任务 - override fun loadRunningTask() { - val endLoading = System.currentTimeMillis() - val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0 - CallerLogger.d(TAG,"展示运行中任务 lading 展示了 ${dex}毫秒") - ThreadUtils.runOnUiThreadDelayed({ - loading_biz.visibility = GONE - },dex,ThreadUtils.MODE.QUEUE) - } - } 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 31f7ec9af9..a5bc332af2 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 @@ -29,11 +29,7 @@ class SwtichBizeModel : ViewModel() { } interface SwtichLineViewCallback { - fun showSwtichLineView() fun showLoadingView() - fun showSwitchTaskInfo() - fun loadLineData() - fun loadRunningTask() } } 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 deleted file mode 100644 index 276cffad25..0000000000 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/TaxiSelectViewGroup.kt +++ /dev/null @@ -1,52 +0,0 @@ -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/task/ItinerarySwitchModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/ItinerarySwitchModel.kt new file mode 100644 index 0000000000..1450f2e22d --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/ItinerarySwitchModel.kt @@ -0,0 +1,33 @@ +package com.mogo.och.unmanned.taxi.ui.task + +import androidx.lifecycle.ViewModel + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class ItinerarySwitchModel : ViewModel() { + + private val TAG = ItinerarySwitchModel::class.java.simpleName + + private var viewCallback: SwtichLineViewCallback? = null + + + override fun onCleared() { + + } + + fun changeOperationStatus(){ + TaxiTaskModel.updateCarServingStatus() + } + + 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/task/ItinerarySwitchView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/ItinerarySwitchView.kt new file mode 100644 index 0000000000..7c609145ac --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/ItinerarySwitchView.kt @@ -0,0 +1,108 @@ +package com.mogo.och.unmanned.taxi.ui.task + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +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.unmanned.taxi.R +import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider +import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst +import com.mogo.och.unmanned.taxi.wigets.TaxiSelectViewGroup +import kotlinx.android.synthetic.main.unmanned_switch_itinerary.view.currentItinerary +import kotlinx.android.synthetic.main.unmanned_switch_itinerary.view.nextItinerary +import kotlinx.android.synthetic.main.unmanned_switch_itinerary.view.order_operation_change +import kotlinx.android.synthetic.main.unmanned_switch_itinerary.view.taxiServerSelector + +class ItinerarySwitchView: ConstraintLayout, ItinerarySwitchModel.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: ItinerarySwitchModel?=null + + private var fragment: LifecycleOwner?=null + + + init { + LayoutInflater.from(context).inflate(R.layout.unmanned_switch_itinerary, this, true) + initView() + initEventBus() + } + + private fun initView(){ + fragment = TaxiUnmannedDriverProvider.getFragmentInfo() + order_operation_change.onClick { + if (MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingVerifyMode) { + ToastUtils.showLong("退出验证模式后再接单吧") + return@onClick + } + viewModel?.changeOperationStatus() + } + taxiServerSelector.checkChangeListener = object : TaxiSelectViewGroup.CheckChangeListener{ + override fun changeCheck(newCheck: TaxiSelectViewGroup.ServerType?) { + when (newCheck) { + TaxiSelectViewGroup.ServerType.currentItinerary -> { + currentItinerary.visibility = View.VISIBLE + nextItinerary.visibility = View.GONE + } + TaxiSelectViewGroup.ServerType.nextItinerary -> { + currentItinerary.visibility = View.GONE + nextItinerary.visibility = View.VISIBLE + } + else ->{ + currentItinerary.visibility = View.GONE + nextItinerary.visibility = View.GONE + } + } + } + + } + } + + 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 { + ViewModelProvider(it).get(ItinerarySwitchModel::class.java) + } + viewModel?.setDistanceCallback(this) + } + + +} 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/task/itinerarycurrent/ItineraryCurrentModel.kt similarity index 100% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt 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/task/itinerarycurrent/ItineraryCurrentView.kt similarity index 92% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarycurrent/ItineraryCurrentView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt index fa36fe5fa2..c43a3f0d3d 100644 --- 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/task/itinerarycurrent/ItineraryCurrentView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.taxi.ui.itinerarycurrent +package com.mogo.och.unmanned.taxi.ui.task.itinerarycurrent import android.content.Context import android.util.AttributeSet @@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider +import com.mogo.och.unmanned.taxi.ui.itinerarycurrent.ItineraryCurrentModel class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineViewCallback { @@ -37,7 +38,6 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi } private fun initView(){ - setBackgroundResource(R.drawable.shape_itinerary_bg_default) fragment = TaxiUnmannedDriverProvider.getFragmentInfo() } 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/task/itinerarynext/ItineraryNextModel.kt similarity index 100% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarynext/ItineraryNextModel.kt 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/task/itinerarynext/ItineraryNextView.kt similarity index 60% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/itinerarynext/ItineraryNextView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarynext/ItineraryNextView.kt index a1a75d7974..964d18fa25 100644 --- 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/task/itinerarynext/ItineraryNextView.kt @@ -1,25 +1,27 @@ -package com.mogo.och.unmanned.taxi.ui.itinerarynext +package com.mogo.och.unmanned.taxi.ui.task.itinerarynext 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.common.module.wigets.WindowRelativeLayout import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider +import com.mogo.och.unmanned.taxi.ui.itinerarynext.ItineraryNextModel -class ItineraryNextView: WindowRelativeLayout, ItineraryNextModel.SwtichLineViewCallback { +class ItineraryNextView: ConstraintLayout, ItineraryNextModel.SwtichLineViewCallback { - constructor(context: Context?) : super(context) + constructor(context: Context) : super(context) - constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet) + 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) : super(context, attributeSet, defStyleAttr) - constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) companion object { 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 078d80b4ad..5c268e7dd1 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 @@ -1,11 +1,10 @@ package com.mogo.och.unmanned.taxi.wigets import android.content.Context -import android.content.res.TypedArray import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.map.listener.IMogoMapListener import com.mogo.och.unmanned.taxi.R @@ -24,6 +23,8 @@ class TaxiSelectView @JvmOverloads constructor( private lateinit var taxiServerTitle:String + var checkChangeListener:CheckChangeListener?=null + init { LayoutInflater.from(context).inflate(R.layout.taxi_select_view, this, true) try { @@ -40,19 +41,28 @@ class TaxiSelectView @JvmOverloads constructor( super.onAttachedToWindow() CallerLogger.d(TAG,"onAttachedToWindow") actv_server_name.text = taxiServerTitle - actv_server_name.setOnCheckedChangeListener { buttonView, isChecked -> - if(buttonView.id==R.id.actv_server_name){ - if(isChecked){ - aciv_check_state.visibility = VISIBLE - }else{ - aciv_check_state.visibility = GONE - } + + onClick { + if (actv_server_name.isChecked) { + return@onClick + }else{ + actv_server_name.isChecked = true + aciv_check_state.visibility = VISIBLE + checkChangeListener?.onCheckChangeListener(actv_server_name.isChecked) } } } fun setCheck(isCheck:Boolean){ - actv_server_name.isChecked = isCheck + if (isCheck) { + actv_server_name.isChecked = true + aciv_check_state.visibility = VISIBLE + checkChangeListener?.onCheckChangeListener(actv_server_name.isChecked) + }else{ + actv_server_name.isChecked = false + aciv_check_state.visibility = GONE + checkChangeListener?.onCheckChangeListener(actv_server_name.isChecked) + } } override fun onVisibilityAggregated(isVisible: Boolean) { @@ -74,5 +84,9 @@ class TaxiSelectView @JvmOverloads constructor( wait_order_num.visibility = visibility } + interface CheckChangeListener{ + fun onCheckChangeListener(isCheck: Boolean) + } + } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectViewGroup.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectViewGroup.kt new file mode 100644 index 0000000000..9c04f15962 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectViewGroup.kt @@ -0,0 +1,90 @@ +package com.mogo.och.unmanned.taxi.wigets + +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.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager.M_LISTENERS +import com.mogo.och.unmanned.taxi.R +import kotlinx.android.synthetic.main.taxi_select_view_group.view.textCurrentItinerary +import kotlinx.android.synthetic.main.taxi_select_view_group.view.textNextItinerary +import kotlin.properties.Delegates + +class TaxiSelectViewGroup @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr),IMogoMapListener { + companion object { + const val TAG = "LoadingMapStatusView" + } + + private var checkType:ServerType? by Delegates.observable(null) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkChangeListener?.changeCheck(newValue) + } + } + var checkChangeListener:CheckChangeListener?=null + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_select_view_group, this, true) + initView() + } + + private fun initView() { + textCurrentItinerary.checkChangeListener = object : TaxiSelectView.CheckChangeListener{ + override fun onCheckChangeListener(isCheck: Boolean) { + if(isCheck){ + checkType = ServerType.currentItinerary + textNextItinerary.setCheck(false) + } + } + } + textNextItinerary.checkChangeListener = object : TaxiSelectView.CheckChangeListener{ + override fun onCheckChangeListener(isCheck: Boolean) { + if(isCheck){ + checkType = ServerType.nextItinerary + textCurrentItinerary.setCheck(false) + } + } + } + } + + 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) + } + + enum class ServerType{ + currentItinerary, + nextItinerary + } + + interface CheckChangeListener{ + fun changeCheck(newCheck:ServerType?) + } + + +} \ 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 3f184f2f38..0b5cc90041 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 @@ -17,7 +17,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:src="@drawable/taxi_selected_head" /> - + + + + - - - \ 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 e441e5f713..d1053f5c78 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 @@ -36,6 +36,12 @@ android:layout_width="@dimen/dp_856" android:layout_height="@dimen/dp_100"/> + - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml new file mode 100644 index 0000000000..2c807a6f4e --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + \ No newline at end of file