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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-08-15 10:37:25 +08:00
commit 09e5f9b984
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java
View File

@ -26,8 +26,8 @@ public class MonthGiftNamingViewHolder extends RecyclerView.ViewHolder {
public void showData(GiftWallModel giftWallModel) { public void showData(GiftWallModel giftWallModel) {
giftTitle.setText(giftWallModel.getGiftname()); giftTitle.setText(giftWallModel.getGiftname());
namingCoin.setText(giftWallModel.getNamingCoinMax()); namingCoin.setText("*"+giftWallModel.getNamingCoinMax());
userName.setText("*"+giftWallModel.getUserNicename()); userName.setText(giftWallModel.getUserNicename());
ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg); ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
ImgLoader.display(itemView.getContext(), giftWallModel.getAvatar(), avatar); ImgLoader.display(itemView.getContext(), giftWallModel.getAvatar(), avatar);

2
common/src/main/res/layout/dialog_live_gift_popup.xml
View File

@ -15,6 +15,8 @@
android:id="@+id/operate_image" android:id="@+id/operate_image"
android:layout_width="122dp" android:layout_width="122dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginEnd="5dp"
android:scaleType="fitXY"
android:layout_gravity="end|bottom" /> android:layout_gravity="end|bottom" />
<FrameLayout <FrameLayout

2
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 437, versionCode : 438,
versionName : "6.5.4" versionName : "6.5.4"
] ]
manifestPlaceholders = [ manifestPlaceholders = [

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

@ -315,7 +315,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
.append("&for"); .append("&for");
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString()); bundle.putString("url", htmlUrl.toString());
bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);
LiveHDDialogFragment fragment = new LiveHDDialogFragment(); LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle); fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
@ -718,7 +718,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
} }
if (!TextUtils.isEmpty(liveGiftModel.getOperateImage())) { if (!TextUtils.isEmpty(liveGiftModel.getOperateImage())) {
operateImage.setVisibility(View.VISIBLE); operateImage.setVisibility(View.VISIBLE);
ImgLoader.display(getContext(), liveGiftModel.getOperateUrl(), operateImage); ImgLoader.display(getContext(), liveGiftModel.getOperateImage(), operateImage);
} }
} }