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

新增【非贵族，守护，粉丝牌送礼交互优化】功能

Browse Source
This commit is contained in:
zlzw
2023-05-10 14:31:15 +08:00
parent b5673025be
commit a6b5c102d2
20 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java
View File

@@ -18,7 +18,7 @@ public class LiveGiftBean {
// public static final int MARK_LUCK = 3;
private int id;
private int type;//0 普通礼物 1是豪华礼物
private int type;//0 普通礼物 1是贵族 2守护 3粉丝团
private int mark;// 0 普通 1热门 2守护 3幸运
private String name;
private String price;

2
common/src/main/java/com/yunbao/common/utils/AppManager.java
View File

@@ -121,7 +121,7 @@ public class AppManager {
*/
public static void runDebugCode(Runnable runnable) {
if (BuildConfig.DEBUG) {
// runnable.run();
runnable.run();
}
}

11
common/src/main/java/com/yunbao/common/utils/DialogUitl.java
View File

@@ -8,7 +8,6 @@ import android.os.Handler;
import android.os.Looper;
import android.text.InputFilter;
import android.text.InputType;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.SparseArray;
@@ -331,7 +330,7 @@ public class DialogUitl {
private Context mContext;
private String mTitle;
private String mContent;
private String mConfrimString;
private String mConfirmString;
private String mCancelString;
private boolean mCancelable;
private boolean mBackgroundDimEnabled;//显示区域以外是否使用黑色半透明背景
@@ -371,8 +370,8 @@ public class DialogUitl {
return this;
}
public Builder setConfrimString(String confrimString) {
mConfrimString = confrimString;
public Builder setConfirmString(String confirmString) {
mConfirmString = confirmString;
return this;
}
@@ -460,8 +459,8 @@ public class DialogUitl {
content.setFilters(new InputFilter[]{new InputFilter.LengthFilter(mLength)});
}
TextView btnConfirm = (TextView) dialog.findViewById(R.id.btn_confirm);
if (!TextUtils.isEmpty(mConfrimString)) {
btnConfirm.setText(mConfrimString);
if (!TextUtils.isEmpty(mConfirmString)) {
btnConfirm.setText(mConfirmString);
}
TextView btnCancel = (TextView) dialog.findViewById(R.id.btn_cancel);
if (!TextUtils.isEmpty(mCancelString)) {

8
common/src/main/java/com/yunbao/common/utils/VersionUtil.java
View File

@@ -50,7 +50,7 @@ public class VersionUtil {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(context.getString(R.string.version_immediate_use))
.setConfirmString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
@@ -81,7 +81,7 @@ public class VersionUtil {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(context.getString(R.string.version_immediate_use))
.setConfirmString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
@@ -111,7 +111,7 @@ public class VersionUtil {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(context.getString(R.string.version_immediate_use))
.setConfirmString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {
@@ -134,7 +134,7 @@ public class VersionUtil {
DialogUitl.Builder builder = new DialogUitl.Builder(context);
builder.setTitle(context.getString(R.string.version_update))
.setContent(configBean.getUpdateDes())
.setConfrimString(context.getString(R.string.version_immediate_use))
.setConfirmString(context.getString(R.string.version_immediate_use))
.setCancelString(context.getString(R.string.version_not_update))
.setCancelable(false)
.setClickCallback(new DialogUitl.SimpleCallback2() {