diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/BaseMvpFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/BaseMvpFragment.java
index 4d382a11..03f35404 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/BaseMvpFragment.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/BaseMvpFragment.java
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
import androidx.databinding.ViewDataBinding;
import androidx.fragment.app.FragmentActivity;
+import com.blankj.utilcode.util.LogUtils;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
@@ -20,6 +21,8 @@ public abstract class BaseMvpFragment
(),
} else {
clFirstCharge(false)
}
-
- EventBus.getDefault().post(mRoomInfoResp?.room_info)
+ mRoomInfoResp?.room_info?.let { roomInfo ->
+ EventBus.getDefault().post(roomInfo)
+ }
EventBus.getDefault().post(roomSettingEvent)
}
@@ -1926,7 +1927,11 @@ class RoomActivity : BaseMvpActivity(),
roomFragment!!.upRoomInfoData(mRoomInfoResp)
roomFragment?.handleRoomMessage(messageEvent)
}
-
+ RoomType.SIGN_CONTRACT ->{
+ mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] = RoomPitBean(pitNumber)
+ roomFragment!!.upRoomInfoData(mRoomInfoResp)
+ roomFragment?.handleRoomMessage(messageEvent)
+ }
else -> {
roomFragment!!.updateSeatViewExchangedWithPitArray(mRoomInfoResp)
}
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 0e315bed..fb7b5639 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
@@ -1,6 +1,7 @@
package com.xscm.modulemain.activity.room.fragment;
import android.Manifest;
+import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -59,6 +60,10 @@ import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
/**
* @author qx
@@ -110,6 +115,7 @@ public class RoomFragment extends BaseMvpFragment {
- if (ktvFragment == null) ktvFragment = RoomKtvFragment.newInstance(mRoomInfoResp);
+ if (ktvFragment == null)
+ ktvFragment = RoomKtvFragment.newInstance(mRoomInfoResp);
else ktvFragment.roomInfoUpdate(mRoomInfoResp);
yield ktvFragment;
}
@@ -436,7 +443,7 @@ public class RoomFragment extends BaseMvpFragment{
+ retryCount++;
+ LogUtils.e("switchFragment retry");
+ switchFragment(newFragment, containerId, true);
+ }
+ );
+ return;
+ }
+
startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
}
@@ -779,7 +827,7 @@ public class RoomFragment extends BaseMvpFragment