梁小江
8e5dc5f6f5
# Conflicts: # gradle.properties # moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java # moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java # moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java # moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java # moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt # moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java # moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java # moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java