拖动时动态透明度

进度条颜色渐变
样式修改
全屏进入到达目的地页面  内存泄漏

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

@@ -331,7 +331,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                 public void run() {
                     mArrivedEndView.get().setDataAndStartAnimation(arrivedEndStation,orderNo);
                 }
-            },200);
+                //如果在全屏 回收需要300毫秒 后期优化使用单独的播放器
+            },500);
         }else {
             if(mArrivedEndView==null||mArrivedEndView.get()==null){
                 return;

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt

@@ -172,6 +172,8 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
     override fun onDetachedFromWindow() {
         svpFrame.setBackgroundResource(R.drawable.tail_ani_0000)
         svpFrame.setVideoAllCallBack(null)
+        svpFrame.onVideoReset()
+        svpFrame.release()
         tvFeel.text = ""
         rvCommentList.visibility = View.INVISIBLE
         btnSubmit.visibility = View.INVISIBLE

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

@@ -168,7 +168,7 @@ object OverlayLeftViewUtils {
         acivOpenClose?.apply {
             pivotX = (width /2).toFloat()
             pivotY = (height /2).toFloat()
-            rotation = 180f
+            rotation = 0f
         }
         params?.x = 0
         windowManager?.updateViewLayout(overlayView, params)
@@ -200,7 +200,7 @@ object OverlayLeftViewUtils {
         acivOpenClose?.apply {
             pivotX = (width /2).toFloat()
             pivotY = (height /2).toFloat()
-            rotation = 0f
+            rotation = 180f
         }
         params?.x = DEVIATION_WIDTH
         windowManager?.updateViewLayout(overlayView, params)

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

@@ -58,10 +58,9 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
         clContain = findViewById(R.id.cl_contain)
 
         val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
-        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708409810/20210610重新排版3屏.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969579713/三屏.png","重新排版"))
-        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png","大运会"))
-        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708554279/红旗车队.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969553174/红旗重新排版.png","红旗车队"))
-        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708596763/全车型混剪增加红旗车队.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969511280/车队.png","全车型混剪增加红旗车队"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656491288793/小宝宝.mov","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969579713/三屏.png","小宝宝"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656491340951/小猫.mov","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png","小猫"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656491369828/星空.mov","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969553174/红旗重新排版.png","星空"))
         val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf)
         val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
         carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener ())

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.Surface
 import android.view.View
@@ -68,6 +69,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             mThumbImageViewLayout.visibility = View.VISIBLE
         }
         GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL)
+        aivStartPlay.scaleX = 0.8f
+        aivStartPlay.scaleY = 0.8f
     }
 
     override fun getLayoutId(): Int {
@@ -87,6 +90,17 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         }
     }
 
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
+        if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
+            if(hasWindowFocus){//获取焦点
+                onVideoResume()
+            }else{
+                onVideoPause()
+            }
+        }
+    }
+
     override fun touchDoubleUp() {
 
     }
@@ -207,10 +221,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         if(mIfCurrentIsFullscreen&&smalllPlayer!=null) {
             if(mTopContainer.marginTop==0) {
                 val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams
-                //layoutParams.setMargins(0, getStatusBarHeight(), 0, 0)
-                layoutParams.height = 316
-                mTopContainer.setPadding(93,0,93,0)
+                layoutParams.height = 336
                 mTopContainer.layoutParams = layoutParams
+                fullscreenButton.setPadding(80,0,80,0)
+                titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 50f)
+                titleTextView.setPadding(30,0,0,0)
+                aivStartPlay.scaleX = 1f
+                aivStartPlay.scaleY = 1f
             }
         }
     }

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

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@drawable/taxi_p_video_shadow11"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:background="@drawable/taxi_p_video_shadow"
+    android:layout_width="2056px"
+    android:layout_height="1294px">
 
     <com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer
         android:id="@+id/video_item_player"
-        android:layout_gravity="center"
-        android:layout_width="1734px"
-        android:layout_height="973px" />
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="143px"
+        android:layout_width="1740px"
+        android:layout_height="978px" />
 </FrameLayout>
 

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

@@ -33,6 +33,7 @@
             android:id="@+id/aciv_open_close"
             android:layout_marginStart="14px"
             android:src="@drawable/ic_baseline_arrow"
+            android:rotation="180"
             android:layout_width="25px"
             android:layout_height="33px"/>
     </LinearLayout>