From 6207705d2ae68915d09da5057653f2f2206c0bfe Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Thu, 18 Dec 2025 11:17:51 +0800
Subject: [PATCH] 77  fix bugs.

---
 .../room/fragment/RoomMentorShipFragment.kt   | 31 +++++++++++--------
 .../dialog/RoomOnlineDialogFragment.java      |  2 +-
 .../main/res/layout/fragment_mentor_ship.xml  | 27 +++++++++++++---
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
index b4587b67..fb42db29 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
@@ -73,8 +73,6 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
     private val timer = CountdownTimer()
     private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
 
-    private val startOrDelay = arrayOf("开始", "延时")
-
     private var mUserInfo: RoomUserBean? = mRoomInfoResp?.user_info
 
     private var dialogMentorShip: DialogMentorShip? = null
@@ -188,6 +186,7 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
         mBinding.tvTimeLeft.setOnClickListener(this)
         mBinding.tvTimeRight.setOnClickListener(this)
         mBinding.ivHelp.setOnClickListener(this)
+        mBinding.tvTimeStart.setOnClickListener(this)
 
         if (mRoomInfoResp?.sign_info?.sign_id != "-1") {
             mSignId = mRoomInfoResp?.sign_info?.sign_id
@@ -233,11 +232,11 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
             }
 
             R.id.tv_time_left -> {
-                if (mBinding.tvTimeLeft.text.toString() == startOrDelay[0]) {
-                    MvpPre.signStart(mRoomId, mSignPitBean?.user_id!!)
-                } else {
-                    MvpPre.signDelay(mSignId!!, mRoomId)
-                }
+                MvpPre.signDelay(mSignId!!, mRoomId)
+            }
+
+            R.id.tv_time_start ->{
+                MvpPre.signStart(mRoomId, mSignPitBean?.user_id!!)
             }
 
             R.id.tv_time_right -> {
@@ -273,7 +272,6 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
     private fun showBtn(isSignUser: Boolean = false) {
         activity?.runOnUiThread {
             if (isStart) {
-                mBinding.tvTimeLeft.text = startOrDelay[1]
                 mBinding.tvTime.visibility = View.VISIBLE
                 mBinding.groupLeftPrice.visibility = View.VISIBLE
                 if (getHostUser() < 4) {
@@ -282,8 +280,6 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
                     mBinding.tvTimeRight.visibility = View.GONE
                 }
             } else {
-                mBinding.tvTimeLeft.text = startOrDelay[0]
-
                 mBinding.tvTimeRight.visibility = View.GONE
                 mBinding.tvTime.visibility = View.GONE
                 mBinding.tvJsq.visibility = View.GONE
@@ -305,9 +301,19 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
                     "0"
                 )
             ) {
-                mBinding.tvTimeLeft.visibility = View.VISIBLE
+                if (isStart){
+                    mBinding.tvTimeLeft.visibility = View.VISIBLE
+                    mBinding.tvTimeStart.visibility = View.GONE
+                }else{
+                    mBinding.tvTimeLeft.visibility = View.GONE
+                    mBinding.tvTimeStart.visibility = View.VISIBLE
+                }
             } else {
-                mBinding.tvTimeLeft.visibility = View.GONE
+                if (isStart){
+                    mBinding.tvTimeLeft.visibility = View.GONE
+                }else{
+                    mBinding.tvTimeStart.visibility = View.GONE
+                }
             }
         }
 
@@ -388,7 +394,6 @@ class RoomMentorShipFragment(var mRoomInfoResp: RoomInfoResp?) :
 
             signTypeDialog?.show(0)
 
-            mBinding.tvTimeLeft.text = startOrDelay[1]
             mBinding.tvLeftPrice.text = currBodyValue
             mBinding.tvSignDay.visibility = View.VISIBLE
             mBinding.tvSignDay.text = "签约${signDay}天"
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
index 70da728a..4f229c6b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
@@ -73,7 +73,7 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
 
     @Override
     protected void initData() {
-//        MvpPre.getRoomOnline(getArguments().getString("roomId"), "1", "10");
+        MvpPre.getRoomOnline(getArguments().getString("roomId"), "1", "10");
     }
 
     @Override
diff --git a/MainModule/src/main/res/layout/fragment_mentor_ship.xml b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
index 7c7c8376..fa7d67ae 100644
--- a/MainModule/src/main/res/layout/fragment_mentor_ship.xml
+++ b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
@@ -50,12 +50,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             android:layout_marginTop="@dimen/dp_2"
             android:gravity="center"
+            android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title">
+
             <TextView
                 android:id="@+id/tv_time_left"
                 android:layout_width="wrap_content"
@@ -66,10 +67,11 @@
                 android:gravity="center"
                 android:paddingHorizontal="@dimen/dp_8"
                 android:paddingVertical="@dimen/dp_1"
-                android:text="开始"
+                android:text="延时"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_13"
-                android:visibility="gone"/>
+                android:visibility="gone" />
+
             <TextView
                 android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
@@ -95,6 +97,23 @@
                 android:visibility="gone" />
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/tv_time_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_3"
+            android:background="@drawable/shape_15"
+            android:backgroundTint="#3ABC6D"
+            android:gravity="center"
+            android:paddingHorizontal="@dimen/dp_8"
+            android:paddingVertical="@dimen/dp_1"
+            android:text="开始"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_13"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
         <com.xscm.modulemain.widget.RoomMentorShipWheatView
             android:id="@+id/rmsw_1"
@@ -109,10 +128,10 @@
             android:id="@+id/iv_host_bg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:layout_marginStart="@dimen/dp_48"
             android:layout_marginTop="@dimen/dp_4"
             android:src="@mipmap/icon_host_top_tips_bg"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />