diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index ea10989dabf85316bcca1efbc7006a978d93598c..82073aa4547d6a752369c37aad3c96c9f4c586c4 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -42,10 +42,9 @@ public class DetailPlayer extends AppCompatActivity { setContentView(R.layout.activity_detail_player); ButterKnife.bind(this); - //String url = "http://baobab.wdjcdn.com/14564977406580.mp4"; - //String url = "https://s3.cn-north-1.amazonaws.com.cn/talkpal/lecture/video/472/v.mp4"; - String url = "https://d131x7vzzf85jg.cloudfront.net/upload/documents/paper/b2/61/00/00/20160420_115018_b544.mp4"; - detailPlayer.setUp(url, false, null, "测试视频"); + String url = "http://baobab.wdjcdn.com/14564977406580.mp4"; + //String url = "https://d131x7vzzf85jg.cloudfront.net/upload/documents/paper/b2/61/00/00/20160420_115018_b544.mp4"; + detailPlayer.setUp(url, true, null, "测试视频"); //增加封面 ImageView imageView = new ImageView(this); diff --git a/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java b/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java index b7dbb8f0ba945d341f7ecb767499317e43f090d3..6957177f349a99a56666a593c2d2a805a57fa28d 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java +++ b/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java @@ -93,6 +93,8 @@ public class ListNormalAdapter extends BaseAdapter { //默认缓存路径 holder.gsyVideoPlayer.setUp(url, true , null, "这是title"); + //holder.gsyVideoPlayer.setNeedShowWifiTip(false); + /************************下方为其他路径************************************/ //如果一个列表的缓存路劲都一一致 //holder.gsyVideoPlayer.setUp(url, true, new File(FileUtils.getTestPath(), "")); diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoPlayer.java index 2a59ec6bc6673c536da5097983602f568aee7ad8..a1ef6b9afff467a2adcdf96ecdd16b3f155467c0 100644 --- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoPlayer.java +++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoPlayer.java @@ -66,8 +66,6 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View. public static boolean IF_RELEASE_WHEN_ON_PAUSE = true; - public static boolean WIFI_TIP_DIALOG_SHOWED = false; - protected Timer UPDATE_PROGRESS_TIMER; protected Surface mSurface; @@ -124,7 +122,6 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View. protected boolean mFirstTouch = false;//是否首次触摸 - /** * 当前UI */ @@ -294,7 +291,8 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View. return; } if (mCurrentState == CURRENT_STATE_NORMAL || mCurrentState == CURRENT_STATE_ERROR) { - if (!mUrl.startsWith("file") && !CommonUtil.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) { + if (!mUrl.startsWith("file") && !CommonUtil.isWifiConnected(getContext()) + && mNeedShowWifiTip) { showWifiDialog(); return; } diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/utils/ListVideoUtil.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/utils/ListVideoUtil.java index 37b32a9c555e3f2dc6a7d77aaef5367db16454e8..e018abffb16d49f5405c8e903318ebbcc4394634 100644 --- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/utils/ListVideoUtil.java +++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/utils/ListVideoUtil.java @@ -58,6 +58,7 @@ public class ListVideoUtil { private boolean isLoop;//循环 private boolean hideKey = true;//隐藏按键 private boolean needLockFull = true;//隐藏按键 + protected boolean needShowWifiTip = true; //是否需要显示流量提示 private int[] listItemRect;//当前item框的屏幕位置 @@ -133,6 +134,8 @@ public class ListVideoUtil { gsyVideoPlayer.setSpeed(speed); + gsyVideoPlayer.setNeedShowWifiTip(needShowWifiTip); + gsyVideoPlayer.setNeedLockFull(needLockFull); gsyVideoPlayer.setUp(url, true, cachePath, mapHeadData, objects); @@ -618,4 +621,15 @@ public class ListVideoUtil { this.needLockFull = needLoadFull; } + public boolean isNeedShowWifiTip() { + return needShowWifiTip; + } + + /** + * 是否需要显示流量提示,默认true + */ + public void setNeedShowWifiTip(boolean needShowWifiTip) { + this.needShowWifiTip = needShowWifiTip; + } + } diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java index f48504fb880af927d15bf2745f60734f4fd768cb..22ca46b21c806f83dd3475cc59e551d7922487de 100644 --- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java +++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java @@ -62,6 +62,8 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia private boolean mShowFullAnimation = true;//是否使用全屏动画效果 + protected boolean mNeedShowWifiTip = true; //是否需要显示流量提示 + protected int[] mListItemRect;//当前item框的屏幕位置 protected int[] mListItemSize;//当前item的大小 @@ -309,6 +311,7 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia gsyVideoPlayer.mHadPlay = mHadPlay; gsyVideoPlayer.mCacheFile = mCacheFile; gsyVideoPlayer.mFullPauseBitmap = mFullPauseBitmap; + gsyVideoPlayer.mNeedShowWifiTip = mNeedShowWifiTip; gsyVideoPlayer.setUp(mUrl, mCache, mCachePath, mMapHeadData, mObjects); gsyVideoPlayer.setStateAndUi(mCurrentState); gsyVideoPlayer.addTextureView(); @@ -662,4 +665,15 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia public void setHideKey(boolean hideKey) { this.mHideKey = hideKey; } + + public boolean isNeedShowWifiTip() { + return mNeedShowWifiTip; + } + + /** + * 是否需要显示流量提示,默认true + */ + public void setNeedShowWifiTip(boolean needShowWifiTip) { + this.mNeedShowWifiTip = needShowWifiTip; + } } diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java index ac431ba8f9a900a35b5bba314bc1af2c13d26446..2b43e5316baa8d47f034b36b331d05270bca9dcd 100644 --- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java +++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java @@ -285,7 +285,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer { return; } if (mCurrentState == CURRENT_STATE_NORMAL) { - if (!mUrl.startsWith("file") && !CommonUtil.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) { + if (!mUrl.startsWith("file") && !CommonUtil.isWifiConnected(getContext()) && mNeedShowWifiTip) { showWifiDialog(); return; } @@ -321,7 +321,6 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); startPlayLogic(); - WIFI_TIP_DIALOG_SHOWED = true; } }); builder.setNegativeButton(getResources().getString(R.string.tips_not_wifi_cancel), new DialogInterface.OnClickListener() {