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 ed7f4b7060..0a991bb6f5 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 @@ -53,7 +53,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac // 展示loading页面 override fun showLoadingView(){ startLoading = System.currentTimeMillis() - loading_biz.visibility = VISIBLE + loading_biz.visibility = GONE } 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 new file mode 100644 index 0000000000..ba227db631 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt @@ -0,0 +1,74 @@ +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.mogo.logger.CallerLogger +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 + +class TaxiSelectView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr),IMogoMapListener { + companion object { + const val TAG = "LoadingMapStatusView" + } + + private lateinit var taxiServerTitle:String + + init { + LayoutInflater.from(context).inflate(R.layout.taxi_select_view, this, true) + try { + val typedArray = context.obtainStyledAttributes(attrs, R.styleable.TaxiSelectView) + taxiServerTitle = typedArray.getString(R.styleable.TaxiSelectView_taxi_server_title)?:"" + + typedArray.recycle() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun onAttachedToWindow() { + 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 + } + } + } + } + + fun setCheck(isCheck:Boolean){ + actv_server_name.isChecked = isCheck + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + + }else{ + + } + } + + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerLogger.d(TAG,"onDetachedFromWindow") + } + + + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/color/taxi_biz_text_color_selector.xml b/OCH/taxi/unmanned-driver/src/main/res/color/taxi_biz_text_color_selector.xml new file mode 100644 index 0000000000..09022e109f --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/color/taxi_biz_text_color_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_selected_head.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_selected_head.png new file mode 100755 index 0000000000..7b7f32a6dd Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_selected_head.png differ 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 new file mode 100644 index 0000000000..ddf43327bb --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml @@ -0,0 +1,32 @@ + + + + + + + \ 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 106e0b4041..aa6dc4acf4 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 @@ -6,6 +6,20 @@ xmlns:tools="http://schemas.android.com/tools" android:background="@drawable/taxi_biz_bg"> + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml b/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml new file mode 100644 index 0000000000..99006aeb52 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 e57d0be01c..177f69f99e 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/values/colors.xml @@ -33,5 +33,6 @@ #F7151D41 #2966EC #CCB9C3E9 + #2EACFF #4Dffffff \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/values/strings.xml b/OCH/taxi/unmanned-driver/src/main/res/values/strings.xml index 0c01eb4938..3994f51619 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/values/strings.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/values/strings.xml @@ -51,6 +51,8 @@ 前往送驾 前往接驾 当前位置 + 当前行程 + 待服务 运营单 演练单 等待乘客