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

4
common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
View File

@@ -550,7 +550,7 @@ public class JavascriptInterfaceUtils {
}
@JavascriptInterface
public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl) {
RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0);
public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl,int isAnchor ) {
RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0,isAnchor==1);
}
}

3
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@@ -233,13 +233,14 @@ public class RouteUtil {
postcard.navigation();
}
public static void forwardGiftWallActivity(String mStream, String mAnchorName, String mLiveUid, String mAvatarUrl, int isAttention) {
public static void forwardGiftWallActivity(String mStream, String mAnchorName, String mLiveUid, String mAvatarUrl, int isAttention,boolean isLive) {
ARouter.getInstance().build(PATH_GIFT_WALL)
.withString(Constants.LIVE_UID, mLiveUid)
.withString(Constants.STREAM, mStream)
.withString("mAnchorName", mAnchorName)
.withString("mAvatarUrl", mAvatarUrl)
.withInt("isAttention", isAttention)
.withBoolean("isLive",isLive)
.navigation();
}

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

@@ -16,16 +16,18 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake;
public class GiftAlreadyWallViewHolder extends RecyclerView.ViewHolder {
private ImageView giftImg;
private TextView giftTitle;
private TextView giftTitle, giftNumber;
public GiftAlreadyWallViewHolder(@NonNull View itemView) {
super(itemView);
giftImg = itemView.findViewById(R.id.gift_img);
giftTitle = itemView.findViewById(R.id.gift_title);
giftNumber = itemView.findViewById(R.id.gift_number);
}
public void showData(GiftWallModel giftWallModel) {
giftTitle.setText(giftWallModel.getGiftname());
giftNumber.setText("*" + giftWallModel.getGiftCountNumber());
ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override

19
common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
View File

@@ -1,6 +1,7 @@
package com.yunbao.common.views;
import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -13,6 +14,7 @@ import com.yunbao.common.adapter.GiftNumberAdapter;
import com.yunbao.common.event.GiftNumberEvent;
import com.yunbao.common.manager.GiftQuantityManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import org.greenrobot.eventbus.Subscribe;
@@ -52,10 +54,23 @@ public class GiftNumberPopup extends BottomPopupView {
new XPopup.Builder(getContext())
.asCustom(new InputCustomPopup(getContext(),
getContext().getString(R.string.the_title_financier3),
R.string.custom_quantity,true).setListener(new InputCustomPopup.InputCustomListener() {
R.string.custom_quantity, true).setListener(new InputCustomPopup.InputCustomListener() {
@Override
public void onConfirm(String text) {
Bus.get().post(new GiftNumberEvent().setmCount(text));
if (!TextUtils.isEmpty(text)) {
int number = Integer.parseInt(text);
if (1 <= number && number <= 9999) {
Bus.get().post(new GiftNumberEvent().setmCount(text));
} else {
ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~9999"));
Bus.get().post(new GiftNumberEvent().setmCount("-1"));
}
} else {
ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~9999"));
Bus.get().post(new GiftNumberEvent().setmCount("-1"));
}
}
})).show();

20
common/src/main/res/layout/item_gift_already_wall.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="132dp"
android:layout_height="143dp"
android:layout_margin="5dp"
android:background="@mipmap/background_gift_already_wall"
android:orientation="vertical">
<ImageView
android:id="@+id/gift_img"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_width="63dp"
android:layout_height="63dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp" />
android:layout_marginTop="17dp" />
<TextView
android:id="@+id/gift_title"
@@ -20,6 +20,16 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="9dp"
android:text="@string/instant_light"
android:textColor="#54618F"
android:textColor="#FFFFFF"
android:textSize="14sp" />
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="2dp"
android:text="@string/instant_light"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>

2
common/src/main/res/values-en-rUS/string.xml
View File

@@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame</string>
<string name="codex">Illustrated book</string>
<string name="unlit_icon">unlit</string>
<string name="all_service_champion">All service</string>
<string name="unlit_icon_hint">Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light</string>
<string name="unlit_icon_hint">Love \"ceremony \" at the beginning, \"wall \" potential light temporarily no light</string>
<string name="lit_icon_hint">No unlit gifts yet</string>
<string name="instant_light">Instant light</string>
<string name="honorary_achievement">Honorary achievement</string>

4
common/src/main/res/values-zh-rHK/strings.xml
View File

@@ -1255,7 +1255,7 @@
<string name="lit_icon">已點亮</string>
<string name="unlit_icon">未點亮</string>
<string name="all_service_champion">全服冠軍</string>
<string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮</string>
<string name="unlit_icon_hint">愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮</string>
<string name="lit_icon_hint">暂无未点亮礼物哦</string>
<string name="instant_light">立即點亮</string>
<string name="gift_wall_entrance">禮物墻入口</string>
@@ -1266,7 +1266,7 @@
<string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
<string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
<string name="gift_wall_entrance7">榮譽成就</string>
<string name="gift_wall_entrance8_1">成就勳章</string>
<string name="gift_wall_entrance8_1">成就勛章</string>
<string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
<string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>

4
common/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1254,7 +1254,7 @@
<string name="lit_icon">已點亮</string>
<string name="unlit_icon">未點亮</string>
<string name="all_service_champion">全服冠軍</string>
<string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮</string>
<string name="unlit_icon_hint">愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮</string>
<string name="lit_icon_hint">暂无未点亮礼物哦</string>
<string name="instant_light">立即點亮</string>
<string name="gift_wall_entrance">禮物墻入口</string>
@@ -1265,7 +1265,7 @@
<string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
<string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
<string name="gift_wall_entrance7">榮譽成就</string>
<string name="gift_wall_entrance8_1">成就勳章</string>
<string name="gift_wall_entrance8_1">成就勛章</string>
<string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
<string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>

4
common/src/main/res/values-zh/strings.xml
View File

@@ -1253,7 +1253,7 @@
<string name="codex">圖鑒</string>
<string name="unlit_icon">未點亮</string>
<string name="all_service_champion">全服冠軍</string>
<string name="unlit_icon_hint">愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮</string>
<string name="unlit_icon_hint">愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮</string>
<string name="lit_icon_hint">暂无未点亮礼物哦</string>
<string name="instant_light">立即點亮</string>
<string name="honorary_achievement">榮譽成就</string>
@@ -1266,7 +1266,7 @@
<string name="gift_wall_entrance5">每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。</string>
<string name="gift_wall_entrance6">當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。</string>
<string name="gift_wall_entrance7">榮譽成就</string>
<string name="gift_wall_entrance8_1">成就勳章</string>
<string name="gift_wall_entrance8_1">成就勛章</string>
<string name="gift_wall_entrance8_2">當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。</string>
<string name="gift_wall_entrance8_3">勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就；</string>
<string name="gift_wall_entrance8_4">富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就；</string>

6
common/src/main/res/values/strings.xml
View File

@@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame</string>
<string name="has_been_lit">%s has been lit</string>
<string name="unlit_icon">unlit</string>
<string name="all_service_champion">All service</string>
<string name="unlit_icon_hint">Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light</string>
<string name="unlit_icon_hint">Love \"ceremony \" at the beginning, \"wall \" potential light temporarily no light</string>
<string name="lit_icon_hint">No unlit gifts yet</string>
<string name="instant_light">Instant light</string>
<string name="gift_wall_entrance">Gift Wall Entrance</string>
@@ -1294,11 +1294,13 @@ Limited ride And limited avatar frame</string>
<string name="last_month_winner_hint2">近期點亮</string>
<string name="received_wall">已獲得</string>
<string name="received_wall2">去點亮</string>
<string name="wall_honor">我的荣誉墙</string>
<string name="wall_honor">我的榮譽墻</string>
<string name="achievement_details">成就詳情</string>
<string name="title_anchor">冠名主播：</string>
<string name="the_title_financier">冠名金主：</string>
<string name="the_title_financier2">冠名</string>
<string name="the_title_financier3">请输入自定义数量</string>
<string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
<string name="been_sent">已送出</string>
</resources>