Merge branch 'dev_robotaxi-d-app-module-videoprocess' into dev_robotaxi-d-app-module_290_220715_2.9.0

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

@@ -62,9 +62,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     private WeakReference<TaxiPassengerArrivedView> mArrivedEndView;
     private WeakReference<TaxiPassengerCheckView> mArrivedCheckView;
     private WeakReference<TaxiPassengerStartAutopilotView> mStartAutopilotView;
-
-    private View vOpenLeft;
-
     protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null;
 
     private Handler mHandler = new Handler(Looper.getMainLooper());
@@ -99,7 +96,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         CallerHmiManager.INSTANCE.setNotificationViewProvider(this);
 
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
-        vOpenLeft = findViewById(R.id.v_open_left);
         updateSwitchMapIcon();
         initListener();
 
@@ -150,7 +146,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
         findViewById(R.id.iv_temp).setOnClickListener(view -> {
             OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(),0,true,-1,true);
-            OverlayLeftViewUtils.INSTANCE.addDragTarget(vOpenLeft);
             //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728");
             //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480");
             //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext());
@@ -248,7 +243,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        OverlayLeftViewUtils.INSTANCE.removeDragTarget(vOpenLeft);
         EventBus.getDefault().unregister(this);
         removeListener();
     }
@@ -288,7 +282,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             }
             if(showOrHideLefeMenu) {
                 OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(), 0, true, -1, true);
-                OverlayLeftViewUtils.INSTANCE.addDragTarget(vOpenLeft);
             }
             if (ochServingOrderFragment.isHidden()){
                 transaction
@@ -315,6 +308,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             }
             if(showOrHideLefeMenu) {
                 OverlayLeftViewUtils.INSTANCE.dismissOverlayView(true);
+                CallerHmiManager.INSTANCE.hideSmallFragment();
             }
         }
     }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/LeftMenuOpen.kt

@@ -8,9 +8,11 @@ import android.os.RemoteCallbackList
 import android.os.RemoteException
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.eagle.core.utilcode.util.Utils
+import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.mulprocess.BinderCursor
 import com.mogo.och.taxi.passenger.mulprocess.BinderProvider
 import com.mogo.och.taxi.passenger.mulprocess.ICallback
@@ -172,6 +174,10 @@ object LeftMenuOpen {
         view?.let {
             it.setOnTouchListener(null)
             it.setOnClickListener(null)
+            if(it.id==R.id.ids_video_anchor){
+                val parent = it.parent as ViewGroup
+                parent.removeView(it)
+            }
         }
     }
 

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt

@@ -11,16 +11,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.LinearInterpolator
+import android.widget.FrameLayout
 import android.widget.ListView
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.och.taxi.passenger.R
-import com.mogo.och.taxi.passenger.ui.leftmenu.model.LeftMenuModel
-import com.mogo.och.taxi.passenger.mulprocess.EmptyService
-import com.mogo.och.taxi.passenger.ui.video.VideoActivity
 import com.mogo.och.taxi.passenger.event.FinishActivity
 import com.mogo.och.taxi.passenger.event.UIStatus
+import com.mogo.och.taxi.passenger.mulprocess.EmptyService
+import com.mogo.och.taxi.passenger.ui.leftmenu.model.LeftMenuModel
+import com.mogo.och.taxi.passenger.ui.video.VideoActivity
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -165,6 +166,8 @@ object OverlayLeftViewUtils {
             }
             lvSelectItem.adapter = ListAdapter(context, integers)
 
+            addTarget(context)
+
             LeftMenuOpen.setValue(view, params, windowManager,::close,::open)
             try {
                 windowManager!!.addView(overlayView, params)
@@ -176,6 +179,25 @@ object OverlayLeftViewUtils {
         }
     }
 
+    private fun addTarget(context: Activity) {
+        try {
+            val content =
+                context.window.decorView.findViewById<FrameLayout>(android.R.id.content)
+            val textView = View(context)
+            textView.id = R.id.ids_video_anchor
+            addDragTarget(textView)
+            val param: FrameLayout.LayoutParams =
+                FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,FrameLayout.LayoutParams.WRAP_CONTENT)
+            param.gravity = Gravity.CENTER_VERTICAL
+            param.width = 143
+            param.height = 308
+            textView.layoutParams = param
+            content.addView(textView)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
     /**
      * 打开状态栏
      */

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

@@ -49,7 +49,6 @@ class VideoActivity : AppCompatActivity() {
     private var rvVideoPlaylist: RecyclerView?=null
     private lateinit var indicatorView: IndicatorView
     private lateinit var clContain: ConstraintLayout
-    private var vOpenLeft: View?=null
     private lateinit var acivTitleIcon: AppCompatImageView
     private lateinit var tvTitle: TextView
 
@@ -116,6 +115,8 @@ class VideoActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
+        setContentView(R.layout.taxi_p_arrived_mogo_consult)
+        initView()
         configPage()
     }
 
@@ -128,8 +129,6 @@ class VideoActivity : AppCompatActivity() {
     private fun configPage() {
         FullVideoUtils.dismissOverlayView(true)
         releaseOnNewInstance()
-        setContentView(R.layout.taxi_p_arrived_mogo_consult)
-        initView()
         when (intent.getIntExtra(VIDEOTYPE, VIDEOTYPE_CONSULT)) {
             VIDEOTYPE_CONSULT -> {
                 videotype = VIDEOTYPE_CONSULT
@@ -295,14 +294,12 @@ class VideoActivity : AppCompatActivity() {
     }
 
     private fun initListener() {
-        OverlayLeftViewUtils.addDragTarget(vOpenLeft)
     }
 
     private fun initView() {
         rvVideoPlaylist = findViewById(R.id.rv_video_playlist)
         indicatorView = findViewById(R.id.indicatorView)
         clContain = findViewById(R.id.cl_contain)
-        vOpenLeft = findViewById(R.id.v_open_left)
         acivTitleIcon = findViewById(R.id.aciv_title_icon)
         tvTitle = findViewById(R.id.tv_mogo_consult)
         acivTitleIcon.setOnClickListener {
@@ -313,21 +310,6 @@ class VideoActivity : AppCompatActivity() {
 
     private fun setBackageAndPlayNext(taxiPassengerVideoPlay: TaxiPassengerVideoPlay) {
         // 设置背景图片
-        Glide.with(this).asBitmap()
-            .load(taxiPassengerVideoPlay.imageUrl)
-            .apply(
-                RequestOptions().transform(
-                    GlideBlurTransform(taxiPassengerVideoPlay.imageUrl, 100)
-                ).diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-            )
-            .into(object : SimpleTarget<Bitmap?>() {
-                override fun onResourceReady(
-                    resource: Bitmap,
-                    transition: Transition<in Bitmap?>?
-                ) {
-                    clContain.background = BitmapDrawable(resources, resource)
-                }
-            })
     }
 
     override fun onAttachedToWindow() {
@@ -416,7 +398,6 @@ class VideoActivity : AppCompatActivity() {
             }
         }
         FullVideoUtils.dismissOverlayView(true)
-        OverlayLeftViewUtils.removeDragTarget(vOpenLeft)
     }
 
     override fun onBackPressed() {}

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java

@@ -33,10 +33,10 @@ public class CarouselZoomPostLayoutListener extends CarouselLayoutManager.PostLa
             translateY = Math.signum(itemPositionToCenterDiff) * translateYGeneral;
             translateX = 0;
         } else {
-            final float translateXGeneral = (child.getMeasuredWidth()*0.9f) * (1 - scale) / 2f;
+            final float translateXGeneral = child.getMeasuredWidth() * (1 - scale)/8;
             translateX = Math.signum(itemPositionToCenterDiff) * translateXGeneral;
             translateY = 0;
         }
-        return new ItemTransformation(scale,scale, scale, translateX, translateY);
+        return new ItemTransformation(scale,scale, scale, 0, translateY);
     }
 }

OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="38px"
+        android:bottomRightRadius="36px"
+        android:topLeftRadius="36px"
+        android:topRightRadius="36px" />
+    <solid android:color="#80051025" />
+</shape>

OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml

@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@drawable/taxi_p_video_shadow"
-    android:layout_width="2056px"
-    android:layout_height="1294px">
+    android:background="@drawable/bg_taxi_p_video_bg_shape"
+    android:layout_width="1620px"
+    android:layout_height="940px">
+
+    <ImageView
+        android:layout_gravity="top"
+        android:src="@drawable/taxi_p_video_bg_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:layout_gravity="bottom"
+        android:src="@drawable/taxi_p_video_bg_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
     <com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer
         android:id="@+id/video_item_player"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="143px"
-        android:layout_width="1740px"
-        android:layout_height="978px" />
+        android:layout_gravity="center"
+        android:layout_width="1560px"
+        android:layout_height="876px" />
 </FrameLayout>
 

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml

@@ -5,14 +5,9 @@
     android:id="@+id/cl_contain"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/cardview_dark_background"
+    android:background="@drawable/taxi_p_video_bg"
     tools:ignore="MissingDefaultResource">
 
-    <View
-        android:background="#80000000"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_title_icon"
         android:src="@drawable/taxi_p_mogo_consult_title_icon"
@@ -42,6 +37,7 @@
         android:layout_height="1294px"
         android:orientation="horizontal"
         android:layout_marginTop="-40px"
+        android:layout_marginStart="24px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_mogo_consult"/>
@@ -61,14 +57,6 @@
         app:vpi_slider_radius="@dimen/dp_20"
         app:vpi_style="round_rect" />
 
-    <View
-        android:id="@+id/v_open_left"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_width="143px"
-        android:layout_height="308px"/>
-
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml

@@ -28,15 +28,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/v_open_left"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginBottom="@dimen/dp_72"
-        android:layout_width="143px"
-        android:layout_height="308px"/>
-
     <ImageView
         android:id="@+id/module_och_taxi_swich_map_iv"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"

OCH/mogo-och-taxi-passenger/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="ids_video_anchor" type="id"/>
+</resources>