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 2023-06-03 11:48:37 +08:00
commit 6e595ff1e4
7 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
View File

@ -48,7 +48,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("ispk") @SerializedName("ispk")
private String ispk; private String ispk;
@SerializedName("pkuid") @SerializedName("pkuid")
private boolean pkuid; private String pkuid;
@SerializedName("pkuid1") @SerializedName("pkuid1")
private String pkuid1; private String pkuid1;
@SerializedName("pkuid2") @SerializedName("pkuid2")
@ -60,7 +60,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("active_total") @SerializedName("active_total")
private String activeTotal; private String activeTotal;
@SerializedName("blind_box_status") @SerializedName("blind_box_status")
private boolean blindBoxStatus; private String blindBoxStatus;
@SerializedName("gift_id") @SerializedName("gift_id")
private String giftId; private String giftId;
@SerializedName("gift_type") @SerializedName("gift_type")
@ -78,7 +78,7 @@ public class SendBlindGiftEvent extends BaseModel {
@SerializedName("action") @SerializedName("action")
private String action; private String action;
@SerializedName("dress_notification") @SerializedName("dress_notification")
private boolean dressNotification; private String dressNotification;
@SerializedName("dress_type") @SerializedName("dress_type")
private Object dressType; private Object dressType;
@SerializedName("dress_id") @SerializedName("dress_id")
@ -313,11 +313,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this; return this;
} }
public boolean isPkuid() { public String isPkuid() {
return pkuid; return pkuid;
} }
public SendBlindGiftEvent setPkuid(boolean pkuid) { public SendBlindGiftEvent setPkuid(String pkuid) {
this.pkuid = pkuid; this.pkuid = pkuid;
return this; return this;
} }
@ -367,11 +367,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this; return this;
} }
public boolean isBlindBoxStatus() { public String isBlindBoxStatus() {
return blindBoxStatus; return blindBoxStatus;
} }
public SendBlindGiftEvent setBlindBoxStatus(boolean blindBoxStatus) { public SendBlindGiftEvent setBlindBoxStatus(String blindBoxStatus) {
this.blindBoxStatus = blindBoxStatus; this.blindBoxStatus = blindBoxStatus;
return this; return this;
} }
@ -449,11 +449,11 @@ public class SendBlindGiftEvent extends BaseModel {
return this; return this;
} }
public boolean isDressNotification() { public String isDressNotification() {
return dressNotification; return dressNotification;
} }
public SendBlindGiftEvent setDressNotification(boolean dressNotification) { public SendBlindGiftEvent setDressNotification(String dressNotification) {
this.dressNotification = dressNotification; this.dressNotification = dressNotification;
return this; return this;
} }

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

@ -1011,17 +1011,17 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
if (mTvGoldCoin != null) { if (mTvGoldCoin != null) {
mTvGoldCoin.setText(goldCoin); mTvGoldCoin.setText(goldCoin);
} }
if (mContext != null && mGiftBean != null) { // if (mContext != null && mGiftBean != null) {
((LiveActivity) mContext).onCoinChanged(coin);// // ((LiveActivity) mContext).onCoinChanged(coin);//
if (by != null) { // if (by != null) {
((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") // ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
, obj.getString("ancherName"), "1"); // , obj.getString("ancherName"), "1");
} else { // } else {
((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") // ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken")
, obj.getString("ancherName"), "0"); // , obj.getString("ancherName"), "0");
} // }
//
} // }
if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) { if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) {
showLianBtn(); showLianBtn();
} }

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

@ -1002,7 +1002,7 @@ public class SocketRyClient {
// 玩家自己送礼物 // 玩家自己送礼物
private void sendGiftInSameRoom(JSONObject map) { private void sendGiftInSameRoom(JSONObject map) {
String ctJson = map.getString("ct"); String ctJson = map.getString("ct");
SendBlindGiftEvent sendBlindGiftEvent = GsonUtils.fromJson(ctJson, SendBlindGiftEvent.class); SendBlindGiftEvent sendBlindGiftEvent = JSON.parseObject(ctJson, SendBlindGiftEvent.class);
LiveReceiveGiftBean receiveGiftBean = JSON.parseObject(map.getString("ct"), LiveReceiveGiftBean.class); LiveReceiveGiftBean receiveGiftBean = JSON.parseObject(map.getString("ct"), LiveReceiveGiftBean.class);
sendBlindGiftEvent.setUserNiceName(map.getString("uname")); sendBlindGiftEvent.setUserNiceName(map.getString("uname"));
receiveGiftBean.setAvatar(map.getString("uhead") + ""); receiveGiftBean.setAvatar(map.getString("uhead") + "");
@ -1051,7 +1051,7 @@ public class SocketRyClient {
try { try {
if (!TextUtils.isEmpty(mLiveUid)) { if (!TextUtils.isEmpty(mLiveUid)) {
if (mLiveUid.equals(map.getString("roomnum"))) { if (mLiveUid.equals(map.getString("roomnum"))) {
mListener.onSendGift(receiveGiftBean, null); mListener.onSendGift(receiveGiftBean, sendBlindGiftEvent);
mListener.onSendGiftPk(map.getLongValue("pktotal1"), map.getLongValue("pktotal2"), livePKUserListBean); mListener.onSendGiftPk(map.getLongValue("pktotal1"), map.getLongValue("pktotal2"), livePKUserListBean);
} else { } else {
mListener.onSendGiftPk(map.getLongValue("pktotal2"), map.getLongValue("pktotal1"), livePKUserListBean); mListener.onSendGiftPk(map.getLongValue("pktotal2"), map.getLongValue("pktotal1"), livePKUserListBean);

7
live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java
View File

@ -71,6 +71,11 @@ public class LiveRoomVoteManager {
} }
private void close() { private void close() {
if(mClose.getTag()!=null){
mClose.setTag(null);
hide();
return;
}
mTitle.setText(R.string.live_vote_close_title); mTitle.setText(R.string.live_vote_close_title);
mSubmit.setText(R.string.live_vote_close_yes); mSubmit.setText(R.string.live_vote_close_yes);
mCancel.setText(R.string.live_vote_close_no); mCancel.setText(R.string.live_vote_close_no);
@ -131,7 +136,7 @@ public class LiveRoomVoteManager {
ToastUtil.show(bean); ToastUtil.show(bean);
return; return;
} }
mClose.setVisibility(View.INVISIBLE); mClose.setTag(true);
}); });
} }

4
main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
View File

@ -199,7 +199,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
void setData(ListBean bean, int position, Object payload) { void setData(ListBean bean, int position, Object payload) {
if (payload == null) { if (payload == null) {
svga.setVisibility(View.GONE); svga.setVisibility(View.INVISIBLE);
if (bean.getDress_head() != null) { if (bean.getDress_head() != null) {
if (bean.getDress_head().contains("svga")) { if (bean.getDress_head().contains("svga")) {
svga.setVisibility(View.VISIBLE); svga.setVisibility(View.VISIBLE);
@ -256,7 +256,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
liveing.setVisibility(View.INVISIBLE); liveing.setVisibility(View.INVISIBLE);
} }
mBtnFollow.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE); mBtnFollow.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
svga.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE); svga.setVisibility(bean.isHide() ? View.INVISIBLE : View.VISIBLE);
mBtnFollow.setTag(position); mBtnFollow.setTag(position);
if (bean.getAttention() == 1) { if (bean.getAttention() == 1) {
mBtnFollow.doChecked(true); mBtnFollow.doChecked(true);

9
main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
View File

@ -66,6 +66,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
private OnAppbarListener appbarListener; private OnAppbarListener appbarListener;
private AppBarLayout rootView; private AppBarLayout rootView;
private CollapsingToolbarLayout toolbarLayout; private CollapsingToolbarLayout toolbarLayout;
private View rootLayout;
public AbsMainListChildViewHolder(Context context, ViewGroup parentView) { public AbsMainListChildViewHolder(Context context, ViewGroup parentView) {
super(context, parentView); super(context, parentView);
@ -82,6 +83,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView); mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView);
mBackgroundLayout = findViewById(R.id.bg_layout); mBackgroundLayout = findViewById(R.id.bg_layout);
rootView = (AppBarLayout) findViewById(R.id.rootView); rootView = (AppBarLayout) findViewById(R.id.rootView);
rootLayout = findViewById(R.id.root_layout);
toolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.toolbar_layout); toolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.toolbar_layout);
hv = new HeadView(rootView); hv = new HeadView(rootView);
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_list); mRefreshView.setEmptyLayoutId(R.layout.view_no_data_list);
@ -342,19 +344,22 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
if (bean.getIslive() == 1) { if (bean.getIslive() == 1) {
setVisibility(View.VISIBLE, position, liveing1, liveing2, liveing3); setVisibility(View.VISIBLE, position, liveing1, liveing2, liveing3);
} }
setVisibility(bean.isHide() ? View.GONE : View.VISIBLE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3); setVisibility(bean.isHide() ? View.INVISIBLE : View.VISIBLE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3);
if (bean.getAttention() != 1) { if (bean.getAttention() != 1) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).doChecked(true); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).doChecked(true);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setText("+" + mContext.getString(R.string.follow)); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setText("+" + mContext.getString(R.string.follow));
if (isRankOne == 0) { if (isRankOne == 0) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ffff79c2); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ffff79c2);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF"));
rootLayout.setBackgroundColor(Color.parseColor("#FF90C0"));
} else if (isRankOne == 1) { } else if (isRankOne == 1) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_7bbaff); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_7bbaff);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF"));
rootLayout.setBackgroundColor(Color.parseColor("#92A9FF"));
} else if (isRankOne == 2) { } else if (isRankOne == 2) {
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ff9072); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ff9072);
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF"));
rootLayout.setBackgroundColor(Color.parseColor("#FFB991"));
} }
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE);
} else { } else {
@ -367,7 +372,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
ImgLoader.display(mContext, R.mipmap.hide, getItem(position, mAvatar1, mAvatar2, mAvatar3)); ImgLoader.display(mContext, R.mipmap.hide, getItem(position, mAvatar1, mAvatar2, mAvatar3));
getItem(position, mSex1, mSex2, mSex3).setVisibility(View.GONE); getItem(position, mSex1, mSex2, mSex3).setVisibility(View.GONE);
setVisibility(View.GONE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3); setVisibility(View.INVISIBLE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3);
} else { } else {
ImgLoader.display(mContext, bean.getAvatarThumb(), getItem(position, mAvatar1, mAvatar2, mAvatar3)); ImgLoader.display(mContext, bean.getAvatarThumb(), getItem(position, mAvatar1, mAvatar2, mAvatar3));
getItem(position, mName1, mName2, mName3).setText(bean.getUserNiceName()); getItem(position, mName1, mName2, mName3).setText(bean.getUserNiceName());

4
main/src/main/res/layout/activity_main_list.xml
View File

@ -3,6 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/root_layout"
android:background="#FF90C0"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
@ -434,7 +436,7 @@
android:id="@+id/refreshView" android:id="@+id/refreshView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="-15dp" android:layout_marginTop="-5dp"
android:background="@drawable/background_white_up" android:background="@drawable/background_white_up"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />