zlzw ff7bfc040d 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

2022-09-22 14:43:57 +08:00

..

src/main

Merge branch 'dev_Memory' into dev_test

2022-09-22 14:43:57 +08:00

agconnect-services.json

111

2022-08-26 13:00:45 +08:00

build.gradle

Merge branch 'dev_Memory' into dev_test

2022-09-22 14:43:57 +08:00

google-services.json

androidx版本首次提交

2022-07-18 15:31:45 +08:00

img_optimizer.log

androidx版本首次提交

2022-07-18 15:31:45 +08:00

proguard-rules.pro

修改测试问题,shouye ytuijian

2022-08-10 23:20:15 +08:00