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

update 6.5.5

Browse Source
This commit is contained in:
zlzw 2023-08-24 16:31:14 +08:00
parent 2b59b1b4fe
commit e1f4e8dde4
7 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,6 +755,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (manager != null && !StringUtil.isEmpty(is_fans)) { if (manager != null && !StringUtil.isEmpty(is_fans)) {
if (is_fans.equals("-2")) { if (is_fans.equals("-2")) {
manager.setAttention(0); manager.setAttention(0);
mLiveRoomViewHolder.setFansGroup("0");
is_fans = "2"; is_fans = "2";
} }
} }

1
live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
View File

@ -132,6 +132,7 @@ public class LiveFansFragment extends AbsDialogFragment {
int num = LiveAudienceActivity.fansNum - 1; int num = LiveAudienceActivity.fansNum - 1;
LiveRoomViewHolder.setFansNum(num); LiveRoomViewHolder.setFansNum(num);
ToastUtil.show("退出成功"); ToastUtil.show("退出成功");
EventBus.getDefault().post("exitFansGroup");
dismiss(); dismiss();
} else if (TextUtils.equals(event.getMethod(), "sendFansCard")) { } else if (TextUtils.equals(event.getMethod(), "sendFansCard")) {
if (LiveRoomViewHolder.mBtnFollow != null && LiveRoomViewHolder.mBtnFollow.getVisibility() == View.VISIBLE) { if (LiveRoomViewHolder.mBtnFollow != null && LiveRoomViewHolder.mBtnFollow.getVisibility() == View.VISIBLE) {

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

@ -785,6 +785,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
if (liveGiftModel.getType() == 7) { if (liveGiftModel.getType() == 7) {
iconArrow.setVisibility(View.GONE); iconArrow.setVisibility(View.GONE);
showBlindProgress(liveGiftModel.getBlind_box_type()); showBlindProgress(liveGiftModel.getBlind_box_type());
description.setTag(liveGiftModel.getBlind_box_type());
} else { } else {
blindBox.setVisibility(View.INVISIBLE); blindBox.setVisibility(View.INVISIBLE);
mCount = DEFAULT_COUNT; mCount = DEFAULT_COUNT;

13
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@ -99,11 +99,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
} }
userID = redPacketInfoModel.getUserId(); userID = redPacketInfoModel.getUserId();
if (redPacketInfoModel.getIsFans()) {
if (!isFans) {
ToastUtil.show(R.string.live_rad_pack_join_fans_group_tip);
}
}
} }
private Handler timeHandler = new Handler(); private Handler timeHandler = new Handler();
@ -158,6 +154,11 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
redPacketTimeLayout.setVisibility(GONE); redPacketTimeLayout.setVisibility(GONE);
redPacketOpen.setVisibility(VISIBLE); redPacketOpen.setVisibility(VISIBLE);
} }
ViewClicksAntiShake.clicksAntiShake(redPacketTimeLayout, () -> {
if (!isFans && redPacketInfoModel.getIsFans()) {
ToastUtil.show(getContext().getString(R.string.live_rad_pack_join_fans_group_click_tip));
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet_open), () -> { ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet_open), () -> {
if (isSuperJackpot) { if (isSuperJackpot) {
@ -189,7 +190,7 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
}); });
} else { } else {
if (!isFans && redPacketInfoModel.getIsFans()) { if (!isFans && redPacketInfoModel.getIsFans()) {
ToastUtil.show(R.string.live_rad_pack_join_fans_group_click_tip); ToastUtil.show(getContext().getString(R.string.live_rad_pack_join_fans_group_click_tip));
return; return;
} }
if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) { if (TextUtils.equals(redPacketInfoModel.getConditions(), "1") && LiveAudienceActivity.isattention == 0) {

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

@ -374,7 +374,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow; public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
private String mAnchorName;//主播名字 private String mAnchorName;//主播名字
private boolean isHinde = false; private boolean isHinde = false;
private boolean isFans=false; private boolean isFans = false;
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) { public void onUpdata(String str) {
@ -457,6 +457,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
} else if ("checkNewLetter".equals(str)) { } else if ("checkNewLetter".equals(str)) {
checkNewLetter(); checkNewLetter();
}else if("exitFansGroup".equals(str)){
setFansGroup("0");
} }
} }
@ -1510,7 +1512,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (TextUtils.equals(data.getReceiveStatus(), "0")) { if (TextUtils.equals(data.getReceiveStatus(), "0")) {
redTimeCountdown = redTimeCountdown - 1; redTimeCountdown = redTimeCountdown - 1;
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
.asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false,isFans)) .asCustom(new ReceiveRendPacketPopup(mContext, redTimeCountdown, mLiveUid, mStream, redPacketModel.getRedPacketId(), data, false, isFans))
.show(); .show();
} else if (TextUtils.equals(data.getReceiveStatus(), "1")) { } else if (TextUtils.equals(data.getReceiveStatus(), "1")) {
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
@ -1547,7 +1549,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
new XPopup.Builder(mContext) new XPopup.Builder(mContext)
.asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true,isFans)) .asCustom(new ReceiveRendPacketPopup(mContext, 0, mLiveUid, mStream, redPacket.getRedPacketId(), redPacket, true, isFans))
.show(); .show();
} }
@ -1798,7 +1800,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -1864,7 +1866,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} }
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -2018,10 +2020,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else { } else {
url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/newUp.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} }
ZhuangBanActivity.forward(mContext, url, false,1); ZhuangBanActivity.forward(mContext, url, false, 1);
} else if (link.equals("zxb")) { } else if (link.equals("zxb")) {
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false,1); ZhuangBanActivity.forward(mContext, url, false, 1);
} else if (link.equals("xyd")) { } else if (link.equals("xyd")) {
openWishListWindow(); openWishListWindow();
} }
@ -3475,8 +3477,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
((LiveAudienceActivity) mContext).openFansMedalOkWindow(); ((LiveAudienceActivity) mContext).openFansMedalOkWindow();
} }
if (!isAncher && bean.getGiftName().equals("粉絲牌")) { if (!isAncher && bean.getGiftName().equals("粉絲牌") && bean.getUid().equals(CommonAppConfig.getInstance().getUid())) {
LiveAudienceActivity.is_fans = "1"; LiveAudienceActivity.is_fans = "1";
setFansGroup("1");
} }
Log.i("tvss", bean.getDrpk_status() + "是" + mLiveUid + "vsss" + bean.getRoomnum()); Log.i("tvss", bean.getDrpk_status() + "是" + mLiveUid + "vsss" + bean.getRoomnum());
if (mLiveGiftAnimPresenter == null) { if (mLiveGiftAnimPresenter == null) {
@ -3943,7 +3946,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void setFansGroup(String isFans) { public void setFansGroup(String isFans) {
this.isFans=isFans.equals("1"); this.isFans = isFans.equals("1");
} }
@ -5277,7 +5280,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=") .append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
@ -5357,7 +5360,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.append("&isZh=") .append("&isZh=")
.append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); .append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());

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

@ -675,6 +675,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel)); mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel));
} }
} }
AppManager.runDebugCode(()->{
liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000);
});
liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000); liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000);
if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) { if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) {
//通知心愿单位置换地方 //通知心愿单位置换地方

20
live/src/main/res/layout/view_send_red_packet.xml
View File

@ -148,7 +148,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginEnd="30dp"> android:layout_marginEnd="30dp">
@ -161,39 +161,45 @@
android:text="@string/there_is_no" android:text="@string/there_is_no"
android:textColor="#FDD04A" android:textColor="#FDD04A"
android:textSize="13sp" /> android:textSize="13sp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_weight="1"
android:orientation="vertical"
>
<Button <Button
android:id="@+id/following_anchor" android:id="@+id/following_anchor"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_weight="1"
android:background="@drawable/background_red_packet_select" android:background="@drawable/background_red_packet_select"
android:gravity="center" android:gravity="center"
android:text="@string/following_anchor" android:text="@string/following_anchor"
android:layout_marginBottom="5dp"
android:textColor="#FDD04A" android:textColor="#FDD04A"
android:textSize="10sp" /> android:textSize="10sp" />
<Button <Button
android:id="@+id/fans_group" android:id="@+id/fans_group"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_weight="1"
android:background="@drawable/background_red_packet_select" android:background="@drawable/background_red_packet_select"
android:gravity="center" android:gravity="center"
android:text="@string/live_send_red_packge_fans_group" android:text="@string/live_send_red_packge_fans_group"
android:textColor="#FDD04A" android:textColor="#FDD04A"
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="23dp" android:layout_marginStart="23dp"
android:layout_marginTop="266dp" android:layout_marginTop="286dp"
android:layout_marginEnd="29dp"> android:layout_marginEnd="29dp">
<TextView <TextView