yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18401019693 2024-01-15 17:58:53 +08:00
commit f928fce069
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -1143,7 +1143,7 @@ public interface PDLiveApi {
Observable<ResponseModel<String>> battlePassRule(); Observable<ResponseModel<String>> battlePassRule();
@GET("/api/public/?service=Livebattlepass.addChatCount") @GET("/api/public/?service=Livebattlepass.addChatCount")
Observable<ResponseModel<List<BaseModel>>> addChatCount(); Observable<ResponseModel<List<BaseModel>>> addChatCount(@Query("stream") String stream);
@GET("/api/public/?service=Sudgameserver.joinMic") @GET("/api/public/?service=Sudgameserver.joinMic")
Observable<ResponseModel<List<BaseModel>>> joinMic(@Query("room_id") String roomId); Observable<ResponseModel<List<BaseModel>>> joinMic(@Query("room_id") String roomId);

4
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@ -2772,9 +2772,9 @@ public class LiveNetManager {
}).isDisposed(); }).isDisposed();
} }
public void addChatCount(HttpCallback<HttpCallbackModel> callback) { public void addChatCount(String stream,HttpCallback<HttpCallbackModel> callback) {
API.get().pdLiveApi(mContext) API.get().pdLiveApi(mContext)
.addChatCount() .addChatCount(stream)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(responseModel -> { .subscribe(responseModel -> {

3
live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
View File

@ -16,6 +16,7 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
@ -131,7 +132,7 @@ public class SocketRyChatUtil {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
LiveNetManager.get(CommonAppContext.sInstance) LiveNetManager.get(CommonAppContext.sInstance)
.addChatCount(new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() { .addChatCount(LiveActivity.mStream,new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
@Override @Override
public void onSuccess(HttpCallbackModel data) { public void onSuccess(HttpCallbackModel data) {

2
main/src/main/res/layout/view_homemain.xml
View File

@ -189,7 +189,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/rt_main_tab" android:layout_above="@id/rt_main_tab"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="12dp" android:layout_marginRight="8dp"
android:layout_marginBottom="10dp" /> android:layout_marginBottom="10dp" />
<LinearLayout <LinearLayout