[6.2.6]

[taxi_u_p]
[mv rename]

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -18,7 +18,6 @@ import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter
-import com.mogo.och.taxi.passenger.ui.arrived.ArrivedView
 import com.mogo.och.taxi.passenger.ui.bottom.BottomBar
 import com.mogo.och.taxi.passenger.ui.check.TaxiPassengerCheckView
 import com.mogo.och.taxi.passenger.ui.startautopilot.StartAutopilotView
@@ -50,7 +49,7 @@ class TaxiPassengerBaseFragment() :
     private var createProgressDialogAnim: FrameAnimatorContainer?=null
 
     override fun getLayoutId(): Int {
-        return R.layout.taxi_p_base_fragment
+        return R.layout.taxt_u_p_base_fragment
     }
 
     override fun getTagName(): String {

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt

@@ -42,7 +42,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
 
     private fun initView() {
         d(SceneConstant.M_TAXI_P + TAG, "initView")
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_arrived_end_panel, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_arrived_end_panel, this, true)
         svp_frame.setBackgroundResource(R.drawable.tail_ani_0000)
         svp_frame.setIsTouchWiget(false)
         svp_frame.setIsTouchWigetFull(false)

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt

@@ -43,7 +43,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener,
 
     private fun initView() {
         d(SceneConstant.M_TAXI_P + TAG, "initView")
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_right_rear_cam, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_right_rear_cam, this, true)
     }
 
     override fun onAttachedToWindow() {
@@ -84,7 +84,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener,
 
     fun resetView(){
         actv_cam_position_group.visibility = GONE
-        v_video_right_rear.setImageResource(R.drawable.taxi_p_right_rear_cam)
+        v_video_right_rear.setImageResource(R.drawable.taxt_u_p_right_rear_cam)
     }
 
     override fun onBackCameraVideo(data: ByteArray) {

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt

@@ -20,8 +20,8 @@ class BottomBar @JvmOverloads constructor(
 
     init {
         isClickable = true
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_bottom_bar, this, true)
-        setBackgroundResource(R.drawable.taxi_p_bottom_bar_bg)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_bottom_bar, this, true)
+        setBackgroundResource(R.drawable.taxt_u_p_bottom_bar_bg)
         actv_precisionmap.setOnClickListener {
             setCheckIndex(SelectView.PRECISIONMAP)
         }

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

@@ -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.taxt_u_p_bottom_check, this, true)
         try {
             val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
             backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)

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

@@ -70,7 +70,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener,
 
     private fun initView(context: Context) {
         d(SceneConstant.M_TAXI_P + TAG, "initView")
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_passenger_check_panel, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_passenger_check_panel, this, true)
         keyBoardLogic()
         numSelectTextView[0] = tv_taxi_passenger_number_first
         numSelectTextView[1] = tv_taxi_passenger_number_second
@@ -201,7 +201,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener,
     private fun changeStyle() {
         numSelectTextView.forEachIndexed { indexIn, textView ->
             if(indexIn==index){
-                numSelectTextView[index]!!.setBackgroundResource(R.drawable.bg_taxi_p_checked_input_background)
+                numSelectTextView[index]!!.setBackgroundResource(R.drawable.taxt_u_p_bg_checked_input_background)
 
                 numSelectTextView[index]!!.setTextColor(
                     ContextCompat.getColor(
@@ -217,7 +217,7 @@ class TaxiPassengerCheckView : WindowRelativeLayout, View.OnClickListener,
                     )
                 )
             }else{
-                numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.bg_taxi_p_check_input_background)
+                numSelectTextView[indexIn]!!.setBackgroundResource(R.drawable.taxt_u_p_bg_check_input_background)
                 numSelectTextView[indexIn]!!.setTextColor(
                     ContextCompat.getColor(
                         context,

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt

@@ -30,7 +30,7 @@ class DebugView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_debug, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_debug, this, true)
         visibility = GONE
     }
 

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt

@@ -36,7 +36,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
     constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_itinerary, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_itinerary, this, true)
         setDrawable(true)
 
         progress_distance.progress = 0

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

@@ -1,27 +1,21 @@
 package com.mogo.och.taxi.passenger.ui.startautopilot
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
 import androidx.lifecycle.ViewModelProvider
-import com.elegant.utils.UiThreadHandler
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.OverlayViewUtils
-import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.manager.devicemanage.data.DoorPosition
 import com.mogo.och.common.module.manager.devicemanage.data.DoorState
 import com.mogo.och.common.module.utils.FrameAnimatorContainer
-import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.widget.WindowRelativeLayout
-import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_left_door
 import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_front_right_door
 import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.actv_orderinfo
@@ -76,7 +70,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
     }
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_start_autopilot_view, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_start_autopilot_view, this, true)
         taxiPStartAutopilotCar = FrameAnimatorContainer(
             R.array.taxi_p_start_autopilot_car,
             20,
@@ -167,9 +161,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
             return
         }
         if (HdMapBuildConfig.currentCarVrIconRes == R.raw.hq_h9) {
-            cl_car_type.setBackgroundResource(R.drawable.taxi_p_start_panel__hq_bg)
+            cl_car_type.setBackgroundResource(R.drawable.taxt_u_p_start_panel__hq_bg)
         } else {
-            cl_car_type.setBackgroundResource(R.drawable.taxi_p_start_panel__df_bg)
+            cl_car_type.setBackgroundResource(R.drawable.taxt_u_p_start_panel__df_bg)
         }
     }
 
@@ -199,7 +193,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu
         taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003)
         taxi_p_autopilot_btn_bg.setImageResource(R.drawable.image_00000_0)
         taxi_p_start_autopilot.background =
-            ContextCompat.getDrawable(context, R.drawable.taxi_p_start_autopilot_txt_btn_bg)
+            ContextCompat.getDrawable(context, R.drawable.taxt_u_p_start_autopilot_txt_btn_bg)
         taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt)
     }
 

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt

@@ -55,8 +55,8 @@ class StatusBarView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_statusview, this, true)
-        setBackgroundResource(R.drawable.taxi_p_status_bg)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_statusview, this, true)
+        setBackgroundResource(R.drawable.taxt_u_p_status_bg)
         isClickable = true
         isFocusable = true
     }

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt

@@ -28,7 +28,7 @@ class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusLis
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_blue_tooth, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_blue_tooth, this, true)
     }
 
 
@@ -43,11 +43,11 @@ class TaxiPBlueToothView : RelativeLayout, IMoGoMoFangProvider.OnMoFangStatusLis
     }
 
     override fun onMoFangConnected() {
-        mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_close)
+        mofangView.setImageResource(R.drawable.taxt_u_p_blue_tooth_close)
     }
 
     override fun onMoFangDisconnected() {
-        mofangView.setImageResource(R.drawable.taxi_p_blue_tooth_open)
+        mofangView.setImageResource(R.drawable.taxt_u_p_blue_tooth_open)
     }
 
     @SuppressLint("SetTextI18n")

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/systemsetting/TaxiPSettingView.kt

@@ -41,7 +41,7 @@ class TaxiPSettingView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_setting_view, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_setting_view, this, true)
         initView()
     }
 

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt

@@ -40,7 +40,7 @@ internal class InfoVideoView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.taxi_p_mogo_video_layout, this, true)
+        LayoutInflater.from(context).inflate(R.layout.taxt_u_p_mogo_video_layout, this, true)
         initView()
     }
 

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

@@ -42,7 +42,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.taxt_u_p_list_video_item_light, parent, false);
         RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
         recyclerItemVideoHolder.setIsRecyclable(false);
         return recyclerItemVideoHolder;
@@ -55,7 +55,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
         final TaxiPassengerVideoPlay taxiPassengerVideoPlay = itemDataList.get(position);
         AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.getResources());
         holder.gsyVideoOptionBuilder
-                .setEnlargeImageRes(R.drawable.taxi_p_change_full)
+                .setEnlargeImageRes(R.drawable.taxt_u_p_change_full)
                 .setUrl(taxiPassengerVideoPlay.getUrl())
                 .setCacheWithPlay(true)
                 .setPlayTag(taxiPassengerVideoPlay.getImageUrl()+position)
@@ -64,7 +64,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
         holder.gsyVideoPlayer.getTitleTextView().setText(taxiPassengerVideoPlay.getTitle());
         Glide.with(context)
                 .load(taxiPassengerVideoPlay.getImageUrl())
-                .apply(new RequestOptions().placeholder(R.drawable.taxi_p_video_holder).centerCrop())
+                .apply(new RequestOptions().placeholder(R.drawable.taxt_u_p_video_holder).centerCrop())
                 .into(holder.gsyVideoPlayer.coverImage);
         holder.gsyVideoPlayer.getThumbImageViewLayout().setOnClickListener(v -> {
             if(onThumbImageClilckListener!=null){

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt

@@ -60,7 +60,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag)
 
     override fun init(context: Context) {
-        mEnlargeImageRes = R.drawable.taxi_p_change_full
+        mEnlargeImageRes = R.drawable.taxt_u_p_change_full
         super.init(context)
         start = findViewById(R.id.start)
         coverImage = findViewById(R.id.thumbImage)
@@ -80,7 +80,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         aivStartPlay.scaleX = 0.8f
         aivStartPlay.scaleY = 0.8f
 
-        mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.bg_taxi_p_video_index,0.66f,0.66f)
+        mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.taxt_u_p_bg_video_index,0.66f,0.66f)
     }
 
     private fun addDrageAnchor(){
@@ -108,7 +108,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             titleTextView.layoutParams = layoutParams1
             aivStartPlay.scaleX = 1f
             aivStartPlay.scaleY = 1f
-            val drawable = ActivityCompat.getDrawable(context, R.drawable.bg_taxi_p_video_index)
+            val drawable = ActivityCompat.getDrawable(context, R.drawable.taxt_u_p_bg_video_index)
             mProgressBar.thumb = drawable
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 mProgressBar.maxHeight = 6
@@ -127,7 +127,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun getLayoutId(): Int {
-        return R.layout.taxi_p_video_show
+        return R.layout.taxt_u_p_video_show
     }
 
     override fun updateStartImage() {
@@ -423,7 +423,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             cloneParams(this, gsyVideoPlayer)
             val frameLayout = FrameLayout(context)
             if (gsyVideoPlayer.fullscreenButton != null) {
-                gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxi_p_change_normal)
+                gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.taxt_u_p_change_normal)
                 gsyVideoPlayer.fullscreenButton.setOnClickListener { v ->
                     if (mBackFromFullScreenListener == null) {
                         clearFullscreenLayout(gsyVideoPlayer)

OCH/taxi/unmanned-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/unmanned-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/unmanned-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/unmanned-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/unmanned-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>