Merge branch 'dev_Memory' into dev_test

# Conflicts:
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/glide/ImgLoader.java
#	dependencies.gradle
#	live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
#	live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
#	main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
#	main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java

dependencies.gradle

@@ -15,7 +15,7 @@ ext {
             "glide-transformations": 'jp.wasabeef:glide-transformations:3.1.1',//一个基于Glide的transformation库,拥有裁剪,着色,模糊,滤镜等多种转换效果
             "roundedimageview"     : 'com.makeramen:roundedimageview:2.3.0', //带圆角，边框的的ImageView
             "gif-drawable"         : 'pl.droidsonroids.gif:android-gif-drawable:1.2.23',//gif库，播放礼物gif用
-            "SVGAPlayer"           : 'com.github.yyued:SVGAPlayer-Android:2.6.0', //svga播放器
+            "SVGAPlayer"           : 'com.github.yyued:SVGAPlayer-Android:2.6.1', //svga播放器
             "qiniu-sdk"            : 'com.qiniu:qiniu-android-sdk:7.2.1',//七牛云存储
 //            "tencent-cosxml"       : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储
 //            "tencent-wechat-sdk"   : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享
@@ -29,6 +29,7 @@ ext {
             "Luban"                : 'top.zibin:Luban:1.1.8',//鲁班压缩图片
             "arouter"              : 'com.alibaba:arouter-api:1.5.2',//ARouter
             "arouter-compiler"     : 'com.alibaba:arouter-compiler:1.2.2',
+            "leakcanary"       : 'com.squareup.leakcanary:leakcanary-android:2.9.1',
             "blank-utilcode"       : 'com.blankj:utilcode:1.30.0',
 
     ]