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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693
2023-08-05 15:22:49 +08:00
parent 9588619b73
commit dfeb1c246b
20 changed files with 103 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java
View File

@@ -22,6 +22,7 @@ import com.yunbao.common.fragment.GiftWithoutWallFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.dialog.CodexDialog;
@@ -125,7 +126,7 @@ public class GiftWallActivity extends AbsActivity {
public void onViewClicks() {
new XPopup.Builder(GiftWallActivity.this)
.enableDrag(false)
.asCustom(new MedalAchievementPopup(GiftWallActivity.this, false, mLiveUid,mLiveUid))
.asCustom(new MedalAchievementPopup(GiftWallActivity.this, false, mLiveUid, mLiveUid))
.show();
}
});
@@ -173,10 +174,12 @@ public class GiftWallActivity extends AbsActivity {
view.setVisibility(view == tab ? View.VISIBLE : View.GONE);
}
}
private void forwardHomePage() {
finish();
finish();
RouteUtil.forwardUserHome(mContext, mLiveUid, false, mLiveUid, 0);
}
/**
* 关于点击礼物分类的通知
*/
@@ -189,6 +192,6 @@ public class GiftWallActivity extends AbsActivity {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveGiftDialogEvent(LiveGiftDialogEvent event) {
onBackPressed();
ToastUtil.show(getString(R.string.the__gifts_in_the_studio));
}
}

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

@@ -1441,7 +1441,7 @@ public class LiveAudienceActivity extends LiveActivity {
break;
case GIFT_WALL:
if (manager != null) {
manager.showGiftWall(event.getUid(),event.isVoicePress());
manager.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar());
}
break;

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

@@ -1658,7 +1658,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
break;
case GIFT_WALL:
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress());
mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar());
}
break;
}

8
live/src/main/java/com/yunbao/live/bean/CoinModel.java
View File

@@ -35,11 +35,11 @@ public class CoinModel extends BaseModel {
public String getCoin() {
long coinMoney = Long.parseLong(coin);
if (999999999 < coinMoney && coinMoney <= 999999999999L) {
coin = coin.substring(0, coin.length() - 2);
coin = coin.substring(0, coin.length() - 3);
coin = coin + "k";
}
if (999999999999L < coinMoney && coinMoney <= 999999999999999L) {
coin = coin.substring(0, coin.length() - 2);
coin = coin.substring(0, coin.length() - 3);
coin = coin + "M";
}
return coin;
@@ -53,11 +53,11 @@ public class CoinModel extends BaseModel {
public String getGold() {
long goldMoney = Long.parseLong(gold);
if (999999999 < goldMoney && goldMoney <= 999999999999L) {
gold = gold.substring(0, gold.length() - 2);
gold = gold.substring(0, gold.length() - 3);
gold = gold + "k";
}
if (999999999999L < goldMoney && goldMoney <= 999999999999999L) {
gold = gold.substring(0, gold.length() - 2);
gold = gold.substring(0, gold.length() - 3);
gold = gold + "M";
}
return gold;

45
live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java
View File

@@ -25,6 +25,7 @@ import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
@@ -43,7 +44,7 @@ import java.util.List;
public class GiftWallDialog extends AbsDialogFragment {
private LinearLayout layoutLitIcon, layoutUnlitIcon, layoutAllServiceChampion;
private TextView textLitIcon, textUnlitIcon, textAllServiceChampion, anchorName, regularBubble;
private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon, attention;
private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon;
private RoundedImageView avatar;
private List<TextView> tabText = new ArrayList<>();
private List<View> tabView = new ArrayList<>();
@@ -70,7 +71,6 @@ public class GiftWallDialog extends AbsDialogFragment {
viewUnlitIcon = mRootView.findViewById(R.id.view_unlit_icon);
viewLitIcon = mRootView.findViewById(R.id.view_lit_icon);
avatar = mRootView.findViewById(R.id.avatar);
attention = mRootView.findViewById(R.id.attention);
anchorName = mRootView.findViewById(R.id.anchor_name);
regularBubble = mRootView.findViewById(R.id.regular_bubble);
tabText.add(textLitIcon);
@@ -106,23 +106,7 @@ public class GiftWallDialog extends AbsDialogFragment {
transaction.commit();
}
});
ViewClicksAntiShake.clicksAntiShake(attention, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
CommonHttpUtil.setAttention(mLiveUid, new CommonCallback<Integer>() {
@Override
public void callback(Integer isAttention) {
if (isAttention == 1) {
LiveActivity.sendSystemMessage(IMLoginManager.get(getContext()).getUserInfo().getUserNicename()
+ getActivity().getString(R.string.live_follow_anchor));
attention.setVisibility(View.GONE);
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.IS_ATTENTION).setLiveType(isAttention));
}
}
});
}
});
ViewClicksAntiShake.clicksAntiShake(regularBubble, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
@@ -149,8 +133,23 @@ public class GiftWallDialog extends AbsDialogFragment {
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(avatar, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
forwardHomePage();
}
});
ViewClicksAntiShake.clicksAntiShake(anchorName, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
forwardHomePage();
}
});
}
private void forwardHomePage() {
dismiss();
RouteUtil.forwardUserHome(mContext, mLiveUid, false, mLiveUid, 0);
}
private void initDate() {
Bundle bundle = getArguments();
if (bundle == null) {
@@ -168,7 +167,11 @@ public class GiftWallDialog extends AbsDialogFragment {
transaction.commit();
ImgLoader.display(getContext(), mAvatarUrl, avatar);
anchorName.setText(mAnchorName);
attention.setVisibility(isAttention == 0 ? View.VISIBLE : View.GONE);
if (isLive){
textLitIcon.setText(getContext().getString(R.string.lit_icon));
}else {
textLitIcon.setText(getContext().getString(R.string.been_sent));
}
}
private void selectTab(TextView textView, View tab) {

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

@@ -204,6 +204,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
transaction.replace(R.id.context_layout_gift, LiveParcelFragment.newInstance(mStream, mLiveUid));
transaction.commit();
isWrap = true;
findViewById(R.id.red_point).setVisibility(View.GONE);
}
});
//；连送

9
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@@ -94,7 +94,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
private String mStream;
private int mType;
private int mAction;
private String mToName;//对方的名字
private String mToName, mAvatarUrl;//对方的名字
private TextView mFollowText;
private TextView mName;
private TextView mID;
@@ -272,7 +272,11 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
@Override
public void onViewClicks() {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mToUid).setVoicePress(isAnchor));
.setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL)
.setUid(mToUid)
.setVoicePress(isAnchor)
.setUname(mToName)
.setAvatar(mAvatarUrl));
dismiss();
}
});
@@ -334,6 +338,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
mUserBean = JSON.toJavaObject(obj, UserBean.class);
mToName = obj.getString("user_nicename");
mAvatarUrl = obj.getString("avatar");
mAction = obj.getIntValue("action");
if (mUserBean.getIslive().equals("1")) {
btn_live.setVisibility(View.VISIBLE);

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

@@ -2658,7 +2658,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
public void showGiftWall(String toUid,boolean isAnchor) {
public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) {
GiftWallDialog giftWallDialog = new GiftWallDialog();
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
@@ -2866,7 +2866,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void onViewClicks() {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId())));
.setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL)
.setUid(mLiveUid)
.setVoicePress(true)
.setAvatar(mAvatarUrl)
.setUname(mAnchorName));
}
});
}

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

@@ -1910,10 +1910,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.setAttention(attention);
}
public void showGiftWall(String toUid,boolean isAnchor) {
public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.showGiftWall(toUid,isAnchor);
mLiveRoomViewHolder.showGiftWall(toUid, isAnchor,mAnchorName,mAvatarUrl);
}
}

1
live/src/main/res/layout/dialog_live_gift_wall.xml
View File

@@ -36,6 +36,7 @@
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="4dp"
android:visibility="gone"
android:src="@mipmap/icon_following_anchor" />
</LinearLayout>