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

HOSO提包版本

Browse Source
This commit is contained in:
zlzw
2024-11-12 09:48:25 +08:00
parent bf8268712b
commit db05ff116e
114 changed files with 1068 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -972,7 +972,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url, true);
dialog.dismiss();
}

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

@@ -232,7 +232,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
mLivePushViewHolder.leave.setVisibility(View.GONE);
sendSystemMessage(mContext.getString(R.string.live_anchor_come_back));
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("isleave", leave)
.execute(new Callback<JsonBean>() {
@Override

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

@@ -1236,7 +1236,7 @@ public class LiveAudienceActivity extends LiveActivity {
manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal());
} else {
//获取房间连麦状态
HttpClient.getInstance().get("live.getDrLm", "live.getDrLm").params("uid", mLiveUid, true).execute(new HttpCallback() {
HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai").params("uid", mLiveUid, true).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@@ -1602,7 +1602,7 @@ public class LiveAudienceActivity extends LiveActivity {
case "3":
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(mContext, bean.getLink(), true);
WebViewActivity.forward(mContext, bean.getLink()+"?1=1", true);
} else {
startActivity(new Intent(mContext, SystemMessageActivity.class).putExtra("type", bean.getType()).putExtra("uid", "").putExtra("title", "").putExtra("headImg", ""));

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

@@ -400,7 +400,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
// return;
// }
if (isDRPK != 1) {
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum")
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -414,7 +414,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
new DialogUitl.SimpleCallback2() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom")
HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk")
.params("type", "1")
.params("sign", "1")
.execute(new HttpCallback() {
@@ -572,7 +572,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
sendSystemMessageRy(mContext.getString(R.string.live_anchor_come_back));
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("isleave", leave)
.params("token", CommonAppConfig.getInstance().getToken())

6
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@@ -410,7 +410,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
// return;
// }
if (isDRPK != 1) {
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum")
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -424,7 +424,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
new DialogUitl.SimpleCallback2() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom")
HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk")
.params("type", "1")
.params("sign", "1")
.execute(new HttpCallback() {
@@ -588,7 +588,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveAnchorViewHolder.setLeaveFlag(false);
}
HttpClient.getInstance().get("Live.isLeave", "Live.isLeave")
HttpClient.getInstance().get("likaizhibo", "likaizhibo")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("isleave", leave)
.params("token", CommonAppConfig.getInstance().getToken())

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

@@ -307,6 +307,9 @@ public class WebViewActivityMedal extends AbsActivity {
}
public static void forward(Context context, String url) {
if(!url.contains("?")){
url+="?t="+System.currentTimeMillis()+"&";
}
forward(context, url, true);
}

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

@@ -410,7 +410,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
* 设置贵族状态
*/
private void loadUserVip() {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.execute(new HttpCallback() {

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

@@ -513,7 +513,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
* 设置贵族状态
*/
private void loadUserVip() {
HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo")
HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo")
.params("uid", IMLoginManager.get(mContext).getUserInfo().getId())
.params("token", IMLoginManager.get(mContext).getUserInfo().getToken())
.execute(new HttpCallback() {

4
live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java
View File

@@ -172,7 +172,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
@Override
public void run() {
HttpClient.getInstance().get("Live.getUserDrLmPower", "Live.getUserDrLmPower")
HttpClient.getInstance().get("huoquyonghulianmaizhuangtai", "huoquyonghulianmaizhuangtai")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@@ -280,7 +280,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
public void onConfirmClick(Dialog dialog, String content) {
Log.e("ry", "退出112");
// //退出多人房间
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", LiveActivity.mLiveUid)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {

4
live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java
View File

@@ -63,8 +63,8 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment {
EventBus.getDefault().register(this);
RelativeLayout rlWebview= (RelativeLayout) findViewById(R.id.rlWebview);
if (mWishWebViewHolder == null) {
String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
String url= CommonAppConfig.HOST + "/h5/Turntable/prank.html?";
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag",url);
mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url);

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

@@ -151,7 +151,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
private Runnable setBlackRunnable = new Runnable() {
@Override
public void run() {
HttpClient.getInstance().get("User.setBlack", "setBlack")
HttpClient.getInstance().get("shezhilaheizhuangtai", "setBlack")
.params("touid", userId);
}
};

2
live/src/main/java/com/yunbao/live/http/ImHttpConsts.java
View File

@@ -9,7 +9,7 @@ public class ImHttpConsts {
public static final String GET_SYSTEM_MESSAGE_LIST = "getSystemMessageList";
public static final String GET_COMMUNITYLIST_LIST = "getCommunityList";
public static final String CHECK_BLACK = "checkBlack";
public static final String SEND_DYNAMICCOMMENT = "sendDynamicComment";
public static final String SEND_DYNAMICCOMMENT = "fabudongtaipinglun";
public static final String SET_BLACK = "setBlack";
public static final String GET_MESSAGEGIFTINFO = "getMessageGiftInfo";

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

@@ -20,7 +20,7 @@ public class ImHttpUtil {
* 私信聊天页面用于获取用户信息
*/
public static void getImUserInfo(String uids, HttpCallback callback) {
HttpClient.getInstance().get("Message.getLists", ImHttpConsts.GET_IM_USER_INFO)
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", ImHttpConsts.GET_IM_USER_INFO)
.execute(callback);
}
@@ -28,7 +28,7 @@ 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)
HttpClient.getInstance().get("fabudongtaipinglun", ImHttpConsts.SEND_DYNAMICCOMMENT)
.params("dynamic_id", dynamic_id)
.params("content", content)
.params("to_comment_id", to_comment_id)
@@ -39,7 +39,7 @@ public class ImHttpUtil {
* 获取系统消息列表
*/
public static void getSystemMessageList(String type, int p, HttpCallback callback) {
HttpClient.getInstance().get("Message.getListInfo", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST)
HttpClient.getInstance().get("huoquxitongxiaoxixiangqing", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST)
.params("p", p)
.params("type", type)
.execute(callback);
@@ -49,7 +49,7 @@ public class ImHttpUtil {
* 猜你喜欢
*/
public static void getCommunityList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Community.guessYouLike", ImHttpConsts.GET_COMMUNITYLIST_LIST)
HttpClient.getInstance().get("cainixihuandongtailiebiao", ImHttpConsts.GET_COMMUNITYLIST_LIST)
.params("p", p)
.execute(callback);
}
@@ -59,7 +59,7 @@ public class ImHttpUtil {
* 判断自己有没有被对方拉黑，聊天的时候用到
*/
public static void checkBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.checkBlack", ImHttpConsts.CHECK_BLACK)
HttpClient.getInstance().get("jiancelaheizhuangtai", ImHttpConsts.CHECK_BLACK)
.params("touid", touid)
.execute(callback);
}
@@ -68,7 +68,7 @@ public class ImHttpUtil {
* 拉黑对方， 解除拉黑
*/
public static void setBlack(String touid, HttpCallback callback) {
HttpClient.getInstance().get("User.setBlack", ImHttpConsts.SET_BLACK)
HttpClient.getInstance().get("shezhilaheizhuangtai", ImHttpConsts.SET_BLACK)
.params("touid", touid)
.execute(callback);
}
@@ -78,7 +78,7 @@ public class ImHttpUtil {
* 获取补偿消息详情
*/
public static void getMessageGiftInfo(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.getMessageGiftInfo", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("chakanxiaoxilibanxiangqing", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@@ -87,7 +87,7 @@ public class ImHttpUtil {
* 删除系统消息
*/
public static void delMsg(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.deleteSystemMessage", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("shanchuxitongxiaoxi", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@@ -96,7 +96,7 @@ public class ImHttpUtil {
* 已读 系统消息
*/
public static void readMsg(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.systemMessageRead", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("xitongxiaoxiyiduzhuangtai", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@@ -105,7 +105,7 @@ public class ImHttpUtil {
* 领取礼物
*/
public static void receiveGift(String msgid, HttpCallback callback) {
HttpClient.getInstance().get("Message.getMessageGiftDetails", ImHttpConsts.GET_MESSAGEGIFTINFO)
HttpClient.getInstance().get("lingquxitongxiaoxilibao", ImHttpConsts.GET_MESSAGEGIFTINFO)
.params("message_id", msgid)
.execute(callback);
}
@@ -114,7 +114,7 @@ public class ImHttpUtil {
* 处罚通知是否有未读消息
*/
public static void getPenalizeStatus(HttpCallback callback) {
HttpClient.getInstance().get("Message.penalizeStatus", "Message.penalizeStatus")
HttpClient.getInstance().get("jianchaweiduchufanxiaoxi", "jianchaweiduchufanxiaoxi")
.execute(callback);
}
@@ -122,7 +122,7 @@ public class ImHttpUtil {
* 处罚通知列表
*/
public static void getPenalizeList(int p, HttpCallback callback) {
HttpClient.getInstance().get("Message.penalizeList", "Message.penalizeList")
HttpClient.getInstance().get("chufantongzhiliebiao", "chufantongzhiliebiao")
.params("p", p)
.execute(callback);
}

8
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java
View File

@@ -251,7 +251,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (i == 0 && s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
i = 1;
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "00:00")
.params("type", "0")
@@ -272,13 +272,13 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
String pkUid = datas.getString("pkuid");
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@@ -768,7 +768,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener {
//把画面设置成九宫格
dr_pk_view.setVisibility(View.VISIBLE);
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")

2
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@@ -546,7 +546,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
//获取活动
private void getEvent() {
if (btn_onecz_event != null) {
HttpClient.getInstance().get("Charge2.isFirstChargeIcons", "Charge2.isFirstChargeIcons")
HttpClient.getInstance().get("xinbanshifouxianshishouchongtubiao", "xinbanshifouxianshishouchongtubiao")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("token", CommonAppConfig.getInstance().getToken())
.execute(new HttpCallback() {

8
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@@ -397,7 +397,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.i("tts2", s1);
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "00:00")
.params("type", "0")
@@ -420,13 +420,13 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid"));
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@@ -940,7 +940,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
@Override
protected void onDRPkApply(UserBean u) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")

18
live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
View File

@@ -350,7 +350,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.i("tts2", s1);
mLiveLinkMicPkViewHolder.setTime(s + " " + s1);
if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) {
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@@ -363,10 +363,10 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid"));
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -456,7 +456,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
public void onLinkDRMicPkQuit(String uid) {
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@@ -697,12 +697,12 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
@Override
protected void onDRPkApply(UserBean u) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
Log.i("多人PK", "1code = " + code + ", msgs = " + msgs + ", info = " + Arrays.deepToString(info) + " mApplyUid = " + mApplyUid);
HttpClient.getInstance().get("live.getdrnum", "live.getdrnum").execute(new HttpCallback() {
HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
Log.i(TAG, "code = " + code + ", msg = " + msg + ", info = " + Arrays.deepToString(info));
@@ -715,7 +715,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
boolean finalAgree = agree;
if (finalAgree) {
HttpClient.getInstance().get("live.joinDRPKroom", "live.joinDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() {
HttpClient.getInstance().get("jiaruduorenpkfangjian", "jiaruduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -738,7 +738,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
L.eSw("将自己从多人pk列表里剔除" + new Gson().toJson(drPkbeans));
}
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@@ -1279,7 +1279,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
public void dRjoinOtherRoom(UserBean u) {
L.eSw("dRjoinOtherRoom UserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBean ");
setMyDrPkDetailsView();
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {

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

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

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

@@ -43,7 +43,7 @@ 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")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")
@@ -51,7 +51,7 @@ public class SocketLinkMicPkUtil {
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("pkuid", pkUid)
.params("type", "1")
.params("sign", "1")

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

@@ -457,7 +457,7 @@ public class SocketRyClient {
} else if (TextUtils.equals(boxType, "2")) {
boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box";
} else {
boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box";
boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box";
}
AllServerNotifyEvent allServerNotifyEvent
= new AllServerNotifyEvent()
@@ -838,7 +838,7 @@ public class SocketRyClient {
stringBuffer.append(sendQuickGiftModel.getUserNicename())
.append(WordUtil.isNewZh() ? " 送出了 " : " sent ")
.append(sendQuickGiftModel.getQuickGiftNumber())
.append(WordUtil.isNewZh() ? " 個小PD " : " small pandas ");
.append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas ");
systemChatMessage2(stringBuffer.toString());
Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum()));
break;
@@ -1486,7 +1486,7 @@ public class SocketRyClient {
}
});
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
View File

@@ -39,7 +39,7 @@ public class SocketRyLinkMicPkUtil {
* @param pkUid 对方主播的uid
*/
public static void linkMicPkAccept(SocketRyClient client, String pkUid, String url, String name) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
@@ -49,7 +49,7 @@ public class SocketRyLinkMicPkUtil {
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")

6
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@@ -463,7 +463,7 @@ public class SocketSwClient {
} else if (TextUtils.equals(boxType, "2")) {
boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box";
} else {
boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box";
boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box";
}
AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent().setBlindBoxId(map.getString("blind_box_id")).setBoxType(boxType).setBoxTypeName(boxTypeName).setDressName(WordUtil.isNewZh() ? map.getString("dress_name") : TextUtils.isEmpty(map.getString("dress_nameen")) ? map.getString("dress_name") : map.getString("dress_nameen")).setGiftNotification(map.getString("gift_notification")).setGiftName(WordUtil.isNewZh() ? mCt.getString("giftname") : mCt.getString("giftnameen")).setUserNiceName(map.getString("uname")).setGiftIcon(map.getString("gifticon")).setAnchorName(map.getString("ancherName")).setDisplaySrc(map.getString("display_src"));
Log.e("AllServerNotifyEvent", allServerNotifyEvent.toString());
@@ -767,7 +767,7 @@ public class SocketSwClient {
case "sendQuickGift":
SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小PD " : " small pandas ");
stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas ");
systemChatMessage2(stringBuffer.toString());
Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum()));
break;
@@ -1416,7 +1416,7 @@ public class SocketSwClient {
// if (rtcRoom != null) {
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.DISCONNEXT_PK_TIME));
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() {
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

4
live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java
View File

@@ -39,7 +39,7 @@ public class SocketSwLinkMicPkUtil {
* @param pkUid 对方主播的uid
*/
public static void linkMicPkAccept(SocketSwClient client, String pkUid, String url, String name) {
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")
@@ -49,7 +49,7 @@ public class SocketSwLinkMicPkUtil {
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
L.eSw("1111111111111111111111111111");
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", pkUid)
.params("type", "1")

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

@@ -144,7 +144,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
@Override
public void onClick(View v) {
//获取房间连麦状态
HttpClient.getInstance().get("live.getDrLm", "live.getDrLm")
HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai")
.params("uid", mLiveUid, true)
.execute(new HttpCallback() {
@Override
@@ -729,8 +729,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
* 观众打开主播的整蛊惑单窗口
*/
public void openZGListWindow() {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
String url = CommonAppConfig.HOST + "/h5/activity/Turntable/index.html?";
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag", url);
Bundle bundle1 = new Bundle();

9
live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
View File

@@ -29,6 +29,7 @@ import com.lxj.xpopup.core.BasePopupView;
import com.lxj.xpopup.interfaces.XPopupCallback;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveAnchorCallMeModel;
import com.yunbao.common.bean.LiveAnchorSayModel;
@@ -546,17 +547,13 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
StringBuffer url = new StringBuffer();
url.append(CommonAppConfig.HOST);
if (TextUtils.equals(ct, "zh")) {
url.append("/index.php?g=portal&m=page&a=index&id=671");
} else {
url.append("/index.php?g=portal&m=page&a=index&id=672");
}
url.append("/h5/page/index.html?id=708");
url.append("&uid=")
.append(model.getId())
.append("&token=")
.append(model.getToken()).append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false);
WebViewActivity.forward(mContext, url.toString(), false);
} else if (i == R.id.btn_live_anchor_say) {
openAnchorSayDialog();
} else if (i == R.id.btn_live_anchor_call_me) {

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

@@ -1276,7 +1276,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
audioManager.setSpeakerphoneOn(true);
HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm")
HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai")
.params("roomid", LiveActivity.mLiveUid)
.execute(new HttpCallback() {
@Override

4
live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
View File

@@ -319,7 +319,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
}
}
HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() {
HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (info.length > 0) {
@@ -404,7 +404,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
*/
private void joinLiveMic() {
L.eSw("joinLiveMic");
HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() {
HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
Log.e("ry", code + "热热热");

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

@@ -506,7 +506,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag());
//断开连麦
LiveRyAnchorActivity.isDRPK = 0;
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -514,7 +514,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("addtime", "1")
.params("type", "1")
@@ -559,14 +559,14 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
.param("uid", CommonAppConfig.getInstance().getUid());
seed_msg.create();
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@@ -584,13 +584,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + LiveRyLinkMicPkPresenter.oldmPkUid)
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@@ -1045,13 +1045,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msg.create();
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {

20
live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java
View File

@@ -177,13 +177,13 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag());
//断开连麦
LiveSwAnchorActivity.isDRPK = 0;
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() {
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
}
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() {
HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
@@ -201,11 +201,11 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_LINK_MIC_PK).param("action", 9).param("msgtype", 10).param("win_uid", datas.getString("win_uid")).param("uid", CommonAppConfig.getInstance().getUid());
seed_msg.create();
Log.i("seed", seed_msg.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -213,10 +213,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -292,7 +292,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
swManager.joinChannelEx(CommonAppConfig.getInstance().getUid(), CommonAppConfig.SWToken, u.getId(), SWAuManager.getChannelName(u.getId()));
}
HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive")
HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")
@@ -301,7 +301,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
@Override
public void onSuccess(int code, String msgs, String[] info) {
if (code == 0) {
HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK")
HttpClient.getInstance().get("kaishipk", "kaishipk")
.params("uid", CommonAppConfig.getInstance().getUid())
.params("pkuid", u.getId())
.params("type", "1")
@@ -600,10 +600,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_SYSTEM).param("action", 1).param("ct", ct);
seed_msg.create();
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

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

@@ -108,7 +108,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
@Override
public void onConfirmClick(Dialog dialog, String content) {
//断开连麦
HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout")
HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu")
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -116,7 +116,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
}
});
HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK")
HttpClient.getInstance().get("jieshupk", "jieshupk")
.params("addtime", "00:00")
.params("type", "0")
.params("sign", "1")
@@ -143,14 +143,14 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
params.topMargin = 0;
LivePushTxViewHolder.mPreView.setLayoutParams(params);
}
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + pkUid)
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msg.mResult.toString())
.execute(new HttpCallback() {
@@ -168,13 +168,13 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi
seed_msgs.create();
Log.i("seed", seed_msgs.mResult.toString());
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + LiveLinkMicPkPresenter.oldmPkUid)
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2")
HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2")
.params("GroupId", "g" + CommonAppConfig.getInstance().getUid())
.params("jsonstr", seed_msgs.mResult.toString())
.execute(new HttpCallback() {

8
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -5523,7 +5523,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void run() {
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1);
bannerBean.setShow_type("2");
mTopBannerList.add(bannerBean);
LiveChatBean bean = new LiveChatBean();
@@ -6243,7 +6243,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1);
bannerBean.setShow_type("2");
if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) {
mTopBannerList.add(bannerBean);
@@ -6302,7 +6302,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {
@@ -6357,7 +6357,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {

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

@@ -160,7 +160,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
ToastUtil.show("多人PK次数已用完");
} else {
//開始多人PK
HttpClient.getInstance().get("live.startDRPK", "live.startDRPK")
HttpClient.getInstance().get("kaishiduorenpk", "kaishiduorenpk")
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
@@ -182,7 +182,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
btn_end_pk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
HttpClient.getInstance().get("live.endDRpk", "live.endDRpk")
HttpClient.getInstance().get("jieshuduorenpkv2", "jieshuduorenpkv2")
.params("roomid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
@@ -450,7 +450,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
if (model != null && model.getWishlist().size() > 0) {
BannerBean bannerModel = new BannerBean();
bannerModel.setShow_type("2");
bannerModel.setLink(CommonAppConfig.HOST + "/index.php");
bannerModel.setLink(CommonAppConfig.HOST + "/h5/wish/index.html");
bannerModel.setImageUrl(model.getImg());
addWishList(bannerModel);

4
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -1201,7 +1201,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
if (isSw) {
if (mLivePlayViewHolder != null) {
mLivePlayViewHolder.endLiveMic();
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", liveID)
.execute(new HttpCallback() {
@Override
@@ -1238,7 +1238,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
Log.e("ry", "下麦成功");
// 该用户切换为观众成功，可以以观众身份进行音视频
//退出多人房间
HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm")
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", liveID)
.execute(new HttpCallback() {
@Override

3
live/src/main/res/layout/dialog_live_task.xml
View File

@@ -47,9 +47,8 @@
<ImageView
android:id="@+id/live_task_banner2"
android:layout_width="0dp"
android:layout_height="95dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:scaleType="fitXY"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/live_task_banner1"

2
live/src/main/res/layout/item_live_task.xml
View File

@@ -37,7 +37,7 @@
android:background="@drawable/background_6cbe53"
android:paddingStart="14dp"
android:paddingTop="4dp"
android:paddingEnd="4dp"
android:paddingEnd="14dp"
android:paddingBottom="4dp"
android:textColor="#FFFFFF"
android:textSize="10sp"

2
live/src/main/res/layout/view_receive_red_packet.xml
View File

@@ -48,7 +48,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:text="來自小PD的獎勵，齊心協力連成目標"
android:text="來自小HOSO的獎勵，齊心協力連成目標"
android:textColor="@color/white"
android:textSize="13sp"
android:textStyle="bold" />