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

Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2

Browse Source 
# Conflicts:
#	main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
This commit is contained in:
ningwenqiang
2024-10-22 13:33:15 +08:00
parent 7b2f853f2e e8c8456e14
commit 3ddcc944c0
9 changed files with 174 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@@ -60,6 +60,7 @@ import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DebugUtils;
@@ -413,6 +414,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.params("key1", RongcloudIMManager.RONG_IM_KEY)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@@ -44,6 +44,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.DebugUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MobclickAgent;
@@ -513,6 +514,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.params("key1", RongcloudIMManager.RONG_IM_KEY)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {