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

update:根据需求修改购买守护界面

Browse Source
This commit is contained in:
zlzw 2022-08-31 19:12:07 +08:00
parent 24a98bdab6
commit 05e9c63bb5
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -1272,7 +1272,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
List<GuardUserBean> list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class); List<GuardUserBean> list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class);
if(list.isEmpty()){ if(list.isEmpty()){
openNewBuyGuardWindow(); openNewBuyGuardWindow(true);
}else { }else {
LiveNewGuardListDialogFragment fragment = new LiveNewGuardListDialogFragment(); LiveNewGuardListDialogFragment fragment = new LiveNewGuardListDialogFragment();
fragment.setList(list); fragment.setList(list);
@ -1340,7 +1340,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
/** /**
* 打开购买新版守护的弹窗 * 打开购买新版守护的弹窗
*/ */
public void openNewBuyGuardWindow() { public void openNewBuyGuardWindow(boolean isEmpty) {
if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream) || mLiveGuardInfo == null) { if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream) || mLiveGuardInfo == null) {
return; return;
} }
@ -1353,6 +1353,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
bundle.putString(Constants.STREAM, mStream); bundle.putString(Constants.STREAM, mStream);
bundle.putString(Constants.LIVE_ANCHER_ICON, mAncherIcon); bundle.putString(Constants.LIVE_ANCHER_ICON, mAncherIcon);
bundle.putString(Constants.USER_ICON, CommonAppConfig.getInstance().getUserBean().getAvatar()); bundle.putString(Constants.USER_ICON, CommonAppConfig.getInstance().getUserBean().getAvatar());
bundle.putBoolean("guard",isEmpty);
fragment.setArguments(bundle); fragment.setArguments(bundle);
fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment"); fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment");
} }

2
live/src/main/java/com/yunbao/live/dialog/LiveGuardDialogFragment.java
View File

@ -164,7 +164,7 @@ public class LiveGuardDialogFragment extends AbsDialogFragment implements View.O
@Override @Override
public void onClick(View v) { public void onClick(View v) {
dismiss(); dismiss();
((LiveActivity) mContext).openNewBuyGuardWindow(); ((LiveActivity) mContext).openNewBuyGuardWindow(true);
} }
@Override @Override

17
live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java
View File

@ -80,6 +80,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
private LiveNewGuardBuyItemsAdapter buyItemsAdapter; private LiveNewGuardBuyItemsAdapter buyItemsAdapter;
private GuardRightAdapter mGuardRightAdapter; private GuardRightAdapter mGuardRightAdapter;
private boolean isEmpty;
@Override @Override
@ -163,6 +164,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
mUserIcon = bundle.getString(Constants.USER_ICON); mUserIcon = bundle.getString(Constants.USER_ICON);
String coinName = WordUtil.getString(R.string.diamond); String coinName = WordUtil.getString(R.string.diamond);
mCoinName = coinName; mCoinName = coinName;
isEmpty=bundle.getBoolean("guard",true);
// mCoinNameTextView.setText(WordUtil.getString(R.string.guard_my) + coinName + ":"); // mCoinNameTextView.setText(WordUtil.getString(R.string.guard_my) + coinName + ":");
mCoinNameTextView.setText("快为您喜欢的主播开通守护吧"); mCoinNameTextView.setText("快为您喜欢的主播开通守护吧");
anchorName.setText(String.format("成爲%s的守護", mAncherName)); anchorName.setText(String.format("成爲%s的守護", mAncherName));
@ -201,11 +203,20 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
private void initView() { private void initView() {
int guardType = mLiveGuardInfo.getMyGuardType(); int guardType = mLiveGuardInfo.getMyGuardType();
if (guardType == Constants.GUARD_TYPE_NONE) { if (guardType == Constants.GUARD_TYPE_NONE) {
// iconCover.setBackgroundResource(R.drawable.guardian_img_wings); if(isEmpty){
userIconOne.setVisibility(View.VISIBLE); iconCover.setImageResource(R.drawable.guardian_img_wings);
userIconTwo.setVisibility(View.VISIBLE); userIconOne.setVisibility(View.GONE);
userIconTwo.setVisibility(View.GONE);
}else{
ImgLoader.display(mContext, mAncherIcon, userIconOne); ImgLoader.display(mContext, mAncherIcon, userIconOne);
ImgLoader.display(mContext, mUserIcon, userIconTwo); ImgLoader.display(mContext, mUserIcon, userIconTwo);
userIconOne.setVisibility(View.VISIBLE);
userIconTwo.setVisibility(View.VISIBLE);
}
// iconCover.setBackgroundResource(R.drawable.guardian_img_wings);
buy1.setVisibility(View.VISIBLE); buy1.setVisibility(View.VISIBLE);
buy2.setVisibility(View.GONE); buy2.setVisibility(View.GONE);
} else { } else {

2
live/src/main/java/com/yunbao/live/dialog/LiveNewGuardListDialogFragment.java
View File

@ -168,7 +168,7 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dismiss(); dismiss();
((LiveActivity) mContext).openNewBuyGuardWindow(); ((LiveActivity) mContext).openNewBuyGuardWindow(list.isEmpty());
} }
@Override @Override