diff --git a/app/src/main/res/drawable-xhdpi/ic_bind_success.png b/app/src/main/res/drawable-xhdpi/ic_bind_success.png index e41c61b3f..b093ccf49 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_bind_success.png and b/app/src/main/res/drawable-xhdpi/ic_bind_success.png differ diff --git a/app/src/main/res/layout/dialog_bind_success.xml b/app/src/main/res/layout/dialog_bind_success.xml index cb1976b2d..68525c521 100644 --- a/app/src/main/res/layout/dialog_bind_success.xml +++ b/app/src/main/res/layout/dialog_bind_success.xml @@ -18,7 +18,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/color_333333" - android:textSize="17sp" + android:textSize="15sp" + android:layout_marginTop="@dimen/dp_10" android:text="恭喜你!绑定成功"/> \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java index 6f637e4e1..75cd0af02 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java @@ -67,7 +67,8 @@ public class GiftValueModel extends BaseModel implements IGiftValueModel { public Single upMic(long micUid, int position) { return api.upMic(AvRoomDataManager.get().getRoomUid(), micUid, position,AvRoomDataManager.get().isShowGiftValue()) - .compose(RxHelper.handleBeanData()); + .compose(RxHelper.handleBeanData()) + .compose(RxHelper.handleSchedulers()); } /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java index dfe28102a..f50652490 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java @@ -24,6 +24,7 @@ import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.ListUtils; +import com.yizhuan.xchat_android_library.utils.LogUtil; import java.util.ArrayList; import java.util.List; @@ -151,6 +152,7 @@ public class GiftValueMrg { return; } SparseArray array = AvRoomDataManager.get().mMicQueueMemberMap; + if (array == null) { return; } @@ -164,7 +166,6 @@ public class GiftValueMrg { RoomQueueInfo roomQueueInfo = array.valueAt(i); int key = array.keyAt(i); if (roomQueueInfo != null) { - if (roomQueueInfo.mChatRoomMember != null) { long micUid = JavaUtil.str2long(roomQueueInfo.mChatRoomMember.getAccount()); if (roomQueueInfo.giftValueData == null) { @@ -172,7 +173,6 @@ public class GiftValueMrg { } long value = giftValueArray.get(micUid, 0L); roomQueueInfo.giftValueData.updateValue(value); - } else if (key == -1 && AvRoomDataManager.get().isLeaveMode()) { // 离开模式礼物值变化 long micUid = AvRoomDataManager.get().getRoomUid(); if (roomQueueInfo.giftValueData == null) { @@ -180,7 +180,6 @@ public class GiftValueMrg { } long value = giftValueArray.get(micUid, 0L); roomQueueInfo.giftValueData.updateValue(value); - } } } @@ -211,15 +210,18 @@ public class GiftValueMrg { if (AvRoomDataManager.get().isLeaveMode() && key == -1) { // 离开模式礼物值变化 long micUid = AvRoomDataManager.get().getRoomUid(); long newValue = array.get(micUid, 0L); - giftValueData.updateValue(newValue); - - } else + if (newValue > 0){ + giftValueData.updateValue(newValue); + } + } else{ giftValueData.updateValue(0); - + } } else { long micUid = JavaUtil.str2long(roomQueueInfo.mChatRoomMember.getAccount()); long newValue = array.get(micUid, 0L); - giftValueData.updateValue(newValue); + if (newValue > 0){ + giftValueData.updateValue(newValue); + } } } }