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-20 13:40:30 +08:00
parent 4693954a72
commit 4fabf3aba3
18 changed files with 238 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/adapter/DragonSendMoneyListAdapter.java
View File

@@ -20,12 +20,18 @@ public class DragonSendMoneyListAdapter extends RecyclerView.Adapter {
RecyclerView send_money_list;
boolean isAnchor;
SparseArray<CountDownTimer> countDownMap;
boolean isAttention;
public DragonSendMoneyListAdapter setAnchor(boolean anchor) {
isAnchor = anchor;
return this;
}
public DragonSendMoneyListAdapter setAttention(boolean attention) {
isAttention = attention;
return this;
}
public List<sendMoneyLongListModel> getMoneyLongListModels() {
return moneyLongListModels;
}
@@ -70,7 +76,7 @@ public class DragonSendMoneyListAdapter extends RecyclerView.Adapter {
// if (time > 0) {
//
// }
sendMoneyListViewHolder.setData(moneyLongListModels.get(position), callBack, isAnchor);
sendMoneyListViewHolder.setData(moneyLongListModels.get(position), callBack, isAnchor,isAttention);
}

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

@@ -5,21 +5,25 @@ 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;
import com.yunbao.common.bean.GuardGetGuardUserInfoModel;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.WordUtil;
public class GuardBuyTipsDialog {
/**
*
* @param context
* @param coin 钻石
* @param content 购买类型名称
* @param coin 钻石
* @param content 购买类型名称
* @param simpleCallback
*/
public static void showBuyOrRenewDialog(Context context, String coin, String content, boolean isOpen,DialogUitl.SimpleCallback simpleCallback) {
public static void showBuyOrRenewDialog(Context context, String coin, String content,
boolean isOpen, GuardGetGuardUserInfoModel mGuardUserInfoModel, int guardType,
DialogUitl.SimpleCallback simpleCallback) {
if (context instanceof Activity) {
if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
return;
@@ -30,25 +34,49 @@ public class GuardBuyTipsDialog {
dialog.setContentView(R.layout.dialog_guard_buy_tips);
dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
if (!isOpen){
Button btn_confirm = dialog.findViewById(R.id.btn_confirm);
TextView content1 = dialog.findViewById(R.id.content1);
TextView content2 = dialog.findViewById(R.id.content2);
TextView contentTextView = dialog.findViewById(R.id.content);
TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
content1.setVisibility(View.VISIBLE);
contentTextView.setVisibility(View.VISIBLE);
buyTypeTextView.setVisibility(View.VISIBLE);
content2.setVisibility(View.GONE);
if (!isOpen) {
if (!TextUtils.isEmpty(coin)) {
TextView contentTextView = dialog.findViewById(R.id.content);
contentTextView.setText(context.getString(R.string.guard_buy_tips_1, coin));
}
if (!TextUtils.isEmpty(content)) {
TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
buyTypeTextView.setText("【"+content+"】");
buyTypeTextView.setText("【" + content + "】");
}
}else {
} else {
if (!TextUtils.isEmpty(coin)) {
TextView contentTextView = dialog.findViewById(R.id.content);
contentTextView.setText(context.getString(R.string.guard_buy_tips_2, coin));
}
if (!TextUtils.isEmpty(content)) {
TextView buyTypeTextView = dialog.findViewById(R.id.buyType);
buyTypeTextView.setText("【"+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);
} else if (guardType==mGuardUserInfoModel.getGuardType()){
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() {
@Override
@@ -56,11 +84,17 @@ public class GuardBuyTipsDialog {
dialog.dismiss();
}
});
dialog.findViewById(R.id.btn_confirm).setOnClickListener(new View.OnClickListener() {
btn_confirm.setText(WordUtil.isNewZh() ? "確認" : "Confirm");
btn_confirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
simpleCallback.onConfirmClick(dialog, "");
dialog.dismiss();
if (content2.getVisibility()==View.VISIBLE){
dialog.dismiss();
}else {
simpleCallback.onConfirmClick(dialog, "");
dialog.dismiss();
}
}
});
dialog.show();

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

@@ -2993,7 +2993,12 @@ public class LiveNetManager {
@Override
public void accept(ResponseModel<Object> stringResponseModel) throws Exception {
if (callback != null) {
callback.onSuccess(stringResponseModel.getData().getMsg());
if (stringResponseModel.getData().getCode() == 0) {
callback.onSuccess(stringResponseModel.getData().getMsg());
} else {
callback.onError(stringResponseModel.getData().getMsg());
}
}
}
}, new Consumer<Throwable>() {
@@ -3129,9 +3134,9 @@ public class LiveNetManager {
}
public void guardGetRewards( String liveUid,HttpCallback<CheckUpgradesModel> callback) {
public void guardGetRewards(String liveUid, HttpCallback<CheckUpgradesModel> callback) {
API.get().pdLiveApi(mContext)
.guardGetRewards("2",liveUid)
.guardGetRewards("2", liveUid)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<CheckUpgradesModel>>() {

2
common/src/main/java/com/yunbao/common/views/DragonSendMoneyListViewHolder.java
View File

@@ -39,7 +39,7 @@ public class DragonSendMoneyListViewHolder extends RecyclerView.ViewHolder {
send_benefits = itemView.findViewById(R.id.send_benefits);
}
public void setData(sendMoneyLongListModel model, DragonSendMoneyListClicksCallBack callBack,boolean isAnchor) {
public void setData(sendMoneyLongListModel model, DragonSendMoneyListClicksCallBack callBack,boolean isAnchor, boolean isAttention) {
ImgLoader.display(itemView.getContext(), model.getUserAvatar(), live_avatar);
user_nicename.setText(String.valueOf(model.getUserNicename()));
gold_num.setText(String.valueOf(model.getGoldNum()));