From 13d251104e0256bb69c990cd0fbe3021930fb81a Mon Sep 17 00:00:00 2001 From: KingYang Date: Fri, 7 Dec 2018 16:42:39 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=B0=83=E6=95=B4setUp=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整setUp之前的初始化UI，隐藏播放/重试/电量布局，防止用户在setUp之前进行操作，提升用户体验 --- jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index 9b130a6fb..69e832f9e 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -150,7 +150,8 @@ android:layout_marginEnd="14dp" android:layout_marginRight="14dp" android:gravity="center_vertical" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="invisible"> + android:layout_gravity="center_vertical" + android:visibility="invisible"> + android:orientation="vertical" + android:visibility="invisible"> Date: Fri, 7 Dec 2018 19:33:31 +0800 Subject: [PATCH 02/11] fix npe --- jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java index 4f47d4c20..996f1b59b 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java @@ -263,7 +263,7 @@ public void onClick(View v) { super.onClick(v); int i = v.getId(); if (i == R.id.thumb) { - if (jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) { + if (jzDataSource == null ||jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) { Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show(); return; } From b414df931e348280406b5d1a79db5e891aa0142b Mon Sep 17 00:00:00 2001 From: I Date: Sat, 8 Dec 2018 14:22:40 +0800 Subject: [PATCH 03/11] speed button should not show > 23 --- app/src/main/java/cn/jzvd/demo/CustomView/JzvdStdSpeed.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/cn/jzvd/demo/CustomView/JzvdStdSpeed.java b/app/src/main/java/cn/jzvd/demo/CustomView/JzvdStdSpeed.java index 71d4fde32..bf48e06b1 100644 --- a/app/src/main/java/cn/jzvd/demo/CustomView/JzvdStdSpeed.java +++ b/app/src/main/java/cn/jzvd/demo/CustomView/JzvdStdSpeed.java @@ -32,7 +32,8 @@ public void init(Context context) { @Override public void setUp(JZDataSource jzDataSource, int screen) { super.setUp(jzDataSource, screen); - if (currentScreen == SCREEN_WINDOW_FULLSCREEN) { + if (currentScreen == SCREEN_WINDOW_FULLSCREEN && + android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { tvSpeed.setVisibility(View.VISIBLE); } else { tvSpeed.setVisibility(View.GONE); From 32cd6e4f4957a2a3e558923ba0245f7534bb5245 Mon Sep 17 00:00:00 2001 From: I Date: Sat, 8 Dec 2018 14:30:02 +0800 Subject: [PATCH 04/11] =?UTF-8?q?Revert=20"=E8=B0=83=E6=95=B4setUp?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84UI"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 13d251104e0256bb69c990cd0fbe3021930fb81a. --- jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index 69e832f9e..9b130a6fb 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -150,8 +150,7 @@ android:layout_marginEnd="14dp" android:layout_marginRight="14dp" android:gravity="center_vertical" - android:orientation="vertical" - android:visibility="invisible"> + android:orientation="vertical"> + android:layout_gravity="center_vertical"> + android:orientation="vertical"> Date: Sat, 8 Dec 2018 14:49:41 +0800 Subject: [PATCH 05/11] fix ui bug --- .../src/main/res/layout/jz_layout_std.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index 9b130a6fb..f2e6bb523 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -109,9 +109,10 @@ android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:paddingLeft="10dp" android:background="@drawable/jz_title_bg" - android:paddingStart="10dp"> + android:paddingStart="10dp" + android:paddingLeft="10dp" + android:visibility="gone"> + android:orientation="vertical" + android:visibility="invisible"> + android:orientation="vertical" + android:visibility="invisible"> Date: Thu, 20 Dec 2018 00:07:14 +0800 Subject: [PATCH 06/11] manifest --- app/src/main/AndroidManifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 95c0094e8..6d46d5ecb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,19 @@ + + android:theme="@style/AppTheme" + tools:ignore="GoogleAppIndexingWarning"> Date: Thu, 20 Dec 2018 00:59:05 +0800 Subject: [PATCH 07/11] fix crach about batter receive --- jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java index 996f1b59b..bf3553884 100644 --- a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java +++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java @@ -76,7 +76,11 @@ public void onReceive(Context context, Intent intent) { int percent = level * 100 / scale; LAST_GET_BATTERYLEVEL_PERCENT = percent; setBatteryLevel(); - getContext().unregisterReceiver(battertReceiver); + try { + getContext().unregisterReceiver(battertReceiver); + } catch (Exception e) { + e.printStackTrace(); + } } } }; @@ -263,7 +267,7 @@ public void onClick(View v) { super.onClick(v); int i = v.getId(); if (i == R.id.thumb) { - if (jzDataSource == null ||jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) { + if (jzDataSource == null || jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) { Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show(); return; } From 08e37eaa86d0c9a6e508cfaad1eb2a1a3cfac630 Mon Sep 17 00:00:00 2001 From: I Date: Wed, 9 Jan 2019 18:39:00 +0800 Subject: [PATCH 08/11] fix item click descendantFocusability --- jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index f2e6bb523..f66e04f51 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" - android:descendantFocusability="blocksDescendants"> + android:descendantFocusability="afterDescendants"> + + From bb5cdc39f73278434c35d38a4ab8ace29ac973f0 Mon Sep 17 00:00:00 2001 From: I Date: Sat, 19 Jan 2019 19:27:23 +0800 Subject: [PATCH 09/11] upgrade env --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ae9fbafb9..72c996660 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 82ed672a2a1215ad7660ac597bbf4941910a799c Mon Sep 17 00:00:00 2001 From: I Date: Wed, 23 Jan 2019 16:38:48 +0800 Subject: [PATCH 10/11] rm et --- jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index f66e04f51..82948dd2c 100644 --- a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml +++ b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml @@ -241,10 +241,4 @@ android:textColor="@android:color/white" android:textSize="14sp" /> - - From 4a194254bb601308a6efefb159164901961e7b52 Mon Sep 17 00:00:00 2001 From: I Date: Tue, 5 Feb 2019 16:56:39 +0800 Subject: [PATCH 11/11] v6.4.2 --- README-ZH.md | 4 ++-- README.md | 4 ++-- app/build.gradle | 4 ++-- gradle/maven_push.gradle | 2 +- jiaozivideoplayer/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index 5492932d9..88c05793a 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -30,7 +30,7 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd ## 使用步骤 1. 通读ReadMe -2. 下载安装demo apk [jiaozivideoplayer-6.4.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.4.1/jiaozivideoplayer-6.4.1.apk)，各个页面都进入一次，各个按钮点一次 +2. 下载安装demo apk [jiaozivideoplayer-6.4.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.4.2/jiaozivideoplayer-6.4.1.apk)，各个页面都进入一次，各个按钮点一次 3. 下载调试develop分支，有针对性的通过效果找到实现的源码 4. 看[自定义相关的WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，实现自己的需求 @@ -52,7 +52,7 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd compile 'cn.jzvd:jiaozivideoplayer:6.4.1' ``` -或直接下载 [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.1) (不建议) +或直接下载 [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.2) (不建议) 2.添加布局 ```xml diff --git a/README.md b/README.md index 0c22d2411..a9c3efe85 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd ## Steps for usage 1. Read through ReadMe -2. Download and install the demo apk[jiaozivideoplayer-6.4.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.4.1/jiaozivideoplayer-6.4.1.apk), each page enters once, each button clicks once +2. Download and install the demo apk[jiaozivideoplayer-6.4.1.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.4.2/jiaozivideoplayer-6.4.1.apk), each page enters once, each button clicks once 3. Download and debug the develop branch, and find the source code through the effect 4. See [custom-related WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，Realize your own needs @@ -57,7 +57,7 @@ Only five steps to use the player: implementation 'cn.jzvd:jiaozivideoplayer:6.4.1' ``` -Or download [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.1) (not recommended). +Or download [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.2) (not recommended). 2.Add `JZVideoPlayer` in your layout: ```xml diff --git a/app/build.gradle b/app/build.gradle index 623b796a8..7a96bd120 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "cn.jzvd.demo" minSdkVersion 16 targetSdkVersion 28 - versionCode 86 - versionName "6.4.1" + versionCode 87 + versionName "6.4.2" } signingConfigs { releaseConfig { diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle index a7f89d4dd..1dd1dee35 100644 --- a/gradle/maven_push.gradle +++ b/gradle/maven_push.gradle @@ -22,7 +22,7 @@ signing { group = "cn.jzvd" archivesBaseName = "jiaozivideoplayer" -version = "6.4.1" +version = "6.4.2" uploadArchives { repositories { diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle index a5d7dd7a4..728f5fa00 100644 --- a/jiaozivideoplayer/build.gradle +++ b/jiaozivideoplayer/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 86 - versionName "6.4.1" + versionCode 87 + versionName "6.4.2" } buildTypes { release {