From b3bc8ebdcbf1aa86d12a625aeb6ae82a65f79332 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Tue, 9 Dec 2025 18:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/room_view_friendship_wheat.xml | 8 +- .../java/com/xscm/modulemain/Application.kt | 2 + .../activity/room/activity/RoomActivity.kt | 22 +-- .../activity/room/fragment/RoomFragment.java | 14 ++ .../src/main/res/layout/activity_room.xml | 18 +- .../res/layout/fragment_friendship_room.xml | 2 +- .../res/layout/fragment_voice_category.xml | 2 +- .../layout/layout_room_mentorship_wheat.xml | 158 ++++++++++-------- MainModule/src/main/res/layout/room_top.xml | 57 +------ 9 files changed, 119 insertions(+), 164 deletions(-) diff --git a/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml b/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml index 93efb45e..8212c46d 100644 --- a/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml +++ b/BaseModule/src/main/res/layout/room_view_friendship_wheat.xml @@ -50,10 +50,10 @@ android:adjustViewBounds="true" app:autoPlay="false" app:layout_constraintDimensionRatio="1:1" - app:layout_constraintBottom_toBottomOf="@id/iv_frame" - app:layout_constraintEnd_toEndOf="@id/iv_frame" - app:layout_constraintStart_toStartOf="@id/iv_frame" - app:layout_constraintTop_toTopOf="@id/iv_frame" + app:layout_constraintBottom_toBottomOf="@id/riv" + app:layout_constraintEnd_toEndOf="@id/riv" + app:layout_constraintStart_toStartOf="@id/riv" + app:layout_constraintTop_toTopOf="@id/riv" app:loopCount="0" app:source="mic.svga" /> diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt index de675d76..e12fa343 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt @@ -64,6 +64,8 @@ open class Application : CommonAppContext() { initLogUtils() initCrashUtils() initSmartRefreshLayout() + if (true) + return AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener { override fun onForeground(activity: Activity?) {//应用切换到前台 diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 198789da..a7c5e7b4 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -578,11 +578,7 @@ class RoomActivity : BaseMvpActivity(), view ) } - mBinding!!.roomTop.muZc.setOnClickListener { view: View -> - this.onClick( - view - ) - } + mBinding!!.inputMenu1.performClick() V2TIMManager.getConversationManager() @@ -2748,22 +2744,6 @@ class RoomActivity : BaseMvpActivity(), aBoolean = true } } - } else if (id == R.id.mu_zc) { - val muZc: RoomKtvWheatView = mBinding!!.roomTop.muZc - if (muZc.getUserId() != "") { - RoomUserInfoFragment.show( - roomId, - muZc.getUserId(), - muZc.pitNumber, - getHostUser(), - false, - 2, - isNumberWhether(), - supportFragmentManager - ) - } else { - MvpPre!!.applyPit(roomId, "9") - } } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index c5729917..215bb130 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -516,7 +516,15 @@ public class RoomFragment extends BaseMvpFragment{ + startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class)); + } + ); } diff --git a/MainModule/src/main/res/layout/activity_room.xml b/MainModule/src/main/res/layout/activity_room.xml index 6334346f..78dbb297 100644 --- a/MainModule/src/main/res/layout/activity_room.xml +++ b/MainModule/src/main/res/layout/activity_room.xml @@ -159,13 +159,13 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="@dimen/dp_10" - app:layout_constraintDimensionRatio="1:0.88" android:clipChildren="false" android:clipToPadding="false" + app:layout_constraintBottom_toTopOf="@id/ease_container" + app:layout_constraintDimensionRatio="1:0.88" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/ease_container"/> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/vp_room_pager" /> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> + android:layout_height="@dimen/dp_350"> diff --git a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml index 436807e8..531615cc 100644 --- a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml +++ b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml @@ -17,26 +17,95 @@ + app:layout_constraintTop_toTopOf="parent"> - - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -148,17 +172,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/gl_center" /> - - + diff --git a/MainModule/src/main/res/layout/room_top.xml b/MainModule/src/main/res/layout/room_top.xml index 1ea9fb49..581d8a1d 100644 --- a/MainModule/src/main/res/layout/room_top.xml +++ b/MainModule/src/main/res/layout/room_top.xml @@ -94,6 +94,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_40" android:overScrollMode="never" + android:elevation="@dimen/dp_1" tools:listitem="@layout/item_like_user"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file