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-07-25 15:25:01 +08:00
parent 0646f245b6
commit a353e51ba8
9 changed files with 110 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,15 @@ public class CoinModel extends BaseModel {
private String usersPackRedDot;
public String getCoin() {
long coinMoney = Long.parseLong(coin);
if (999999999 < coinMoney && coinMoney <= 999999999999L) {
coin = coin.substring(0, coin.length() - 2);
coin = coin + "k";
}
if (999999999999L < coinMoney && coinMoney <= 999999999999999L) {
coin = coin.substring(0, coin.length() - 2);
coin = coin + "M";
}
return coin;
}
@@ -42,6 +51,15 @@ 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 + "k";
}
if (999999999999L < goldMoney && goldMoney <= 999999999999999L) {
gold = gold.substring(0, gold.length() - 2);
gold = gold + "M";
}
return gold;
}

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

@@ -93,7 +93,7 @@ import java.util.List;
* 直播间新送礼弹窗
*/
public class LiveGiftPopup extends AbsDialogFragment {
private ImageView gitBackground, nobilityIcon, description, iconArrow;
private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage;
private JSONArray liveGiftList;
private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber;
private RecyclerView giftTitle;
@@ -118,6 +118,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
private MarqueeTextView giftDescription;
private boolean isPk;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -167,6 +168,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
description = mRootView.findViewById(R.id.description);
lvStr = mRootView.findViewById(R.id.lv_str);
iconArrow = mRootView.findViewById(R.id.icon_arrow);
operateImage = mRootView.findViewById(R.id.operate_image);
leaveHint = mRootView.findViewById(R.id.leave_hint);
progressBar = mRootView.findViewById(R.id.progressBar);
levelingLayout = mRootView.findViewById(R.id.leveling_layout);
@@ -184,6 +186,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
liveGiftSend.setEnabled(false);
giftNumberLayout.setVisibility(View.INVISIBLE);
giftDescription.setVisibility(View.GONE);
operateImage.setVisibility(View.GONE);
levelingLayout.setVisibility(View.VISIBLE);
//点击包裹
ViewClicksAntiShake.clicksAntiShake(liveWrap, new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -282,6 +285,27 @@ public class LiveGiftPopup extends AbsDialogFragment {
ImgLoader.display(getContext(), R.mipmap.icon_arrow_down, iconArrow);
}
});
/**
* 礼物图片运营位跳转
*/
ViewClicksAntiShake.clicksAntiShake(operateImage, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(CommonAppConfig.HOST)
.append(liveGiftModel.getOperateUrl())
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken())
.append("&for");
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
}
});
}
private void initDate() {
@@ -421,6 +445,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
lvStr.setText("Lv." + coinModel.getUserLevel());
int nextLeve = Integer.parseInt(coinModel.getUserLevel());
int maxLeve = Integer.parseInt(coinModel.getUserLevelMax());
findViewById(R.id.red_point).setVisibility((!TextUtils.isEmpty(coinModel.getUsersPackRedDot())) &&
TextUtils.equals(coinModel.getUsersPackRedDot(), "1") ? View.VISIBLE : View.GONE);
if (maxLeve > nextLeve) {
String leveNext = String.valueOf(nextLeve + 1);
String userNextLevel = coinModel.getUserNextLevelRewards();
@@ -646,6 +672,10 @@ public class LiveGiftPopup extends AbsDialogFragment {
giftDescription.setVisibility(View.VISIBLE);
levelingLayout.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(liveGiftModel.getOperateImage())) {
operateImage.setVisibility(View.VISIBLE);
ImgLoader.display(getContext(), liveGiftModel.getOperateUrl(), operateImage);
}
}
@Subscribe(threadMode = ThreadMode.MAIN)