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

11111

Browse Source
This commit is contained in:
18401019693
2022-07-29 16:04:12 +08:00
parent 41f07f2e3d
commit 00de2169b9
39 changed files with 531 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java
View File

@@ -306,9 +306,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
sendSystemMessage(WordUtil.getString(R.string.live_anchor_come_back));
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("isleave", leave)
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new Callback<JsonBean>() {
@Override
public void onStart(Request<JsonBean, ? extends Request> request) {

1
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -920,7 +920,6 @@ public class LiveAudienceActivity extends LiveActivity {
//退出多人房间
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -247,7 +247,6 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
case Constants.LIVE_FUNC_DR://多人PK
if(isDRPK != 1) {
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -261,7 +260,6 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
@Override
public void onConfirmClick(Dialog dialog, String content) {
HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", "1")
.params("sign", "1")
.execute(new HttpCallback() {

3
live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
View File

@@ -1,6 +1,5 @@
package com.yunbao.live.activity;
import android.app.Activity;
import android.net.Uri;
import android.os.Bundle;
import android.view.Gravity;
@@ -20,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
@@ -59,7 +57,6 @@ public class PDLIiveChatActivity extends FragmentActivity {
}
public void windowColor() {
Window window = getWindow();

17
live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java
View File

@@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
import android.app.Activity;
import android.content.Intent;
import android.os.Handler;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,11 +12,12 @@ import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.TextView;
import com.yunbao.common.Constants;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.EditNameRemarksActivity;
import io.rong.imlib.RongIMClient;
/**
@@ -28,6 +30,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
private TextView tvBlack, tvBlackMove;
private LinearLayout ltRemarks;
private PopupWindow popupWindow;
private Handler netHandler = new Handler();
public MenuPopuwWindow(Activity context) {
this.mContext = context;
@@ -110,6 +113,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
popupWindow.dismiss();
tvBlack.setVisibility(View.VISIBLE);
tvBlackMove.setVisibility(View.GONE);
netHandler.post(setBlackRunnable);
}
@Override
@@ -126,6 +130,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
popupWindow.dismiss();
tvBlackMove.setVisibility(View.VISIBLE);
tvBlack.setVisibility(View.GONE);
netHandler.post(setBlackRunnable);
}
@Override
@@ -141,4 +146,14 @@ public class MenuPopuwWindow implements View.OnClickListener {
popupWindow.dismiss();
}
}
//将对方拉黑或者解除拉黑(自己后台）
private Runnable setBlackRunnable = new Runnable() {
@Override
public void run() {
HttpClient.getInstance().get("User.setBlack", "setBlack")
.params("touid", userId);
}
};
}

12
live/src/main/java/com/yunbao/live/http/ImHttpUtil.java
View File

@@ -22,8 +22,6 @@ public class ImHttpUtil {
*/
public static void getImUserInfo(String uids, HttpCallback callback) {
HttpClient.getInstance().get("Message.getLists", ImHttpConsts.GET_IM_USER_INFO)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -32,8 +30,6 @@ public class ImHttpUtil {
*/
public static void sendDynamicComment(String dynamic_id, String content, String to_comment_id, HttpCallback callback) {
HttpClient.getInstance().get("Community.sendDynamicComment", ImHttpConsts.SEND_DYNAMICCOMMENT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("dynamic_id", dynamic_id)
.params("content", content)
.params("to_comment_id", to_comment_id)
@@ -45,8 +41,6 @@ public class ImHttpUtil {
*/
public static void getSystemMessageList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Message.getListInfo", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("p", p)
.params("type", type)
.execute(callback);
@@ -57,8 +51,6 @@ public class ImHttpUtil {
*/
public static void getCommunityList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Community.guessYouLike", ImHttpConsts.GET_COMMUNITYLIST_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("p", p)
.execute(callback);
}
@@ -69,8 +61,6 @@ public class ImHttpUtil {
*/
public static void checkBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.checkBlack", ImHttpConsts.CHECK_BLACK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.execute(callback);
}
@@ -80,8 +70,6 @@ public class ImHttpUtil {
*/
public static void setBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.setBlack", ImHttpConsts.SET_BLACK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.execute(callback);
}

193
live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java
View File

@@ -4,11 +4,13 @@ import android.text.TextUtils;
import com.lzy.okgo.request.PostRequest;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.JsonBean;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MD5Util;
@@ -47,7 +49,7 @@ public class LiveHttpUtil {
*/
public static void getMicList(String liveuid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Live.getDrLm", "Live.getDrLm")
.params("uid", liveuid)
.params("uid", liveuid, true)
.execute(callback);
}
@@ -56,8 +58,6 @@ public class LiveHttpUtil {
*/
public static void getHDList(HttpCallback callback) {
HttpClient.getInstance().get("Active.getActiveList", "Active.getActiveList")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -69,8 +69,6 @@ public class LiveHttpUtil {
*/
public static void roomCharge(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.roomCharge", LiveHttpConsts.ROOM_CHARGE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("liveuid", liveUid)
.execute(callback);
@@ -85,8 +83,6 @@ public class LiveHttpUtil {
*/
public static void timeCharge(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.timeCharge", LiveHttpConsts.TIME_CHARGE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("liveuid", liveUid)
.execute(callback);
@@ -98,8 +94,6 @@ public class LiveHttpUtil {
*/
public static void getCoin(HttpCallback callback) {
HttpClient.getInstance().get("Live.getCoin", LiveHttpConsts.GET_COIN)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -110,7 +104,6 @@ public class LiveHttpUtil {
*/
public static void getLiveRecord(String touid, int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getLiverecord", LiveHttpConsts.GET_LIVE_RECORD)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("p", p)
.execute(callback);
@@ -133,7 +126,6 @@ public class LiveHttpUtil {
*/
public static void getAllImpress(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.getUserLabel", LiveHttpConsts.GET_ALL_IMPRESS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.execute(callback);
}
@@ -143,8 +135,6 @@ public class LiveHttpUtil {
*/
public static void setImpress(String touid, String ImpressIDs, HttpCallback callback) {
HttpClient.getInstance().get("User.setUserLabel", LiveHttpConsts.SET_IMPRESS)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.params("labels", ImpressIDs)
.execute(callback);
@@ -156,8 +146,6 @@ public class LiveHttpUtil {
*/
public static void getAdminList(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Live.getAdminList", LiveHttpConsts.GET_ADMIN_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.execute(callback);
}
@@ -167,8 +155,6 @@ public class LiveHttpUtil {
*/
public static void setAdmin(String liveUid, String touid, HttpCallback callback) {
HttpClient.getInstance().get("Live.setAdmin", LiveHttpConsts.SET_ADMIN)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("touid", touid)
.execute(callback);
@@ -179,8 +165,6 @@ public class LiveHttpUtil {
*/
public static void getLiveShutUpList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getShutList", LiveHttpConsts.GET_LIVE_SHUT_UP_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
@@ -191,8 +175,6 @@ public class LiveHttpUtil {
*/
public static void liveCancelShutUp(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelShut", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("touid", toUid)
.execute(callback);
@@ -203,8 +185,6 @@ public class LiveHttpUtil {
*/
public static void getLiveBlackList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getKickList", LiveHttpConsts.GET_LIVE_BLACK_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
@@ -215,8 +195,6 @@ public class LiveHttpUtil {
*/
public static void liveCancelBlack(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelKick", LiveHttpConsts.LIVE_CANCEL_BLACK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("touid", toUid)
.execute(callback);
@@ -245,8 +223,6 @@ public class LiveHttpUtil {
*/
public static void setReport(String touid, String content, HttpCallback callback) {
HttpClient.getInstance().get("Live.setReport", LiveHttpConsts.SET_REPORT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.params("content", content)
.execute(callback);
@@ -258,8 +234,6 @@ public class LiveHttpUtil {
public static void setReport(String touid, String content, File file1, File file2, File file3, String videoId, HttpCallback callback) {
PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.setReport", LiveHttpConsts.SET_REPORT)
.isMultipart(true)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.params("content", content);
if (file1 != null) {
@@ -282,7 +256,6 @@ public class LiveHttpUtil {
*/
public static void getLiveUser(String touid, String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Live.getPop", LiveHttpConsts.GET_LIVE_USER)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("liveuid", liveUid)
.execute(callback);
@@ -293,8 +266,6 @@ public class LiveHttpUtil {
*/
public static void kicking(String liveUid, String touid, HttpCallback callback) {
HttpClient.getInstance().get("Live.kicking", LiveHttpConsts.KICKING)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("touid", touid)
.execute(callback);
@@ -306,8 +277,6 @@ public class LiveHttpUtil {
*/
public static void setShutUp(String liveUid, String stream, int type, String touid, HttpCallback callback) {
HttpClient.getInstance().get("Live.setShutUp", LiveHttpConsts.SET_SHUT_UP)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.params("type", type)
@@ -323,8 +292,6 @@ public class LiveHttpUtil {
*/
public static void superCloseRoom(String liveUid, int type, HttpCallback callback) {
HttpClient.getInstance().get("Live.superStopRoom", LiveHttpConsts.SUPER_CLOSE_ROOM)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("type", type)
.execute(callback);
@@ -336,8 +303,6 @@ public class LiveHttpUtil {
*/
public static void getGuardBuyList(HttpCallback callback) {
HttpClient.getInstance().get("Guard.getList", LiveHttpConsts.GET_GUARD_BUY_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -346,8 +311,6 @@ public class LiveHttpUtil {
*/
public static void buyGuard(String liveUid, String stream, int guardId, HttpCallback callback) {
HttpClient.getInstance().get("Guard.buyGuard", LiveHttpConsts.BUY_GUARD)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.params("guardid", guardId)
@@ -360,8 +323,6 @@ public class LiveHttpUtil {
*/
public static void getGuardList(String liveUid, int p, HttpCallback callback) {
HttpClient.getInstance().get("Guard.getGuardList", LiveHttpConsts.GET_GUARD_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("p", p)
.execute(callback);
@@ -373,7 +334,6 @@ public class LiveHttpUtil {
*/
public static void getLinkMicStream(HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.requestLVBAddrForLinkMic", LiveHttpConsts.GET_LINK_MIC_STREAM)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -385,8 +345,6 @@ public class LiveHttpUtil {
*/
public static void linkMicShowVideo(String touid, String pull_url) {
HttpClient.getInstance().get("Live.showVideo", LiveHttpConsts.LINK_MIC_SHOW_VIDEO)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", CommonAppConfig.getInstance().getUid())
.params("touid", touid)
.params("pull_url", pull_url)
@@ -403,8 +361,6 @@ public class LiveHttpUtil {
*/
public static void setLinkMicEnable(boolean linkMicEnable, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.setMic", LiveHttpConsts.SET_LINK_MIC_ENABLE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("ismic", linkMicEnable ? 1 : 0)
.execute(callback);
}
@@ -415,7 +371,6 @@ public class LiveHttpUtil {
*/
public static void checkLinkMicEnable(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.isMic", LiveHttpConsts.CHECK_LINK_MIC_ENABLE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("liveuid", liveUid)
.execute(callback);
}
@@ -425,7 +380,7 @@ public class LiveHttpUtil {
*/
public static void livePkCheckLive(String liveUid, String stream, String uidStream, HttpCallback callback) {
HttpClient.getInstance().get("Home.getisPk", "Home.getisPk")
.params("uid", liveUid)
.params("uid", liveUid, true)
// .params("token", CommonAppConfig.getInstance().getToken())
// .params("liveuid", liveUid)
// .params("stream", stream)
@@ -438,8 +393,6 @@ public class LiveHttpUtil {
*/
public static void sendRedPack(String stream, String coin, String count, String title, int type, int sendType, HttpCallback callback) {
HttpClient.getInstance().get("Red.SendRed", LiveHttpConsts.SEND_RED_PACK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("coin", coin)
.params("nums", count)
@@ -455,8 +408,6 @@ public class LiveHttpUtil {
public static void getRedPackList(String stream, HttpCallback callback) {
String sign = MD5Util.getMD5("stream=" + stream + "&" + SALT);
HttpClient.getInstance().get("Red.GetRedList", LiveHttpConsts.GET_RED_PACK_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("sign", sign)
.execute(callback);
@@ -466,11 +417,10 @@ public class LiveHttpUtil {
* 直播间抢红包
*/
public static void robRedPack(String stream, int redPackId, HttpCallback callback) {
String uid = CommonAppConfig.getInstance().getUid();
String uid = IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getUserInfo().getId() + "";
String sign = MD5Util.getMD5("redid=" + redPackId + "&stream=" + stream + "&uid=" + uid + "&" + SALT);
HttpClient.getInstance().get("Red.RobRed", LiveHttpConsts.ROB_RED_PACK)
.params("uid", uid)
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", uid,true)
.params("stream", stream)
.params("redid", redPackId)
.params("sign", sign)
@@ -482,11 +432,8 @@ public class LiveHttpUtil {
* 直播间红包领取详情
*/
public static void getRedPackResult(String stream, int redPackId, HttpCallback callback) {
String uid = CommonAppConfig.getInstance().getUid();
String sign = MD5Util.getMD5("redid=" + redPackId + "&stream=" + stream + "&" + SALT);
HttpClient.getInstance().get("Red.GetRedRobList", LiveHttpConsts.GET_RED_PACK_RESULT)
.params("uid", uid)
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("redid", redPackId)
.params("sign", sign)
@@ -498,8 +445,6 @@ public class LiveHttpUtil {
*/
public static void sendDanmu(String content, String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendBarrage", LiveHttpConsts.SEND_DANMU)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", "1")
@@ -516,8 +461,6 @@ public class LiveHttpUtil {
*/
public static void checkLive(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.checkLive", LiveHttpConsts.CHECK_LIVE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@@ -529,8 +472,6 @@ public class LiveHttpUtil {
*/
public static void enterRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.enterRoom", LiveHttpConsts.ENTER_ROOM)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("city", CommonAppConfig.getInstance().getCity())
.params("liveuid", liveUid)
.params("stream", stream)
@@ -542,7 +483,6 @@ public class LiveHttpUtil {
*/
public static void enterBackRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Tx.userjoinroom", "Tx.userjoinroom")
.params("token", CommonAppConfig.getInstance().getToken())
.params("GroupId", "g" + liveUid)
.params("stream", stream)
.execute(callback);
@@ -553,7 +493,6 @@ public class LiveHttpUtil {
*/
public static void qBackRoom(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Tx.leave_room", "Tx.leave_room")
.params("token", CommonAppConfig.getInstance().getToken())
.params("GroupId", "g" + liveUid)
.params("stream", stream)
.execute(callback);
@@ -564,8 +503,6 @@ public class LiveHttpUtil {
*/
public static void getGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getGiftList", LiveHttpConsts.GET_GIFT_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -574,8 +511,6 @@ public class LiveHttpUtil {
*/
public static void getNewGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getGiftListApp", LiveHttpConsts.GET_GIFT_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -584,8 +519,6 @@ public class LiveHttpUtil {
*/
public static void getWrapList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getPackList", LiveHttpConsts.GET_WRAP_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -594,50 +527,45 @@ public class LiveHttpUtil {
*/
public static void getWishList(HttpCallback callback) {
HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
/**
/**
* 用户获取主播的心愿单列表
*/
public static void getWishList(String liveId, HttpCallback callback) {
HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST)
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", liveId)
.params("uid", liveId, true)
.execute(callback);
}
/**
* 獲取新手任務
*
* @param callback
*/
public static void getFrontTask(HttpCallback callback) {
HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask")
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
/**
* 獲取新手任務
*
* @param callback
*/
public static void getFrontTask(String Token,String uid,HttpCallback callback) {
public static void getFrontTask(String Token, String uid, HttpCallback callback) {
HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask")
.params("token", Token)
.params("uid", uid)
.params("token", Token, true)
.params("uid", uid, true)
.execute(callback);
}
/**
* 完成新手任務
*/
public static void setFrontTask(String type , HttpCallback callback) {
public static void setFrontTask(String type, HttpCallback callback) {
HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask")
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", type)
.execute(callback);
}
@@ -645,21 +573,18 @@ public class LiveHttpUtil {
/**
* 完成新手任務
*/
public static void setFrontTask(String type ,String liveuid , HttpCallback callback) {
public static void setFrontTask(String type, String liveuid, HttpCallback callback) {
HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask")
.params("token", CommonAppConfig.getInstance().getToken())
.params("uid", CommonAppConfig.getInstance().getUid())
.params("type", type)
.params("liveuid", liveuid)
.execute(callback);
}
/**
* 修改心愿单列表
*/
public static void modifyWishList(String list, HttpCallback callback) {
HttpClient.getInstance().get("Guide.setWishlist", LiveHttpConsts.SET_WISH_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("list", list)
.execute(callback);
}
@@ -669,8 +594,6 @@ public class LiveHttpUtil {
*/
public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, HttpCallback callback) {
HttpClient.getInstance().get("Live.sendGift", LiveHttpConsts.SEND_GIFT)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.params("giftid", giftId)
@@ -697,8 +620,6 @@ public class LiveHttpUtil {
public static void sendZAN(String liveUid, HttpCallback callback) {
HttpClient.getInstance().get("Fans.doubleClickLight", "Fans.DoubleClickLight")
.params("liveuid", liveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -707,7 +628,6 @@ public class LiveHttpUtil {
*/
public static void livePkSearchAnchor(String key, int p, HttpCallback callback) {
HttpClient.getInstance().get("Livepk.search", LiveHttpConsts.LIVE_PK_SEARCH_ANCHOR)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("key", key)
.params("p", p)
.execute(callback);
@@ -719,8 +639,6 @@ public class LiveHttpUtil {
*/
public static void getLivePkList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Livepk.getLiveList", LiveHttpConsts.GET_LIVE_PK_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("p", p)
.execute(callback);
}
@@ -746,44 +664,6 @@ public class LiveHttpUtil {
.execute(callback);
}
/**
* 主播开播
*
* @param title 直播标题
* @param type 直播类型 普通 密码 收费等
* @param typeVal 密码 价格等
* @param file 封面图片文件
* @param callback
*/
public static void createRoom(String title, int liveClassId, int type, int typeVal, File file, boolean openLocation, HttpCallback callback) {
// CommonAppConfig appConfig = CommonAppConfig.getInstance();
// UserBean u = appConfig.getUserBean();
// if (u == null) {
// return;
// }
// PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.createRoom", LiveHttpConsts.CREATE_ROOM)
// .params("uid", appConfig.getUid())
// .params("token", appConfig.getToken())
// .params("user_nicename", u.getUserNiceName())
// .params("avatar", u.getAvatar())
// .params("avatar_thumb", u.getAvatarThumb())
// .params("city", openLocation ? appConfig.getCity() : "")
// .params("province", openLocation ? appConfig.getProvince() : "")
// .params("lat", openLocation ? String.valueOf(appConfig.getLat()) : "")
// .params("lng", openLocation ? String.valueOf(appConfig.getLng()) : "")
// .params("title", title)
// .params("liveclassid", liveClassId)
// .params("type", type)
// .params("type_val", typeVal)
// .params("deviceinfo", LiveConfig.getSystemParams());
// ;
// if (file != null) {
// request.params("file", file);
// }
// request.execute(callback);
}
/**
* 新主播开播
*
@@ -794,14 +674,8 @@ public class LiveHttpUtil {
* @param callback
*/
public static void newcreateRoom(String title, int liveClassId, int type, int typeVal, File file, HttpCallback callback) {
CommonAppConfig appConfig = CommonAppConfig.getInstance();
UserBean u = appConfig.getUserBean();
if (u == null) {
return;
}
PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.createRoom2", LiveHttpConsts.CREATE_ROOM)
.params("uid", appConfig.getUid())
.params("token", appConfig.getToken())
.params("title", title)
.params("liveclassid", liveClassId)
.params("type", type)
@@ -819,8 +693,6 @@ public class LiveHttpUtil {
*/
public static void changeLive(String stream) {
HttpClient.getInstance().get("Live.changeLive", LiveHttpConsts.CHANGE_LIVE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("stream", stream)
.params("status", "1")
.execute(new HttpCallback() {
@@ -837,8 +709,6 @@ public class LiveHttpUtil {
public static void stopLive(String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.stopRoom", LiveHttpConsts.STOP_LIVE)
.params("stream", stream)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -852,7 +722,6 @@ public class LiveHttpUtil {
public static void getisRong(HttpCallback callback) {
HttpClient.getInstance().get("Live.isRong", "Live.isRong")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(callback);
}
@@ -861,7 +730,6 @@ public class LiveHttpUtil {
*/
public static void getTxLinkMicAccUrl(String originStreamUrl, HttpCallback callback) {
HttpClient.getInstance().get("Linkmic.requestPlayUrlWithSignForLinkMic", LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("originStreamUrl", originStreamUrl)
.execute(callback);
}
@@ -872,7 +740,6 @@ public class LiveHttpUtil {
*/
public static void linkMicTxMixStream(String mergeparams) {
HttpClient.getInstance().get("Linkmic.mergeVideoStream", LiveHttpConsts.LINK_MIC_TX_MIX_STREAM)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("mergeparams", mergeparams)
.execute(CommonHttpUtil.NO_CALLBACK);
}
@@ -883,8 +750,6 @@ public class LiveHttpUtil {
*/
public static void getMyAdminRoomList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.getRoomList", LiveHttpConsts.GET_MY_ADMIN_ROOM_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("p", p)
.execute(callback);
}
@@ -895,8 +760,6 @@ public class LiveHttpUtil {
*/
public static void getLiveGiftPrizePool(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Jackpot.getJackpot", LiveHttpConsts.GET_LIVE_GIFT_PRIZE_POOL)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@@ -907,8 +770,6 @@ public class LiveHttpUtil {
*/
public static void anchorCheckLive(String liveUid, String stream, HttpCallback callback) {
HttpClient.getInstance().get("Live.checkLiveing", LiveHttpConsts.ANCHOR_CHECK_LIVE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("liveuid", liveUid)
.params("stream", stream)
.execute(callback);
@@ -931,8 +792,6 @@ public class LiveHttpUtil {
public static void getHcGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Live.getSvgaList", LiveHttpConsts.GET_GIFT_LIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -943,8 +802,6 @@ public class LiveHttpUtil {
public static void getHczGiftList(HttpCallback callback) {
HttpClient.getInstance().get("Home.aoto_load", "Home.aoto_load")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -955,8 +812,6 @@ public class LiveHttpUtil {
public static void geteEvent(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Rank.isActivity", LiveHttpConsts.GET_EVENT)
.params("anchorUid", anchor_id)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -966,8 +821,6 @@ public class LiveHttpUtil {
public static void setEvent(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Rank.crystalTimeEnd", LiveHttpConsts.GET_EVENT)
.params("anchor_id", anchor_id)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -976,8 +829,6 @@ public class LiveHttpUtil {
*/
public static void userHopePrankTurntable(String anchor_id, String prankid, HttpCallback callback) {
HttpClient.getInstance().get("Prank.userHopePrankTurntable", LiveHttpConsts.USERHOPEPRANKTURNTABLE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("prankid", prankid)
.params("anchor_id", anchor_id)
.execute(callback);
@@ -988,8 +839,6 @@ public class LiveHttpUtil {
*/
public static void endPrankTurntable(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Prank.endPrankTurntable", LiveHttpConsts.ENDPRANKTURNTABLE)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("anchor_id", anchor_id)
.execute(callback);
}
@@ -999,8 +848,6 @@ public class LiveHttpUtil {
*/
public static void getAnchorLastWeekList(HttpCallback callback) {
HttpClient.getInstance().get("WeekStar.getAnchorLastWeekList", LiveHttpConsts.GETANCHORLASTWEEKLIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(callback);
}
@@ -1009,8 +856,6 @@ public class LiveHttpUtil {
*/
public static void useHotCardUserList(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Live.useHotCardUserList", LiveHttpConsts.USEHOTCARDUSERLIST)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("anchor_id", anchor_id)
.execute(callback);
}
@@ -1020,8 +865,6 @@ public class LiveHttpUtil {
*/
public static void isHotCard(String anchor_id, HttpCallback callback) {
HttpClient.getInstance().get("Live.isHotCard", LiveHttpConsts.ISHOTCARD)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("anchor_id", anchor_id)
.execute(callback);
}
@@ -1031,8 +874,6 @@ public class LiveHttpUtil {
*/
public static void setInstructorRemark(String touid, String remark, HttpCallback callback) {
HttpClient.getInstance().get("User.setInstructorRemark", LiveHttpConsts.SETINSTRUCTORREMARK)
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.params("touid", touid)
.params("remark", remark)
.execute(callback);

1
live/src/main/java/com/yunbao/live/socket/SocketClient.java
View File

@@ -784,7 +784,6 @@ public class SocketClient {
LivePushTxViewHolder.mPreView.setLayoutParams(params);
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java
View File

@@ -44,7 +44,6 @@ public class SocketLinkMicPkUtil {
public static void linkMicPkAccept(SocketClient client, String pkUid, String url, String name) {
Log.i("pksend", "发送的pkurl=" + url + "****发送的pkname=" + name);
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")
@@ -53,7 +52,6 @@ public class SocketLinkMicPkUtil {
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")

1
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@@ -910,7 +910,6 @@ public class SocketRyClient {
LivePushRyViewHolder.mPreView.setLayoutParams(params);
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@@ -179,7 +179,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onClick(View v) {
//获取房间连麦状态
HttpClient.getInstance().get("live.getDrLm", "live.getDrLm")
.params("uid", mLiveUid)
.params("uid", mLiveUid,true)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

1
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@@ -727,7 +727,6 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

1
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@@ -354,7 +354,6 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
public void onConfirmClick(Dialog dialog, String content) {
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

2
live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java
View File

@@ -108,7 +108,6 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
public void onConfirmClick(Dialog dialog, String content) {
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -117,7 +116,6 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "00:00")
.params("type", "0")
.params("sign", "1")

2
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@@ -81,7 +81,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
public void onClick(View view) {
//開始多人PK
HttpClient.getInstance().post("live.startDRPK", "live.startDRPK")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
@@ -103,7 +102,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
@Override
public void onClick(View view) {
HttpClient.getInstance().get("live.endDRpk", "live.endDRpk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override