From 34323fd983516ea8bd6642b95279ecac160b6ae6 Mon Sep 17 00:00:00 2001 From: hch <16607480311@163.com> Date: Mon, 15 Jan 2024 17:11:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=80=9A=E8=A1=8C=E8=AF=81=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/src/main/res/layout/view_homemain.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml index 8554ee2ef..04909f460 100644 --- a/main/src/main/res/layout/view_homemain.xml +++ b/main/src/main/res/layout/view_homemain.xml @@ -189,7 +189,7 @@ android:layout_height="wrap_content" android:layout_above="@id/rt_main_tab" android:layout_alignParentRight="true" - android:layout_marginRight="12dp" + android:layout_marginRight="8dp" android:layout_marginBottom="10dp" /> Date: Mon, 15 Jan 2024 17:52:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=B9=E5=B9=95?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/java/com/yunbao/common/http/PDLiveApi.java | 2 +- .../main/java/com/yunbao/common/http/live/LiveNetManager.java | 4 ++-- .../main/java/com/yunbao/live/socket/SocketRyChatUtil.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index fc1f78a04..537b97f59 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -1143,7 +1143,7 @@ public interface PDLiveApi { Observable> battlePassRule(); @GET("/api/public/?service=Livebattlepass.addChatCount") - Observable>> addChatCount(); + Observable>> addChatCount(@Query("stream") String stream); @GET("/api/public/?service=Sudgameserver.joinMic") Observable>> joinMic(@Query("room_id") String roomId); diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index 040407c0d..70354f0e5 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -2772,9 +2772,9 @@ public class LiveNetManager { }).isDisposed(); } - public void addChatCount(HttpCallback callback) { + public void addChatCount(String stream,HttpCallback callback) { API.get().pdLiveApi(mContext) - .addChatCount() + .addChatCount(stream) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(responseModel -> { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java index e3e3e2762..655b137fa 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java @@ -16,6 +16,7 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; +import com.yunbao.live.activity.LiveActivity; import org.greenrobot.eventbus.EventBus; @@ -131,7 +132,7 @@ public class SocketRyChatUtil { SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); } LiveNetManager.get(CommonAppContext.sInstance) - .addChatCount(new com.yunbao.common.http.base.HttpCallback() { + .addChatCount(LiveActivity.mStream,new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(HttpCallbackModel data) {