fix;修复红包失效时的入口更新问题
This commit is contained in:
@@ -82,15 +82,18 @@ class RedPackageHandler : RoomHandler() {
|
||||
* 查找最新的厅内红包(新/旧版的厅内红包,非全服红包)
|
||||
*/
|
||||
private fun requestLatestRoomRedPackage() {
|
||||
logD("requestLatestRoomRedPackage()")
|
||||
val roomId = roomContext?.roomId ?: return
|
||||
logD("requestLatestRoomRedPackage() roomId:$roomId")
|
||||
RedPackageModel.getLatestRoomRedPackage(roomId)
|
||||
.compose(bindToLifecycle())
|
||||
.subscribe({ data ->
|
||||
logD("requestLatestRoomRedPackage() data:$data")
|
||||
handleRoomRedPackage(data, false)
|
||||
}, {})
|
||||
}, {
|
||||
if (it.message == "No RedPackage") {
|
||||
updateIcon(null)
|
||||
} else {
|
||||
// 网络等原因的失败,不处理就好
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -152,7 +155,7 @@ class RedPackageHandler : RoomHandler() {
|
||||
} else {
|
||||
if (!inOperation) {
|
||||
RedPackageGoRoomDialog.newInstance(data).show(context)
|
||||
}else{
|
||||
} else {
|
||||
// 需求:正在房间中领取红包时,不展示其他房间的全服红包
|
||||
}
|
||||
}
|
||||
|
@@ -163,7 +163,6 @@ class RedPackageWidget : ConstraintLayout, RoomWidget {
|
||||
* 更新数据
|
||||
*/
|
||||
private fun loadData(data: RedPackageNotifyInfo?) {
|
||||
logD("loadData() data:$data")
|
||||
this.data = data
|
||||
stopCountDown()
|
||||
if (data != null) {
|
||||
|
@@ -58,6 +58,9 @@ object RedPackageModel {
|
||||
.io2main()
|
||||
.handleBeanData()
|
||||
.toObservable().map {
|
||||
if (it.isEmpty()) {
|
||||
throw NullPointerException("No RedPackage")
|
||||
}
|
||||
val item = it.last()
|
||||
RedPackageNotifyInfo(
|
||||
redEnvelopeId = item.id,
|
||||
|
Reference in New Issue
Block a user