修复
This commit is contained in:
parent
84c43f74bc
commit
f55e9c0cfe
@ -27,6 +27,7 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.animation.Animation;
|
import android.view.animation.Animation;
|
||||||
import android.view.animation.AnimationUtils;
|
import android.view.animation.AnimationUtils;
|
||||||
|
import android.widget.FrameLayout;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
@ -203,7 +204,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
|
|||||||
View v_chat_active_close;
|
View v_chat_active_close;
|
||||||
RecyclerView rv_chat_active;
|
RecyclerView rv_chat_active;
|
||||||
ImageView img_zg_img, btnAttention, textLeave;
|
ImageView img_zg_img, btnAttention, textLeave;
|
||||||
LinearLayout attentionLayout;
|
FrameLayout attentionLayout;
|
||||||
ClipPathCircleImage clipImage2;
|
ClipPathCircleImage clipImage2;
|
||||||
|
|
||||||
public Vh(View itemView) {
|
public Vh(View itemView) {
|
||||||
@ -211,7 +212,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
|
|||||||
mBg = (LinearLayout) itemView.findViewById(R.id.bg);
|
mBg = (LinearLayout) itemView.findViewById(R.id.bg);
|
||||||
mTextView = (TextView) itemView.findViewById(R.id.text_txt);
|
mTextView = (TextView) itemView.findViewById(R.id.text_txt);
|
||||||
textTxt2 = (TextView) itemView.findViewById(R.id.text_txt2);
|
textTxt2 = (TextView) itemView.findViewById(R.id.text_txt2);
|
||||||
attentionLayout = (LinearLayout) itemView.findViewById(R.id.attention_layout);
|
attentionLayout = (FrameLayout) itemView.findViewById(R.id.attention_layout);
|
||||||
clipImage2 = (ClipPathCircleImage) itemView.findViewById(R.id.clip_image2);
|
clipImage2 = (ClipPathCircleImage) itemView.findViewById(R.id.clip_image2);
|
||||||
itemView.setOnClickListener(mOnClickListener);
|
itemView.setOnClickListener(mOnClickListener);
|
||||||
|
|
||||||
|
@ -105,13 +105,18 @@ public class ResultRendPacketPopup extends CenterPopupView {
|
|||||||
new HttpCallback<List<RedPacketGiftModel>>() {
|
new HttpCallback<List<RedPacketGiftModel>>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<RedPacketGiftModel> data) {
|
public void onSuccess(List<RedPacketGiftModel> data) {
|
||||||
// if (data.size() > 0) {
|
if (data.size() > 0) {
|
||||||
new XPopup.Builder(getContext())
|
new XPopup.Builder(getContext())
|
||||||
.asCustom(new LuckUserRedPacketPopup(getContext(), data))
|
.asCustom(new LuckUserRedPacketPopup(getContext(), data))
|
||||||
.show();
|
.show();
|
||||||
// } else {
|
} else {
|
||||||
// ToastUtil.show(R.string.no_data);
|
new XPopup.Builder(getContext())
|
||||||
// }
|
.asCustom(new ResultRendPacketPopup(getContext(),
|
||||||
|
true,
|
||||||
|
redPacketInfoModel,
|
||||||
|
isSuperJackpot))
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,13 +131,18 @@ public class ResultRendPacketPopup extends CenterPopupView {
|
|||||||
new HttpCallback<List<RedPacketGiftModel>>() {
|
new HttpCallback<List<RedPacketGiftModel>>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<RedPacketGiftModel> data) {
|
public void onSuccess(List<RedPacketGiftModel> data) {
|
||||||
// if (data.size() > 0) {
|
if (data.size() > 0) {
|
||||||
new XPopup.Builder(getContext())
|
new XPopup.Builder(getContext())
|
||||||
.asCustom(new LuckUserRedPacketPopup(getContext(), data))
|
.asCustom(new LuckUserRedPacketPopup(getContext(), data))
|
||||||
.show();
|
.show();
|
||||||
// } else {
|
} else {
|
||||||
// ToastUtil.show(R.string.no_data);
|
new XPopup.Builder(getContext())
|
||||||
// }
|
.asCustom(new ResultRendPacketPopup(getContext(),
|
||||||
|
true,
|
||||||
|
redPacketInfoModel,
|
||||||
|
isSuperJackpot))
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@
|
|||||||
android:layout_height="45dp" />
|
android:layout_height="45dp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<FrameLayout
|
||||||
android:id="@+id/attention_layout"
|
android:id="@+id/attention_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -201,13 +201,13 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/automatic_chat"
|
android:id="@+id/automatic_chat"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_marginStart="42dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
|
android:layout_marginEnd="74dp"
|
||||||
android:layout_marginBottom="3dp"
|
android:layout_marginBottom="3dp"
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:enabled="false"
|
android:enabled="false"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
@ -219,12 +219,13 @@
|
|||||||
android:id="@+id/btn_attention"
|
android:id="@+id/btn_attention"
|
||||||
android:layout_width="54dp"
|
android:layout_width="54dp"
|
||||||
android:layout_height="26dp"
|
android:layout_height="26dp"
|
||||||
|
android:layout_gravity="end|center_vertical"
|
||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginEnd="11dp"
|
android:layout_marginEnd="11dp"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
android:src="@mipmap/btn_attention" />
|
android:src="@mipmap/btn_attention" />
|
||||||
|
|
||||||
</LinearLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/xyd_complete"
|
android:id="@+id/xyd_complete"
|
||||||
|
Loading…
Reference in New Issue
Block a user