From c16afd490d9e2c30b0f84ca7300fdb4999046739 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Wed, 23 Sep 2020 21:59:56 +0800 Subject: [PATCH 01/52] dependencies --- build.gradle | 2 +- demo/build.gradle | 2 +- gradlew | 0 library/build.gradle | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index 353dce49..37589407 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = '1.4.10' repositories { jcenter() google() diff --git a/demo/build.gradle b/demo/build.gradle index 240a542d..a352a4da 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.12' implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation project(':library') implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8' implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4' diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/library/build.gradle b/library/build.gradle index d809fca6..e5bcd2df 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -24,7 +24,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.core:core-ktx:+" + implementation "androidx.core:core-ktx:1.3.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } From b882f22bc2765ce7b49eb714d9f72b0ac3a96f06 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Wed, 23 Sep 2020 22:13:23 +0800 Subject: [PATCH 02/52] upgrade kt --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index e5bcd2df..5e66face 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.core:core-ktx:1.3.1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } apply from: '../gradle/build_upload.gradle' From 378170db9ce0299b55d4022a4712741110dafc74 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sat, 26 Sep 2020 01:32:47 +0800 Subject: [PATCH 03/52] readme --- README.md | 50 ++++++++++---------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 1ecb6816..ecaf10dc 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,8 @@ -

JiaoZiVideoPlayer

 +

JiaoZiVideoPlayer

 -- -

- - - - -

- -高度自定义的安卓视频框架 - -## 置顶消息： - -群主微信进饺子粉丝群，沟通重心从Q群转移到微信群。微信:lipangit备注JZVD，Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，QQ:1066666651，[Telegram](https://t.me/jiaozitoken)，[Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)，[公众号文章](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0) - -为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，推出基于以太坊ERC-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/JZVD/JZT)，必定大有可为。 - -#### [找点事做挣饺子币](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%89%BE%E7%82%B9%E4%BA%8B%E5%81%9A%EF%BC%8C%E6%8C%A3%E7%82%B9%E9%A5%BA%E5%AD%90%E5%B8%81) - -#### [购买咨询服务送饺子币](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E8%B4%AD%E4%B9%B0%E5%92%A8%E8%AF%A2%E6%9C%8D%E5%8A%A1%E9%80%81%E9%A5%BA%E5%AD%90%E5%B8%81) - -## 文档 - -- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装[Demo jiaozivideoplayer-7.5.0.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.5.0/jiaozivideoplayer-7.5.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)，测试哪个播放内核适合自己的项目 - -## 效果 - - - - +高度自定义的安卓视频框架 ## QuickStart @@ -92,18 +63,17 @@ protected void onPause() { -keep interface tv.danmaku.ijk.media.player.** { *; } ``` -即便是自定义UI，或者对Library有过修改，依然要通过上述步骤使用播放器。 - -## 注意： -1. 7.0版本之后要在JzvdStd外面包一层Layout -2. 如果引入配置失败，根据失败的log检查是否添加了Java8的配置，或者升级环境到最新的稳定版 - -## JZVD DEMO说明 -

JiaoZiVideoPlayer

 +## 效果 +

+ +

+

+ +

## License MIT -Copyright (c) 2015-2020 李盼 +Copyright (c) 2015-2020 jzvd.org Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: From a9d3855e347554fb52980d40bcd946a6352db363 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sat, 26 Sep 2020 01:47:31 +0800 Subject: [PATCH 04/52] readme --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ecaf10dc..50c00ca2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -

JiaoZiVideoPlayer

 --- - - 高度自定义的安卓视频框架 ## QuickStart @@ -65,10 +61,10 @@ protected void onPause() { ## 效果

- +

- +

## License MIT From aa66c160f72b0ed72c6cab085543cdd9a265b055 Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Sun, 27 Sep 2020 03:07:32 +0800 Subject: [PATCH 05/52] index.md --- docs/index.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/index.md diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 00000000..e69de29b From b5b6b652b12f0f6af15c1ed5dbfded23ec555a8c Mon Sep 17 00:00:00 2001 From: Nathen <1066666651@qq.com> Date: Mon, 28 Sep 2020 20:39:36 +0800 Subject: [PATCH 06/52] docs --- demo/src/main/AndroidManifest.xml | 4 - .../java/cn/jzvd/demo/Fragment_1_Base.java | 9 +- .../Tab_1_Basic/ExtendsNormalActivity.java | 44 ---------- .../res/layout/activity_extends_normal.xml | 16 ---- demo/src/main/res/layout/fragment_api.xml | 8 -- docs/index.md | 85 +++++++++++++++++++ 6 files changed, 86 insertions(+), 80 deletions(-) delete mode 100644 demo/src/main/java/cn/jzvd/demo/Tab_1_Basic/ExtendsNormalActivity.java delete mode 100644 demo/src/main/res/layout/activity_extends_normal.xml diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index d5804e44..2d567c9e 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -72,10 +72,6 @@ android:name=".Tab_1_Basic.OrientationActivity" android:configChanges="orientation|screenSize|keyboardHidden" android:screenOrientation="portrait" /> - - - - - - diff --git a/demo/src/main/res/layout/fragment_api.xml b/demo/src/main/res/layout/fragment_api.xml index 62dc8c73..4dd0961e 100644 --- a/demo/src/main/res/layout/fragment_api.xml +++ b/demo/src/main/res/layout/fragment_api.xml @@ -29,14 +29,6 @@ android:layout_marginBottom="8dp" android:text="@string/orientation" /> -