Compare commits
2 Commits
8e5dc5f6f5
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| d646f5d500 | |||
| f7d9e2a0a9 |
@@ -28,8 +28,8 @@ isBuildModule=false
|
||||
#org.gradle.deamon=false
|
||||
android.injected.testOnly=false
|
||||
|
||||
APP_VERSION_NAME=1.3.1.1
|
||||
APP_VERSION_CODE=188
|
||||
APP_VERSION_NAME=1.3.2.2
|
||||
APP_VERSION_CODE=189
|
||||
|
||||
org.gradle.jvm.toolchain.useLegacyAdapters=false
|
||||
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
|
||||
|
||||
@@ -2125,7 +2125,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
|
||||
if (mRoomInfoResp!!.room_auction.auction_list != null) {
|
||||
mRoomInfoResp!!.room_auction.auction_list.clear()
|
||||
}
|
||||
if (mRoomInfoResp!!.room_auction.auction_list != null) {
|
||||
if (mRoomInfoResp!!.room_auction.auction_list != null && text.auction_list != null) {
|
||||
mRoomInfoResp!!.room_auction.auction_list.addAll(text.auction_list)
|
||||
} else {
|
||||
mRoomInfoResp!!.room_auction.auction_list = ArrayList()
|
||||
@@ -3267,7 +3267,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
|
||||
fun roomInfoEvent(messageEvent: UserInfo) {
|
||||
if (messageEvent != null && messageEvent.red_num != null) {
|
||||
inputSting ="# 口令红包 "+ messageEvent.red_num
|
||||
intRed_num=inputSting
|
||||
intRed_num="# 口令红包 "+ messageEvent.red_num
|
||||
dialogDismiss(2)
|
||||
} else if (messageEvent!=null && messageEvent.ta != null){
|
||||
intRed_num=""
|
||||
|
||||
Reference in New Issue
Block a user