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

修改问题

Browse Source
This commit is contained in:
18401019693
2024-03-23 16:47:28 +08:00
parent f94b3f27e3
commit f04a2865af
17 changed files with 162 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/yunbao/common/bean/GuardGetGuardUserInfoModel.java
View File

@@ -29,7 +29,7 @@ public class GuardGetGuardUserInfoModel extends BaseModel {
@SerializedName("guard_type")
private int guardType;
@SerializedName("exp")
private int exp;
private String exp;
@SerializedName("level")
private int level;
@SerializedName("endtime")
@@ -84,11 +84,11 @@ public class GuardGetGuardUserInfoModel extends BaseModel {
return this;
}
public int getExp() {
public String getExp() {
return exp;
}
public GuardGetGuardUserInfoModel setExp(int exp) {
public GuardGetGuardUserInfoModel setExp(String exp) {
this.exp = exp;
return this;
}

24
common/src/main/java/com/yunbao/common/bean/GuardUserInfoModel.java
View File

@@ -27,13 +27,13 @@ public class GuardUserInfoModel extends BaseModel {
@SerializedName("live_avatar")
private String liveAvatar;
@SerializedName("guard_type")
private int guardType;
private String guardType;
@SerializedName("exp")
private int exp;
private String exp;
@SerializedName("level")
private int level;
private String level;
@SerializedName("endtime")
private int endtime;
private String endtime;
@SerializedName("user_language")
private String userLanguage;
@SerializedName("live_language")
@@ -75,38 +75,38 @@ public class GuardUserInfoModel extends BaseModel {
return this;
}
public int getGuardType() {
public String getGuardType() {
return guardType;
}
public GuardUserInfoModel setGuardType(int guardType) {
public GuardUserInfoModel setGuardType(String guardType) {
this.guardType = guardType;
return this;
}
public int getExp() {
public String getExp() {
return exp;
}
public GuardUserInfoModel setExp(int exp) {
public GuardUserInfoModel setExp(String exp) {
this.exp = exp;
return this;
}
public int getLevel() {
public String getLevel() {
return level;
}
public GuardUserInfoModel setLevel(int level) {
public GuardUserInfoModel setLevel(String level) {
this.level = level;
return this;
}
public int getEndtime() {
public String getEndtime() {
return endtime;
}
public GuardUserInfoModel setEndtime(int endtime) {
public GuardUserInfoModel setEndtime(String endtime) {
this.endtime = endtime;
return this;
}

18
common/src/main/java/com/yunbao/common/dialog/DragonRulePopup.java
View File

@@ -1,6 +1,7 @@
package com.yunbao.common.dialog;
import android.content.Context;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
@@ -9,8 +10,14 @@ import com.yunbao.common.R;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
public class DragonRulePopup extends CenterPopupView {
public DragonRulePopup(@NonNull Context context) {
LinearLayout list_no;
LinearLayout list;
boolean isList;
public DragonRulePopup(@NonNull Context context, boolean isList) {
super(context);
this.isList = isList;
}
// 返回自定义弹窗的布局
@@ -23,6 +30,15 @@ public class DragonRulePopup extends CenterPopupView {
@Override
protected void onCreate() {
super.onCreate();
list_no = findViewById(R.id.list_no);
list = findViewById(R.id.list);
if (!isList){
list_no.setVisibility(VISIBLE);
list.setVisibility(GONE);
}else {
list_no.setVisibility(GONE);
list.setVisibility(VISIBLE);
}
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.dragon_close), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {

22
common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java
View File

@@ -68,15 +68,15 @@ public class GuardUpgradePopup extends CenterPopupView {
leave_hint.setText(hintStringBuffer.toString());
if (mUpgradesModel.getRewards().size() > 0) {
if (mUpgradesModel.getRewards().size() == 1) {
rewards_line1.setVisibility(GONE);
rewards_line1.setVisibility(INVISIBLE);
rewards_line2.setVisibility(VISIBLE);
rewards_line3.setVisibility(GONE);
rewards_line3.setVisibility(INVISIBLE);
RewardsModel rewardsModel = mUpgradesModel.getRewards().get(0);
ImgLoader.display(getContext(), rewardsModel.getImagePath(), rewards_img2);
rewards_text2.setText(rewardsModel.getRewardName());
} else if (mUpgradesModel.getRewards().size() == 2) {
rewards_line1.setVisibility(VISIBLE);
rewards_line2.setVisibility(GONE);
rewards_line2.setVisibility(INVISIBLE);
rewards_line3.setVisibility(VISIBLE);
RewardsModel rewardsModel1 = mUpgradesModel.getRewards().get(0);
RewardsModel rewardsModel3 = mUpgradesModel.getRewards().get(1);
@@ -104,22 +104,22 @@ public class GuardUpgradePopup extends CenterPopupView {
ImgLoader.display(getContext(), rewardsModel3.getImagePath(), rewards_img3);
rewards_text3.setText(rewardsModel3.getRewardName());
} else {
rewards_line1.setVisibility(GONE);
rewards_line2.setVisibility(GONE);
rewards_line3.setVisibility(GONE);
rewards_line1.setVisibility(INVISIBLE);
rewards_line2.setVisibility(INVISIBLE);
rewards_line3.setVisibility(INVISIBLE);
}
} else {
rewards_line1.setVisibility(GONE);
rewards_line2.setVisibility(GONE);
rewards_line3.setVisibility(GONE);
rewards_line1.setVisibility(INVISIBLE);
rewards_line2.setVisibility(INVISIBLE);
rewards_line3.setVisibility(INVISIBLE);
}
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.confirm), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
LiveNetManager.get(getContext())
.guardGetRewards(mLiveUid,new HttpCallback<CheckUpgradesModel>() {
.guardGetRewards(mUpgradesModel.getLevel(), mLiveUid, new HttpCallback<Object>() {
@Override
public void onSuccess(CheckUpgradesModel data) {
public void onSuccess(Object data) {
dismiss();
}

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

@@ -1190,5 +1190,5 @@ public interface PDLiveApi {
@GET("/api/public/?service=Guard.checkUpgrades")
Observable<ResponseModel<CheckUpgradesModel>> checkUpgrades(@Query("liveuid") String liveUid);
@GET("/api/public/?service=Guard.getRewards")
Observable<ResponseModel<CheckUpgradesModel>> guardGetRewards(@Query("type") String type,@Query("liveuid") String liveUid);
Observable<ResponseModel<Object>> guardGetRewards(@Query("guard_level") String guardLevel,@Query("liveuid") String liveUid);
}

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

@@ -3136,14 +3136,14 @@ public class LiveNetManager {
}
public void guardGetRewards(String liveUid, HttpCallback<CheckUpgradesModel> callback) {
public void guardGetRewards(String guardLevel,String liveUid, HttpCallback<Object> callback) {
API.get().pdLiveApi(mContext)
.guardGetRewards("2", liveUid)
.guardGetRewards(guardLevel, liveUid)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<CheckUpgradesModel>>() {
.subscribe(new Consumer<ResponseModel<Object>>() {
@Override
public void accept(ResponseModel<CheckUpgradesModel> listResponseModel) throws Exception {
public void accept(ResponseModel<Object> listResponseModel) throws Exception {
if (callback != null) {
callback.onSuccess(listResponseModel.getData().getInfo());
}