yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

礼物值bugfix

Browse Source
This commit is contained in:
oujunhui
2020-05-19 18:56:30 +08:00
parent 5dd297adef
commit a6138e0e48
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/ic_bind_success.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

7
app/src/main/res/layout/dialog_bind_success.xml
View File

@@ -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="恭喜你！绑定成功"/>
<TextView
@@ -27,10 +28,10 @@
android:layout_height="38dp"
android:gravity="center"
android:textSize="15sp"
android:textColor="@color/color_333333"
android:textColor="@color/white"
android:layout_marginTop="22dp"
android:layout_marginBottom="22dp"
android:background="@drawable/bg_bind_success_close"
android:background="@drawable/bg_common_confirm_normal_22r"
android:text="关闭"/>
</LinearLayout>

3
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java
View File

@@ -67,7 +67,8 @@ public class GiftValueModel extends BaseModel implements IGiftValueModel {
public Single<RoomGiftValue> 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());
}
/**

18
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -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<RoomQueueInfo> 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);
}
}
}
}