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-04-08 10:01:42 +08:00
parent 7c006e8e03
commit 88b96267ef
3 changed files with 257 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ public class GuardUserInfoModel extends BaseModel {
@SerializedName("live_avatar")
private String liveAvatar;
@SerializedName("guard_type")
private String guardType;
private int guardType;
@SerializedName("exp")
private String exp;
@SerializedName("level")
@@ -38,6 +38,17 @@ public class GuardUserInfoModel extends BaseModel {
private String userLanguage;
@SerializedName("live_language")
private String liveLanguage;
@SerializedName("is_open")
private String isOpen;
public String getIsOpen() {
return isOpen;
}
public GuardUserInfoModel setIsOpen(String isOpen) {
this.isOpen = isOpen;
return this;
}
public String getUid() {
return uid;
@@ -75,11 +86,11 @@ public class GuardUserInfoModel extends BaseModel {
return this;
}
public String getGuardType() {
public int getGuardType() {
return guardType;
}
public GuardUserInfoModel setGuardType(String guardType) {
public GuardUserInfoModel setGuardType(int guardType) {
this.guardType = guardType;
return this;
}

65
common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
View File

@@ -5,7 +5,6 @@ import android.app.Dialog;
import android.content.Context;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.yunbao.common.R;
@@ -43,39 +42,49 @@ public class GuardBuyTipsDialog {
contentTextView.setVisibility(View.VISIBLE);
buyTypeTextView.setVisibility(View.VISIBLE);
content2.setVisibility(View.GONE);
if (!isOpen) {
if (!TextUtils.isEmpty(coin)) {
contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
}
if (!TextUtils.isEmpty(content)) {
buyTypeTextView.setText("【" + content + "】");
}
if (TextUtils.isEmpty(coin) && mGuardUserInfoModel == null && !isOpen && guardType == -200) {
content1.setVisibility(View.GONE);
contentTextView.setVisibility(View.VISIBLE);
buyTypeTextView.setVisibility(View.GONE);
content2.setVisibility(View.GONE);
contentTextView.setText(content);
} else {
if (!TextUtils.isEmpty(coin)) {
contentTextView.setText(context.getString(R.string.guard_buy_tips_2, coin));
if (!isOpen) {
if (!TextUtils.isEmpty(coin)) {
contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
}
if (!TextUtils.isEmpty(content)) {
buyTypeTextView.setText("【" + content + "】");
}
} else {
if (!TextUtils.isEmpty(coin)) {
contentTextView.setText(context.getString(R.string.guard_buy_tips_2, coin));
}
if (!TextUtils.isEmpty(content)) {
buyTypeTextView.setText("【" + content + "】");
}
}
if (!TextUtils.isEmpty(content)) {
buyTypeTextView.setText("【" + content + "】");
}
}
if (mGuardUserInfoModel != null) {
if (mGuardUserInfoModel.getGuardType() != 0) {
if (guardType < mGuardUserInfoModel.getGuardType()) {
content1.setVisibility(View.GONE);
contentTextView.setVisibility(View.GONE);
buyTypeTextView.setVisibility(View.GONE);
content2.setVisibility(View.VISIBLE);
if (mGuardUserInfoModel != null) {
if (mGuardUserInfoModel.getGuardType() != 0) {
if (TextUtils.equals(mGuardUserInfoModel.getIsOpen(), "1") &&
guardType < mGuardUserInfoModel.getGuardType()) {
content1.setVisibility(View.GONE);
contentTextView.setVisibility(View.GONE);
buyTypeTextView.setVisibility(View.GONE);
content2.setVisibility(View.VISIBLE);
} else if (guardType==mGuardUserInfoModel.getGuardType()){
} else if (guardType == mGuardUserInfoModel.getGuardType()) {
content1.setVisibility(View.GONE);
} else {
content1.setVisibility(View.VISIBLE);
}
} else {
content1.setVisibility(View.GONE);
}else {
content1.setVisibility(View.VISIBLE);
}
} else {
content1.setVisibility(View.GONE);
}
} else {
content1.setVisibility(View.GONE);
}
dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
@@ -88,9 +97,9 @@ public class GuardBuyTipsDialog {
btn_confirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content2.getVisibility()==View.VISIBLE){
if (content2.getVisibility() == View.VISIBLE) {
dialog.dismiss();
}else {
} else {
simpleCallback.onConfirmClick(dialog, "");
dialog.dismiss();
}