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

app/build.gradle

@@ -87,6 +87,7 @@ android {
         }
         debug {
             signingConfig signingConfigs.release
+            debuggable true
         }
     }
     lintOptions {
@@ -111,6 +112,8 @@ dependencies {
     api project(':video')
     annotationProcessor rootProject.ext.dependencies["arouter-compiler"]
 
+  //  implementation rootProject.ext.dependencies["leakcanary"]
+
 
 }
 // 链接包需要注释掉 否正无法更新 谷歌包需要打开