1:修改酒吧房主动调用下麦的操作

2:修改房间明细，只有自己创建的，添加了时间对应的收益和流水，我主持的知悉那是时间

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -211,7 +211,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     var roomId: String? = null
     var mRoomInfoResp: RoomInfoResp? = null
 
-    @JvmField
     @Autowired
     var taskId: String? = null
 
@@ -1604,9 +1603,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             if (mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.user_id
                 || mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.meet_user_id
             ) {
-                if (mRoomInfoResp?.user_info?.pit_number != 0) {
+//                if (mRoomInfoResp?.user_info?.pit_number != 0) {
-                    MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
+//                    MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
-                }
+//                }
                 AgoraManager.getInstance().lastRoomId = roomId
                 MvpPre?.getRoomIn(messageEvent.text.room_id,"")
                 if (publicScreenFragment != null) {

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RoomDetailsActivity.java

@@ -48,6 +48,7 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
     private String etime = "";
     Set<String> loadedUserIds = new HashSet<>();
     Set<String> loadedUserIds2 = new HashSet<>();
+    @Autowired
     public int type;
 
 
@@ -89,6 +90,7 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
         initListener();
         adapter = new RoomDetailsAdapter(null);
         adapter.openLoadAnimation(BaseQuickAdapter.SCALEIN);
+        adapter.setType(type);
         mBinding.rv.setAdapter(adapter);
         mBinding.rv.setLayoutManager(new LinearLayoutManager(this));
         mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyRoomListFragment.java

@@ -141,7 +141,7 @@ public class MyRoomListFragment extends BaseMvpFragment<MyRoomPresenter, RoomFra
                     @Override
                     public void onClick(View v) {
                         // TODO: 跳转到房间详情页面
-                        ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").navigation();
+                        ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").withInt("type",1).navigation();
                     }
                 });
                 helper.getView(R.id.cl_my_room_list).setOnClickListener(new View.OnClickListener() {

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomDetailsPresenter.java

@@ -21,7 +21,6 @@ public class RoomDetailsPresenter extends BasePresenter<MyRoomListContacts.Deati
 
     @Override
     public void getCharmList(String room_id, String stime, String etime, String p, int type) {
-        if (type == 0) {
             api.getCharmList(room_id, stime, etime, p, new BaseObserver<RoomDetails>() {
                 @Override
                 public void onSubscribe(Disposable d) {
@@ -54,7 +53,7 @@ public class RoomDetailsPresenter extends BasePresenter<MyRoomListContacts.Deati
 //                    MvpRef.get().finishRefresh();
 //                }
 //            });
-        } else {
+//        } else {
 ////            MvpRef.get().showLoadings();
 //            ApiClient.getInstance().getUserHostlDetail(BaseApplication.getInstance().getToken(), room_id, stime, etime, p, new BaseObserver<RoomDetails>() {
 //                @Override
@@ -74,6 +73,6 @@ public class RoomDetailsPresenter extends BasePresenter<MyRoomListContacts.Deati
 //                    MvpRef.get().finishRefresh();
 //                }
 //            });
-        }
+//        }
     }
 }

MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java

@@ -314,7 +314,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     if (myRoomActivity != null)
                         myRoomActivity.isShowLoading(true);
 //                    startActivity(new Intent(getContext(), RoomDetailsActivity.class));
-                    ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").navigation();
+                    ARouter.getInstance().build(ARouteConstants.MY_ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").withInt("type",0).navigation();
                 }
             });
             cl_my_room_list.setOnClickListener(new View.OnClickListener() {//跳转房间

MainModule/src/main/java/com/xscm/modulemain/adapter/RoomDetailsAdapter.java

@@ -17,6 +17,7 @@ import java.util.List;
 public class RoomDetailsAdapter extends BaseMultiItemQuickAdapter<BaseMultiItemEntity, BaseViewHolder> {
     private static final int TYPE_DATE_HEADER = 1;
     private static final int TYPE_GIFT_ITEM = 2;
+    private int type;
 
     public RoomDetailsAdapter(List<BaseMultiItemEntity> data) {
         super(data);
@@ -34,8 +35,13 @@ public class RoomDetailsAdapter extends BaseMultiItemQuickAdapter<BaseMultiItemE
 
                 RoomDeatailList roomDetailList = (RoomDeatailList) item;
                 helper.setText(R.id.tv6, roomDetailList.getTime());
-                helper.setText(R.id.tv8, roomDetailList.getTotal_earning() + "");
+                if (type == 1){
-                helper.setText(R.id.tve, roomDetailList.getTotal_price() + "");
+                    helper.setVisible(R.id.rl1, false);
+                }else {
+                    helper.setVisible(R.id.rl1, true);
+                    helper.setText(R.id.tv8, roomDetailList.getTotal_earning() + "");
+                    helper.setText(R.id.tve, roomDetailList.getTotal_price() + "");
+                }
                 break;
             case TYPE_GIFT_ITEM:
                 RoomDeatil item1 = (RoomDeatil) item;
@@ -59,4 +65,7 @@ public class RoomDetailsAdapter extends BaseMultiItemQuickAdapter<BaseMultiItemE
     }
 
 
+    public void setType(int type) {
+        this.type = type;
+    }
 }