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
This commit is contained in:
huangjian
2022-01-05 10:18:01 +08:00
63 changed files with 1029 additions and 698 deletions

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_8" />
<solid android:color="#F6F7F9" />
</shape>