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

6
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -1044,7 +1044,11 @@ public class LiveAudienceActivity extends LiveActivity {
liveFansFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
break;
case GUARD:
openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
if(event.getObject()==null) {
openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
}else{
openNewBuyGuardWindow(true);
}
break;
case LIVE_WKS://周星榜
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="

6
live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java
View File

@@ -1,6 +1,5 @@
package com.yunbao.live.adapter;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Build;
@@ -13,14 +12,11 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.LiveUserMailBoxModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.dialog.LiveUserAnchorMailBoxWebInfoPopDialog;
@@ -94,7 +90,7 @@ public class LiveUserAnchorMailBoxAdapter extends RecyclerView.Adapter<LiveUserA
new DialogUitl.Builder(mContext)
.setTitle(mContext.getString(R.string.live_user_letter_dialog_title))
.setContent(mContext.getString(R.string.live_user_letter_dialog_content))
.setConfrimString(mContext.getString(R.string.live_user_letter_dialog_yes))
.setConfirmString(mContext.getString(R.string.live_user_letter_dialog_yes))
.setCancelString(mContext.getString(R.string.live_user_letter_dialog_no))
.setView(R.layout.dialog_live_random_pk)
.setCancelable(true)

42
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@@ -45,7 +45,9 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.GiftCacheUtil;
import com.yunbao.common.utils.NobleUtil;
@@ -59,6 +61,7 @@ import com.yunbao.live.adapter.LiveGiftPagerAdapter;
import com.yunbao.live.bean.GiftTopBean;
import com.yunbao.live.bean.LiveGuardInfo;
import com.yunbao.live.custom.GiftViewPager;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.utils.ToolsButton;
@@ -809,6 +812,45 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
isGetNewWrap = true;
refreshWrapListAfterSend();
}
} else if (code == 1007 && mLiveGiftBean.getType() != 0) {
hideLianBtn();
dismiss();
LiveAudienceEvent.LiveAudienceType type = null;
String confirmString = mContext.getString(R.string.dialog_fount_submit);
String tips = msg;
switch (mLiveGiftBean.getType()) {
case 1:
type = LiveAudienceEvent.LiveAudienceType.NOBLE;
tips = mContext.getString(R.string.dialog_live_gift_noble);
confirmString = mContext.getString(R.string.dialog_live_gift_open_noble);
break;
case 2:
type = LiveAudienceEvent.LiveAudienceType.GUARD;
tips = mContext.getString(R.string.dialog_live_gift_guard);
confirmString = mContext.getString(R.string.dialog_live_gift_open_guard);
break;
case 3:
type = LiveAudienceEvent.LiveAudienceType.FAN_CLUB;
tips = mContext.getString(R.string.dialog_live_gift_fans);
confirmString = mContext.getString(R.string.dialog_live_gift_open_fans);
}
LiveAudienceEvent.LiveAudienceType finalType = type;
new DialogUitl.Builder(mContext)
.setView(R.layout.dialog_live_unfollow)
.setConfirmString(confirmString)
.setContent(tips)
.setClickCallback((dialog, content) -> {
LiveAudienceEvent event = new LiveAudienceEvent()
.setType(finalType);
if (finalType == LiveAudienceEvent.LiveAudienceType.GUARD) {
event = event.setObject("");
}
Bus.get().post(event);
}).build().show();
AppManager.runDebugCode(() -> {
Log.i("gifBean", mLiveGiftBean.toString());
});
} else {
hideLianBtn();
ToastUtil.show(msg);

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

@@ -1,6 +1,5 @@
package com.yunbao.live.dialog;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.os.Bundle;
import android.text.Html;
@@ -35,7 +34,6 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
@@ -438,7 +436,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
.setView(R.layout.dialog_live_random_pk)
.setTitle(mContext.getString(R.string.dialog_tip))
.setCancelString(mContext.getString(R.string.live_use_discount_no))
.setConfrimString(mContext.getString(R.string.live_use_discount_yes))
.setConfirmString(mContext.getString(R.string.live_use_discount_yes))
.setClickCallback(new DialogUitl.SimpleCallback2() {
@Override
public void onCancelClick() {

11
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@@ -5,8 +5,6 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
@@ -46,29 +44,22 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveReportActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.bean.GuardUserBean;
import com.yunbao.live.bean.ImpressBean;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.live.custom.MyTextView;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveRoomChangeEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.live.utils.LiveTextRender;
import com.yunbao.live.views.LiveRoomViewHolder;
import org.greenrobot.eventbus.EventBus;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import io.rong.imlib.IRongCoreCallback;
@@ -534,7 +525,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
if (mFollowing) {
DialogUitl.Builder builder = new DialogUitl.Builder(mContext)
.setContent(mContext.getString(R.string.unfollow))
.setConfrimString(mContext.getString(R.string.unfollow_confrim))
.setConfirmString(mContext.getString(R.string.unfollow_confrim))
.setCancelString(mContext.getString(R.string.unfollow_cancel))
.setView(R.layout.dialog_live_unfollow)
.setClickCallback3(new DialogUitl.SimpleCallback3() {

3
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@@ -54,7 +54,6 @@ import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
@@ -1242,7 +1241,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
"<font color='#999999' size='12'>有人向您发起PK请求。</font><br/>" +
"<font color='#FB4F4F' size='12'>若拒绝PK，将会10分钟内不会再收到任何随机PK请求。</font>"
))
.setConfrimString("接受")
.setConfirmString("接受")
.setCancelString("拒絕")
.setView(R.layout.dialog_live_random_pk)
.setSimpleCallbackView(new DialogUitl.SimpleCallbackView() {

4
live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java
View File

@@ -46,7 +46,6 @@ import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.common.views.LiveClarityCustomPopup;
import com.yunbao.common.views.LiveNewWishListPopup;
@@ -62,7 +61,6 @@ import com.yunbao.live.dialog.LiveAnchorSayPopDialog;
import com.yunbao.live.dialog.LiveFaceUnityDialogFragment;
import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment;
import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment;
import com.yunbao.live.dialog.LiveNewWishListDialogFragment;
import com.yunbao.live.dialog.LiveTimeDialogFragment;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.http.LiveHttpConsts;
@@ -664,7 +662,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
new DialogUitl.Builder(mContext)
.setContent(mContext.getString(R.string.live_location_close_3))
.setCancelable(true)
.setConfrimString(mContext.getString(R.string.live_location_close_2))
.setConfirmString(mContext.getString(R.string.live_location_close_2))
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override

13
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@@ -7,25 +7,19 @@ import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.media.AudioManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.ui.StyledPlayerView;
@@ -35,10 +29,8 @@ import com.lxj.xpopup.core.BasePopupView;
import com.lxj.xpopup.interfaces.XPopupCallback;
import com.lzf.easyfloat.EasyFloat;
import com.lzy.okserver.OkDownload;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.EnterRoomNewModel;
import com.yunbao.common.dialog.LiveFontSizeSettingDialog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.interfaces.OnItemClickListener;
@@ -50,14 +42,11 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.ScreenDimenUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.LiveClarityCustomPopup;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.dialog.LiveUserDialogFragment;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.utils.LiveExoPlayerManager;
@@ -700,7 +689,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
DialogUitl.Builder builder = new DialogUitl.Builder(mContext)
.setContent("邀請您進行語音連麥")
.setTitle(mLiveBean.getUserNiceName())
.setConfrimString("接受")
.setConfirmString("接受")
.setCancelString("拒絕")
.setView(R.layout.dialog_live_mic_invite)
.setClickCallback(new DialogUitl.SimpleCallback() {

3
live/src/main/java/com/yunbao/live/views/LiveReadyRyViewHolder.java
View File

@@ -29,7 +29,6 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
@@ -231,7 +230,7 @@ public class LiveReadyRyViewHolder extends AbsViewHolder implements View.OnClick
new DialogUitl.Builder(mContext)
.setContent(mContext.getString(R.string.live_location_close_3))
.setCancelable(true)
.setConfrimString(mContext.getString(R.string.live_location_close_2))
.setConfirmString(mContext.getString(R.string.live_location_close_2))
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override

3
live/src/main/java/com/yunbao/live/views/LiveReadyViewHolder.java
View File

@@ -41,7 +41,6 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
@@ -255,7 +254,7 @@ public class LiveReadyViewHolder extends AbsViewHolder implements View.OnClickLi
new DialogUitl.Builder(mContext)
.setContent(mContext.getString(R.string.live_location_close_3))
.setCancelable(true)
.setConfrimString(mContext.getString(R.string.live_location_close_2))
.setConfirmString(mContext.getString(R.string.live_location_close_2))
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override