6.5.4礼物冠名

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

View File

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

View File

@ -233,13 +233,14 @@ public class RouteUtil {
postcard.navigation(); 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) ARouter.getInstance().build(PATH_GIFT_WALL)
.withString(Constants.LIVE_UID, mLiveUid) .withString(Constants.LIVE_UID, mLiveUid)
.withString(Constants.STREAM, mStream) .withString(Constants.STREAM, mStream)
.withString("mAnchorName", mAnchorName) .withString("mAnchorName", mAnchorName)
.withString("mAvatarUrl", mAvatarUrl) .withString("mAvatarUrl", mAvatarUrl)
.withInt("isAttention", isAttention) .withInt("isAttention", isAttention)
.withBoolean("isLive",isLive)
.navigation(); .navigation();
} }

View File

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

View File

@ -1,6 +1,7 @@
package com.yunbao.common.views; package com.yunbao.common.views;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager; 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.event.GiftNumberEvent;
import com.yunbao.common.manager.GiftQuantityManager; import com.yunbao.common.manager.GiftQuantityManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@ -52,10 +54,23 @@ public class GiftNumberPopup extends BottomPopupView {
new XPopup.Builder(getContext()) new XPopup.Builder(getContext())
.asCustom(new InputCustomPopup(getContext(), .asCustom(new InputCustomPopup(getContext(),
getContext().getString(R.string.the_title_financier3), 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 @Override
public void onConfirm(String text) { 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(); })).show();

View File

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

View File

@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame</string>
<string name="codex">Illustrated book</string> <string name="codex">Illustrated book</string>
<string name="unlit_icon">unlit</string> <string name="unlit_icon">unlit</string>
<string name="all_service_champion">All service</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="lit_icon_hint">No unlit gifts yet</string>
<string name="instant_light">Instant light</string> <string name="instant_light">Instant light</string>
<string name="honorary_achievement">Honorary achievement</string> <string name="honorary_achievement">Honorary achievement</string>

View File

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

View File

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

View File

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

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="has_been_lit">%s has been lit</string>
<string name="unlit_icon">unlit</string> <string name="unlit_icon">unlit</string>
<string name="all_service_champion">All service</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="lit_icon_hint">No unlit gifts yet</string>
<string name="instant_light">Instant light</string> <string name="instant_light">Instant light</string>
<string name="gift_wall_entrance">Gift Wall Entrance</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="last_month_winner_hint2">近期點亮</string>
<string name="received_wall">已獲得</string> <string name="received_wall">已獲得</string>
<string name="received_wall2">去點亮</string> <string name="received_wall2">去點亮</string>
<string name="wall_honor">我的荣誉墙</string> <string name="wall_honor">我的榮譽墻</string>
<string name="achievement_details">成就詳情</string> <string name="achievement_details">成就詳情</string>
<string name="title_anchor">冠名主播:</string> <string name="title_anchor">冠名主播:</string>
<string name="the_title_financier">冠名金主:</string> <string name="the_title_financier">冠名金主:</string>
<string name="the_title_financier2">冠名</string> <string name="the_title_financier2">冠名</string>
<string name="the_title_financier3">请输入自定义数量</string> <string name="the_title_financier3">请输入自定义数量</string>
<string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
<string name="been_sent">已送出</string>
</resources> </resources>

View File

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

View File

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

View File

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

View File

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

View File

@ -25,6 +25,7 @@ import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveActivity;
@ -43,7 +44,7 @@ import java.util.List;
public class GiftWallDialog extends AbsDialogFragment { public class GiftWallDialog extends AbsDialogFragment {
private LinearLayout layoutLitIcon, layoutUnlitIcon, layoutAllServiceChampion; private LinearLayout layoutLitIcon, layoutUnlitIcon, layoutAllServiceChampion;
private TextView textLitIcon, textUnlitIcon, textAllServiceChampion, anchorName, regularBubble; private TextView textLitIcon, textUnlitIcon, textAllServiceChampion, anchorName, regularBubble;
private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon, attention; private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon;
private RoundedImageView avatar; private RoundedImageView avatar;
private List<TextView> tabText = new ArrayList<>(); private List<TextView> tabText = new ArrayList<>();
private List<View> tabView = 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); viewUnlitIcon = mRootView.findViewById(R.id.view_unlit_icon);
viewLitIcon = mRootView.findViewById(R.id.view_lit_icon); viewLitIcon = mRootView.findViewById(R.id.view_lit_icon);
avatar = mRootView.findViewById(R.id.avatar); avatar = mRootView.findViewById(R.id.avatar);
attention = mRootView.findViewById(R.id.attention);
anchorName = mRootView.findViewById(R.id.anchor_name); anchorName = mRootView.findViewById(R.id.anchor_name);
regularBubble = mRootView.findViewById(R.id.regular_bubble); regularBubble = mRootView.findViewById(R.id.regular_bubble);
tabText.add(textLitIcon); tabText.add(textLitIcon);
@ -106,23 +106,7 @@ public class GiftWallDialog extends AbsDialogFragment {
transaction.commit(); 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() { ViewClicksAntiShake.clicksAntiShake(regularBubble, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
public void onViewClicks() { public void onViewClicks() {
@ -149,8 +133,23 @@ public class GiftWallDialog extends AbsDialogFragment {
.show(); .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() { private void initDate() {
Bundle bundle = getArguments(); Bundle bundle = getArguments();
if (bundle == null) { if (bundle == null) {
@ -168,7 +167,11 @@ public class GiftWallDialog extends AbsDialogFragment {
transaction.commit(); transaction.commit();
ImgLoader.display(getContext(), mAvatarUrl, avatar); ImgLoader.display(getContext(), mAvatarUrl, avatar);
anchorName.setText(mAnchorName); 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) { private void selectTab(TextView textView, View tab) {

View File

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

View File

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

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(); GiftWallDialog giftWallDialog = new GiftWallDialog();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid); bundle.putString(Constants.LIVE_UID, mLiveUid);
@ -2866,7 +2866,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override @Override
public void onViewClicks() { public void onViewClicks() {
Bus.get().post(new LiveAudienceEvent() 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));
} }
}); });
} }

View File

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

View File

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