From cae0ff524ee89a9b25cf6db88b7db5f75cb8d0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=B4=E9=B9=BF?= Date: Thu, 21 May 2020 16:46:00 +0800 Subject: [PATCH 1/2] tt --- demo/build.gradle | 0 .../JzvdStdShowShareButtonAfterFullscreen.java | 0 .../CustomJzvd/JzvdStdShowTitleAfterFullscreen.java | 0 .../java/cn/jzvd/demo/CustomMedia/JZMediaExo.java | 0 .../java/cn/jzvd/demo/api/CustomMediaActivity.java | 0 .../main/java/cn/jzvd/demo/utils/StatusBarUtil.java | 0 .../res/layout/activity_api_custom_mediaplayer.xml | 0 .../main/res/layout/activity_listview_viewpager.xml | 0 demo/src/main/res/layout/item_textview.xml | 0 demo/src/main/res/layout/item_tiktok.xml | 0 demo/src/main/res/layout/item_videoview.xml | 0 demo/src/main/res/layout/item_videoview_tiny.xml | 0 demo/src/main/res/layout/layout_list.xml | 0 .../res/layout/layout_std_with_share_button.xml | 0 gradle.properties | 0 gradlew | 0 library/src/main/java/cn/jzvd/JZUtils.java | 0 .../main/res/drawable-xhdpi/jz_back_tiny_normal.png | Bin .../res/drawable-xhdpi/jz_back_tiny_pressed.png | Bin .../main/res/drawable-xhdpi/jz_battery_level_10.png | Bin .../res/drawable-xhdpi/jz_battery_level_100.png | Bin .../main/res/drawable-xhdpi/jz_battery_level_30.png | Bin .../main/res/drawable-xhdpi/jz_battery_level_50.png | Bin .../main/res/drawable-xhdpi/jz_battery_level_70.png | Bin .../main/res/drawable-xhdpi/jz_battery_level_90.png | Bin .../src/main/res/drawable-xhdpi/jz_pause_normal.png | Bin .../main/res/drawable-xhdpi/jz_pause_pressed.png | Bin .../src/main/res/drawable-xhdpi/jz_play_normal.png | Bin .../src/main/res/drawable-xhdpi/jz_play_pressed.png | Bin .../main/res/drawable-xhdpi/jz_restart_normal.png | Bin .../main/res/drawable-xhdpi/jz_restart_pressed.png | Bin library/src/main/res/drawable/jz_bottom_bg.9.png | Bin library/src/main/res/drawable/jz_title_bg.9.png | Bin 33 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 demo/build.gradle mode change 100755 => 100644 demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowShareButtonAfterFullscreen.java mode change 100755 => 100644 demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTitleAfterFullscreen.java mode change 100755 => 100644 demo/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java mode change 100755 => 100644 demo/src/main/java/cn/jzvd/demo/api/CustomMediaActivity.java mode change 100755 => 100644 demo/src/main/java/cn/jzvd/demo/utils/StatusBarUtil.java mode change 100755 => 100644 demo/src/main/res/layout/activity_api_custom_mediaplayer.xml mode change 100755 => 100644 demo/src/main/res/layout/activity_listview_viewpager.xml mode change 100755 => 100644 demo/src/main/res/layout/item_textview.xml mode change 100755 => 100644 demo/src/main/res/layout/item_tiktok.xml mode change 100755 => 100644 demo/src/main/res/layout/item_videoview.xml mode change 100755 => 100644 demo/src/main/res/layout/item_videoview_tiny.xml mode change 100755 => 100644 demo/src/main/res/layout/layout_list.xml mode change 100755 => 100644 demo/src/main/res/layout/layout_std_with_share_button.xml mode change 100755 => 100644 gradle.properties mode change 100755 => 100644 gradlew mode change 100755 => 100644 library/src/main/java/cn/jzvd/JZUtils.java mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_10.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_100.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_30.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_50.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_70.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_battery_level_90.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_pause_normal.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_pause_pressed.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_play_normal.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_play_pressed.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_restart_normal.png mode change 100755 => 100644 library/src/main/res/drawable-xhdpi/jz_restart_pressed.png mode change 100755 => 100644 library/src/main/res/drawable/jz_bottom_bg.9.png mode change 100755 => 100644 library/src/main/res/drawable/jz_title_bg.9.png diff --git a/demo/build.gradle b/demo/build.gradle old mode 100755 new mode 100644 diff --git a/demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowShareButtonAfterFullscreen.java b/demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowShareButtonAfterFullscreen.java old mode 100755 new mode 100644 diff --git a/demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTitleAfterFullscreen.java b/demo/src/main/java/cn/jzvd/demo/CustomJzvd/JzvdStdShowTitleAfterFullscreen.java old mode 100755 new mode 100644 diff --git a/demo/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java b/demo/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java old mode 100755 new mode 100644 diff --git a/demo/src/main/java/cn/jzvd/demo/api/CustomMediaActivity.java b/demo/src/main/java/cn/jzvd/demo/api/CustomMediaActivity.java old mode 100755 new mode 100644 diff --git a/demo/src/main/java/cn/jzvd/demo/utils/StatusBarUtil.java b/demo/src/main/java/cn/jzvd/demo/utils/StatusBarUtil.java old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/activity_api_custom_mediaplayer.xml b/demo/src/main/res/layout/activity_api_custom_mediaplayer.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/activity_listview_viewpager.xml b/demo/src/main/res/layout/activity_listview_viewpager.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/item_textview.xml b/demo/src/main/res/layout/item_textview.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/item_tiktok.xml b/demo/src/main/res/layout/item_tiktok.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/item_videoview.xml b/demo/src/main/res/layout/item_videoview.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/item_videoview_tiny.xml b/demo/src/main/res/layout/item_videoview_tiny.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/layout_list.xml b/demo/src/main/res/layout/layout_list.xml old mode 100755 new mode 100644 diff --git a/demo/src/main/res/layout/layout_std_with_share_button.xml b/demo/src/main/res/layout/layout_std_with_share_button.xml old mode 100755 new mode 100644 diff --git a/gradle.properties b/gradle.properties old mode 100755 new mode 100644 diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/library/src/main/java/cn/jzvd/JZUtils.java b/library/src/main/java/cn/jzvd/JZUtils.java old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png b/library/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png b/library/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_10.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_10.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_100.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_100.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_30.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_30.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_50.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_50.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_70.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_70.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_battery_level_90.png b/library/src/main/res/drawable-xhdpi/jz_battery_level_90.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_pause_normal.png b/library/src/main/res/drawable-xhdpi/jz_pause_normal.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_pause_pressed.png b/library/src/main/res/drawable-xhdpi/jz_pause_pressed.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_play_normal.png b/library/src/main/res/drawable-xhdpi/jz_play_normal.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_play_pressed.png b/library/src/main/res/drawable-xhdpi/jz_play_pressed.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_restart_normal.png b/library/src/main/res/drawable-xhdpi/jz_restart_normal.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable-xhdpi/jz_restart_pressed.png b/library/src/main/res/drawable-xhdpi/jz_restart_pressed.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable/jz_bottom_bg.9.png b/library/src/main/res/drawable/jz_bottom_bg.9.png old mode 100755 new mode 100644 diff --git a/library/src/main/res/drawable/jz_title_bg.9.png b/library/src/main/res/drawable/jz_title_bg.9.png old mode 100755 new mode 100644 From 38a6937dd0dbef6217ae9f9826dd6a5385ac1f0e Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sun, 24 May 2020 22:17:01 +0800 Subject: [PATCH 2/2] v7.4.0 --- README.md | 6 +++--- demo/build.gradle | 4 ++-- gradle/build_upload.gradle | 2 +- library/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5f09573a..b2ae9e63 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ --

- +

@@ -23,7 +23,7 @@ ## 文档 -- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装[Demo jiaozivideoplayer-7.3.1.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.3.1/jiaozivideoplayer-7.3.1.apk)，仔细过一遍Demo +- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装[Demo jiaozivideoplayer-7.4.0.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.4.0/jiaozivideoplayer-7.4.0.apk)，仔细过一遍Demo - [文档 - 自定义Jzvd](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89Jzvd)，继承JzvdStd实现自己的播放器 - [文档 - 自定义播放内核](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89%E6%92%AD%E6%94%BE%E5%86%85%E6%A0%B8)，测试哪个播放内核适合自己的项目 @@ -37,7 +37,7 @@ 1.添加类库 ```gradle -implementation 'cn.jzvd:jiaozivideoplayer:7.3.1' +implementation 'cn.jzvd:jiaozivideoplayer:7.4.0' ``` 2.添加布局 diff --git a/demo/build.gradle b/demo/build.gradle index dbc08a3a..b888b879 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -8,8 +8,8 @@ android { applicationId "cn.jzvd.demo" minSdkVersion 16 targetSdkVersion 29 - versionCode 101 - versionName "7.3.1" + versionCode 102 + versionName "7.4.0" ndk { // add support lib abiFilters 'armeabi-v7a' //, 'arm64-v8a'//, "mips" //,'armeabi''x86',, 'x86_64', diff --git a/gradle/build_upload.gradle b/gradle/build_upload.gradle index 1da1b39b..445d2a54 100644 --- a/gradle/build_upload.gradle +++ b/gradle/build_upload.gradle @@ -8,7 +8,7 @@ signing { group = "cn.jzvd" archivesBaseName = "jiaozivideoplayer" -version = "7.3.1" +version = "7.4.0" uploadArchives { repositories { diff --git a/library/build.gradle b/library/build.gradle index bfecb012..39047ab3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 101 - versionName "7.3.1" + versionCode 102 + versionName "7.4.0" } compileOptions {