ShiQi e234adf929 Merge branch 'modify-back' of https://gitee.com/xiao12feng/zhibo_1 into Added-a-button ... # Conflicts: # android-app/app/src/main/java/com/example/livestreaming/ChatAdapter.java # android-app/app/src/main/java/com/example/livestreaming/ChatMessage.java # android-app/app/src/main/res/drawable/ic_arrow_back_24.xml # android-app/app/src/main/res/layout/activity_room_detail_new.xml # android-app/app/src/main/res/layout/dialog_stream_info.xml # android-app/app/src/main/res/layout/item_chat_message.xml		2025-12-18 16:10:15 +08:00
..
src/main	Merge branch 'modify-back' of https://gitee.com/xiao12feng/zhibo_1 into Added-a-button	2025-12-18 16:10:15 +08:00
build.gradle.kts	安卓界面的修改	2025-12-18 14:20:41 +08:00
proguard-rules.pro	修改为安卓	2025-12-16 15:47:36 +08:00