diff --git a/app/libs/SudMGP-v1.1.32.200.aar b/app/libs/SudMGP-v1.1.32.200.aar deleted file mode 100644 index f781d255d..000000000 Binary files a/app/libs/SudMGP-v1.1.32.200.aar and /dev/null differ diff --git a/app/libs/SudMGP-v1.3.6.1181.aar b/app/libs/SudMGP-v1.3.6.1181.aar new file mode 100644 index 000000000..ab3eb3804 Binary files /dev/null and b/app/libs/SudMGP-v1.3.6.1181.aar differ diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt index 6796ab3cb..a3366790a 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt @@ -53,6 +53,9 @@ import com.nnbc123.core.room.anotherroompk.ShowUserInfoDialogEvent import com.nnbc123.core.room.bean.RoomContributeDataInfo import com.nnbc123.core.room.bean.RoomContributeUserInfo import com.nnbc123.core.room.bean.RoomInfo +import com.nnbc123.core.room.bean.RoomModeType +import com.nnbc123.core.room.game.GameInfo +import com.nnbc123.core.room.game.GameModel import com.nnbc123.core.room.model.RoomContributeListModel import com.nnbc123.core.room.queuing_mic.event.HasAnimationEffect import com.nnbc123.core.share.ShareModel @@ -66,6 +69,7 @@ import com.nnbc123.core.utils.net.RxHelper import com.nnbc123.library.rxbus.RxBus import com.nnbc123.library.utils.FormatUtils import com.nnbc123.library.utils.JavaUtil +import com.nnbc123.library.utils.ResUtil import com.nnbc123.library.utils.SingleToastUtil import com.trello.rxlifecycle3.android.FragmentEvent import io.reactivex.SingleObserver @@ -240,16 +244,16 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte } //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式! - private val isShowChangeGame: Boolean - get() = false - /* RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo; + private val isShowChangeGame: Boolean get() { + val currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo; return currentRoomInfo != null && AvRoomDataManager.get().isRoomOwner() && currentRoomInfo.getIsPermitRoom() != 1 && currentRoomInfo.getType() != RoomInfo.ROOM_TYPE_SINGLE && (currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE || currentRoomInfo.getRoomModeType() == 2 || - currentRoomInfo.getRoomModeType() == 4);*/ + currentRoomInfo.getRoomModeType() == 4) + } fun setRoomBg(roomInfo: RoomInfo?) { if (_binding == null) return @@ -421,6 +425,34 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte setupFollowRoom() FOLLOW_ROOM_TYPE = if (AvRoomDataManager.get().isRoomFans) "2" else "1" setIdOnlineData() + if (isShowChangeGame) { + initRvGame() + binding.llChangeGame.visibility = View.VISIBLE + if (AvRoomDataManager.get().isOpenGame) { + binding.tvCurrGame.text = it.mgName + } else { + binding.tvCurrGame.text = "扩列交友" + } + GameModel.getGameList() + .compose(bindToLifecycle()) + .subscribe { gameInfos -> + if (AvRoomDataManager.get().isOpenGame) { + for (i in gameInfos.indices) { + val gameInfo: GameInfo = gameInfos[i] + if (gameInfo.mgId.toLongOrNull() == it.mgId) { + gameInfos.removeAt(i) + break + } + } + val gameInfo = GameInfo() + gameInfo.name = "扩列交友" + gameInfos.add(gameInfo) + } + gameAdapter?.setNewData(gameInfos) + } + } else { + binding.llChangeGame.setVisibility(View.GONE) + } } } @@ -520,8 +552,8 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte var imageView: ImageView val avatarList = listOf( binding.ivRank0, - binding.ivRank1, - binding.ivRank2 +// binding.ivRank1, +// binding.ivRank2 ) for (i in avatarList.indices) { imageView = avatarList[i] @@ -538,13 +570,13 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte private fun updateRoomRanks(data: List) { val avatarList = arrayListOf( binding.ivRank0, - binding.ivRank1, - binding.ivRank2 +// binding.ivRank1, +// binding.ivRank2 ) val stvList = arrayListOf( binding.stvRank0, - binding.stvRank1, - binding.stvRank2 +// binding.stvRank1, +// binding.stvRank2 ) for (i in 0 until avatarList.size) { avatarList[i].loadAvatar(data.getOrNull(i)?.avatar) diff --git a/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java b/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java index cc3913073..3130b6ba4 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java +++ b/app/src/main/java/com/nnbc123/app/avroom/game/AppConfig.java @@ -8,8 +8,8 @@ import com.nnbc123.app.BuildConfig; public class AppConfig { - protected static final String APP_ID = "1467745235064848385"; - protected static final String APP_KEY = "BvjLDpWol7OihaYeFebuepx1bZu6cxU5"; + protected static final String APP_ID = "1735573973195948033"; + protected static final String APP_KEY = "r23OylNqnjOBPM0SDgVBfq6RCKMWAc0X"; protected static boolean isTestEnv = BuildConfig.DEBUG; } diff --git a/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt b/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt index c8cbf17cd..d8f121032 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/game/GameDelegate.kt @@ -34,7 +34,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private val TAG = "GameDelegate" private var APP_CODE = "" - private val mRoomID = AvRoomDataManager.get().roomUid.toString() + private val mRoomID :String get() = AvRoomDataManager.get().roomUid.toString() private val mLanguage = "zh-CN" //语言 //调用游戏SDK的接口,成功加载游戏后可用: @@ -84,7 +84,10 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } fun updateGame(mgId: Long?) { - if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return + if (mgId == null || mgId == 0L) return + if (mgId == mMGID && iSudFSTAPP != null) { + return + } mMGID = mgId updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage) @@ -165,7 +168,9 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: ) { iSudFSTAPP?.destroyMG() iSudFSTAPP = SudMGP.loadMG(activity, userID, roomID, code, mgID, language, mISudFSMMG) - addGameView(iSudFSTAPP!!.gameView) + iSudFSTAPP?.apply { + addGameView(gameView) + } } /** @@ -226,6 +231,9 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: LogUtils.d(p0) } + override fun onGameLoadingProgress(p0: Int, p1: Int, p2: Int) { + } + override fun onGameStarted() { } diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index 9907792c2..49cece625 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -169,12 +169,62 @@ android:id="@+id/icon_room_vip" android:layout_width="30dp" android:layout_height="30dp" - android:layout_gravity="center_vertical" + android:layout_marginTop="2.5dp" android:layout_marginEnd="3dp" android:scaleType="fitXY" android:src="@drawable/ic_vip_room_bottom" android:visibility="gone" /> + + + + + + + + + + + + + + - + + + - + + + + + + + - + + + + - + + + + + + + + + + + + - + - + + + + - + + + + + + + - + + + + - + + + + + + + + + + + + - + - - - - - - - - - - - - - diff --git a/app/src/module_mini_world/res/layout/fragment_game_room.xml b/app/src/module_mini_world/res/layout/fragment_game_room.xml index 133c1ff53..213853250 100644 --- a/app/src/module_mini_world/res/layout/fragment_game_room.xml +++ b/app/src/module_mini_world/res/layout/fragment_game_room.xml @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_marginTop="75dp" + android:layout_marginTop="85dp" android:orientation="vertical"> > { + fun getGameList(): Single> { return api.getGameList() .compose(RxHelper.handleBeanData()) .compose(RxHelper.handleSchAndExce()) @@ -34,7 +34,7 @@ object GameModel : BaseModel() { */ @POST("/miniGame/record/miniGameList") fun getGameList( - ): Single>> + ): Single>> /** * diff --git a/core/src/main/java/com/nnbc123/core/room/model/RoomBaseModel.java b/core/src/main/java/com/nnbc123/core/room/model/RoomBaseModel.java index f11681cf7..9d7dd14a9 100644 --- a/core/src/main/java/com/nnbc123/core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/nnbc123/core/room/model/RoomBaseModel.java @@ -568,7 +568,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel { */ @Override public Single updateMyMicQueue(int micPosition, String roomId, UserInfo userInfo) { - return updateMyMicQueue(micPosition, roomId, userInfo); + return updateMyMicQueue(micPosition, roomId, userInfo, false); } @Override diff --git a/gradle.properties b/gradle.properties index 8dc3093e9..20299533c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,5 +29,5 @@ COMPILE_SDK_VERSION=32 MIN_SDK_VERSION=21 TARGET_SDK_VERSION=32 -version_name=1.3.2 -version_code=132 \ No newline at end of file +version_name=2.0.0 +version_code=2000 \ No newline at end of file