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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586 2022-08-31 19:40:58 +08:00
commit 6f6cfc8f80
8 changed files with 25 additions and 7 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) {
List<GuardUserBean> list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class);
if(list.isEmpty()){
openNewBuyGuardWindow();
openNewBuyGuardWindow(true);
}else {
LiveNewGuardListDialogFragment fragment = new LiveNewGuardListDialogFragment();
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) {
return;
}
@ -1353,6 +1353,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
bundle.putString(Constants.STREAM, mStream);
bundle.putString(Constants.LIVE_ANCHER_ICON, mAncherIcon);
bundle.putString(Constants.USER_ICON, CommonAppConfig.getInstance().getUserBean().getAvatar());
bundle.putBoolean("guard",isEmpty);
fragment.setArguments(bundle);
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
public void onClick(View v) {
dismiss();
((LiveActivity) mContext).openNewBuyGuardWindow();
((LiveActivity) mContext).openNewBuyGuardWindow(true);
}
@Override

19
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 GuardRightAdapter mGuardRightAdapter;
private boolean isEmpty;
@Override
@ -132,7 +133,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
buy2 = mRootView.findViewById(R.id.buy2);
guard_tips = mRootView.findViewById(R.id.guard_textView2);
iconCover.setImageResource(R.drawable.guardian_img_wings);
//iconCover.setImageResource(R.drawable.guardian_img_wings);
mBtnBuy.setOnClickListener(this);
submit.setOnClickListener(this);
@ -163,6 +164,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
mUserIcon = bundle.getString(Constants.USER_ICON);
String coinName = WordUtil.getString(R.string.diamond);
mCoinName = coinName;
isEmpty=bundle.getBoolean("guard",true);
// mCoinNameTextView.setText(WordUtil.getString(R.string.guard_my) + coinName + ":");
mCoinNameTextView.setText("快为您喜欢的主播开通守护吧");
anchorName.setText(String.format("成爲%s的守護", mAncherName));
@ -201,7 +203,20 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
private void initView() {
int guardType = mLiveGuardInfo.getMyGuardType();
if (guardType == Constants.GUARD_TYPE_NONE) {
iconCover.setBackgroundResource(R.drawable.guardian_img_wings);
if(isEmpty){
iconCover.setImageResource(R.drawable.guardian_img_wings);
userIconOne.setVisibility(View.GONE);
userIconTwo.setVisibility(View.GONE);
}else{
ImgLoader.display(mContext, mAncherIcon, userIconOne);
ImgLoader.display(mContext, mUserIcon, userIconTwo);
userIconOne.setVisibility(View.VISIBLE);
userIconTwo.setVisibility(View.VISIBLE);
}
// iconCover.setBackgroundResource(R.drawable.guardian_img_wings);
buy1.setVisibility(View.VISIBLE);
buy2.setVisibility(View.GONE);
} 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
public void onClick(View view) {
dismiss();
((LiveActivity) mContext).openNewBuyGuardWindow();
((LiveActivity) mContext).openNewBuyGuardWindow(list.isEmpty());
}
@Override

1
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@ -932,6 +932,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
}
public void release() {
EventBus.getDefault().unregister(this);
LiveHttpUtil.cancel(LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL);
LiveHttpUtil.cancel(LiveHttpConsts.GET_LINK_MIC_STREAM);
LiveHttpUtil.cancel(LiveHttpConsts.LINK_MIC_SHOW_VIDEO);

1
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -178,7 +178,6 @@ public class SocketRyClient {
}
UserBean us = CommonAppConfig.getInstance().getUserBean();
if (map.getString("uid") != null && map.getString("uid").equals(us.getId())) {
LiveAudienceActivity.is_fans = "1";
int num = LiveAudienceActivity.fansNum + 1;
LiveRoomViewHolder.setFansNum(num);
}

1
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -651,6 +651,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void release() {
super.release();
EventBus.getDefault().unregister(this);
removeCallbacks();
}
/**

1
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1416,6 +1416,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mViewMedal.setVisibility(View.GONE);
} else {
if (mBtnFollow.getVisibility() == View.VISIBLE) {
LiveAudienceActivity.is_fans = "2";
mBtnFollow.setVisibility(View.GONE);
mViewMedal.setVisibility(View.VISIBLE);
}