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

优化：调整天梯赛左右下角连胜字样大小

Browse Source 
update 随机PK
This commit is contained in:
zlzw
2022-12-08 17:45:21 +08:00
parent 9eff246f06
commit 3fa259c5b9
16 changed files with 357 additions and 76 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

@@ -705,7 +705,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
*/
@Override
public void onLinkMicPkStart(final String pkUid, final String pkhead, final String pkname, String isLadders) {
Log.e("ry", "pkUid" + pkUid + "pkhead" + pkhead + "pkname" + pkname);
Log.e("ry", "pkUid = " + pkUid + ", pkhead = " + pkhead + ", pkname = " + pkname + ", isLadders = " + isLadders);
if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
Handler handler = new Handler();

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

@@ -163,7 +163,10 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
public void onStartPK(String pkUid) {
ToastUtil.show("发起随机PK:" + pkUid);
JSONObject msg1 = buildLinkMicJSON();
msg1.put("randomPk", true);
msg1.put("random_pk", "1");
if(RandomPkManager.getInstance().isRankModel()){
msg1.put("is_ladders","https://downs.yaoulive.com/rank_top_box.png");
}
linkMicAnchorApply(pkUid, pkUid, msg1.toString());
}

26
live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java
View File

@@ -2,48 +2,26 @@ package com.yunbao.live.dialog;
import android.app.Dialog;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.fastjson.JSON;
import com.google.android.material.tabs.TabLayout;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.bean.RandomPkUserBean;
import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.live.R;
import com.yunbao.live.adapter.RandomPkRecyclerAdapter;
import com.yunbao.live.bean.LivePkBean;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.common.manager.RandomPkManager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
/**
* 随机PK
*/
@@ -154,7 +132,7 @@ public class RandomPkDialogFragment extends AbsDialogFragment implements View.On
private void initData() {
RandomPkManager.getInstance().addOnRandomPkTimer(randomPkTimer);
initPkSwitch();
if (RandomPkManager.getInstance().isPking()) {
if (RandomPkManager.getInstance().isRequestPk()) {
mPkBtnTitle.setText(String.format(WordUtil.getString(R.string.random_pk_info_btn_ing), RandomPkManager.getInstance().getTimer()));
mPkBtnDesc.setText(R.string.random_pk_info_btn_end_desc);
mPkBtnDesc.setVisibility(View.VISIBLE);
@@ -240,7 +218,7 @@ public class RandomPkDialogFragment extends AbsDialogFragment implements View.On
ToastUtil.show("未开启随机PK开关");
return;
}
if ((mPkBtn.getTag() != null && (boolean) mPkBtn.getTag()) || RandomPkManager.getInstance().isPking()) {
if ((mPkBtn.getTag() != null && (boolean) mPkBtn.getTag()) || RandomPkManager.getInstance().isRequestPk()) {
RandomPkManager.getInstance().exitPk();
return;
}

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

@@ -765,7 +765,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
msg1.put("pkhead", CommonAppConfig.getInstance().getUserBean().getAvatarThumb());
msg1.put("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName());
rtcRoom.getLocalUser().responseJoinOtherRoom(mApplyUid, mApplyUid, true, true, msg1.toString(), new IRCRTCResultCallback() {
IMRTCManager.getInstance().responseJoinOtherRoom(mApplyUid, true, msg1.toString(), new IRCRTCResultCallback() {
@Override
public void onSuccess() {
RCRTCEngine.getInstance().joinOtherRoom(mApplyUid, new IRCRTCResultDataCallback<RCRTCOtherRoom>() {

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

@@ -32,6 +32,7 @@ import com.yunbao.common.bean.SocketModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.manager.IMRTCManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ToastUtil;
@@ -1053,9 +1054,7 @@ public class SocketRyClient {
mListener.onLinkMicPkStart(map.getString("uid"), map.getString("pkhead"), map.getString("pkname"), map.getString("is_ladders"));// mListener.onLinkMicPkStart(map.getString("uid"));
break;
case 3://对方主播拒绝PK的回调
if (map.containsKey("randomPk") && map.getString("randomPk").equals("true")) {
}
RandomPkManager.getInstance().setPkStatus(RandomPkManager.PK_STATUS_REFUSE);
RandomPkManager.getInstance().setPkStatus(RandomPkManager.PK_STATUS_REFUSE);
mListener.onLinkMicPkRefuse();
break;
case 4://所有人收到PK开始址的回调
@@ -1102,10 +1101,7 @@ public class SocketRyClient {
msg1.put("pkuid", CommonAppConfig.getInstance().getUid());
msg1.put("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName());
msg1.put("pkhead", CommonAppConfig.getInstance().getUserBean().getAvatar());
if (rtcRoom == null) {
return;
}
rtcRoom.getLocalUser().requestJoinOtherRoom(map.getString("uid"), map.getString("uid"), true, msg1.toString(), new IRCRTCResultCallback() {
IMRTCManager.getInstance().requestJoinOtherRoom(map.getString("uid"), true, msg1.toString(), new IRCRTCResultCallback() {
@Override
public void onSuccess() {
ToastUtil.show("邀请 " + map.getString("uid") + " 发送成功");

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

@@ -238,7 +238,8 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
JSONObject map = JSONObject.parseObject(extra);
userBean1.setAvatar(map.getString("pkhead"));
userBean1.setUserNiceName(map.getString("pkname"));
userBean1.setRandomPk(map.containsKey("randomPk") ? map.getBoolean("randomPk") : false);
userBean1.setRandomPk(map.containsKey("random_pk") && map.getString("random_pk").equals("1"));
userBean1.setRankPkImgUrl(map.containsKey("is_ladders") ? map.getString("is_ladders") : null);
userBean1.setId(map.getString("uid"));
userBean1.setUserNiceName(map.getString("pkname"));
userBean1.setAvatar(map.getString("pkhead"));

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

@@ -328,7 +328,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private TextView mRandomPkTimer;
public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) {
super(context, parentView);
Contexts = context;
@@ -1627,6 +1626,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.leftMargin = DpUtil.dp2px(3);
textParams.setMarginStart(DpUtil.dp2px(3));
textParams.setMarginEnd(DpUtil.dp2px(2));
View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
View titleView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
@@ -1793,7 +1793,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_l1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidL1 != null && !"".equals(uidL1)) {
if (uidL1 != null && !"" .equals(uidL1)) {
showUserDialog(uidL1);
}
}
@@ -1801,7 +1801,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_l2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidL2 != null && !"".equals(uidL2)) {
if (uidL2 != null && !"" .equals(uidL2)) {
showUserDialog(uidL2);
}
}
@@ -1809,7 +1809,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_l3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidL3 != null && !"".equals(uidL3)) {
if (uidL3 != null && !"" .equals(uidL3)) {
showUserDialog(uidL3);
}
}
@@ -1817,7 +1817,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_r1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidR1 != null && !"".equals(uidR1)) {
if (uidR1 != null && !"" .equals(uidR1)) {
showUserDialog(uidR1);
}
}
@@ -1825,7 +1825,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_r2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidR2 != null && !"".equals(uidR2)) {
if (uidR2 != null && !"" .equals(uidR2)) {
showUserDialog(uidR2);
}
}
@@ -1833,7 +1833,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_r3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (uidR3 != null && !"".equals(uidR3)) {
if (uidR3 != null && !"" .equals(uidR3)) {
showUserDialog(uidR3);
}
}
@@ -3030,7 +3030,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
if ("1".equals(info[0])) {
if ("1" .equals(info[0])) {
ft_hot_add.setVisibility(View.VISIBLE);
} else {
ft_hot_add.setVisibility(View.GONE);
@@ -3045,7 +3045,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
*/
public static void getIsHot(String isUseHotCard) {
ImgLoader.display2(Contexts, "https://downs.yaoulive.com/img_hot_gif.gif", img_hot_gif);
if ("1".equals(isUseHotCard)) {
if ("1" .equals(isUseHotCard)) {
ft_hot_add.setVisibility(View.VISIBLE);
} else {
ft_hot_add.setVisibility(View.GONE);
@@ -3343,7 +3343,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else if (bean.getActivityId() == 0) {
openWebDialog(bean.getLink());
} else {
LiveGameDialogFragment fragment = new LiveGameDialogFragment("1".equals(bean.getShow_type()));
LiveGameDialogFragment fragment = new LiveGameDialogFragment("1" .equals(bean.getShow_type()));
fragment.setActivityId(bean.getActivityId());
fragment.setRoomId(mLiveUid);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment");
@@ -3394,7 +3394,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
nowTime = time;
tv_trickery_time.setText("" + nowTime);
openType = 0;
if ("1".equals(msgtype)) {
if ("1" .equals(msgtype)) {
nums = jsonObject.getString("nums");
prankid = jsonObject.getString("prankid");
content = jsonObject.getString("content");
@@ -3558,21 +3558,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) {
if ("svga_new_user_gif".equals(str)) {
if ("svga_new_user_gif" .equals(str)) {
if (fastMsgRecyclerView == null) return;
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
fastMsgRecyclerView.getLayoutParams();
params1.rightMargin = DeviceUtils.getScreenWidth((Activity) mContext) / 3;
fastMsgRecyclerView.setLayoutParams(params1);
} else if ("stop_svga_new_user_gif".equals(str)) {
} else if ("stop_svga_new_user_gif" .equals(str)) {
if (fastMsgRecyclerView == null) return;
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams)
fastMsgRecyclerView.getLayoutParams();
params1.rightMargin = 0;
fastMsgRecyclerView.setLayoutParams(params1);
} else if ("showBanner".equals(str)) {
} else if ("showBanner" .equals(str)) {
showBanner3(bean1);
} else if ("stop_svga_new_user_double".equals(str) && mBannerList3.size() > 2) {
} else if ("stop_svga_new_user_double" .equals(str) && mBannerList3.size() > 2) {
mBannerList3.get(2).setLink("1");
mBanner3.update(mBannerList3);
@@ -3583,7 +3583,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
}
} else if ("stop_svga_new_user_follow".equals(str) && mBannerList3.size() > 1) {
} else if ("stop_svga_new_user_follow" .equals(str) && mBannerList3.size() > 1) {
mBannerList3.get(1).setLink("1");
mBanner3.update(mBannerList3);
@@ -3594,7 +3594,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
}
} else if ("stop_new_user_gif".equals(str) && mBannerList3.size() > 0) {
} else if ("stop_new_user_gif" .equals(str) && mBannerList3.size() > 0) {
IMLoginManager.get(mContext).setNewUserGif(false);
mBannerList3.get(0).setLink("1");
mBanner3.update(mBannerList3);

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

@@ -1220,6 +1220,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onLinkMicPkStart(String pkUid, String pkhead, String pkname, String isLadders) {
System.out.println("PK测试 pkUid = " + pkUid + ", pkhead = " + pkhead + ", pkname = " + pkname + ", isLadders = " + isLadders);
if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
Handler handler = new Handler();