yangchong211 7 лет назад
Родитель
Сommit
173ccbe7fd

+ 7 - 4
YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/VideoPlayerController.java

@@ -1,6 +1,5 @@
 package org.yczbj.ycvideoplayerlib;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -129,7 +128,7 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
     /**
      * 试看类型 setMemberType 如果不设置该方法,那么默认视频都是可以看的
      */
-    private int mType;
+    private int mType = 0;
     /**
      * 是否有观看权限
      */
@@ -237,6 +236,7 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
     }
 
 
+
     private void initListener() {
         mCenterStart.setOnClickListener(this);
         mBack.setOnClickListener(this);
@@ -342,6 +342,10 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
      * 设置会员权限类型
      * @param isLogin   是否登录
      * @param type      视频试看类型
+     *                  0
+     *                  1
+     *                  2
+     *                  3
      */
     @Override
     public void setMemberType(boolean isLogin, int type) {
@@ -662,7 +666,7 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
 
 
         //添加,试看视频
-        if (!mIsSee || !mIsLogin) {
+        if (mIsSee || !mIsLogin) {
             mIvTrySee.setVisibility(VISIBLE);
             mCenterStart.setVisibility(GONE);
             mLength.setVisibility(View.GONE);
@@ -679,7 +683,6 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
         mTop.setVisibility(View.VISIBLE);
         mBack.setVisibility(View.VISIBLE);
 
-        mLlTrySee.setVisibility(GONE);
         mLoading.setVisibility(View.GONE);
         mError.setVisibility(View.GONE);
         mCompleted.setVisibility(View.GONE);

+ 1 - 1
app/build.gradle

@@ -96,7 +96,7 @@ dependencies {
     compile 'cn.yc:YCBaseAdapterLib:1.3'                            //adapter封装
     compile 'cn.yc:YCDialogLib:3.5'                                 //弹窗
     compile 'cn.yc:YCProgressLib:1.2'                               //进度条
-//    compile 'cn.yc:YCVideoPlayerLib:2.4.3'                            //播放器
+//    compile 'cn.yc:YCVideoPlayerLib:2.4.5'                            //播放器
     compile project(':YCVideoPlayerLib')
     compile 'cn.yc:YCStatusBarLib:1.3'                              //状态栏
 }

+ 5 - 0
app/src/main/java/org/yczbj/ycvideoplayer/ui/video/view/activity/VideoContentActivity.java

@@ -43,6 +43,8 @@ import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by yc on 2018/2/26.
+ *
+ *
  */
 
 public class VideoContentActivity extends BaseMVPActivity {
@@ -68,6 +70,7 @@ public class VideoContentActivity extends BaseMVPActivity {
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,10 +82,12 @@ public class VideoContentActivity extends BaseMVPActivity {
         onLoadData();
     }
 
+
     private void initView() {
         initRecyclerView();
     }
 
+
     private void initData() {
         Intent intent = getIntent();
         try {