添加游戏列表点击查询游戏状态

common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java

@@ -25,6 +25,7 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.event.RoomHolderTypeEvent;
 import com.yunbao.common.event.SudGameListDissMissEvent;
 import com.yunbao.common.event.SudGameListEvent;
+import com.yunbao.common.event.SudGameListRefreshEvent;
 import com.yunbao.common.event.SudGameListSillEvent;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -320,6 +321,10 @@ public class SudGameListPopup extends BottomPopupView {
     public void onSudGameListDissMissEvent(SudGameListDissMissEvent event) {
         dialog.dismiss();
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListRefreshEvent(SudGameListRefreshEvent event) {
+        mRefreshView.initData();
+    }
 
 
 }

common/src/main/java/com/yunbao/common/event/SudGameListRefreshEvent.java

@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class SudGameListRefreshEvent extends BaseModel {
+}

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -1028,5 +1028,10 @@ public interface PDLiveApi {
     Observable<ResponseModel<CreateSudRoomModel>> randomRoom(
     );
 
+    @GET("/api/public/?service=Sudgameserver.checkRoomStatus")
+    Observable<ResponseModel<CreateSudRoomModel>> checkRoomStatus(
+            @Query("room_id") String roomId
+    );
+
 
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -2268,6 +2268,28 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void checkRoomStatus(String roomId, HttpCallback<CreateSudRoomModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .checkRoomStatus(roomId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<CreateSudRoomModel>>() {
+                    @Override
+                    public void accept(ResponseModel<CreateSudRoomModel> createSudRoomModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(createSudRoomModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     public void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, int page, HttpCallback<List<SudRoomListModel>> callback) {
         API.get().pdLiveApi(mContext)
                 .getRoomList(sudGameId, threshold, roomHolderType, liveUid, page)

common/src/main/java/com/yunbao/common/views/SudGameListViewHolder.java

@@ -18,18 +18,20 @@ import com.yunbao.common.activity.SudGameActivity;
 import com.yunbao.common.bean.CreateSudRoomModel;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.SudRoomListModel;
-import com.yunbao.common.bean.playerObject;
 import com.yunbao.common.event.SudGameListDissMissEvent;
+import com.yunbao.common.event.SudGameListRefreshEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
-import java.util.List;
+import java.util.Locale;
 
 import pl.droidsonroids.gif.GifImageView;
 
@@ -38,7 +40,7 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder {
     private TextView roomName, playerWeAre, playerWeAre2, goldenBeanNumber;
     private RoundedImageView avatarList1, avatarList2, avatarList3, avatarList4, avatarList5;
     private GifImageView gifImageView;
-    private ImageView sex,game_icon;
+    private ImageView sex, game_icon;
 
 
     public SudGameListViewHolder(@NonNull View itemView) {
@@ -104,52 +106,72 @@ public class SudGameListViewHolder extends RecyclerView.ViewHolder {
         ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.layout), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
+                LiveNetManager.get(itemView.getContext()).checkRoomStatus(model.getId(), new com.yunbao.common.http.base.HttpCallback<CreateSudRoomModel>() {
-                createSudRoomModel.setSudGameId(model.getSudGameId());
+                    @Override
-                createSudRoomModel.setSudGameRoomId(model.getSudGameRoomId());
+                    public void onSuccess(CreateSudRoomModel data) {
-                createSudRoomModel.setAvatar(model.getAvatar());
+                        if (TextUtils.equals(data.getRoomStatus(), "0")) {
-                createSudRoomModel.setRoomName(model.getRoomName());
+                            if (IMLoginManager.get(itemView.getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                createSudRoomModel.setSudGameName(model.getSudGameName());
+                                ToastUtil.show("房间不存在");
-                if (isHome) {
+                            } else {
-                    if (TextUtils.equals(model.getLiveUid(), "0")) {
+                                ToastUtil.show("The room does not exist");
-                        Intent intent = new Intent(itemView.getContext(), SudGameActivity.class);
+                            }
-                        intent.putExtra("CreateSudRoom", new Gson().toJson(createSudRoomModel));
+                            Bus.get().post(new SudGameListRefreshEvent());
-                        itemView.getContext().startActivity(intent);
+                        } else {
-                    } else {
+                            CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
-                        LiveHttpUtil.getLiveInfo(model.getLiveUid() + "", new HttpCallback() {
+                            createSudRoomModel.setSudGameId(model.getSudGameId());
-                            @Override
+                            createSudRoomModel.setSudGameRoomId(model.getSudGameRoomId());
-                            public void onSuccess(int code, String msg, String[] info) {
+                            createSudRoomModel.setAvatar(model.getAvatar());
-                                if (code == 0 && info.length > 0) {
+                            createSudRoomModel.setRoomName(model.getRoomName());
-                                    LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
+                            createSudRoomModel.setSudGameName(model.getSudGameName());
-                                    new LiveRoomCheckLivePresenter(itemView.getContext(), liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
+                            if (isHome) {
+                                if (TextUtils.equals(model.getLiveUid(), "0")) {
+                                    Intent intent = new Intent(itemView.getContext(), SudGameActivity.class);
+                                    intent.putExtra("CreateSudRoom", new Gson().toJson(createSudRoomModel));
+                                    itemView.getContext().startActivity(intent);
+                                } else {
+                                    LiveHttpUtil.getLiveInfo(model.getLiveUid() + "", new HttpCallback() {
                                         @Override
-                                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                                        public void onSuccess(int code, String msg, String[] info) {
-                                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
+                                            if (code == 0 && info.length > 0) {
-                                            IMLoginManager.get(itemView.getContext()).setSudGame(new Gson().toJson(createSudRoomModel));
+                                                LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
-                                        }
+                                                new LiveRoomCheckLivePresenter(itemView.getContext(), liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
+                                                    @Override
+                                                    public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                                                        RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
+                                                        IMLoginManager.get(itemView.getContext()).setSudGame(new Gson().toJson(createSudRoomModel));
+                                                    }
 
-                                        @Override
+                                                    @Override
-                                        public void onCheckError(String contextError) {
+                                                    public void onCheckError(String contextError) {
 
+                                                    }
+                                                });
+                                            } else {
+                                                RouteUtil.forwardUserHome(itemView.getContext(), model.getLiveUid(), 0);
+                                            }
                                         }
                                     });
-                                } else {
-                                    RouteUtil.forwardUserHome(itemView.getContext(), model.getLiveUid(), 0);
                                 }
+
+                            } else {
+                                new XPopup.Builder(itemView.getContext())
+                                        .enableDrag(false)
+                                        .dismissOnTouchOutside(false)
+                                        .dismissOnBackPressed(false)
+                                        .asCustom(new LiveSudGamePopup(itemView.getContext(), createSudRoomModel))
+                                        .show();
+
+                                Bus.get().post(new SudGameListDissMissEvent());
                             }
-                        });
+                        }
                     }
 
-                } else {
+                    @Override
-                    new XPopup.Builder(itemView.getContext())
+                    public void onError(String error) {
-                            .enableDrag(false)
+                        ToastUtil.show(error);
-                            .dismissOnTouchOutside(false)
+                    }
-                            .dismissOnBackPressed(false)
+                });
-                            .asCustom(new LiveSudGamePopup(itemView.getContext(), createSudRoomModel))
-                            .show();
 
-                    Bus.get().post(new SudGameListDissMissEvent());
-                }
 
             }
         });

common/src/main/res/layout/dialog_home_search_sud_game.xml

@@ -97,30 +97,38 @@
             android:layout_marginTop="10dp" />
 
 
-
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/layout_history_empty"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="20dp"
         android:orientation="vertical">
 
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="80dp"
+            android:src="@mipmap/icon_attention_noanchor" />
+
         <TextView
             android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@drawable/bg_home_search_not"
+            android:layout_marginTop="20dp"
             android:gravity="center"
             android:paddingStart="30dp"
             android:paddingTop="12dp"
             android:paddingEnd="30dp"
             android:paddingBottom="12dp"
             android:text="@string/interactive_game_search_room_have_been_found"
-            android:textColor="#CCFFFFFF"
+            android:textColorHint="#000"
             android:textSize="14sp" />
     </LinearLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list_room"
         android:layout_width="match_parent"

common/src/main/res/layout/dialog_search_sud_game.xml

@@ -111,16 +111,22 @@
     <LinearLayout
         android:id="@+id/layout_history_empty"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="20dp"
         android:orientation="vertical">
 
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="80dp"
+            android:src="@mipmap/icon_attention_noanchor" />
+
         <TextView
             android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@drawable/bg_home_search_not"
             android:gravity="center"
             android:paddingStart="30dp"
             android:paddingTop="12dp"

common/src/main/res/values-zh-rHK/strings.xml

@@ -1341,5 +1341,5 @@
     <string name="interactive_game_search_room">搜索房間</string>
     <string name="interactive_game_search_history">搜索历史</string>
     <string name="interactive_game_search_room_name_input">請輸入您要搜索的房主昵稱、房主ID或房間名</string>
-    <string name="interactive_game_search_room_have_been_found">暫未搜索結果~</string>
+    <string name="interactive_game_search_room_have_been_found">不存在此房间</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1340,5 +1340,5 @@
     <string name="interactive_game_search_room">搜索房間</string>
     <string name="interactive_game_search_history">搜索历史</string>
     <string name="interactive_game_search_room_name_input">請輸入您要搜索的房主昵稱、房主ID或房間名</string>
-    <string name="interactive_game_search_room_have_been_found">暫未搜索結果~</string>
+    <string name="interactive_game_search_room_have_been_found">不存在此房间</string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1341,6 +1341,6 @@
     <string name="interactive_game_search_room">搜索房間</string>
     <string name="interactive_game_search_history">搜索历史</string>
     <string name="interactive_game_search_room_name_input">請輸入您要搜索的房主昵稱、房主ID或房間名</string>
-    <string name="interactive_game_search_room_have_been_found">暫未搜索結果~</string>
+    <string name="interactive_game_search_room_have_been_found">不存在此房间</string>
 
 </resources>

main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java

@@ -30,6 +30,7 @@ import com.yunbao.common.dialog.SudGameListSelectPopup;
 import com.yunbao.common.dialog.SudGameSearchDialogPopup;
 import com.yunbao.common.event.RoomHolderTypeEvent;
 import com.yunbao.common.event.SudGameListEvent;
+import com.yunbao.common.event.SudGameListRefreshEvent;
 import com.yunbao.common.event.SudGameListSillEvent;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.HttpCallback;
@@ -386,4 +387,8 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
     public void onPause() {
         super.onPause();
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListRefreshEvent(SudGameListRefreshEvent event) {
+        mRefreshView.initData();
+    }
 }