Commit Graph

10 Commits

Author SHA1 Message Date
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
1e98de9931 补充注释及移除部分未用到代码 2022-09-22 13:35:45 +08:00
d2bb4e4375 update 2022-09-22 13:02:53 +08:00
d1d31da6be 完成美颜UI 90% 2022-09-20 18:29:05 +08:00
dd39064ca5 update 2022-09-09 15:20:59 +08:00
18142669586
036f27a415 111 2022-08-26 13:00:45 +08:00
18142669586
254f3af3c7 111 2022-08-04 13:30:22 +08:00
18401019693
18aabb85a7 11111 2022-07-23 10:05:15 +08:00
18401019693
e1dbc9d38c 11111 2022-07-21 11:24:15 +08:00
18401019693
1791a114e3 androidx版本首次提交 2022-07-18 15:31:45 +08:00