diff --git a/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java b/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java index 7ea5bb874..6b0fd0b22 100644 --- a/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java +++ b/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java @@ -48,7 +48,7 @@ public class SendBlindGiftEvent extends BaseModel { @SerializedName("ispk") private String ispk; @SerializedName("pkuid") - private boolean pkuid; + private String pkuid; @SerializedName("pkuid1") private String pkuid1; @SerializedName("pkuid2") @@ -60,7 +60,7 @@ public class SendBlindGiftEvent extends BaseModel { @SerializedName("active_total") private String activeTotal; @SerializedName("blind_box_status") - private boolean blindBoxStatus; + private String blindBoxStatus; @SerializedName("gift_id") private String giftId; @SerializedName("gift_type") @@ -78,7 +78,7 @@ public class SendBlindGiftEvent extends BaseModel { @SerializedName("action") private String action; @SerializedName("dress_notification") - private boolean dressNotification; + private String dressNotification; @SerializedName("dress_type") private Object dressType; @SerializedName("dress_id") @@ -313,11 +313,11 @@ public class SendBlindGiftEvent extends BaseModel { return this; } - public boolean isPkuid() { + public String isPkuid() { return pkuid; } - public SendBlindGiftEvent setPkuid(boolean pkuid) { + public SendBlindGiftEvent setPkuid(String pkuid) { this.pkuid = pkuid; return this; } @@ -367,11 +367,11 @@ public class SendBlindGiftEvent extends BaseModel { return this; } - public boolean isBlindBoxStatus() { + public String isBlindBoxStatus() { return blindBoxStatus; } - public SendBlindGiftEvent setBlindBoxStatus(boolean blindBoxStatus) { + public SendBlindGiftEvent setBlindBoxStatus(String blindBoxStatus) { this.blindBoxStatus = blindBoxStatus; return this; } @@ -449,11 +449,11 @@ public class SendBlindGiftEvent extends BaseModel { return this; } - public boolean isDressNotification() { + public String isDressNotification() { return dressNotification; } - public SendBlindGiftEvent setDressNotification(boolean dressNotification) { + public SendBlindGiftEvent setDressNotification(String dressNotification) { this.dressNotification = dressNotification; return this; } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index ad8fccdc4..12e730af6 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -1011,17 +1011,17 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On if (mTvGoldCoin != null) { mTvGoldCoin.setText(goldCoin); } - if (mContext != null && mGiftBean != null) { - ((LiveActivity) mContext).onCoinChanged(coin);// - if (by != null) { - ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") - , obj.getString("ancherName"), "1"); - } else { - ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") - , obj.getString("ancherName"), "0"); - } - - } +// if (mContext != null && mGiftBean != null) { +// ((LiveActivity) mContext).onCoinChanged(coin);// +// if (by != null) { +// ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") +// , obj.getString("ancherName"), "1"); +// } else { +// ((LiveActivity) mContext).sendGiftMessage(mGiftBean, obj.getString("gifttoken") +// , obj.getString("ancherName"), "0"); +// } +// +// } if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) { showLianBtn(); } diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 45d0781f4..994c4d589 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -1002,7 +1002,7 @@ public class SocketRyClient { // 玩家自己送礼物 private void sendGiftInSameRoom(JSONObject map) { 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); sendBlindGiftEvent.setUserNiceName(map.getString("uname")); receiveGiftBean.setAvatar(map.getString("uhead") + ""); @@ -1051,7 +1051,7 @@ public class SocketRyClient { try { if (!TextUtils.isEmpty(mLiveUid)) { if (mLiveUid.equals(map.getString("roomnum"))) { - mListener.onSendGift(receiveGiftBean, null); + mListener.onSendGift(receiveGiftBean, sendBlindGiftEvent); mListener.onSendGiftPk(map.getLongValue("pktotal1"), map.getLongValue("pktotal2"), livePKUserListBean); } else { mListener.onSendGiftPk(map.getLongValue("pktotal2"), map.getLongValue("pktotal1"), livePKUserListBean); diff --git a/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java b/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java index 9579086a8..0ae3a72f3 100644 --- a/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java +++ b/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java @@ -71,6 +71,11 @@ public class LiveRoomVoteManager { } private void close() { + if(mClose.getTag()!=null){ + mClose.setTag(null); + hide(); + return; + } mTitle.setText(R.string.live_vote_close_title); mSubmit.setText(R.string.live_vote_close_yes); mCancel.setText(R.string.live_vote_close_no); @@ -131,7 +136,7 @@ public class LiveRoomVoteManager { ToastUtil.show(bean); return; } - mClose.setVisibility(View.INVISIBLE); + mClose.setTag(true); }); } diff --git a/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java index 7451774ec..a05bb818f 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java @@ -199,7 +199,7 @@ public class MainListAdapter extends RefreshAdapter { void setData(ListBean bean, int position, Object payload) { if (payload == null) { - svga.setVisibility(View.GONE); + svga.setVisibility(View.INVISIBLE); if (bean.getDress_head() != null) { if (bean.getDress_head().contains("svga")) { svga.setVisibility(View.VISIBLE); @@ -256,7 +256,7 @@ public class MainListAdapter extends RefreshAdapter { liveing.setVisibility(View.INVISIBLE); } 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); if (bean.getAttention() == 1) { mBtnFollow.doChecked(true); diff --git a/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java b/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java index 81ce41e48..bbcb5b2cd 100644 --- a/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java @@ -66,6 +66,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple private OnAppbarListener appbarListener; private AppBarLayout rootView; private CollapsingToolbarLayout toolbarLayout; + private View rootLayout; public AbsMainListChildViewHolder(Context context, ViewGroup parentView) { super(context, parentView); @@ -82,6 +83,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView); mBackgroundLayout = findViewById(R.id.bg_layout); rootView = (AppBarLayout) findViewById(R.id.rootView); + rootLayout = findViewById(R.id.root_layout); toolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.toolbar_layout); hv = new HeadView(rootView); mRefreshView.setEmptyLayoutId(R.layout.view_no_data_list); @@ -342,19 +344,22 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple if (bean.getIslive() == 1) { 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) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).doChecked(true); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setText("+" + mContext.getString(R.string.follow)); if (isRankOne == 0) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ffff79c2); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); + rootLayout.setBackgroundColor(Color.parseColor("#FF90C0")); } else if (isRankOne == 1) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_7bbaff); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); + rootLayout.setBackgroundColor(Color.parseColor("#92A9FF")); } else if (isRankOne == 2) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setBackgroundResource(R.drawable.background_ff9072); getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setTextColor(Color.parseColor("#FFFFFF")); + rootLayout.setBackgroundColor(Color.parseColor("#FFB991")); } getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE); } else { @@ -367,7 +372,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple ImgLoader.display(mContext, R.mipmap.hide, getItem(position, mAvatar1, mAvatar2, mAvatar3)); getItem(position, mSex1, mSex2, mSex3).setVisibility(View.GONE); - setVisibility(View.GONE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3); + setVisibility(View.INVISIBLE, position, mBtnFollow1, mBtnFollow2, mBtnFollow3); } else { ImgLoader.display(mContext, bean.getAvatarThumb(), getItem(position, mAvatar1, mAvatar2, mAvatar3)); getItem(position, mName1, mName2, mName3).setText(bean.getUserNiceName()); diff --git a/main/src/main/res/layout/activity_main_list.xml b/main/src/main/res/layout/activity_main_list.xml index d5ff6d106..84fc90703 100644 --- a/main/src/main/res/layout/activity_main_list.xml +++ b/main/src/main/res/layout/activity_main_list.xml @@ -3,6 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:id="@+id/root_layout" + android:background="#FF90C0" android:layout_height="match_parent">