[6.2.6]

[taxi-p]
[整理]

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt

@@ -7,8 +7,8 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.mogo.och.taxi.passenger.R
-import kotlinx.android.synthetic.main.m1_bottom_check.view.aciv_center_image
-import kotlinx.android.synthetic.main.m1_bottom_check.view.actv_title
+import kotlinx.android.synthetic.main.taxi_p_bottom_check.view.aciv_center_image
+import kotlinx.android.synthetic.main.taxi_p_bottom_check.view.actv_title
 
 open class BottomCheckView @JvmOverloads constructor(
     context: Context,
@@ -31,7 +31,7 @@ open class BottomCheckView @JvmOverloads constructor(
     private var isCheck = false
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_check, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxi_p_bottom_check, this, true)
         try {
             val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
             backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt

@@ -198,14 +198,14 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener {
         numSelectTextView.forEachIndexed { indexIn, textView ->
             if(indexIn==index){
                 numSelectTextView[index]!!.setBackgroundResource(R.drawable.bg_taxi_p_checked_input_background)
-                numSelectTextView[index]!!.setTextColor(resources.getColor(R.color.taxi_p_check_keyboard_input_field_checked))
+                numSelectTextView[index]!!.setTextColor(resources.getColor(android.R.color.white))
                 numSelectTextView[index]!!.setShadowLayer(0f,0f,0f,
-                    resources.getColor(R.color.taxi_p_check_keyboard_input_field_checked_text_shadow))
+                    resources.getColor(android.R.color.white))
             }else{
-                numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.bg_taxi_p_check_input_background)
-                numSelectTextView[indexIn]!!.setTextColor(resources.getColor(R.color.taxi_p_check_keyboard_input_field))
+                numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.taxi_p_check_input_background)
+                numSelectTextView[indexIn]!!.setTextColor(resources.getColor(R.color.taxi_p_FF282F62))
                 numSelectTextView[indexIn]!!.setShadowLayer(20f,0f,2f,
-                        resources.getColor(R.color.taxi_p_check_keyboard_input_field_checked_text_shadow))
+                        resources.getColor(android.R.color.white))
             }
         }
 
@@ -223,7 +223,7 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener {
         sb.setSpan(
             TextAppearanceSpan("default",
                 Typeface.NORMAL,100,
-                resources.getColorStateList(R.color.taxi_p_check_passenger_number) ,null ),
+                resources.getColorStateList(R.color.taxi_p_FFFFC836) ,null ),
             4, 5, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
         tv_passenger_count.text = sb
         tv_passenger_start.text = "起 点 :  $startSiteAddr"

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt

@@ -175,7 +175,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
         taxi_p_start_autopilot?.let {
             if (isBoarded) {
                 it.setTextColor(
-                    ContextCompat.getColor(context, R.color.taxi_p_start_autopilot_txt_color)
+                    ContextCompat.getColor(context, android.R.color.white)
                 )
                 it.background = null
             } else {
@@ -183,7 +183,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
                     ContextCompat.getDrawable(context, R.drawable.taxi_p_start_autopilot_txt_btn_bg)
                 taxi_p_autopilot_btn_bg!!.background = null
                 it.setTextColor(
-                    ContextCompat.getColor(context, R.color.taxi_p_start_autopilot_txt_un_color)
+                    ContextCompat.getColor(context, R.color.taxi_p_4dffffff)
                 )
             }
             it.tag = isBoarded
@@ -208,7 +208,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
             isStarting = true
             taxi_p_start_autopilot?.text = resources.getString(R.string.taxi_p_start_autopilot_loading)
             taxi_p_start_autopilot?.setTextColor(
-                ContextCompat.getColor(context, R.color.taxi_p_start_autopilot_txt_color)
+                ContextCompat.getColor(context, android.R.color.white)
             )
             startingAutopilotCountDown()
         } else {

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java

@@ -1,7 +1,6 @@
 package com.mogo.och.taxi.passenger.ui.video;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -52,7 +51,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
     @NonNull
     @Override
     public RecyclerItemVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(context).inflate(R.layout.list_video_item_light, parent, false);
+        View v = LayoutInflater.from(context).inflate(R.layout.taxi_p_video_item_light, parent, false);
         RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
         recyclerItemVideoHolder.setIsRecyclable(false);
         return recyclerItemVideoHolder;

OCH/taxi/passenger/src/main/res/anim/alpha_show_hide.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="1000" android:fromAlpha="1" android:toAlpha="0" />

OCH/taxi/passenger/src/main/res/anim/left_to_right.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:startOffset="500"  >
-<translate
-    android:duration="142"
-    android:fromXDelta="-110%"
-    android:toXDelta="0"/>
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"  android:duration="142"  />
-</set>

OCH/taxi/passenger/src/main/res/anim/right_to_left.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:startOffset="500" >
-<translate
-    android:duration="142"
-    android:fromXDelta="0"
-    android:toXDelta="-110%"/>
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"  android:duration="142"  />
-</set>

OCH/taxi/passenger/src/main/res/animator/alpha_hide_hide_f.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator android:propertyName="alpha" android:duration="1000" android:valueFrom="1.0" android:valueTo="0.0"/>
-</set>

OCH/taxi/passenger/src/main/res/animator/alpha_hide_show_f.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator android:propertyName="alpha" android:duration="1000" android:valueFrom="0.0" android:valueTo="1.0"/>
-</set>

OCH/taxi/passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/taxi_autopilot_text_color_normal"/>
-</selector>