diff --git a/app/build.gradle b/app/build.gradle index 0bda3a120..b0e03775c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,6 @@ dependencies { def androidDependencies = rootProject.ext.androidDependencies def dataDependencies = rootProject.ext.dataDependencies annotationProcessor viewDependencies.apt_butterKnife - //debugCompile dataDependencies.leakcanary implementation viewDependencies.butterKnife implementation androidDependencies.recyclerView implementation viewDependencies.DanmakuFlameMaster @@ -102,4 +101,7 @@ dependencies { //implementation "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion" + + debugImplementation dataDependencies.leakcanary + } diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index 4977e2f17..652cd9f0d 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -239,8 +239,8 @@ private String getUrl() { //String url = "ijkhttphook:https://res.exexm.com/cw_145225549855002"; // - // String url = "http://7xjmzj.com1.z0.glb.clouddn.com/20171026175005_JObCxCE2.mp4"; - String url = "http://hjq-1257036536.cos.ap-shanghai.myqcloud.com/m3u8/m1/out2.m3u8"; + String url = "http://7xjmzj.com1.z0.glb.clouddn.com/20171026175005_JObCxCE2.mp4"; + //String url = "http://hjq-1257036536.cos.ap-shanghai.myqcloud.com/m3u8/m1/out2.m3u8"; //String url = "http://223.110.243.138/PLTV/2510088/224/3221227177/index.m3u8"; //String url = "http://qiniu.carmmi.com/image/132451525666042.mp4"; //String url = "http://ucp.wn.sunmath.cn/file-upload/gYQJHxK9iNQKJeWyS/V80418-103803.mp4?rc_uid=7sCFCGoaF2iTc9vH9&rc_token=prJK-xGutKmy2LDQO-OZASjob0o1u_s3e5SgMHmgjtn"; diff --git a/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java b/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java index 9a42583a3..3f5b39963 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java +++ b/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java @@ -1,6 +1,5 @@ package com.example.gsyvideoplayer; -import android.app.Application; import android.support.multidex.MultiDexApplication; import com.shuyu.gsyvideoplayer.GSYVideoManager; @@ -14,7 +13,7 @@ import tv.danmaku.ijk.media.exo2.Exo2PlayerManager; import tv.danmaku.ijk.media.exo2.ExoPlayerCacheManager; -//import com.squareup.leakcanary.LeakCanary; +import com.squareup.leakcanary.LeakCanary; /** * Created by shuyu on 2016/11/11. @@ -25,12 +24,12 @@ public class GSYApplication extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); - //if (LeakCanary.isInAnalyzerProcess(this)) { + if (LeakCanary.isInAnalyzerProcess(this)) { // This process is dedicated to LeakCanary for heap analysis. // You should not init your app in this process. - //return; - //} - //LeakCanary.install(this); + return; + } + LeakCanary.install(this); //GSYVideoType.enableMediaCodec(); //GSYVideoType.enableMediaCodecTexture(); @@ -44,12 +43,12 @@ public void onCreate() { //GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL); //GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL); + //GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL); //GSYVideoType.setRenderType(GSYVideoType.SUFRACE); //GSYVideoType.setRenderType(GSYVideoType.GLSURFACE); //IjkPlayerManager.setLogLevel(IjkMediaPlayer.IJK_LOG_SILENT); - //GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL); } } diff --git a/dependencies.gradle b/dependencies.gradle index 8240cf609..9517da37b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -25,7 +25,7 @@ ext { floatWindow = '1.0.6' //DataLibraries - leakcanary = '1.5' + leakcanary= '1.6.1' imageLoader = '4.0.0'