Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

陈硕
2 parents 20d297cf 4003f582
Showing 13 changed files with 87 additions and 60 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/UGCListFragment.java
app/src/main/java/com/cnlive/gundam/video/view/BaseVideoView.java
app/src/main/res/layout/fragment_player_ugc_live.xml
app/src/main/res/layout/layout_player_controller_live_l.xml
app/src/main/res/layout/layout_player_controller_live_p.xml
app/src/main/res/layout/layout_player_controller_ugc_live_l.xml
app/src/main/res/layout/layout_player_controller_ugc_live_p.xml
app/src/main/res/layout/layout_player_controller_ugc_vod_l.xml
app/src/main/res/layout/layout_player_controller_ugc_vod_p.xml
app/src/main/res/layout/layout_player_controller_vod_l.xml
app/src/main/res/layout/layout_player_controller_vod_p.xml
app/src/main/res/layout/layout_player_ugc_info.xml
app/src/main/res/values/colors.xml
@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,11 +13,11 @@ import android.widget.Toast;
 import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.databinding.FragmentActiveListBinding;
 import com.cnlive.gundam.main.model.ActiveInfo;
 import com.cnlive.gundam.main.model.ActiveListModel;
-import com.cnlive.gundam.data.network.RetrofitUtil;
-import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.main.utils.ActivityJumpUtil;
 import com.cnlive.libs.util.Config;
@@ -92,7 +91,6 @@ public class UGCListFragment extends Fragment implements SwipeRefreshLayout.OnRe
     @Override
     public void onResponse(Call<ActiveListModel> call, Response<ActiveListModel> response) {
-        Log.e("11111111111111", "onResponse: "+call.request().toString() );
         binding.contentView.setRefreshing(false);
         if (response.isSuccessful()) {
             ActiveListModel model = response.body();
@@ -49,6 +49,8 @@ public abstract class BaseVideoView extends RelativeLayout implements
     protected static boolean isLive;
     //记录当前视频是否能播
     protected boolean canPlay = true;
+    //记录当前视频状态是否结束
+    protected boolean isStatusEnd = false;
     //本地缓存数据工具类
     private SharedPreferencesHelper sharedPreferencesHelper;
     //播放进度保存至本地缓存的标识前缀
@@ -108,7 +110,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
             if (Build.VERSION.SDK_INT >= 23) {
                 int checkCallPhonePermission = ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_PHONE_STATE);
                 if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
-                    if(ugcLivePermissionListener != null)
+                    if (ugcLivePermissionListener != null)
                         ugcLivePermissionListener.onShouldRequestPermission();
                 } else {
                     addUgcLiveStatus();
@@ -133,14 +135,14 @@ public abstract class BaseVideoView extends RelativeLayout implements
     /**
      * 设置UGC LIVE的直播状态监听
      */
-    public void setUgcLiveStatusPermissionListener(OnUgcLiveStatusPermissionListener l){
+    public void setUgcLiveStatusPermissionListener(OnUgcLiveStatusPermissionListener l) {
         ugcLivePermissionListener = l;
     }
     /**
      * 添加UGC LIVE的直播状态监听
      */
-    public void addUgcLiveStatus(){
+    public void addUgcLiveStatus() {
         VideoStatusUtil.setOnVideoPlayStatusCallback(mOnVideoStatusCallback);
         VideoStatusUtil.init(videoModel.getId());
     }
@@ -213,7 +215,6 @@ public abstract class BaseVideoView extends RelativeLayout implements
      * @param rate
      */
     public void switchVideoRate(String rate) {
-        //TODO 换成无缝切换
         curRate = rate;
         if (binding.controllerView != null)
             binding.controllerView.setSwitchRateType(PlayerControllerView.SWITCH_RATE_START, curRate);
@@ -252,7 +253,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
             isPrepareSeek = true;
             iMediaPlayer.seekTo(curPlayPosition);
         } else {
-            if (canPlay && !iMediaPlayer.getPlayState()) {
+            if (!iMediaPlayer.getPlayState()) {
                 setPlayState(true);
                 isPlay = true;
             }
@@ -310,22 +311,27 @@ public abstract class BaseVideoView extends RelativeLayout implements
             switch (status) {
                 case IVideoStatus.MEDIA_STATUS_LIVING:
                     //直播中'
-                    canPlay = true;
-                    if (!binding.videoView.getPlayState()) {
-                        binding.videoView.reload();
-                        binding.infoView.show(PlayerInfoView.SHOW_BUFFERING);
+                    if (!isStatusEnd) {
+                        canPlay = true;
+                        isPlay = true;
+                        setPlayState(true);
                     }
                     break;
                 case IVideoStatus.MEDIA_STATUS_LEAVE:
                     //主播暂时离开
-                    canPlay = false;
-                    binding.videoView.stop();
-                    binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_leave));
+                    if (!isStatusEnd) {
+                        canPlay = false;
+                        isPlay = false;
+                        setPlayState(false);
+                        binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_leave));
+                    }
                     break;
                 case IVideoStatus.MEDIA_STATUS_END:
                     //直播结束
                     canPlay = false;
-                    binding.videoView.stop();
+                    isPlay = false;
+                    isStatusEnd = true;
+                    binding.videoView.release();
                     binding.infoView.show(PlayerInfoView.SHOW_UGC_LIVE_STATUS, getContext().getString(R.string.player_status_end));
                     break;
             }
@@ -344,7 +350,7 @@ public abstract class BaseVideoView extends RelativeLayout implements
     }
     //ugc live 监听直播状态得需要android.permission.READ_PHONE_STATE
-    public interface OnUgcLiveStatusPermissionListener{
+    public interface OnUgcLiveStatusPermissionListener {
         void onShouldRequestPermission();
     }
 }
@@ -17,6 +17,7 @@
         <com.cnlive.libs.video.barrage.BarrageLayout
             android:id="@+id/private_message"
+            android:layout_marginTop="50dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
@@ -144,7 +144,7 @@
             <RelativeLayout
                 android:id="@+id/bottomLayout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="40dp"
                 android:background="#44000000"
                 android:visibility="@{showController.get() ? View.VISIBLE : View.GONE}">
@@ -152,33 +152,43 @@
                     android:id="@+id/playBtn"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
+                    android:layout_centerVertical="true"
                     android:layout_marginRight="5dp"
+                    android:layout_marginLeft="10dp"
                     android:onClick="@{playerControllerView.onClick}"
                     android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}" />
-                <TextView
-                    android:id="@+id/rate"
+                <RelativeLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:onClick="@{playerControllerView.onClick}"
-                    android:text="@{VideoRateUtil.getRateText(rateType.get())}"
-                    android:textColor="@android:color/white"
-                    android:visibility="@{hasRate.get() ? View.VISIBLE : View.GONE}" />
+                    android:layout_height="match_parent"
+                    android:layout_alignParentRight="true">
-                <android.support.v7.widget.SwitchCompat
-                    android:id="@+id/barrage_top"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:background="@null"
-                    android:textIsSelectable="false"
-                    android:layout_alignParentRight="true"
-                    android:thumb="@drawable/switch_thumb"
-                    app:switchMinWidth="30dp"
-                    app:track="@drawable/switch_track" />
+                    <TextView
+                        android:id="@+id/rate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="10dp"
+                        android:onClick="@{playerControllerView.onClick}"
+                        android:text="@{VideoRateUtil.getRateText(rateType.get())}"
+                        android:textColor="@android:color/white"
+                        android:visibility="@{hasRate.get() ? View.VISIBLE : View.GONE}" />
+
+                    <android.support.v7.widget.SwitchCompat
+                        android:id="@+id/barrage_top"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:background="@null"
+                        android:textIsSelectable="false"
+                        android:layout_marginRight="10dp"
+                        android:layout_toLeftOf="@+id/rate"
+                        android:thumb="@drawable/switch_thumb"
+                        app:switchMinWidth="15dp"
+                        app:track="@drawable/switch_track" />
+
+                </RelativeLayout>
             </RelativeLayout>
@@ -52,7 +52,7 @@
         <RelativeLayout
             android:id="@+id/bottomLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:background="#44000000"
             android:layout_alignParentBottom="true"
             android:visibility="@{showController.get() ? View.VISIBLE : View.GONE}">
@@ -62,15 +62,17 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_centerVertical="true"
                 android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}"
                 android:onClick="@{playerControllerView.onClick}"/>
-
-
             <ImageView
                 android:id="@+id/fullScreen"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
                 android:src="@drawable/player_full_screen"
                 android:layout_alignParentRight="true"
                 android:onClick="@{playerControllerView.onClick}"/>
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
@@ -9,7 +8,7 @@
         <import type="android.databinding.ObservableBoolean" />
-        <import type="com.cnlive.gundam.video.view.PlayerControllerView"/>
+        <import type="com.cnlive.gundam.video.view.PlayerControllerView" />
         <import type="android.view.View" />
@@ -27,7 +26,7 @@
         <variable
             name="playerControllerView"
-            type="PlayerControllerView"/>
+            type="PlayerControllerView" />
     </data>
@@ -47,8 +46,8 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginLeft="10dp"
-                android:src="@drawable/player_back"
-                android:onClick="@{playerControllerView.onClick}"/>
+                android:onClick="@{playerControllerView.onClick}"
+                android:src="@drawable/player_back" />
             <TextView
                 android:id="@+id/title"
@@ -75,9 +74,8 @@
                 android:layout_height="30dp"
                 android:layout_marginRight="5dp"
                 android:onClick="@{playerControllerView.onClick}"
-                android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}" />
-
-
+                android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}"
+                android:visibility="gone" />
         </RelativeLayout>
@@ -63,6 +63,7 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginRight="5dp"
+                android:visibility="gone"
                 android:onClick="@{playerControllerView.onClick}"
                 android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}"/>
@@ -92,6 +92,7 @@
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginRight="5dp"
+                    android:layout_marginLeft="10dp"
                     android:onClick="@{playerControllerView.onClick}"
                     android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}" />
@@ -60,7 +60,7 @@
         <RelativeLayout
             android:id="@+id/bottomLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:background="#44000000"
             android:layout_alignParentBottom="true"
             android:visibility="@{showController.get() ? View.VISIBLE : View.GONE}">
@@ -70,6 +70,8 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_centerVertical="true"
                 android:onClick="@{playerControllerView.onClick}"
                 android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}"/>
@@ -179,6 +179,7 @@
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:layout_marginRight="5dp"
+                        android:layout_marginLeft="10dp"
                         android:onClick="@{playerControllerView.onClick}"
                         android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}" />
@@ -61,7 +61,7 @@
         <RelativeLayout
             android:id="@+id/bottomLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="40dp"
             android:background="#44000000"
             android:layout_alignParentBottom="true"
             android:visibility="@{showController.get() ? View.VISIBLE : View.GONE}">
@@ -71,8 +71,10 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
                 android:src="@{isPlay ? @drawable/player_play : @drawable/player_pause}"
-                android:onClick="@{playerControllerView.onClick}"/>
+                android:onClick="@{playerControllerView.onClick}"
+                android:layout_centerVertical="true"/>
             <TextView
                 android:id="@+id/curTime"
@@ -106,10 +108,12 @@
             <ImageView
                 android:id="@+id/fullScreen"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
                 android:src="@drawable/player_full_screen"
                 android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
                 android:onClick="@{playerControllerView.onClick}"/>
         </RelativeLayout>
@@ -168,13 +168,14 @@
             android:layout_height="match_parent"
             android:visibility="@{showType.get() == PlayerInfoView.SHOW_UGC_LIVE_STATUS ? View.VISIBLE : View.GONE}"
             tools:visibility="gone"
-            android:background="#000000">
+            android:background="@color/play_status_bg">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{statusMsg.get()}"
                 android:gravity="center"
+                android:background="@drawable/player_btn_bg"
                 android:textColor="@android:color/white"
                 android:layout_centerInParent="true"/>
@@ -11,4 +11,6 @@
     <color name="gray">#9e9e9e</color>
     <color name="gray_bg">#dedbdb</color>
+
+    <color name="play_status_bg">#03faf6</color>
 </resources>