From 986902886a56062eb2882f19392ffb15c46f14c6 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 3 Aug 2023 14:29:04 +0800 Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/AchievementDetailsAdapter.java | 41 +++++ .../adapter/MedalAchievementAdapter.java | 44 +++++ .../common/bean/MedalAchievementModel.java | 42 +++++ .../common/bean/UserMedalListModel.java | 76 +++++++++ .../yunbao/common/bean/UserMedalModel.java | 72 ++++++++ .../dialog/AchievementDetailsPopup.java | 93 +++++++++++ .../com/yunbao/common/http/PDLiveApi.java | 6 + .../common/http/live/LiveNetManager.java | 45 +++++ .../views/AchievementDetailsViewHolder.java | 22 +++ .../views/MedalAchievementViewHolder.java | 48 ++++++ .../background_achievement_details_list.xml | 8 + .../drawable/background_codex_item_btn.xml | 4 +- .../res/layout/item_achievement_details.xml | 12 ++ .../src/main/res/layout/item_codex_item.xml | 1 + .../res/layout/item_medal_achievement.xml | 32 ++++ .../res/layout/popup_achievement_details.xml | 155 ++++++++++++++++++ .../background_medal_achievement.png | Bin 0 -> 13977 bytes common/src/main/res/values/strings.xml | 2 + .../yunbao/live/dialog/GiftWallDialog.java | 16 +- .../live/dialog/MedalAchievementPopup.java | 94 +++++++++++ .../yunbao/live/views/LiveRoomViewHolder.java | 1 + .../drawable/background_medal_achievement.xml | 9 + .../main/res/layout/dialog_live_gift_wall.xml | 1 + .../res/layout/dialog_medal_achievement.xml | 80 +++++++++ 24 files changed, 899 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.java create mode 100644 common/src/main/java/com/yunbao/common/adapter/MedalAchievementAdapter.java create mode 100644 common/src/main/java/com/yunbao/common/bean/MedalAchievementModel.java create mode 100644 common/src/main/java/com/yunbao/common/bean/UserMedalListModel.java create mode 100644 common/src/main/java/com/yunbao/common/bean/UserMedalModel.java create mode 100644 common/src/main/java/com/yunbao/common/dialog/AchievementDetailsPopup.java create mode 100644 common/src/main/java/com/yunbao/common/views/AchievementDetailsViewHolder.java create mode 100644 common/src/main/java/com/yunbao/common/views/MedalAchievementViewHolder.java create mode 100644 common/src/main/res/drawable/background_achievement_details_list.xml create mode 100644 common/src/main/res/layout/item_achievement_details.xml create mode 100644 common/src/main/res/layout/item_medal_achievement.xml create mode 100644 common/src/main/res/layout/popup_achievement_details.xml create mode 100644 common/src/main/res/mipmap-xxhdpi/background_medal_achievement.png create mode 100644 live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java create mode 100644 live/src/main/res/drawable/background_medal_achievement.xml create mode 100644 live/src/main/res/layout/dialog_medal_achievement.xml diff --git a/common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.java b/common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.java new file mode 100644 index 000000000..79cebed8e --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.java @@ -0,0 +1,41 @@ +package com.yunbao.common.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.UserMedalModel; +import com.yunbao.common.views.AchievementDetailsViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class AchievementDetailsAdapter extends RecyclerView.Adapter { + private List dressInfo = new ArrayList<>(); + + public AchievementDetailsAdapter(List dressInfo) { + this.dressInfo = dressInfo; + } + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_achievement_details, parent, false); + return new AchievementDetailsViewHolder(herdView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + AchievementDetailsViewHolder achievementDetailsViewHolder = (AchievementDetailsViewHolder) holder; + achievementDetailsViewHolder.showData(dressInfo.get(position)); + } + + @Override + public int getItemCount() { + return dressInfo.size(); + } +} diff --git a/common/src/main/java/com/yunbao/common/adapter/MedalAchievementAdapter.java b/common/src/main/java/com/yunbao/common/adapter/MedalAchievementAdapter.java new file mode 100644 index 000000000..e0b43c9df --- /dev/null +++ b/common/src/main/java/com/yunbao/common/adapter/MedalAchievementAdapter.java @@ -0,0 +1,44 @@ +package com.yunbao.common.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.UserMedalListModel; +import com.yunbao.common.views.MedalAchievementViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class MedalAchievementAdapter extends RecyclerView.Adapter { + private List medalData = new ArrayList<>(); + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_medal_achievement, parent, false); + return new MedalAchievementViewHolder(herdView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + MedalAchievementViewHolder achievementViewHolder = (MedalAchievementViewHolder) holder; + achievementViewHolder.showData(medalData.get(position)); + } + + @Override + public int getItemCount() { + return medalData.size(); + } + + public void addAllData(List mGiftWall) { + + medalData.clear(); + medalData.addAll(mGiftWall); + notifyDataSetChanged(); + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/MedalAchievementModel.java b/common/src/main/java/com/yunbao/common/bean/MedalAchievementModel.java new file mode 100644 index 000000000..9a6fb6ea5 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/MedalAchievementModel.java @@ -0,0 +1,42 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class MedalAchievementModel extends BaseModel { + + @SerializedName("medal_total_number") + private String medalTotalNumber; + @SerializedName("medal_light_number") + private String medalLightNumber; + @SerializedName("medal_data") + private List medalData; + + public String getMedalTotalNumber() { + return medalTotalNumber; + } + + public MedalAchievementModel setMedalTotalNumber(String medalTotalNumber) { + this.medalTotalNumber = medalTotalNumber; + return this; + } + + public String getMedalLightNumber() { + return medalLightNumber; + } + + public MedalAchievementModel setMedalLightNumber(String medalLightNumber) { + this.medalLightNumber = medalLightNumber; + return this; + } + + public List getMedalData() { + return medalData; + } + + public MedalAchievementModel setMedalData(List medalData) { + this.medalData = medalData; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/UserMedalListModel.java b/common/src/main/java/com/yunbao/common/bean/UserMedalListModel.java new file mode 100644 index 000000000..13b783833 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/UserMedalListModel.java @@ -0,0 +1,76 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +import java.util.ArrayList; +import java.util.List; + +public class UserMedalListModel extends BaseModel { + + @SerializedName("dress_name") + private String dressName; + @SerializedName("dress_info") + private List dressInfo = new ArrayList<>(); + @SerializedName("display_src") + private String displaySrc; + @SerializedName("dress_description") + private String dressDescription; + @SerializedName("display_src_second") + private String displaySrcSecond; + @SerializedName("dress_status")//1Hd2whd + private String dressStatus; + + public String getDressDescription() { + return dressDescription; + } + + public UserMedalListModel setDressDescription(String dressDescription) { + this.dressDescription = dressDescription; + return this; + } + + public String getDisplaySrcSecond() { + return displaySrcSecond; + } + + public UserMedalListModel setDisplaySrcSecond(String displaySrcSecond) { + this.displaySrcSecond = displaySrcSecond; + return this; + } + + public String getDressStatus() { + return dressStatus; + } + + public UserMedalListModel setDressStatus(String dressStatus) { + this.dressStatus = dressStatus; + return this; + } + + public String getDressName() { + return dressName; + } + + public UserMedalListModel setDressName(String dressName) { + this.dressName = dressName; + return this; + } + + public List getDressInfo() { + return dressInfo; + } + + public UserMedalListModel setDressInfo(List dressInfo) { + this.dressInfo = dressInfo; + return this; + } + + public String getDisplaySrc() { + return displaySrc; + } + + public UserMedalListModel setDisplaySrc(String displaySrc) { + this.displaySrc = displaySrc; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/bean/UserMedalModel.java b/common/src/main/java/com/yunbao/common/bean/UserMedalModel.java new file mode 100644 index 000000000..4ac5dde3e --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/UserMedalModel.java @@ -0,0 +1,72 @@ +package com.yunbao.common.bean; + +import com.google.gson.annotations.SerializedName; + +public class UserMedalModel extends BaseModel { + @SerializedName("id") + private String id; + @SerializedName("display_src") + private String displaySrc; + @SerializedName("dress_name") + private String dressName; + @SerializedName("dress_description") + private String dressDescription; + @SerializedName("sort") + private String sort; + @SerializedName("dress_status") + private String dressStatus; + + public String getId() { + return id; + } + + public UserMedalModel setId(String id) { + this.id = id; + return this; + } + + public String getDisplaySrc() { + return displaySrc; + } + + public UserMedalModel setDisplaySrc(String displaySrc) { + this.displaySrc = displaySrc; + return this; + } + + public String getDressName() { + return dressName; + } + + public UserMedalModel setDressName(String dressName) { + this.dressName = dressName; + return this; + } + + public String getDressDescription() { + return dressDescription; + } + + public UserMedalModel setDressDescription(String dressDescription) { + this.dressDescription = dressDescription; + return this; + } + + public String getSort() { + return sort; + } + + public UserMedalModel setSort(String sort) { + this.sort = sort; + return this; + } + + public String getDressStatus() { + return dressStatus; + } + + public UserMedalModel setDressStatus(String dressStatus) { + this.dressStatus = dressStatus; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/dialog/AchievementDetailsPopup.java b/common/src/main/java/com/yunbao/common/dialog/AchievementDetailsPopup.java new file mode 100644 index 000000000..2c7fc07a3 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/dialog/AchievementDetailsPopup.java @@ -0,0 +1,93 @@ +package com.yunbao.common.dialog; + + +import android.content.Context; +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.core.CenterPopupView; +import com.yunbao.common.R; +import com.yunbao.common.adapter.AchievementDetailsAdapter; +import com.yunbao.common.bean.UserMedalListModel; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +public class AchievementDetailsPopup extends CenterPopupView { + private UserMedalListModel userMedalListModel; + private ImageView achievementImg; + private TextView dressName, dressDescription; + private View havaDataList, havaData; + private AchievementDetailsAdapter achievementDetailsAdapter; +private RecyclerView achievementImgList; + public AchievementDetailsPopup(@NonNull Context context, UserMedalListModel userMedalListModel) { + super(context); + this.userMedalListModel = userMedalListModel; + } + + @Override + protected int getImplLayoutId() { + return R.layout.popup_achievement_details; + } + + @Override + protected void onCreate() { + super.onCreate(); + havaDataList = findViewById(R.id.hava_data_list); + havaData = findViewById(R.id.hava_data); + if (userMedalListModel.getDressInfo().size() > 0) { + havaDataList.setVisibility(GONE); + havaData.setVisibility(VISIBLE); + achievementDetailsAdapter = new AchievementDetailsAdapter(userMedalListModel.getDressInfo()); + + achievementImg = findViewById(R.id.achievement_img2); + dressName = findViewById(R.id.dress_name2); + dressDescription = findViewById(R.id.dress_description2); + achievementImgList = findViewById(R.id.achievement_img_list); + + if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) { + ImgLoader.display(getContext(), userMedalListModel.getDisplaySrc(), achievementImg); + } else { + ImgLoader.display(getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg); + } + dressName.setText(userMedalListModel.getDressName()); + dressDescription.setText(userMedalListModel.getDressDescription()); + achievementImgList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false)); + achievementImgList.setAdapter(achievementDetailsAdapter); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.gift_details_btn2), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dialog.dismiss(); + } + }); + + } else { + havaDataList.setVisibility(VISIBLE); + havaData.setVisibility(GONE); + + achievementImg = findViewById(R.id.achievement_img); + dressName = findViewById(R.id.dress_name); + dressDescription = findViewById(R.id.dress_description); + + if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) { + ImgLoader.display(getContext(), userMedalListModel.getDisplaySrc(), achievementImg); + } else { + ImgLoader.display(getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg); + } + dressName.setText(userMedalListModel.getDressName()); + dressDescription.setText(userMedalListModel.getDressDescription()); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.gift_details_btn), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dialog.dismiss(); + } + }); + } + + } +} diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 904534dd3..12b2a56cf 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -31,6 +31,7 @@ import com.yunbao.common.bean.LiveRoomVoteModel; import com.yunbao.common.bean.LiveStetUpStatusModel; import com.yunbao.common.bean.LiveTaskModel; import com.yunbao.common.bean.LiveUserMailBoxModel; +import com.yunbao.common.bean.MedalAchievementModel; import com.yunbao.common.bean.MsgSwitchDetailModel; import com.yunbao.common.bean.NewPeopleInfo; import com.yunbao.common.bean.NobleRankHideUserListModel; @@ -49,6 +50,7 @@ import com.yunbao.common.bean.SetAttentsModel; import com.yunbao.common.bean.SlideInBannerModel; import com.yunbao.common.bean.StarChallengeStatusModel; import com.yunbao.common.bean.UserAreaBean; +import com.yunbao.common.bean.UserMedalListModel; import com.yunbao.common.bean.VipModel; import com.yunbao.common.bean.WishListGiftConfModel; import com.yunbao.common.bean.WishListModel; @@ -888,5 +890,9 @@ public interface PDLiveApi { Observable>> getGiftGuideHistory( @Query("liveuid") String liveUid ); + @GET("/api/public/?service=Gift.getUserMedalList") + Observable> getUserMedalList(); + @GET("/api/public/?service=Gift.getLiveMedalList") + Observable> getLiveMedalList(); } diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java index c727f5adc..d51ef37be 100644 --- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java +++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java @@ -31,6 +31,7 @@ import com.yunbao.common.bean.LiveRoomVoteModel; import com.yunbao.common.bean.LiveStetUpStatusModel; import com.yunbao.common.bean.LiveTaskModel; import com.yunbao.common.bean.LiveUserMailBoxModel; +import com.yunbao.common.bean.MedalAchievementModel; import com.yunbao.common.bean.NobleRankHideUserListModel; import com.yunbao.common.bean.NobleTrumpetModel; import com.yunbao.common.bean.PkRankBean; @@ -1954,6 +1955,50 @@ public class LiveNetManager { }).isDisposed(); } + public void getUserMedalList(HttpCallback callback) { + API.get().pdLiveApi(mContext) + .getUserMedalList() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel listResponseModel) throws Exception { + if (callback != null) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(R.string.net_error)); + } + } + }).isDisposed(); + } + + public void getLiveMedalList(HttpCallback callback) { + API.get().pdLiveApi(mContext) + .getLiveMedalList() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel listResponseModel) throws Exception { + if (callback != null) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(R.string.net_error)); + } + } + }).isDisposed(); + } + /** * 直播间取消网络请求 */ diff --git a/common/src/main/java/com/yunbao/common/views/AchievementDetailsViewHolder.java b/common/src/main/java/com/yunbao/common/views/AchievementDetailsViewHolder.java new file mode 100644 index 000000000..05c44f939 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/AchievementDetailsViewHolder.java @@ -0,0 +1,22 @@ +package com.yunbao.common.views; + +import android.view.View; +import android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.R; +import com.yunbao.common.bean.UserMedalModel; +import com.yunbao.common.glide.ImgLoader; + +public class AchievementDetailsViewHolder extends RecyclerView.ViewHolder { + private ImageView achievementImg; + public AchievementDetailsViewHolder(@NonNull View itemView) { + super(itemView); + achievementImg = itemView.findViewById(R.id.achievement_img); + } + public void showData(UserMedalModel userMedalModel){ + ImgLoader.display(itemView.getContext(), userMedalModel.getDisplaySrc(), achievementImg); + } +} diff --git a/common/src/main/java/com/yunbao/common/views/MedalAchievementViewHolder.java b/common/src/main/java/com/yunbao/common/views/MedalAchievementViewHolder.java new file mode 100644 index 000000000..6c45a011c --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/MedalAchievementViewHolder.java @@ -0,0 +1,48 @@ +package com.yunbao.common.views; + +import android.graphics.Color; +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.XPopup; +import com.yunbao.common.R; +import com.yunbao.common.bean.UserMedalListModel; +import com.yunbao.common.dialog.AchievementDetailsPopup; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +public class MedalAchievementViewHolder extends RecyclerView.ViewHolder { + private ImageView achievementImg; + private TextView giftWall; + + public MedalAchievementViewHolder(@NonNull View itemView) { + super(itemView); + achievementImg = itemView.findViewById(R.id.achievement_img); + giftWall = itemView.findViewById(R.id.gift_wall); + } + + public void showData(UserMedalListModel userMedalListModel) { + if (TextUtils.equals(userMedalListModel.getDressStatus(), "1")) { + ImgLoader.display(itemView.getContext(), userMedalListModel.getDisplaySrc(), achievementImg); + giftWall.setTextColor(Color.parseColor("#6F43FF")); + } else { + ImgLoader.display(itemView.getContext(), userMedalListModel.getDisplaySrcSecond(), achievementImg); + giftWall.setTextColor(Color.parseColor("#53408F")); + } + giftWall.setText(userMedalListModel.getDressName()); + ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + new XPopup.Builder(itemView.getContext()) + .enableDrag(false) + .asCustom(new AchievementDetailsPopup(itemView.getContext(), userMedalListModel)) + .show(); + } + }); + } +} diff --git a/common/src/main/res/drawable/background_achievement_details_list.xml b/common/src/main/res/drawable/background_achievement_details_list.xml new file mode 100644 index 000000000..a803f914b --- /dev/null +++ b/common/src/main/res/drawable/background_achievement_details_list.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/drawable/background_codex_item_btn.xml b/common/src/main/res/drawable/background_codex_item_btn.xml index 0682d347a..9769f0609 100644 --- a/common/src/main/res/drawable/background_codex_item_btn.xml +++ b/common/src/main/res/drawable/background_codex_item_btn.xml @@ -2,13 +2,13 @@ - + - + diff --git a/common/src/main/res/layout/item_achievement_details.xml b/common/src/main/res/layout/item_achievement_details.xml new file mode 100644 index 000000000..cb19261f7 --- /dev/null +++ b/common/src/main/res/layout/item_achievement_details.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/item_codex_item.xml b/common/src/main/res/layout/item_codex_item.xml index 27e0f6b88..9b24732aa 100644 --- a/common/src/main/res/layout/item_codex_item.xml +++ b/common/src/main/res/layout/item_codex_item.xml @@ -26,6 +26,7 @@ android:layout_width="50dp" android:layout_height="20dp" android:layout_marginTop="6dp" + android:textSize="11sp" android:background="@drawable/background_codex_item_btn" android:gravity="center" /> \ No newline at end of file diff --git a/common/src/main/res/layout/item_medal_achievement.xml b/common/src/main/res/layout/item_medal_achievement.xml new file mode 100644 index 000000000..6f25b39d9 --- /dev/null +++ b/common/src/main/res/layout/item_medal_achievement.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/popup_achievement_details.xml b/common/src/main/res/layout/popup_achievement_details.xml new file mode 100644 index 000000000..9a706886d --- /dev/null +++ b/common/src/main/res/layout/popup_achievement_details.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/background_medal_achievement.png b/common/src/main/res/mipmap-xxhdpi/background_medal_achievement.png new file mode 100644 index 0000000000000000000000000000000000000000..67933e568191229bcec1d98611336002b6899489 GIT binary patch literal 13977 zcmV;KHfG6*P)00001b5ch_0Itp) z=>PyA07*naRCr$PeOt3-$#GWhbNXDmr{^M#B@4g7ZxDfbCM*+r0EHbE7)w|VV*&>v zj6=iB*n%g(8Vzy?I}`x{I4sNJCWB&v2N{HUM?wDvcr!-U%xErsIo;=+O?d#}1=W_^{Fm6esXqUFCu0(&lj)t=M8kiSTP77#BW*n0^qAl~~S zTo_nDykKDOCD0AxFaP!Rj~yP#VyEmqH0Ebu zjV9Co5M5pnt?~CudbB2bYkf}t=U`3$>*68(_gDVI>W_PR4}h5FH%!biI^)nk8^~NwmHsq6?zSbE1ofM3)bV&L7a_X3f><*%>)BqE~_h+q5c`X>(#>5E4<>DJLRM29ztZUDq5L@NLo8aTHEja>d?P=i?f zhkwhzOA7J3{I03zZ@LYxm!`Ms+xjLank?^0%j?hLL$~MguP3`DpVsJE3M0Y~kAsw# zlr8_R$3pYM^m*grjRz}Z(7N6Ld3`~2aYl6hkm%w*(WARWkM7aE%Qb!J)o-l+uqBEn zh+q4;^=A%G=vR)PrPcAXL^o~`9o^gj7+QFBgXjRQz=Yt|q=4~TUP4;LjQ;*O`jEuU z*;*u&BmmaUDQrMn)ft4h~ge0%)0_#RttEZw}pgIRI8(ZtZm=g`LYh|cd4 zoxMZ!;O+GP_vkKt`sF{cZDbe3U;ga+H;!-9Cr)1^I)xT~j_3%Q_>>5nx@1ZmZ2lxu z0?h1z7KZHhfXuPb*q?eZBS05ZE&(!q%YF>B$YyrF|zZAEkmZM;9?TPVFk5`dQ?{ReFfx7(u+wDH3X;#v=>KtF!#M~K)ShHLExyb{>VSpXh8 z2xGvc1=A9cC&&mG$F^-rx@RIr2ftVD9s;IJs1^-T8D0`y0L;+F_cpdMK>Xk>qI*9` z8@>Pe^6#xa9|G||`-Sy)ZoWt#1&B{RM0Aulb?jCvCvz?0m+y-NIwb&;B57l6@a|?! z{Pso@-+z<7{||n5^~n&3zw(Rg@7?+c9o__pUm!Ypmgo?g7zZ3jh8fXG=u&)*Hh!=<_;~a_(S3mU2MNUV(!XAPJOtw3{M+k0w|;c9sXKk1=m_pL02uDIIqczG z31DgWT1X(76Aw}x1tkwf-rU{$e?(vSS3wYe_3y0j-1-O+yVs7MB|5q#0)DQAs1_!! zqy(_BgEodafkTh?Hk$Yho4fB5{p!Drg7}v=AjUz*2{v^(W+FwcEt>dBj{UVEN`N@U zP~_uh9C-AD_(zFOKeT}O+JIwU7||fc#x5T}!<_ilf6=3fTOjsADt9d`8D81ytEVit zrNcQ}eT@0uL)R|lY|+s}8+fmk*WV)jv9B1h#W|X7GKdj3!7&qqjh!{v-fxjOVGV{z zj4SHscvh<~s|*hSw;@3+V`nuTa^QOSjmp5{yEaj*cwSlF>(}DZ>qo~_YuS0R;59i~ zvDf*xWE1C&9lR49KXLC*J2de>|K;_an^_Yl?*!Y#IIZI=ND@F}w2@V(Hqh3=-vk)zW=90e?MwYBoJrs#7zdVbg}J<;npCv zzVC{ztI+P#!aL$8powwQBOg7F*TmU7ku-6RBR)7GI?SP$S7BTi8m^%P@@=q>LqG3E*fOyHJv?5YbwnT0uk=f;HB)F}KFu!;8aD z0x>jkzBHQ52^@Be(ZpLI#$kuJ**t2Tb^!uwwvQsNQE4vP=W53ycb9EXm1&SRjwv44 z#BULGZR`f-1T-i)*XHdYfOAbzm1Lnx-! z#B*L+vu-@hIbou-w(RE`O|3p!-)qop)op#B(ss|3nMg+haX#$8#_s+*Id)=$(iAmi=m#i`c>3pB_xll<{m(ubo!An(o?$DFV32 zUdEG^H4ahwE&dfP3B=ggWt%vG829YpCk_VyDls{rcs4DCV#%+Y4=($*^9`aTEEPqK}< z_?y^HvWelHn9ZD!eqwg9JxM_?eP4SC%&Liti;WLE77$;109^$J2bvhSoky7y`L=Vi ziKUATAYSg+U4?PJ)--q^?%UV_#2?+p-9&mjH~(M_bW z;wZM|w)52+^y@~^&OnT8n71~0iM!2-+U3C7dmDOiybFoC4J$j5clopRyKYO~CG+m> zNxJnV&(=jr-9ER~x^U^Wi~5#4YVCS;q8CDI?DZgK*8bNYL0hd(gK?XuSE-Jl_0e0MCf8!S@+50AZi*c z4cqFkB|F`pS6=cyR@1j=t+ZR>iIK|c9?>KaBO_+Ai8(_&?%BZyxXWYb3Cxd`clFh# z(T&bf@kz*H2C^qL!52jlI{^^0cVet2-U9J*$8OU2ER_Qi*cpgn6LU~J-?6J5S?VK2 z(C!`2ddI2EuXl7^i?yg71z3FFXkz4Idv~l&j4S)_6C)!g2LQpGsBILi<3=wwpdui5 z4>9F9)2M6qGp3K8n2>-nDiFnE1*J7qF>n~sq&Anye5 zD4tPPs z(10cf#P{DKdVuRmU78r?1bZjgoZy#}#EdKhf?#G&jh1J*=StP(n29p5!mdgJ!T__! z3(t;8jbPZnOp^;VIUu=yDeIUWN#LyIge{0kDfvnN293I1?o*VxgAukj(}*Wyi&vz9%;T~6$f+7(y!$AUQ7#QDTd+Qjfq$mM!4?!1(U zB|go1201T@s3exYfgp`pI?$HldlIq(aa#G}lK0^;nQIK)GY^2&ZDxD1MsD!70}0gaauOLG=2r|d&% zkMibF0w~RJ!xpz@zNOveWE|LmD*Rx}To4t#rQKZ8rMv_nr9JCu*P5AQ(I)|_`Sex* ztzGr%Q!`^qn~JZ2)-~*FZnKyZh+@OB^JGmdK+I3#dVey&l*ftd$qO_og-aI zmSthtvDQSC6GsEsTE2B(z5PhJNO@G1gqWPI$ybwwT-ChEYL%&B2p~RxM1-etQwE?( z8#|a2aIrl@l>EfT#?I1UJcupfT8wzV)dtoQa_cv1g6K)&O%O{{dvHot3cVi;Jrp&t zwglV)o28}XB&lgJOCwqX)uKW2p#N^IKDG8NQ^3>KHCk)!)W93j&SOmpZ5;^d?J9b}hNKzFRa! zl~T0rEty>sVPm%iVjOn7*?HKZH8EZkO@3kn#O~n9U4xd$K?r*%F7n1M zx!Afv{7dUQr+C+y%?Z3F$~G~Z6Pe1ytWpz+FpK%x7Pp0#++NC54(F5rr*P6w->=td-T3?-+j*f1v(U#qymyoEsj4l(ASyvn9JgB^}L!xayv6}{B z?VXSVD+bD2VkQ43{c{L1DCAIAxlpLA>bJL!Roz3sANzPp~_XHa*{B&&=`QbfE; z88ST2`H7Pz&QWX$#7HO@eW3iSQWIwoA0eKYH+D`Sh-X82JNGem>Xd=0VSOLI&Bgm% z?X+a(EnK`2K`)c`)jX<0fZy{nY%1N0xWEt=z=`i|EKr;B>0+>`7IvAdXtlP2VDhI^j&+@4c zc-G^t+w^#L@Uk_QnXa_4J0p6O@7R@N=TRVrpZM9$9Xq@xIskEN8jks10oN?rqXk}r z=I(xL6WZy&yAMaUQ`@Q4Pg+$RFNcTM3I(WD<|n|;Hm{1N7e#T;?#=9-=rSkRPb@(U zbK*vr{3l*;>Y(;A(A!^c`CfXamamxuQ`>gyi#Iz8h;c=Uy%V#5nBVNscd2SzSsF+L z$)u{advSV6^_EfnyQImuL#JaniaB82sWZ%{L3!D?b;U>XSmQ~V4F&8iGoVM#o_W-+FV{QDP_Hoq#zpMibw9k?7=weC#Yi3}orqGevOM zxbEEM!rbj$Rnc>5*WzLu3*vNQ2M|j?F>GS_@JvKgM3%UkIk6*CVqm`Ll|lE}V@h~t zgJI5WnNc1cmRG_m>)lkACIULuCWAn8nkX$Vh-Ie9cE_3$xgNh`H}DgWHYXUw^2E-2 zJt;b^gQkROZ$|sj7(hM} z@7PTh+ERa!fFpr{Ie~cM*+9%UJ1~RT_p%JbB7q%9AjM8RBq{+w05L9#zSZlUK=z*; z6px$E>3R}0F#x=Pcn3qbG?^rjgW~Zl?iPsQV*59%k6YH_mh`^*x7K&k#%=-ef~?0a z0e~2ZwsAd)Lorzs&kkZ8R>{mZVu**CPjaPNTPPwmf2939qX%)dvYklWaqYsG*Ou3= z73m_6!&-lr{OCYk_Pf>Hevg)Im16*TR~T3e5kwz>PV+DpIj+s-g2CW9Dx z*hCtu!N#uQEKfq0e#Pt$T(33+rq8*4Ia83%b?HZzBWRW3bYH8S_6tXr=!a<#hZgHK z(aNB^G@Jhd8f6;;VS5J*l1HXljS>$Kx4m`tA!IgSmD|PuXZifCWr?%G5OG;buej;wU$r*HxF5K?4+)dlPQ51@x%zn)PCYFb0RqGx!QrJ zw}@%lgwn5u!Fc20O+5X(mX*h^qz40xRiS{GZQ^%w6x&!3A0jKJvWa=-uz&_LS(yt3 zjCm<4!U4fz`s%@Ev!s-l=0TQNs-u=T{ SODHXwQp&mC(x;-0>kgLi+}=RwQdRMi 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 近期點亮 已獲得 去點亮 + 我的荣誉墙 + 成就詳情 diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java index a5f06e276..5703cab6e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java @@ -17,6 +17,7 @@ import com.makeramen.roundedimageview.RoundedImageView; import com.yunbao.common.Constants; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.event.GiftWallItemEvent; +import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.fragment.AllServiceChampionFragment; import com.yunbao.common.fragment.GiftWithoutWallFragment; import com.yunbao.common.glide.ImgLoader; @@ -28,7 +29,6 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.event.LiveAudienceEvent; -import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.live.views.GiftAlreadyWallFragment; import org.greenrobot.eventbus.Subscribe; @@ -49,6 +49,7 @@ public class GiftWallDialog extends AbsDialogFragment { private List tabView = new ArrayList<>(); private String mStream, mAnchorName, mLiveUid, mAvatarUrl; private int isAttention = 0;//是否关注 0=没关注, + private boolean isLive;//是否正在直播 @Override public void onActivityCreated(Bundle savedInstanceState) { @@ -135,7 +136,16 @@ public class GiftWallDialog extends AbsDialogFragment { public void onViewClicks() { new XPopup.Builder(getContext()) .enableDrag(false) - .asCustom(new CodexDialog(getContext(), mStream, mLiveUid,false)) + .asCustom(new CodexDialog(getContext(), mStream, mLiveUid, false)) + .show(); + } + }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.medal_achievement), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + new XPopup.Builder(getContext()) + .enableDrag(false) + .asCustom(new MedalAchievementPopup(getContext(), isLive)) .show(); } }); @@ -151,7 +161,7 @@ public class GiftWallDialog extends AbsDialogFragment { mAnchorName = bundle.getString("mAnchorName"); mAvatarUrl = bundle.getString("mAvatarUrl"); isAttention = bundle.getInt("isAttention"); - + isLive = bundle.getBoolean("isLive"); FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); transaction.replace(R.id.context_layout_gift, GiftAlreadyWallFragment.newInstance(mStream, mLiveUid)); transaction.commit(); diff --git a/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java b/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java new file mode 100644 index 000000000..e14abf8a3 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/MedalAchievementPopup.java @@ -0,0 +1,94 @@ +package com.yunbao.live.dialog; + +import android.content.Context; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.core.BottomPopupView; +import com.yunbao.common.adapter.MedalAchievementAdapter; +import com.yunbao.common.bean.MedalAchievementModel; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.live.R; + +public class MedalAchievementPopup extends BottomPopupView { + private boolean isLive; + private TextView achievementText; + private RecyclerView achievementList; + private MedalAchievementAdapter medalAchievementAdapter; + + public MedalAchievementPopup(@NonNull Context context, boolean isLive) { + super(context); + this.isLive = isLive; + } + + // 返回自定义弹窗的布局 + @Override + protected int getImplLayoutId() { + return R.layout.dialog_medal_achievement; + } + + // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑 + @Override + protected void onCreate() { + super.onCreate(); + initView(); + initDate(); + } + + private void initDate() { + if (isLive) { + LiveNetManager.get(getContext()) + .getLiveMedalList(new HttpCallback() { + @Override + public void onSuccess(MedalAchievementModel data) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(data.getMedalLightNumber()) + .append("/") + .append(data.getMedalTotalNumber()); + achievementText.setText(stringBuffer.toString()); + medalAchievementAdapter.addAllData(data.getMedalData()); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } else { + LiveNetManager.get(getContext()) + .getUserMedalList(new HttpCallback() { + @Override + public void onSuccess(MedalAchievementModel data) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(data.getMedalLightNumber()) + .append("/") + .append(data.getMedalTotalNumber()); + achievementText.setText(stringBuffer.toString()); + medalAchievementAdapter.addAllData(data.getMedalData()); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } + } + + private void initView() { + achievementText = findViewById(R.id.achievement_text); + achievementList = findViewById(R.id.achievement_list); + if (isLive) { + achievementList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false)); + } else { + achievementList.setLayoutManager(new GridLayoutManager(getContext(), 4, GridLayoutManager.VERTICAL, false)); + } + medalAchievementAdapter = new MedalAchievementAdapter(); + achievementList.setAdapter(medalAchievementAdapter); + } +} diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index b4086d48e..39db6a2b5 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2666,6 +2666,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis bundle.putString("mAnchorName", mAnchorName); bundle.putString("mAvatarUrl", mAvatarUrl); bundle.putInt("isAttention", isAttention); + bundle.putBoolean("isLive", mContext instanceof LiveRyAnchorActivity); giftWallDialog.setArguments(bundle); giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); // RouteUtil.forwardGiftWallActivity(mStream,mAnchorName,mLiveUid,mAvatarUrl,isAttention); diff --git a/live/src/main/res/drawable/background_medal_achievement.xml b/live/src/main/res/drawable/background_medal_achievement.xml new file mode 100644 index 000000000..75f3d9478 --- /dev/null +++ b/live/src/main/res/drawable/background_medal_achievement.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_live_gift_wall.xml b/live/src/main/res/layout/dialog_live_gift_wall.xml index 1e9c28dee..5ae28e0f1 100644 --- a/live/src/main/res/layout/dialog_live_gift_wall.xml +++ b/live/src/main/res/layout/dialog_live_gift_wall.xml @@ -58,6 +58,7 @@ android:textSize="16sp" /> + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file