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/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"> = android.os.Build.VERSION_CODES.M) { tvSpeed.setVisibility(View.VISIBLE); } else { tvSpeed.setVisibility(View.GONE); 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 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 { diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java index 4f47d4c20..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.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; } diff --git a/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml b/jiaozivideoplayer/src/main/res/layout/jz_layout_std.xml index 9b130a6fb..82948dd2c 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"> + android:paddingStart="10dp" + android:paddingLeft="10dp" + android:visibility="gone"> + android:orientation="vertical" + android:visibility="invisible"> + android:orientation="vertical" + android:visibility="invisible">