[charter]

[3.2.0]
[UI调整]

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt

@@ -53,7 +53,7 @@ class MainFragment :
             R.drawable.m1_small_map_view_dir_end)
     private val lineTrajectory =
         BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources,
-            com.mogo.eagle.core.function.map.R.drawable.taxi_map_arrow_arrived)
+            R.drawable.charter_p_trajectory_line)
 
     override fun getLayoutId(): Int {
         return R.layout.m1_main_fragment

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt

@@ -3,9 +3,11 @@ package com.mogo.och.bus.passenger.ui.view.bottom.impl
 import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
@@ -24,11 +26,11 @@ import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
 
-class GoView @JvmOverloads constructor(
+class GoViewWithArrive @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : AppCompatTextView(context, attrs, defStyleAttr) {
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     var applyClickListener: BottomClickView.ApplyClickLintener?=null
 
@@ -39,6 +41,7 @@ class GoView @JvmOverloads constructor(
     }
 
     init {
+        LayoutInflater.from(context).inflate(R.layout.m1_bottom_go, this, true)
         setBackgroundResource(R.drawable.charter_p_bottom_center_normal)
         setOnTouchListener(object :OnTouchListener{
             @SuppressLint("ClickableViewAccessibility")

OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_order_closedoor_press.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/charter_p_order_closedoor_normal"
+        android:width="@dimen/dp_108"
+        android:height="@dimen/dp_108"/>
+    <item >
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_54"/>
+            <solid android:color="#30000000"/>
+        </shape>
+    </item>
+</layer-list >

OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_8"/>
-    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE"/>
+    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE" android:angle="0"/>
 </shape>

OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_opendoor_press.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/m1_order_opendoor_normal"
+        android:width="@dimen/dp_108"
+        android:height="@dimen/dp_108"/>
+    <item >
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_54"/>
+            <solid android:color="#30000000"/>
+        </shape>
+    </item>
+</layer-list >

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml

@@ -8,11 +8,8 @@
     tools:ignore="MissingDefaultResource">
 
 
-    <com.mogo.och.bus.passenger.ui.view.bottom.impl.GoView
+    <com.mogo.och.bus.passenger.ui.view.bottom.impl.GoViewWithArrive
         android:id="@+id/aciv_center_image"
-        android:text="出发"
-        android:gravity="center"
-        android:textSize="@dimen/dp_48"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:textColor="@android:color/white"
@@ -103,7 +100,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="@dimen/dp_167"
+        android:layout_width="@dimen/dp_175"
         android:layout_height="match_parent"/>
 
     <androidx.appcompat.widget.AppCompatImageView

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_489"
+    android:layout_height="@dimen/dp_107"
+    android:background="@drawable/charter_p_bottom_center_normal"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    tools:ignore="MissingDefaultResource">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_arrow_right_go"
+        android:src="@drawable/charter_p_right_arrow_go"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/actv_go_title"
+        android:layout_width="73dp"
+        android:layout_height="@dimen/dp_53"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/actv_go_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/aciv_arrow_right_go"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textSize="@dimen/dp_48"
+        android:textColor="@android:color/white"
+        android:text="出发"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
+
+</merge>

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml

@@ -120,14 +120,26 @@
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_click_go_explore"
         app:layout_constraintStart_toStartOf="@+id/v_clikc_go_explore_bg"
-        app:layout_constraintEnd_toEndOf="@+id/v_clikc_go_explore_bg"
+        app:layout_constraintEnd_toStartOf="@+id/aciv_arrow_right"
         app:layout_constraintTop_toTopOf="@+id/v_clikc_go_explore_bg"
+        app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="@+id/v_clikc_go_explore_bg"
+        android:layout_marginEnd="@dimen/dp_10"
         android:text="点击开始探索"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_30"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_arrow_right"
+        android:src="@drawable/charter_p_right_arrow_novice_guidance"
+        app:layout_constraintTop_toTopOf="@+id/v_clikc_go_explore_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/v_clikc_go_explore_bg"
+        app:layout_constraintStart_toEndOf="@+id/actv_click_go_explore"
+        app:layout_constraintEnd_toEndOf="@+id/v_clikc_go_explore_bg"
+        android:layout_width="@dimen/dp_50"
+        android:layout_height="@dimen/dp_34"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>