From 8c8ed56e15d0ac39bde9d2445510d279e37e782f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 8 Oct 2024 17:41:27 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E8=A1=8C=E7=A8=8Btitle]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/bizswitch/SwitchBizView.kt        |   2 +-
 .../unmanned/taxi/wigets/TaxiSelectView.kt    |  74 +++++++++++++
 .../color/taxi_biz_text_color_selector.xml    |   5 +
 .../res/drawable-nodpi/taxi_selected_head.png | Bin 0 -> 6089 bytes
 .../src/main/res/layout/taxi_select_view.xml  |  32 ++++++
 .../main/res/layout/unmanned_switch_biz.xml   |  28 +++++
 .../src/main/res/values/attrs.xml             |  98 ++++++++++++++++++
 .../src/main/res/values/colors.xml            |   1 +
 .../src/main/res/values/strings.xml           |   2 +
 9 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/wigets/TaxiSelectView.kt
 create mode 100644 OCH/taxi/unmanned-driver/src/main/res/color/taxi_biz_text_color_selector.xml
 create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_selected_head.png
 create mode 100644 OCH/taxi/unmanned-driver/src/main/res/layout/taxi_select_view.xml
 create mode 100644 OCH/taxi/unmanned-driver/src/main/res/values/attrs.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/taxi_color_2eacff" android:state_checked="true"/>
+    <item android:color="@color/white" android:state_checked="false"/>
+</selector>
\ 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 0000000000000000000000000000000000000000..7b7f32a6ddd50e41da0752a77cae125ea47b3ed9
GIT binary patch
literal 6089
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

literal 0
HcmV?d00001

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll_loaing_view"
+    android:layout_width="@dimen/dp_253"
+    android:layout_height="@dimen/dp_113">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_check_state"
+        android:layout_width="@dimen/dp_253"
+        android:layout_height="@dimen/dp_113"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/taxi_selected_head" />
+
+    <androidx.appcompat.widget.AppCompatCheckBox
+        android:id="@+id/actv_server_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        android:button="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/task_current_itinerary"
+        android:textColor="@color/taxi_biz_text_color_selector"
+        android:textSize="@dimen/dp_45" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_h_top"
+        app:layout_constraintGuide_begin="@dimen/dp_20"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_v_left"
+        app:layout_constraintGuide_begin="@dimen/dp_41"
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <androidx.appcompat.widget.AppCompatImageView
         android:src="@drawable/taxi_biz_bg_header"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,6 +40,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <com.mogo.och.unmanned.taxi.wigets.TaxiSelectView
+        app:taxi_server_title="@string/task_current_itinerary"
+        app:layout_constraintTop_toBottomOf="@+id/guideline_h_top"
+        app:layout_constraintStart_toEndOf="@+id/guideline_v_left"
+        android:layout_marginStart="@dimen/dp_24"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
+    <com.mogo.och.unmanned.taxi.wigets.TaxiSelectView
+        app:layout_constraintTop_toBottomOf="@+id/guideline_h_top"
+        app:layout_constraintStart_toEndOf="@+id/guideline_v_left"
+        app:taxi_server_title="@string/task_next_itinerary"
+        android:layout_marginStart="@dimen/dp_237"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--圆角ImageView布局 -->
+    <declare-styleable name="TaxiSelectView">
+        <attr name="taxi_server_title" format="string" />
+    </declare-styleable>
+
+    <!--阴影布局 -->
+    <declare-styleable name="ShadowLayout">
+        <!-- 阴影颜色-->
+        <attr name="shadowColor" format="color"/>
+        <!-- 圆角大小，默认无圆角0-->
+        <attr name="shadowRadius" format="dimension"/>
+        <!-- 模糊半径 -->
+        <attr name="blurRadius" format="dimension" />
+        <!-- 是否有点击效果-->
+        <attr name="hasEffect" format="boolean"/>
+        <attr name="bgColor" format="color"/>
+        <!-- 水平位移-->
+        <attr name="xOffset" format="dimension"/>
+        <!--竖直位移 -->
+        <attr name="yOffset" format="dimension"/>
+        <!--横向修正 -->
+        <attr name="blurCorrectX" format="dimension"/>
+        <!--纵向向修正 -->
+        <attr name="blurCorrectY" format="dimension"/>
+        <!-- -->
+        <attr name="shadow_position" format="enum">
+            <enum name="normal" value="0" />
+            <enum name="solid" value="1" />
+            <enum name="outer" value="2" />
+            <enum name="inner" value="3" />
+        </attr>
+    </declare-styleable>
+
+    <!--CardView -->
+    <declare-styleable name="OCHCardViewCorner">
+        <attr name="och_card_left_top_radius" format="dimension" />
+        <attr name="och_card_right_top_radius" format="dimension" />
+        <attr name="och_card_right_bottom_radius" format="dimension" />
+        <attr name="och_card_left_bottom_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="OCHRealtimeBlurView">
+        <attr name="och_realtime_blur_radius" format="dimension" />
+        <attr name="och_realtime_downsample_factor" format="float" />
+        <attr name="och_realtime_overlay_color" format="color" />
+        <attr name="och_realtime_onece" format="boolean" />
+    </declare-styleable>
+    <declare-styleable name="OCHShapeBlurView">
+        <attr name="och_realtime_start_color" format="color" />
+        <attr name="och_realtime_end_color" format="color" />
+        <attr name="och_realtime_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="MarqueeTextView">
+        <attr name="customGap" format="float" />
+        <attr name="useCustomGap" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="MapDirectionView">
+        <!-- 地图样式asset目录下的路径 -->
+        <attr name="mapStylePath" format="string" />
+        <attr name="mapStyleExtraPath" format="string" />
+        <!-- 自车模型图片 -->
+        <attr name="carDrawable" format="reference" />
+        <!-- 罗盘图片 -->
+        <attr name="compassDrawable" format="reference" />
+        <!-- 起点图片 -->
+        <attr name="startPointDrawable" format="reference" />
+        <!-- 终点图片 -->
+        <attr name="endPointDrawable" format="reference" />
+        <!-- 已走过路线的图片 -->
+        <attr name="arrivedDrawable" format="reference" />
+        <!-- 未走过路线的图片 -->
+        <attr name="unArrivedDrawable" format="reference" />
+        <!-- 重置位置图片右面margin -->
+        <attr name="resetDrawableMarginRight" format="dimension" />
+        <!-- 重置位置图片下面margin -->
+        <attr name="resetDrawableMarginBottom" format="dimension" />
+        <!-- 规定屏幕范围的padding -->
+        <attr name="leftPadding" format="integer" />
+        <attr name="topPadding" format="integer" />
+        <attr name="rightPadding" format="integer" />
+        <attr name="bottomPadding" format="integer" />
+    </declare-styleable>
+
+    <declare-styleable name="SlidePanelView">
+        <attr name="textSize" format="dimension" />
+        <attr name="NORMAL_TEXT_MARGIN_LEFT" format="dimension" />
+        <attr name="NORMAL_TEXT_MARGIN_RIGHT" format="dimension" />
+        <attr name="SHORT_TEXT_MARGIN_LEFT" format="dimension" />
+        <attr name="SHORT_TEXT_MARGIN_RIGHT" format="dimension" />
+        <attr name="BLOCK_START_X" format="dimension" />
+        <attr name="BLOCK_START_Y" format="dimension" />
+    </declare-styleable>
+
+</resources>
\ 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 @@
     <color name="routing_verify_choose_line_bg">#F7151D41</color>
     <color name="routing_verify_choose_line">#2966EC</color>
     <color name="taxi_color_ccb9c3e9">#CCB9C3E9</color>
+    <color name="taxi_color_2eacff">#2EACFF</color>
     <color name="taxi_color_4dffffff">#4Dffffff</color>
 </resources>
\ 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 @@
     <string name="task_start_end_site">前往送驾</string>
     <string name="task_start_start_site">前往接驾</string>
     <string name="task_current_loc">当前位置</string>
+    <string name="task_current_itinerary">当前行程</string>
+    <string name="task_next_itinerary">待服务</string>
     <string name="task_order">运营单</string>
     <string name="task_exercise">演练单</string>
     <string name="arrived_start_site">等待乘客</string>