yangchong пре 7 година
родитељ
комит
1755a67c83

+ 1 - 1
YCVideoPlayerLib/build.gradle

@@ -51,7 +51,7 @@ group = "cn.yc"
 //发布到JCenter上的项目名字,必须填写
 def libName = "YCVideoPlayerLib"
 // 版本号,下次更新是只需要更改版本号即可
-version = "2.4.3"
+version = "2.4.4"
 /**  上面配置后上传至jcenter后的编译路径是这样的: compile 'cn.yc:YCVideoPlayerLib:2.4'  **/
 
 //生成源文件

+ 3 - 3
YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/VideoPlayerUtils.java

@@ -118,7 +118,7 @@ public class VideoPlayerUtils {
      * @param milliseconds 毫秒数
      * @return ##:##
      */
-    static String formatTime(long milliseconds) {
+    public static String formatTime(long milliseconds) {
         if (milliseconds <= 0 || milliseconds >= 24 * 60 * 60 * 1000) {
             return "00:00";
         }
@@ -140,7 +140,7 @@ public class VideoPlayerUtils {
      * @param context           上下文
      * @param url               视频链接url
      */
-    static void savePlayPosition(Context context, String url, long position) {
+    public static void savePlayPosition(Context context, String url, long position) {
         context.getSharedPreferences("VIDEO_PLAYER_PLAY_POSITION", Context.MODE_PRIVATE).edit().putLong(url, position).apply();
     }
 
@@ -150,7 +150,7 @@ public class VideoPlayerUtils {
      * @param url               视频链接url
      * @return 上次保存的播放位置
      */
-    static long getSavedPlayPosition(Context context, String url) {
+    public static long getSavedPlayPosition(Context context, String url) {
         return context.getSharedPreferences("VIDEO_PLAYER_PLAY_POSITION", Context.MODE_PRIVATE).getLong(url, 0);
     }
 

+ 2 - 2
app/build.gradle

@@ -97,7 +97,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 project(':YCVideoPlayerLib')
+//    compile 'cn.yc:YCVideoPlayerLib:2.4.3'                            //播放器
+    compile project(':YCVideoPlayerLib')
     compile 'cn.yc:YCStatusBarLib:1.3'                              //状态栏
 }

+ 52 - 47
app/src/main/java/org/yczbj/ycvideoplayer/ui/home/view/activity/VideoPlayerMeActivity.java

@@ -42,6 +42,7 @@ import org.yczbj.ycvideoplayer.ui.home.view.adapter.NarrowImageAdapter;
 import org.yczbj.ycvideoplayer.ui.home.view.adapter.VideoPlayerMeAdapter;
 import org.yczbj.ycvideoplayer.util.AppUtil;
 import org.yczbj.ycvideoplayerlib.ConstantKeys;
+import org.yczbj.ycvideoplayerlib.VideoPlayerUtils;
 import org.yczbj.ycvideoplayerlib.listener.OnMemberClickListener;
 import org.yczbj.ycvideoplayerlib.listener.OnVideoBackListener;
 import org.yczbj.ycvideoplayerlib.listener.OnVideoControlListener;
@@ -99,7 +100,7 @@ public class VideoPlayerMeActivity extends BaseActivity implements VideoPlayerMe
 
     @Override
     public void initView() {
-        YCAppBar.translucentStatusBar(this, true);
+        YCAppBar.setStatusBarLightMode(this, Color.WHITE);
         initVideoPlayer();
         initYCRefreshView();
     }
@@ -393,54 +394,58 @@ public class VideoPlayerMeActivity extends BaseActivity implements VideoPlayerMe
                     "name","title",ConstantVideo.VideoPlayerList[a]);
             list.add(dialogListBean);
         }
-        BottomDialogFragment.create(getSupportFragmentManager())
-            .setViewListener(new BottomDialogFragment.ViewListener() {
-                @Override
-                public void bindView(View v) {
-                    RecyclerView recyclerView = (RecyclerView) v.findViewById(R.id.recyclerView);
-                    ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel);
-                    ImageView ivDownload = (ImageView) v.findViewById(R.id.iv_download);
-
-                    recyclerView.setLayoutManager(new LinearLayoutManager(VideoPlayerMeActivity.this));
-                    DialogListAdapter mAdapter = new DialogListAdapter(VideoPlayerMeActivity.this, list);
-                    recyclerView.setAdapter(mAdapter);
-                    final RecycleViewItemLine line = new RecycleViewItemLine(
-                            VideoPlayerMeActivity.this, LinearLayout.HORIZONTAL,
-                            SizeUtils.dp2px(1),
-                            VideoPlayerMeActivity.this.getResources().getColor(R.color.grayLine));
-                    recyclerView.addItemDecoration(line);
-                    mAdapter.setOnItemClickListener(new DialogListAdapter.OnItemClickListener() {
-                        @Override
-                        public void onItemClick(int position) {
+        final BottomDialogFragment dialog = new BottomDialogFragment();
+        dialog.setFragmentManager(getSupportFragmentManager());
+        dialog.setViewListener(new BottomDialogFragment.ViewListener() {
+            @Override
+            public void bindView(View v) {
+                RecyclerView recyclerView = (RecyclerView) v.findViewById(R.id.recyclerView);
+                ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel);
+                ImageView ivDownload = (ImageView) v.findViewById(R.id.iv_download);
+
+                recyclerView.setLayoutManager(new LinearLayoutManager(VideoPlayerMeActivity.this));
+                DialogListAdapter mAdapter = new DialogListAdapter(VideoPlayerMeActivity.this, list);
+                recyclerView.setAdapter(mAdapter);
+                final RecycleViewItemLine line = new RecycleViewItemLine(
+                        VideoPlayerMeActivity.this, LinearLayout.HORIZONTAL,
+                        SizeUtils.dp2px(1),
+                        VideoPlayerMeActivity.this.getResources().getColor(R.color.grayLine));
+                recyclerView.addItemDecoration(line);
+                mAdapter.setOnItemClickListener(new DialogListAdapter.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(int position) {
 
+                    }
+                });
+                View.OnClickListener listener = new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        switch (v.getId()){
+                            case R.id.iv_cancel:
+                                if(VideoPlayerUtils.isActivityLiving(VideoPlayerMeActivity.this)){
+                                    dialog.dismissDialogFragment();
+                                }
+                                break;
+                            case R.id.iv_download:
+
+                                break;
+                            default:
+                                break;
                         }
-                    });
-                    View.OnClickListener listener = new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            switch (v.getId()){
-                                case R.id.iv_cancel:
-
-                                    break;
-                                case R.id.iv_download:
-
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                    };
-                    ivCancel.setOnClickListener(listener);
-                    ivDownload.setOnClickListener(listener);
-                }
-            })
-            .setLayoutRes(R.layout.dialog_bottom_list_view)
-            .setDimAmount(0.5f)
-            .setTag("BottomDialog")
-            .setCancelOutside(true)
-            .setHeight(ScreenUtils.getScreenHeight()-videoPlayer.getHeight()
-                    -AppUtil.getStatusBarHeight(this))
-            .show();
+                    }
+                };
+                ivCancel.setOnClickListener(listener);
+                ivDownload.setOnClickListener(listener);
+            }
+        });
+        dialog.setLayoutRes(R.layout.dialog_bottom_list_view);
+        dialog.setDimAmount(0.5f);
+        dialog.setTag("BottomDialog");
+        dialog.setCancelOutside(true);
+        //这个高度可以自己设置,十分灵活
+        dialog.setHeight(ScreenUtils.getScreenHeight()-videoPlayer.getHeight()
+                -AppUtil.getStatusBarHeight(this));
+        dialog.show();
     }
 
 

+ 3 - 0
app/src/main/java/org/yczbj/ycvideoplayer/ui/test/test1/TestActivity.java

@@ -1,5 +1,6 @@
 package org.yczbj.ycvideoplayer.ui.test.test1;
 
+import android.graphics.Color;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -21,6 +22,7 @@ import cn.jzvd.JZUserAction;
 import cn.jzvd.JZUserActionStandard;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
+import cn.ycbjie.ycstatusbarlib.bar.YCAppBar;
 
 /**
  * @author yc
@@ -74,6 +76,7 @@ public class TestActivity extends BaseActivity implements View.OnClickListener {
 
     @Override
     public void initView() {
+        YCAppBar.setStatusBarLightMode(this, Color.WHITE);
         jzVideo.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
                 , JZVideoPlayerStandard.SCREEN_WINDOW_NORMAL, "饺子快长大");
         Picasso.with(this)

+ 3 - 0
app/src/main/java/org/yczbj/ycvideoplayer/ui/test/test2/TestMyActivity.java

@@ -1,5 +1,6 @@
 package org.yczbj.ycvideoplayer.ui.test.test2;
 
+import android.graphics.Color;
 import android.view.View;
 import android.widget.Button;
 
@@ -31,6 +32,7 @@ import org.yczbj.ycvideoplayerlib.VideoPlayerUtils;
 import java.util.ArrayList;
 
 import butterknife.Bind;
+import cn.ycbjie.ycstatusbarlib.bar.YCAppBar;
 
 /**
  * @author yc
@@ -107,6 +109,7 @@ public class TestMyActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void initView() {
+        YCAppBar.setStatusBarLightMode(this, Color.WHITE);
         //原始封装视频播放,没有设置登录状态和权限
         initVideo();
     }

+ 4 - 1
app/src/main/java/org/yczbj/ycvideoplayer/ui/test/test3/ui/activity/GlideCropActivity.java

@@ -1,6 +1,7 @@
 package org.yczbj.ycvideoplayer.ui.test.test3.ui.activity;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.util.Log;
 import android.view.View;
@@ -21,6 +22,7 @@ import org.yczbj.ycvideoplayer.util.ImageCropUtils;
 import org.yczbj.ycvideoplayer.weight.HeightTransformation;
 
 import butterknife.Bind;
+import cn.ycbjie.ycstatusbarlib.bar.YCAppBar;
 
 /**
  * Created by yc on 2018/1/10.
@@ -85,7 +87,8 @@ public class GlideCropActivity extends BaseActivity implements View.OnClickListe
 
     @Override
     public void initView() {
-
+        YCAppBar.setStatusBarLightMode(this, Color.WHITE);
+        //YCAppBar.setStatusBarColor(this,Color.WHITE);
     }
 
     @Override

+ 2 - 1
app/src/main/res/layout/activity_me_cache.xml

@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite">
 
     <LinearLayout
         android:layout_width="match_parent"

+ 2 - 1
app/src/main/res/layout/activity_test.xml

@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite">
 
 
     <ScrollView

+ 1 - 0
app/src/main/res/layout/activity_test_glide_crop.xml

@@ -4,6 +4,7 @@
     android:orientation="vertical" 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/colorWhite"
     android:padding="10dp">
 
     <LinearLayout

+ 2 - 1
app/src/main/res/layout/activity_test_my.xml

@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite">
 
 
     <org.yczbj.ycvideoplayerlib.VideoPlayer