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

common/build.gradle

@@ -104,7 +104,9 @@ dependencies {
     api rootProject.ext.dependencies["gif-drawable"]
 
     //svga播放器
-    api rootProject.ext.dependencies["SVGAPlayer"]
+    //api rootProject.ext.dependencies["SVGAPlayer"]
+    implementation 'com.squareup.wire:wire-runtime:4.4.1'
+    api files('libs/library-release.aar')
 
     //七牛云存储
     api rootProject.ext.dependencies["qiniu-sdk"]