huangjian 3a9d023ace Merge remote-tracking branch 'origin/yinyou_permission' into yinyou_develop ...

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
#	app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
#	app/src/main/res/layout/activity_chat_room.xml

2022-01-05 10:18:01 +08:00

..

color

66陪玩-origin

2020-04-02 10:43:40 +08:00

drawable

私聊页面UI调整

2021-12-28 10:12:48 +08:00

drawable-v21

66陪玩-origin

2020-04-02 10:43:40 +08:00

drawable-xhdpi

主题色修改

2021-12-02 19:01:15 +08:00

layout

消息页UI修改

2021-12-16 11:31:53 +08:00

menu

迁移AndroidX

2020-04-24 15:14:59 +08:00

raw

66陪玩-origin

2020-04-02 10:43:40 +08:00

values

个人信息与权限

2021-12-28 15:04:16 +08:00

xml

66陪玩-origin

2020-04-02 10:43:40 +08:00