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

1：修改踩的逻辑

Browse Source 
2：修改巡乐会布局
This commit is contained in:
梁小江
2025-10-01 14:38:33 +08:00
parent aae94d15e0
commit f2fc382e4c
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.2.0 APP_VERSION_NAME=1.2.1
APP_VERSION_CODE=172 APP_VERSION_CODE=173
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

4
moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
View File

@@ -115,7 +115,7 @@
android:id="@+id/gv_xyz" android:id="@+id/gv_xyz"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_21" android:layout_marginTop="@dimen/dp_31"
app:layout_constraintEnd_toStartOf="@+id/iv_zyx" app:layout_constraintEnd_toStartOf="@+id/iv_zyx"
android:translationY="@dimen/dp_78" android:translationY="@dimen/dp_78"
app:layout_constraintTop_toBottomOf="@+id/gv_fz" app:layout_constraintTop_toBottomOf="@+id/gv_fz"
@@ -163,7 +163,7 @@
<com.xscm.moduleutil.view.QXMeetGiftView <com.xscm.moduleutil.view.QXMeetGiftView
android:id="@+id/gv_sdlw" android:id="@+id/gv_sdlw"
android:layout_width="@dimen/dp_94" android:layout_width="@dimen/dp_94"
android:layout_height="@dimen/dp_118" android:layout_height="@dimen/dp_108"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
app:layout_constraintTop_toTopOf="@+id/gv_xyz" app:layout_constraintTop_toTopOf="@+id/gv_xyz"
app:layout_constraintStart_toStartOf="@+id/gv_fzlw" app:layout_constraintStart_toStartOf="@+id/gv_fzlw"

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

@@ -3531,10 +3531,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
} }
mBinding!!.ivQuanC.setOnClickListener { v: View? -> mBinding!!.ivQuanC.setOnClickListener { v: View? ->
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS) if (mRoomInfoResp!!.room_info.head_line.room_id != null && mRoomInfoResp!!.room_info.head_line.room_id.isNotEmpty()){
.withString("from", "我的界面") if (mRoomInfoResp!!.room_info.head_line.room_id != roomId){
.withString("roomId", mRoomInfoResp!!.room_info.head_line.room_id) RoomManager.getInstance().fetchRoomDataAndEnter(applicationContext,mRoomInfoResp!!.room_info.head_line.room_id,"")
.navigation() }else{
com.blankj.utilcode.util.ToastUtils.showLong("您就在当前房间")
}
}
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
// .withString("from", "我的界面")
// .withString("roomId", mRoomInfoResp!!.room_info.head_line.room_id)
// .navigation()
} }
mBinding!!.imYc.setOnClickListener { v: View? -> mBinding!!.imYc.setOnClickListener { v: View? ->