From 95beb590d72883949618c53b32c05165fafbd103 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Sat, 2 Nov 2024 17:09:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8DPK=E6=BC=8F?= =?UTF-8?q?=E6=8E=89=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/activity/LiveSwAnchorActivity.java | 4 ++-- .../presenter/LiveRyLinkMicPkPresenter.java | 4 ++-- .../presenter/LiveSwLinkMicPkPresenter.java | 10 +++++----- .../live/views/LivePlaySwViewHolder.java | 2 +- .../live/views/LivePushRyViewHolder.java | 6 +++--- .../live/views/LivePushSwViewHolder.java | 10 +++++----- .../live/views/LivePushTxViewHolder.java | 4 ++-- .../com/yunbao/main/views/HonorViewHolder.java | 2 +- main/src/main/res/layout/activity_entry2.xml | 18 +++++------------- 9 files changed, 26 insertions(+), 34 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java index 8a82eea13..2355b0e15 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java @@ -408,7 +408,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("ylachuangjianduorenpk", "live.createDRPKroom") .params("type", "1") .params("sign", "1") .execute(new HttpCallback() { @@ -572,7 +572,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveAnchorViewHolder.setLeaveFlag(false); } - HttpClient.getInstance().get("Live.isLeave", "Live.isLeave") + HttpClient.getInstance().get("ylalikaizhibo", "Live.isLeave") .params("uid", CommonAppConfig.getInstance().getUid()) .params("isleave", leave) .params("token", CommonAppConfig.getInstance().getToken()) diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java index 4d6ff7add..afde19e9a 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -950,7 +950,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V 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") + HttpClient.getInstance().get("ylahuoqushengyupkshu", "live.getdrnum") .execute(new HttpCallback() { @Override @@ -969,7 +969,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V @Override public void onSuccess() { if (finalAgree == true) { - HttpClient.getInstance().get("live.joinDRPKroom", "live.joinDRPKroom") + HttpClient.getInstance().get("ylajiaruduorenpkfangjian", "live.joinDRPKroom") .params("uid", CommonAppConfig.getInstance().getUid()) .params("roomid", u.getId()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java index a8d06cbe7..836025371 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java @@ -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("ylahuoquduorenpkfangjian", "Live.getDRPKroom").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) { @@ -702,7 +702,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V 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("ylahuoqushengyupkshu", "live.getdrnum").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("ylajiaruduorenpkfangjian", "live.joinDRPKroom").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("ylahuoquduorenpkfangjian", "Live.getDRPKroom").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("ylahuoquduorenpkfangjian", "Live.getDRPKroom").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) { diff --git a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java index b48f14bc1..8ae49cd78 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java @@ -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("ylajiaruduorenlianmai", "live.joinDrLm").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { Log.e("ry", code + "热热热"); diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java index 92b448136..1aa390d83 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java @@ -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("ylafasongxiaoxiv2", "Tx.sendmsgzs2") .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("ylafasongxiaoxiv2", "Tx.sendmsgzs2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { @@ -1045,7 +1045,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX seed_msg.create(); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("ylafasongxiaoxiv2", "Tx.sendmsgzs2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java index d93cd7368..2d948e0bd 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java @@ -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("ylafasongxiaoxiv2", "Tx.sendmsgzs2").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("ylafasongxiaoxiv2", "Tx.sendmsgzs2").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("ylafasongxiaoxiv2", "Tx.sendmsgzs2").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("ylafasongxiaoxiv2", "Tx.sendmsgzs2").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) { @@ -600,7 +600,7 @@ 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("ylafasongxiaoxiv2", "Tx.sendmsgzs2").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("ylafasongxiaoxiv2", "ylafasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java index 7fb30f2b5..ea1ef4ce1 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java @@ -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("ylafasongxiaoxiv2", "Tx.sendmsgzs2") .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("ylafasongxiaoxiv2", "Tx.sendmsgzs2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { diff --git a/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java b/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java index 195613565..67d7bb79f 100644 --- a/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java @@ -74,7 +74,7 @@ public class HonorViewHolder extends AbsUserHomeViewHolder { /** * 获取用户荣誉和座骑 */ - HttpClient.getInstance().get("User.medalCarList", LiveHttpConsts.GET_USER_LIST) + HttpClient.getInstance().get("ylaxunzhangzuoqiliebiao", LiveHttpConsts.GET_USER_LIST) .params("uid", mToUid,true) .execute(new HttpCallback() { @Override diff --git a/main/src/main/res/layout/activity_entry2.xml b/main/src/main/res/layout/activity_entry2.xml index 5117ca544..b05bd19a5 100644 --- a/main/src/main/res/layout/activity_entry2.xml +++ b/main/src/main/res/layout/activity_entry2.xml @@ -21,13 +21,6 @@ app:layout_constraintTop_toTopOf="@+id/lt_btn_facebook" app:layout_constraintWidth_percent="0.84" /> - - @@ -104,8 +97,7 @@ android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@+id/btn_google" app:layout_constraintEnd_toEndOf="@+id/btn_google" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/guideline" + app:layout_constraintStart_toEndOf="@+id/googleImg" app:layout_constraintTop_toTopOf="@+id/btn_google" />