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

新增直播间冠名礼物特效

Browse Source
This commit is contained in:
Martin
2024-07-16 10:31:18 +08:00
parent 484069dac7
commit 22b208bcd9
14 changed files with 340 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/src/main/assets/gift_live_naming_bg.svga Normal file
View File

Binary file not shown.

BIN
common/src/main/assets/gift_live_naming_title_cn.svga Normal file
View File

Binary file not shown.

BIN
common/src/main/assets/gift_live_naming_title_en.svga Normal file
View File

Binary file not shown.

4
common/src/main/java/com/yunbao/common/bean/UserMedalModel.java
View File

@@ -30,6 +30,10 @@ public class UserMedalModel extends BaseModel implements BaseBannerInfo {
return use_status;
}
public void setUse_status(String use_status) {
this.use_status = use_status;
}
public String getId() {
return id;
}

31
common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveDialog.java
View File

@@ -13,16 +13,22 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.lxj.xpopup.XPopup;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.R;
import com.yunbao.common.adapter.GiftWallAchieveAdapter;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.MedalAchievementModel;
import com.yunbao.common.bean.UserMedalListModel;
import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import java.util.ArrayList;
import java.util.List;
@@ -41,6 +47,7 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
private String toUid;
private boolean isAnchor;
private View topBar;
private TextView honor;
private List<UserMedalListModel> userMedalListModelList = new ArrayList<>();
@@ -90,12 +97,29 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 3, GridLayoutManager.VERTICAL, false));
numCount = findViewById(R.id.numCount);
topBar = findViewById(R.id.top_bar);
honor = findViewById(R.id.honor);
mIvBack.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
}
});
ViewClicksAntiShake.clicksAntiShake(honor, () -> {
StringBuffer htmlUrl = new StringBuffer();
IMLoginModel userInfo = IMLoginManager.get(getContext()).getUserInfo();
htmlUrl.append(CommonAppConfig.HOST)
.append("/h5/shequ/index.html#/h5/shequ/RongYuQiang?")
.append("touid=")
.append(toUid)
.append("&token=")
.append(userInfo.getToken())
.append("&uid=")
.append(userInfo.getId()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
RouteUtil.forwardLiveZhuangBanActivity(htmlUrl.toString(), true);
});
}
@Override
@@ -124,7 +148,12 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
giftWallAchieveAdapter.setOnItemClickListener(new GiftWallAchieveAdapter.OnItemClickListener() {
@Override
public void onItemClick(int position) {
GiftWallAchieveWearDialog giftWallAchieveWearDialog = new GiftWallAchieveWearDialog(mContext,isAnchor,userMedalListModelList.get(position).getDressInfo());
GiftWallAchieveWearDialog giftWallAchieveWearDialog = new GiftWallAchieveWearDialog(mContext, isAnchor, userMedalListModelList.get(position).getDressInfo(), new GiftWallAchieveWearDialog.UserUseDressSuccess() {
@Override
public void onSuccess() {
initData();
}
});
giftWallAchieveWearDialog.showDialog();
}
});

31
common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveWearDialog.java
View File

@@ -12,7 +12,7 @@ import com.lxj.xpopup.XPopup;
import com.stx.xhb.androidx.XBanner;
import com.stx.xhb.androidx.transformers.Transformer;
import com.yunbao.common.R;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.bean.UserMedalModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
@@ -43,11 +43,14 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
String putOn = WordUtil.isNewZh() ? "佩戴" : "wearing";
String wearing = WordUtil.isNewZh() ? "已佩戴" : "worn";
private List<UserMedalModel> achieveWearModels = new ArrayList<>();
private UserUseDressSuccess userUseDressSuccess;
public GiftWallAchieveWearDialog(@NonNull Context context,boolean isAnchor, List<UserMedalModel> achieveWearModels) {
public GiftWallAchieveWearDialog(@NonNull Context context,boolean isAnchor, List<UserMedalModel> achieveWearModels,UserUseDressSuccess userUseDressSuccess) {
super(context);
this.isAnchor = isAnchor;
this.achieveWearModels = achieveWearModels;
this.userUseDressSuccess = userUseDressSuccess;
}
public GiftWallAchieveWearDialog setFullWindows(boolean fullWindows) {
@@ -94,16 +97,22 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
btnConfirm.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
if (achieveWearModels.get(selectPosition).getUseStatus().equals("2") && achieveWearModels.get(selectPosition).getDressStatus().equals("2")) {
LiveNetManager.get(mContext).userUseDress("3", achieveWearModels.get(selectPosition).getUsersDressId(), new HttpCallback<BaseModel>() {
if (achieveWearModels.get(selectPosition).getUseStatus().equals("0") && achieveWearModels.get(selectPosition).getDressStatus().equals("2")) {
LiveNetManager.get(mContext).userUseDress("3", achieveWearModels.get(selectPosition).getUsersDressId(), new HttpCallback<HttpCallbackModel>() {
@Override
public void onSuccess(BaseModel data) {
dialog.dismiss();
public void onSuccess(HttpCallbackModel data) {
ToastUtil.show(data.getMsg());
if (data.getCode() == 0) {
if(userUseDressSuccess!=null){
userUseDressSuccess.onSuccess();
}
dialog.dismiss();
}
}
@Override
public void onError(String error) {
ToastUtil.show(error);
}
});
}
@@ -132,8 +141,8 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
public void setWearInfo() {
textAchieveName.setText(achieveWearModels.get(selectPosition).getDressName());
textAchieveHint.setText(achieveWearModels.get(selectPosition).getDressDescription());
btnConfirm.setText(achieveWearModels.get(selectPosition).getUseStatus().equals("2") ? wearing : putOn);
if (achieveWearModels.get(selectPosition).getUseStatus().equals("2") && achieveWearModels.get(selectPosition).getDressStatus().equals("2")) {
btnConfirm.setText(achieveWearModels.get(selectPosition).getUseStatus().equals("1") ? wearing : putOn);
if (achieveWearModels.get(selectPosition).getUseStatus().equals("0") && achieveWearModels.get(selectPosition).getDressStatus().equals("2")) {
btnConfirm.setBackground(getResources().getDrawable(R.drawable.gift_wall_achieve_wear_sure));
} else {
btnConfirm.setBackground(getResources().getDrawable(R.drawable.gift_wall_achieve_wear_disable));
@@ -176,4 +185,8 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
}
});
}
public interface UserUseDressSuccess {
void onSuccess();
}
}

3
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@@ -1274,8 +1274,7 @@ public interface PDLiveApi {
Observable<ResponseModel<MedalAchievementModel>> getGiftHallMedalList(@Query("to_uid") String liveUid,@Query("type")String type);
@GET("/api/public/?service=Dress.userUseDress")
Observable<ResponseModel<BaseModel>> userUseDress(@Query("dress_type") String dress_type,@Query("users_dress_id")String users_dress_id);
Observable<ResponseModel<List<BaseModel>>> userUseDress(@Query("dress_type") String dress_type,@Query("users_dress_id")String users_dress_id);
/**
* 个人展馆

11
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@@ -3528,16 +3528,19 @@ public class LiveNetManager {
}).isDisposed();
}
public void userUseDress(String dressType, String usersDressId, HttpCallback<BaseModel> callback) {
public void userUseDress(String dressType, String usersDressId, HttpCallback<HttpCallbackModel> callback) {
API.get().pdLiveApi(mContext)
.userUseDress(dressType, usersDressId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<BaseModel>>() {
.subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
@Override
public void accept(ResponseModel<BaseModel> listResponseModel) throws Exception {
public void accept(ResponseModel<List<BaseModel>> responseModel) throws Exception {
if (callback != null) {
callback.onSuccess(listResponseModel.getData().getInfo());
HttpCallbackModel model = new HttpCallbackModel();
model.setCode(responseModel.getData().getCode());
model.setMsg(responseModel.getData().getMsg());
callback.onSuccess(model);
}
}
}, new Consumer<Throwable>() {

4
common/src/main/res/layout/dialog_gift_wall_achieve.xml
View File

@@ -64,11 +64,13 @@
android:layout_height="match_parent"/>
<TextView
android:id="@+id/honor"
android:text="@string/wall_honor"
android:gravity="center_vertical"
android:textColor="#E0E0E0"
android:textSize="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="match_parent"/>
<ImageView
android:src="@mipmap/dialog_gift_wall_more"