MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1：添加首页支付等功能，红包功能

Browse Source
This commit is contained in:
梁小江
2025-10-13 15:21:46 +08:00
parent 88930b3b74
commit 9ce10b1a66
22 changed files with 382 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
View File

@@ -343,6 +343,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onPause() {
super.onPause()
LogUtils.e("RoomActivity", "onPause")
if (mRoomInfoResp != null) {
if (mRoomInfoResp!!.room_info.type_id != "6") {
// 只有在用户主动离开应用时才执行最小化操作
@@ -350,6 +351,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 保持Activity alive，不调用finish()
minimizeToBackground()
userLeaving = false // 重置标记
}
}
@@ -488,6 +490,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
supportFragmentManager.findFragmentById(R.id.vp_room_pager) // 替换为你实际的容器 ID
if (currentFragment is RoomCabinFragment) {
currentFragment.onConfigurationChanged(newConfig)
initPublicScreenFragment()
}
}
@@ -1083,6 +1086,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
private fun enterLandscapeMode() {
isFullScreen = true
@@ -1195,6 +1201,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 隐藏退出按钮
ivExitFullscreen!!.visibility = View.GONE
// upHeight()
// initPublicScreenFragment()
// if (!isFinishing && !isDestroyed) {
// resetFragment()
// upHeight()
// } else {
// Log.e("Fragment", "Fragment transaction skipped due to state loss.")
// }
// isFullScreen = false;
@@ -3768,6 +3783,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 恢复房间状态
resumeRoomState()
setupEffectView()
MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId)
// resetFragment()
}
@@ -3943,6 +3959,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val roomBean = resp.room_info
if (roomBean!!.type_id.equals("6")){
// upHeight()
initPublicScreenFragment()
if (!isFinishing && !isDestroyed) {
resetFragment()
upHeight()
} else {
Log.e("Fragment", "Fragment transaction skipped due to state loss.")
}
return
}
this.mRoomBean = roomBean

59
moduleroom/src/main/res/layout/activity_room.xml
View File

@@ -553,34 +553,6 @@
</com.xscm.moduleutil.widget.DropViewRoom>
<com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_135"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<FrameLayout
android:id="@+id/fl_screenshare"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/iv_quan"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:src="@mipmap/quan"
android:translationZ="10dp"/>
<!-- 自定义内容 -->
</com.xscm.moduleutil.widget.floatingView.Floa>
<com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat_zuoji"
@@ -724,5 +696,36 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_135"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:translationZ="1000dp"
tools:visibility="visible">
<FrameLayout
android:id="@+id/fl_screenshare"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/iv_quan"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:src="@mipmap/quan"
android:translationZ="10dp"/>
<!-- 自定义内容 -->
</com.xscm.moduleutil.widget.floatingView.Floa>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

24
moduleroom/src/main/res/layout/fragment_room_auction.xml
View File

@@ -141,15 +141,14 @@
<com.xscm.moduleutil.widget.RoomMakeWheatView
android:id="@+id/room_make_wheat2"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_70"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_p"
app:room_make_wheat_number="888" />
android:id="@+id/room_make_wheat2"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_70"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:room_make_pic="@mipmap/za_p"
app:room_make_wheat_number="888"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container"
@@ -173,11 +172,11 @@
<TextView
android:id="@+id/tv_relation"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_1"
android:text="关系"
android:gravity="center"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/btn_relation"
@@ -199,7 +198,6 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:gravity="center"
android:id="@+id/tv_gift"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
@@ -207,6 +205,7 @@
android:text="礼物"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
android:gravity="center"
app:layout_constraintEnd_toEndOf="@+id/btn_gift"
app:layout_constraintStart_toStartOf="@id/btn_gift"
app:layout_constraintTop_toBottomOf="@id/btn_gift" />
@@ -286,6 +285,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="一号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
@@ -328,6 +328,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="二号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
@@ -371,6 +372,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="三号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"

2
moduleroom/src/main/res/layout/room_cabin_fragment.xml
View File

@@ -137,7 +137,7 @@
app:layout_constraintEnd_toStartOf="@+id/room_make_wheat2"
app:layout_constraintStart_toEndOf="@+id/room_make_wheat1"
app:layout_constraintTop_toTopOf="@+id/room_make_wheat1"
tools:visibility="visible">
>
<!-- <ImageView-->
<!-- android:layout_width="match_parent"-->