样式调整、加载中提示

2022-06-30 11:32:20 +08:00
parent 42722a637c
commit f53e9249a5
9 changed files with 21 additions and 14 deletions
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
@@ -58,10 +58,10 @@ class TaxiPassengerMogoConsultView :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/1655708596763/全车型混剪增加红旗车队.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969511280/车队.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/1655708499497/大运会合作解说版.m4v","https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png","蘑菇车联牵手成都大运会"))
+        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","多视角体验蘑菇车联自动驾驶"))
        val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf)
        val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
        carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener ())
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoMoviesView.kt
@@ -58,9 +58,10 @@ class TaxiPassengerMogoMoviesView :RelativeLayout {
        clContain = findViewById(R.id.cl_contain)

        val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
-        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","星空"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656558672856/小宝宝.mp4","https://img.zhidaohulian.com/fileServer/online_car_hailing/1656559345882/1.png","小宝宝"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656558697055/小猫.mp4","https://img.zhidaohulian.com/fileServer/online_car_hailing/1656559367261/2.png","小猫"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656558730074/星空.mp4","https://img.zhidaohulian.com/fileServer/online_car_hailing/1656559406169/4.png","星空"))
+        arrayListOf.add(TaxiPassengerVideoPlay("https://img.zhidaohulian.com/fileServer/online_car_hailing/1656558644708/海浪.mp4","https://img.zhidaohulian.com/fileServer/online_car_hailing/1656559384635/3.png","星空"))
        val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf)
        val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
        carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener ())
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
@@ -90,6 +90,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
        }
    }

+    override fun setStateAndUi(state: Int) {
+        super.setStateAndUi(state)
+        if(state==CURRENT_STATE_PLAYING_BUFFERING_START){
+            ToastUtils.showShort("加载中请稍等")
+        }
+    }
+
    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
        super.onWindowFocusChanged(hasWindowFocus)
        if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <gradient android:startColor="#a3000000" android:endColor="#00000000" android:angle="90"/>
+    <gradient android:startColor="#99000000" android:endColor="#00000000" android:angle="90"/>
 </shape>
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <gradient android:endColor="#a3000000" android:startColor="#00000000" android:angle="90"/>
+    <gradient android:endColor="#99000000" android:startColor="#00000000" android:angle="90"/>
 </shape>
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
@@ -4,7 +4,7 @@
    <item android:id="@android:id/background">
        <shape>
            <corners android:radius="5px"/>
-            <solid android:color="#33D8D8D8" />
+            <solid android:color="#99D8D8D8" />
        </shape>
    </item>
    <item android:id="@android:id/secondaryProgress">
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
@@ -9,7 +9,7 @@
    tools:ignore="MissingDefaultResource">

    <View
-        android:background="#4C000000"
+        android:background="#B3000000"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>

--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml
@@ -9,11 +9,10 @@
    tools:ignore="MissingDefaultResource">

    <View
-        android:background="#4C000000"
+        android:background="#B3000000"
        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_movies_title_icon"
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_interphone.xml
@@ -28,7 +28,7 @@
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:layout_width="143px"
-        android:layout_height="408px">
+        android:layout_height="308px">
        <androidx.appcompat.widget.AppCompatImageView
            android:id="@+id/aciv_open_close"
            android:layout_marginStart="14px"