Merge pull request #808 from CarGuo/dev

Dev

README.md

@@ -173,10 +173,22 @@ compile 'com.shuyu:gsyVideoPlayer-ex_so:4.0.0-beat1'
 ## 七、混淆
 
 ```
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.**
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.base.**
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.utils.**
 -keep class tv.danmaku.ijk.** { *; }
 -dontwarn tv.danmaku.ijk.**
--keep class com.shuyu.gsyvideoplayer.** { *; }
--dontwarn com.shuyu.gsyvideoplayer.**
+
+-keep public class * extends android.view.View{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
 ```
 
 ## 温馨提示

app/build.gradle

@@ -13,8 +13,8 @@ android {
         minSdkVersion globalConfiguration.androidMinSdkVersion
         targetSdkVersion globalConfiguration.androidTargetSdkVersion
 
-        versionCode 3
-        versionName "1.4.9"
+        versionCode 5
+        versionName "4.0.0"
 
         javaCompileOptions {
             annotationProcessorOptions.includeCompileClasspath = true

app/proguard-rules.pro

@@ -40,12 +40,6 @@
     native <methods>;
 }
 
-
--keepclassmembers class fqcn.of.javascript.interface.for.webview {
-   public *;
-}
-
-
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
     private static final java.io.ObjectStreamField[] serialPersistentFields;
@@ -77,7 +71,53 @@ public static ** valueOf(java.lang.String);
 }
 
 
--keep class com.shuyu.gsyvideoplayer.** { *; }
--dontwarn com.shuyu.gsyvideoplayer.**
+# 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆
+-keepclassmembers class * {
+    void *(**On*Event);
+    void *(**On*Listener);
+}
+
+-keepclassmembers class * extends android.webkit.webViewClient {
+    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+    public boolean *(android.webkit.WebView, java.lang.String);
+}
+-keepclassmembers class * extends android.webkit.webViewClient {
+    public void *(android.webkit.webView, jav.lang.String);
+}
+
+
+# ButterKnife
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+-keepclasseswithmembernames class * {
+    @butterknife.* <fields>;
+}
+-keepclasseswithmembernames class * {
+    @butterknife.* <methods>;
+}
+
+# Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+
+# 保留我们自定义控件（继承自View）不被混淆
+-keep public class * extends android.view.View{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.**
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.base.**
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.utils.**
 -keep class tv.danmaku.ijk.** { *; }
 -dontwarn tv.danmaku.ijk.**
\ No newline at end of file

app/src/main/java/com/example/gsyvideoplayer/DanmkuVideoActivity.java

@@ -54,7 +54,8 @@ public class DanmkuVideoActivity extends AppCompatActivity {
         danmakuVideoPlayer.setShrinkImageRes(R.drawable.custom_shrink);
         danmakuVideoPlayer.setEnlargeImageRes(R.drawable.custom_enlarge);
 
-        String url = "https://res.exexm.com/cw_145225549855002";
+        //String url = "https://res.exexm.com/cw_145225549855002";
+        String url = "http://9890.vod.myqcloud.com/9890_4e292f9a3dd011e6b4078980237cc3d3.f20.mp4";
         //String url = "https://res.exexm.com/cw_145225549855002";
         danmakuVideoPlayer.setUp(url, true, null, "测试视频");
 

dependencies.gradle

@@ -17,7 +17,7 @@ ext {
     butterKnifeVersion = '8.2.1'
 
     ijkplayer = '0.8.4'
-    DanmakuFlameMaster = '0.6.4'
+    DanmakuFlameMaster = '0.9.16'
 
     transitionseverywhere = '1.7.0'
     floatWindow = '1.0.6'
@@ -54,6 +54,7 @@ ext {
             ndkbitmap_armv7a     : "com.github.ctiao:ndkbitmap-armv7a:${DanmakuFlameMaster}",
             ndkbitmap_armv5      : "com.github.ctiao:ndkbitmap-armv5:${DanmakuFlameMaster}",
             ndkbitmap_x86        : "com.github.ctiao:ndkbitmap-x86:${DanmakuFlameMaster}",
+
             glide                : "com.github.bumptech.glide:glide:${imageLoader}",
             glideProcessor       : "com.github.bumptech.glide:compiler:${imageLoader}",
             floatWindow          : "com.github.yhaolpz:FloatWindow:${floatWindow}",

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYVideoBaseManager.java

@@ -584,9 +584,10 @@ public abstract class GSYVideoBaseManager implements IMediaPlayer.OnPreparedList
     }
 
     /**
-     * 设置了视频的播放类型,IJKEXOPLAYER和IJKEXOPLAYER2是互斥的
-     * GSYVideoType IJKPLAYER = 0 or IJKEXOPLAYER = 1 or IJKEXOPLAYER2 = 2;
-     * IJKEXOPLAYER2 must be compile com.shuyu:gsyVideoPlayer-exo2:$gsyVideoVersion
+     * 设置了视频的播放类型
+     * IJKPLAYER = 0; 默认IJK
+     * IJKEXOPLAYER2 = 2;EXOPlayer2 (最好配合GSYVideoType.SUFRACE)
+     * SYSTEMPLAYER = 4;系统播放器 (最好配合GSYVideoType.SUFRACE)
      */
     public void setVideoType(Context context, int videoType) {
         this.context = context.getApplicationContext();