合并接口第er次上传

common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java

@@ -1,8 +1,6 @@
 package com.yunbao.common.bean;
 
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
 
 import java.util.List;
 
@@ -103,6 +101,18 @@ public class EnterRoomInfoModel extends BaseModel {
     private String liveBg;
     @SerializedName("anchor_goodnum")
     private String anchorGoodnum;
+    @SerializedName("jackpot_level")
+    private String jackpotLevel="-1";
+
+    public String getJackpotLevel() {
+
+        return jackpotLevel;
+    }
+
+    public EnterRoomInfoModel setJackpotLevel(String jackpotLevel) {
+        this.jackpotLevel = jackpotLevel;
+        return this;
+    }
 
     public String getVotestotal() {
         return votestotal;

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

@@ -324,4 +324,12 @@ public interface PDLiveApi {
             @Query("GroupId") String GroupId,
             @Query("stream") String stream
     );
+    /**
+     * 加入房间推送Im欢迎语
+     */
+    @GET("/api/public/?service=Tx.leaveRoomNew")
+    Observable<ResponseModel<String>> leaveRoomNew(
+            @Query("GroupId") String GroupId,
+            @Query("stream") String stream
+    );
 }

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

@@ -406,4 +406,32 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
+
+    /**
+     * 离开直播间
+     *
+     * @param stream
+     * @param liveUid
+     */
+    public void leaveRoomNew(String stream, String liveUid,HttpCallback<String> callback) {
+        API.get().pdLiveApi(mContext)
+                .userJoinRoomNew("g" + liveUid, stream)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<String>>() {
+                    @Override
+                    public void accept(ResponseModel<String> stringResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess("");
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
 }