From 7fc1285ad7c922b8caa0727aa3608d0d4bbc0a32 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 26 Nov 2023 12:01:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/fragment/GameRoomFragment.kt | 196 ----- .../avroom/fragment/HomePartyFragment.java | 20 +- .../com/chwl/app/avroom/game/AppConfig.java | 15 - .../com/chwl/app/avroom/game/GameDelegate.kt | 673 ------------------ .../avroom/game/OnGameStatusChangeListener.kt | 13 - .../chwl/app/avroom/game/SudMGPAPPState.java | 61 -- .../chwl/app/avroom/game/SudMGPMGState.java | 125 ---- .../res/layout/fragment_game_room.xml | 155 ---- 8 files changed, 5 insertions(+), 1253 deletions(-) delete mode 100644 app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt delete mode 100644 app/src/main/java/com/chwl/app/avroom/game/AppConfig.java delete mode 100644 app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt delete mode 100644 app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt delete mode 100644 app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java delete mode 100644 app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java delete mode 100644 app/src/module_mini_world/res/layout/fragment_game_room.xml diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt deleted file mode 100644 index 5c030aaa7..000000000 --- a/app/src/main/java/com/chwl/app/avroom/fragment/GameRoomFragment.kt +++ /dev/null @@ -1,196 +0,0 @@ -package com.chwl.app.avroom.fragment - -import android.annotation.SuppressLint -import android.os.Bundle -import android.view.View -import androidx.core.view.isInvisible -import androidx.core.view.isVisible -import androidx.databinding.DataBindingUtil -import com.chwl.app.R -import com.chwl.app.avroom.adapter.GameMicroViewAdapter -import com.chwl.app.avroom.adapter.GameMiniMicroViewAdapter -import com.chwl.app.avroom.adapter.OnMicroItemClickListener -import com.chwl.app.avroom.firstcharge.FirstChargePrizeDialog -import com.chwl.app.avroom.game.GameDelegate -import com.chwl.app.avroom.game.OnGameStatusChangeListener -import com.chwl.app.avroom.presenter.GameRoomPresenter -import com.chwl.app.avroom.redpackage.RedPackageWidget -import com.chwl.app.avroom.view.IGameRoomView -import com.chwl.app.databinding.FragmentGameRoomBinding -import com.chwl.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener -import com.chwl.core.home.bean.BannerInfo -import com.chwl.core.manager.AvRoomDataManager -import com.chwl.core.music.model.PlayerModel -import com.chwl.core.pay.event.FirstChargeEvent -import com.chwl.core.room.event.FinishAvRoomEvent -import com.chwl.library.base.factory.CreatePresenter -import org.greenrobot.eventbus.Subscribe -import org.greenrobot.eventbus.ThreadMode - -/** - * 轰趴房间 - * - * @author chenran - * @date 2017/7/26 - */ -@CreatePresenter(GameRoomPresenter::class) -class GameRoomFragment : BaseRoomFragment(), - View.OnClickListener, OnGiftDialogBtnClickListener, IGameRoomView, OnMicroItemClickListener, - OnGameStatusChangeListener { - - companion object { - @JvmStatic - fun newInstance(): GameRoomFragment { - val roomFragment = GameRoomFragment() - val bundle = Bundle() - roomFragment.arguments = bundle - return roomFragment - } - } - - private lateinit var gameBinding: FragmentGameRoomBinding - private lateinit var gameDelegate: GameDelegate - private var isShowMiniMic = false - - override fun getRootLayoutId(): Int { - return R.layout.fragment_game_room - } - - override fun onFindViews() { - super.onFindViews() - gameBinding = DataBindingUtil.bind(mView)!! - gameBinding.lifecycleOwner = this - gameBinding.click = this - gameBinding.ktvModel = false - gameDelegate = GameDelegate( - requireActivity(), - gameBinding.flGameContainer, - AvRoomDataManager.get().mCurrentRoomInfo?.mgId - ) - gameDelegate.setOnGameStatusChangeListener(this) - } - - - @SuppressLint("CheckResult") - override fun initiate() { - gameBinding.microView.bindAdapter(GameMicroViewAdapter(context)) - super.initiate() - //游戏模式暂时不需要这个 - PlayerModel.get().stop() - gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo - gameBinding.tvShowMiniMic.setOnClickListener { showMiniMic() } - gameBinding.ivShowMic.setOnClickListener { showMic() } - } - - private fun showMiniMic() { - if (isShowMiniMic) return - isShowMiniMic = true - gameBinding.microView.bindAdapter(GameMiniMicroViewAdapter(context).apply { - setOnClick { showMic() } - }) - gameBinding.tvShowMiniMic.isVisible = false - gameBinding.microView.postDelayed({ - gameBinding.ivShowMic.isVisible = true - gameBinding.llMicView.setBackgroundResource(R.drawable.bg_mini_mic_entrance) - }, 100) - } - - private fun showMic() { - if (!isShowMiniMic) return - isShowMiniMic = false - gameBinding.microView.bindAdapter(GameMicroViewAdapter(context)) - gameBinding.tvShowMiniMic.isVisible = true - gameBinding.llMicView.background = null - gameBinding.ivShowMic.isVisible = false - } - - override fun onSetListener() { - super.onSetListener() - bottomView.setBottomViewListener(BaseRoomBottomViewWrapper()) - } - - override fun updateView() { - super.updateView() - gameDelegate.updateGame(AvRoomDataManager.get().mCurrentRoomInfo?.mgId) - gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo - if (isSixMic()) { - gameBinding.tvShowMiniMic.isVisible = !isShowMiniMic - gameBinding.ivShowMic.isVisible = isShowMiniMic - } else { - showMic() - gameBinding.tvShowMiniMic.isInvisible = true - gameBinding.ivShowMic.isVisible = false - } - gameBinding.microView.adapter.notifyDataSetChanged() - } - - override fun onGameStart() { - if (isSixMic()) { - showMiniMic() - } - } - - override fun onGameEnd() { - if (isSixMic()) { - showMic() - } - } - - private fun isSixMic(): Boolean { - return AvRoomDataManager.get().mgMicNum == AvRoomDataManager.GAME_DEF_MIC_COUNT - } - - override fun onSendMsgSuccess(msg: String?) { - super.onSendMsgSuccess(msg) - msg?.let { - if (AvRoomDataManager.get().isSelfGamePlaying) { - gameDelegate.hitTheMark(msg) - } - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun onFinishAvRoomEvent(event: FinishAvRoomEvent) { - gameDelegate.exitGame() - } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun onFirstRechargeEvent(event: FirstChargeEvent) { - FirstChargePrizeDialog( - requireContext(), - event.chargeProdTitle, - event.firstChargeRewardList - ).openDialog() - } - - override fun onStart() { - super.onStart() - gameDelegate.onStart() - } - - override fun onResume() { - super.onResume() - gameDelegate.onResume() - } - - - override fun onPause() { - super.onPause() - gameDelegate.onPause() - } - - override fun onStop() { - super.onStop() - gameDelegate.onStop() - } - - override fun onDestroy() { - gameDelegate.onDestroy() - super.onDestroy() - } - - override fun initWidget() { - super.initWidget() - registerWidget(RedPackageWidget::class.java.simpleName, gameBinding.redPackageWidget) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index 6d3747e04..bec39e929 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -14,11 +14,8 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.core.content.ContextCompat; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; @@ -29,14 +26,12 @@ import com.trello.rxlifecycle3.android.FragmentEvent; import com.chwl.app.R; import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.avroom.activity.RoomOnlineUserActivity; -import com.chwl.app.avroom.adapter.SelectGameAdapter; import com.chwl.app.avroom.dialog.ExitRoomPopupWindow; import com.chwl.app.avroom.widget.GiftV2View; import com.chwl.app.avroom.widget.RoomEffectView; import com.chwl.app.base.BaseFragment; import com.chwl.app.databinding.FragmentChatroomGameMainBinding; import com.chwl.app.friend.view.SelectFriendActivity; -import com.chwl.app.home.helper.OpenRoomHelper; import com.chwl.app.ui.widget.ShareDialog; import com.chwl.app.utils.RegexUtil; import com.chwl.core.gift.bean.GiftMultiReceiverInfo; @@ -44,7 +39,6 @@ import com.chwl.core.gift.bean.GiftReceiveInfo; import com.chwl.core.gift.bean.LuckyBagGifts; import com.chwl.core.gift.bean.MultiGiftReceiveInfo; import com.chwl.core.home.event.FollowRoomEvent; -import com.chwl.core.home.event.ShareRoomEvent; import com.chwl.core.home.model.CollectionRoomModel; import com.chwl.core.im.custom.bean.CustomAttachment; import com.chwl.core.im.custom.bean.RoomInfoAttachment; @@ -55,15 +49,12 @@ import com.chwl.core.manager.IMNetEaseManager; import com.chwl.core.manager.RoomEvent; import com.chwl.core.praise.PraiseModel; import com.chwl.core.room.bean.RoomInfo; -import com.chwl.core.room.game.GameInfo; -import com.chwl.core.room.game.GameModel; import com.chwl.core.room.queuing_mic.event.HasAnimationEffect; import com.chwl.core.share.ShareModel; import com.chwl.core.super_admin.util.SuperAdminUtil; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.Logger; -import com.chwl.library.utils.JavaUtil; import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.SingleToastUtil; @@ -72,7 +63,6 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.lang.reflect.Field; -import java.util.Objects; import cn.sharesdk.framework.Platform; import io.reactivex.SingleObserver; @@ -433,11 +423,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe Fragment tempFragment = roomFragment; switch (currentRoomInfo.getType()) { - case RoomInfo.ROOMTYPE_GAME: - if (!(tempFragment instanceof GameRoomFragment)) { - tempFragment = GameRoomFragment.newInstance(); - } - break; +// case RoomInfo.ROOMTYPE_GAME: +// if (!(tempFragment instanceof GameRoomFragment)) { +// tempFragment = GameRoomFragment.newInstance(); +// } +// break; case RoomInfo.ROOM_TYPE_SINGLE: if (!(tempFragment instanceof SingleRoomFragment)) { tempFragment = SingleRoomFragment.newInstance(); diff --git a/app/src/main/java/com/chwl/app/avroom/game/AppConfig.java b/app/src/main/java/com/chwl/app/avroom/game/AppConfig.java deleted file mode 100644 index cdcfb7102..000000000 --- a/app/src/main/java/com/chwl/app/avroom/game/AppConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright © Sud.Tech - https://sud.tech - */ -package com.chwl.app.avroom.game; - -import com.chwl.library.BuildConfig; - -public class AppConfig { - - protected static final String APP_ID = "1578948593831571457"; - protected static final String APP_KEY = "J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd"; - protected static boolean isTestEnv = BuildConfig.DEBUG; - -} diff --git a/app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt b/app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt deleted file mode 100644 index 7b332d379..000000000 --- a/app/src/main/java/com/chwl/app/avroom/game/GameDelegate.kt +++ /dev/null @@ -1,673 +0,0 @@ -package com.chwl.app.avroom.game - -import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context -import android.os.Handler -import android.os.Looper -import android.text.TextUtils -import android.util.Log -import android.view.View -import android.view.ViewTreeObserver.OnGlobalLayoutListener -import android.widget.FrameLayout -import com.google.gson.Gson -import com.chwl.app.R -import com.chwl.core.auth.AuthModel -import com.chwl.core.manager.AvRoomDataManager -import com.chwl.core.room.game.GameCfg -import com.chwl.core.room.game.GameModel -import com.chwl.core.room.game.GameStatus -import com.chwl.core.room.model.HomePartyModel -import com.chwl.core.user.UserModel -import com.chwl.core.utils.LogUtils -import com.chwl.core.utils.net.RxHelper -import com.chwl.library.net.rxnet.callback.CallBack -import com.chwl.library.utils.SingleToastUtil -import okhttp3.* -import org.json.JSONException -import org.json.JSONObject -import tech.sud.mgp.core.* -import java.util.* - -class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: Long?) { - - private val TAG = "GameDelegate" - private var APP_CODE = "" - - private val mRoomID = AvRoomDataManager.get().roomUid.toString() - private val mLanguage = "zh-TW" //語言 - - //調用遊戲SDK的接口,成功加載遊戲後可用: - private var iSudFSTAPP: ISudFSTAPP? = null - - private val gson = Gson() - - //小遊戲ID - private var mMGID = 0L - - //通用狀態-遊戲，關鍵詞 - private var mKeyWord: String? = null - private val mUid = AuthModel.get().currentUid.toString() - - private val homePartyModel = HomePartyModel() - - private var onGameStatusChangeListener: OnGameStatusChangeListener? = null - - fun setOnGameStatusChangeListener(onGameStatusChangeListener: OnGameStatusChangeListener) { - this.onGameStatusChangeListener = onGameStatusChangeListener - } - - private val loginCallback: AppLoginListener = - object : AppLoginListener { - override fun onLoginFailure(err: String?) { - SingleToastUtil.showToast(err) - } - - override fun onLoginSuccess(new_code: String, expire_Date: Long) { - APP_CODE = new_code - Handler(Looper.getMainLooper()).post { - //初始化遊戲SDK - initGameSDK( - activity, - AppConfig.APP_ID, - AppConfig.APP_KEY, - AppConfig.isTestEnv - ) - } - } - - } - - init { - mMGID = mgId ?: 0L - login(loginCallback) - } - - fun updateGame(mgId: Long?) { - if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return - mMGID = mgId - updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) - loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage) - } - - fun exitGame() { - UserModel.get().cacheLoginUserInfo?.gameStatus = GameStatus.STATUS_NOT_JOIN - notifySelfPlayingState(false) - notifySelfInState(false) - } - - /** - * 例如"你畫我猜"遊戲的文字命中 - */ - fun hitTheMark(msg: String) { - mKeyWord?.let { - if (msg.contains(it)) { - notifySelfTextHit(it, msg) - } - } - } - - /** - * "接入方客戶端"登陸接口, 從"接入方服務端"獲得Code - * "接入方服務端"是通過"服務端接入SDK"獲得Code來返回給"接入方客戶端"的 - * @param listener - */ - @SuppressLint("CheckResult") - private fun login(listener: AppLoginListener) { - GameModel.getGameCode() - .compose(RxHelper.bindContext(activity)) - .subscribe({ - listener.onLoginSuccess(it.code, it.expireDate) - }, { - listener.onLoginFailure(it.message) - }) - - } - - /** - * 1，初始化遊戲SDK - * - * @param context 上下文 - * @param appID appID - * @param appKey appKey - * @param isTestEnv 是否是測試環境，true：測試環境，false：正式環境 - */ - private fun initGameSDK(context: Context, appID: String, appKey: String, isTestEnv: Boolean) { - SudMGP.initSDK(context, appID, appKey, isTestEnv, object : ISudListenerInitSDK { - override fun onSuccess() { - loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage) - } - - override fun onFailure(code: Int, errInfo: String) { - showToast("初始化遊戲SDK失敗:$code--errInfo:$errInfo") - } - }) - - } - - /** - * 2，加載遊戲 - * - * @param activity 上下文Activity - * @param userID 用戶ID，業務系統保證每個用戶擁有唯一ID - * @param roomID 房間ID，進入同一房間內的 - * @param code 令牌 - * @param mgID 小遊戲ID - * @param language 遊戲語言 現支持，簡體：zh-CN 繁體：zh-TW 英語：en-US 馬來語：ms-MY - */ - private fun loadMG( - activity: Activity, - userID: String, - roomID: String, - code: String, - mgID: Long, - language: String - ) { - iSudFSTAPP?.destroyMG() - iSudFSTAPP = SudMGP.loadMG(activity, userID, roomID, code, mgID, language, mISudFSMMG) - iSudFSTAPP?.apply { - addGameView(gameView) - } - } - - /** - * 3，將遊戲view添加到我們的布局當中 - * - * @param gameView - */ - private fun addGameView(gameView: View) { - container.removeAllViews() - container.addView(gameView) - } - - private fun showToast(content: String?) { - SingleToastUtil.showToast(content) - } - - - /** - * 通知"文字命中狀態"到遊戲端 - * - * @param iSudFSTAPP - * @param keyWord - */ - private fun notifySelfTextHit(keyWord: String?, msg: String) { - LogUtils.d("notifySelfTextHit") - try { - //狀態名稱 - val state: String = SudMGPAPPState.APP_COMMON_SELF_TEXT_HIT - - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("isHit", true) // true 命中，false 未命中 - jsonObject.put("keyWord", keyWord) // true 命中，false 未命中 - jsonObject.put("text", msg) // 聊天原始內容，這裏的值只是一個示例，意指內容當中包含關鍵詞則命中，具體按業務規則定。 - val dataJson = jsonObject.toString() - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - /** - * 設置當前關鍵詞 - * - * @param keyWord - */ - private fun setKeyWord(keyWord: String?) { - mKeyWord = keyWord - } - - /** - * 遊戲SDK調用app的接口 - */ - private val mISudFSMMG: ISudFSMMG = object : ISudFSMMG { - - override fun onGameLog(p0: String?) { - LogUtils.d(p0) - } - - override fun onGameLoadingProgress(p0: Int, p1: Int, p2: Int) { - - } - - override fun onGameStarted() { - } - - override fun onGameDestroyed() { - } - - /** - * 回調此方法，表示令牌過期，此時需要刷新令牌並使用ISudFSMStateHandle回調 - * @param handle - * @param dataJson - */ - override fun onExpireCode(handle: ISudFSMStateHandle, dataJson: String) { - login(object : AppLoginListener { - override fun onLoginFailure(err: String?) { - - } - - override fun onLoginSuccess(new_code: String, expire_Date: Long) { - APP_CODE = new_code - try { - val jsonObject = JSONObject() - jsonObject.put("ret_code", 0) - jsonObject.put("ret_msg", "success") - handle.success(jsonObject.toString()) - } catch (e: JSONException) { - e.printStackTrace() - } - iSudFSTAPP?.updateCode(APP_CODE, null) - } - - }) - } - - /** - * 處理獲取遊戲視圖信息 - * @param handle - * @param dataJson - */ - override fun onGetGameViewInfo(handle: ISudFSMStateHandle, dataJson: String) { - //拿到遊戲View的寬高 - val gameViewWidth = container.measuredWidth - val gameViewHeight = container.measuredHeight - if (gameViewWidth > 0 && gameViewHeight > 0) { - notifyGameViewInfo(handle, gameViewWidth, gameViewHeight) - return - } - - //如果遊戲View未加載完成，則監聽加載完成時回調 - container.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener { - override fun onGlobalLayout() { - container.viewTreeObserver.removeOnGlobalLayoutListener(this) - val width = container.measuredWidth - val height = container.measuredHeight - notifyGameViewInfo(handle, width, height) - } - }) - } - - override fun onGetGameCfg(handle: ISudFSMStateHandle?, p1: String?) { - handle?.success(gson.toJson(GameCfg())) - } - - /** - * 通知遊戲，遊戲視圖信息 - * @param handle - * @param gameViewWidth - * @param gameViewHeight - */ - private fun notifyGameViewInfo( - handle: ISudFSMStateHandle, - gameViewWidth: Int, - gameViewHeight: Int - ) { - try { - val jsonObject = JSONObject() - jsonObject.put("ret_code", 0) - jsonObject.put("ret_msg", "success") - - //遊戲View大小 - val viewSize = JSONObject() - viewSize.put("width", gameViewWidth) - viewSize.put("height", gameViewHeight) - jsonObject.put("view_size", viewSize) - - //遊戲安全操作區域 - val viewGameRect = JSONObject() - viewGameRect.put("left", 0) - viewGameRect.put("top", container.context.resources.getDimensionPixelOffset(R.dimen.dp_180)) - viewGameRect.put("right", 0) - viewGameRect.put("bottom", container.context.resources.getDimensionPixelOffset(R.dimen.dp_150)) - jsonObject.put("view_game_rect", viewGameRect) - - //通知遊戲 - val json = jsonObject.toString() - Log.d(TAG, "notifyGameViewInfo:$json") - handle.success(json) - } catch (e: JSONException) { - e.printStackTrace() - } - } - - /** - * 遊戲狀態變化 - * @param handle - * @param state 狀態名 - * @param dataJson 狀態數據，json字符串 - */ - override fun onGameStateChange( - handle: ISudFSMStateHandle, - state: String, - dataJson: String - ) { - Log.d(TAG, "onGameStateChange state:$state--dataJson:$dataJson") - when (state) { - //SudMGPMGState.MG_COMMON_PUBLIC_MESSAGE -> showToast("遊戲：公屏消息") - SudMGPMGState.MG_COMMON_KEY_WORD_TO_HIT -> { - if (TextUtils.isEmpty(dataJson)) { - setKeyWord(null) - } else { - try { - val jsonObject = JSONObject(dataJson) - if (jsonObject.isNull("word")) { - setKeyWord(null) - } else { - val keyWord = jsonObject.getString("word") - setKeyWord(keyWord) - } - } catch (e: Exception) { - e.printStackTrace() - } - } - } - SudMGPMGState.APP_COMMON_SELF_CLICK_JOIN_BTN -> { - - try { - val jsonObject = JSONObject(dataJson) - val seatIndex = jsonObject.optInt("seatIndex", -1) - updateMyMicQueue(GameStatus.STATUS_NOT_READY, true, seatIndex) - } catch (e: Exception) { - e.printStackTrace() - } - - } - SudMGPMGState.APP_COMMON_SELF_CLICK_START_BTN -> { - notifySelfPlayingState(true) - } - SudMGPMGState.MG_COMMON_GAME_STATE -> handleGameState(dataJson) - } - } - - /** - * 玩家狀態變化 - * @param handle - * @param userId 玩家用戶ID - * @param state 狀態名 - * @param dataJson 狀態數據，json字符串。參考文檔 - */ - override fun onPlayerStateChange( - handle: ISudFSMStateHandle, - userId: String, - state: String, - dataJson: String - ) { - Log.d(TAG, "onPlayerStateChange userId:$userId--state:$state--dataJson:$dataJson") - when (state) { - SudMGPMGState.MG_COMMON_PLAYER_IN -> handlePlayerIn(userId, dataJson) - SudMGPMGState.MG_COMMON_PLAYER_READY -> handlePlayerReady(userId, dataJson) - SudMGPMGState.MG_COMMON_PLAYER_CAPTAIN -> handlePlayerCaptain(dataJson) - SudMGPMGState.MG_COMMON_PLAYER_PLAYING -> handlePlayerPlaying(userId, dataJson) - } - } - } - - private fun handlePlayerIn(userId: String, dataJson: String) { - if (userId != mUid) return - try { - val jsonObject = JSONObject(dataJson) - val retCode = jsonObject.getInt("retCode") - val isIn = jsonObject.getBoolean("isIn") - if (retCode != 0) { - return - } - if (isIn) { // 已加入 - if (AvRoomDataManager.get().isRoomOwner) { - notifySelfCaptainState(mUid) - } - } else { // 未加入 - var reason = 0 - if (jsonObject.has("reason")) { - reason = jsonObject.getInt("reason") - } - if (reason == 0) { - updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) - } else if (reason == 1) { - updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) - } - } - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun updateMyMicQueue(gameStatus: Int, isJoin: Boolean = false, seatIndex: Int = -1) { - UserModel.get().cacheLoginUserInfo?.gameStatus = gameStatus - val position = AvRoomDataManager.get().getMicPosition(mUid) - if (position != AvRoomDataManager.POSITON_NOT_ON_MIC) { - if (isJoin) notifySelfInState(true, seatIndex) - homePartyModel.updateMyMicQueue( - position, - AvRoomDataManager.get().roomId.toString(), - UserModel.get().cacheLoginUserInfo - ).subscribe() - } else if (isJoin) { - val upPosition = AvRoomDataManager.get().findGamePosition() - if (upPosition == Int.MIN_VALUE) { - showToast("當前遊戲人數已滿!") - } else { - UserModel.get().cacheLoginUserInfo?.gameStatus = 1 - homePartyModel.upMicroPhone(upPosition, - mUid, - AvRoomDataManager.get().roomId.toString(), - false, object : CallBack { - override fun onSuccess(data: String?) { - notifySelfInState(true, seatIndex) - } - - override fun onFail(code: Int, error: String?) { - showToast(error) - } - - }) - } - } - } - - private fun handlePlayerReady(userId: String, dataJson: String) { - if (userId != mUid) return - try { - val jsonObject = JSONObject(dataJson) - val retCode = jsonObject.getInt("retCode") - val isReady = jsonObject.getBoolean("isReady") - if (retCode != 0) { - return - } - updateMyMicQueue(if (isReady) GameStatus.STATUS_READY else GameStatus.STATUS_NOT_READY) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun handlePlayerCaptain(dataJson: String) { - try { - val jsonObject = JSONObject(dataJson) - val retCode = jsonObject.getInt("retCode") - if (retCode != 0) { - return - } - - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun handleGameState(dataJson: String) { - try { - val jsonObject = JSONObject(dataJson) - val gameState = jsonObject.getInt("gameState") - if (gameState == 0) { - onGameStatusChangeListener?.onGameEnd() - } else if (gameState == 2) { - onGameStatusChangeListener?.onGameStart() - } - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun handlePlayerPlaying(userId: String, dataJson: String) { - if (userId != mUid) return - try { - val jsonObject = JSONObject(dataJson) - val retCode = jsonObject.getInt("retCode") - if (retCode != 0) { - return - } - val isPlaying = jsonObject.getBoolean("isPlaying") - if (isPlaying) { - updateMyMicQueue(GameStatus.STATUS_PLAYING) - } else { - updateMyMicQueue(GameStatus.STATUS_NOT_READY) - } - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfInState(isIn: Boolean, seatIndex: Int = -1) { - try { - if (!isIn) { - notifySelfReadyState(false) - } - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_IN - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("isIn", isIn) // true 加入遊戲，false 退出遊戲 - if (seatIndex != -1) { - jsonObject.put("seatIndex", seatIndex) - } - jsonObject.put("teamId", 1) //哪一隊伍(2v2,4v4) - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfReadyState(isReady: Boolean) { - try { - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_READY - - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("isReady", isReady) // true 準備，false 取消準備 - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfPlayingState(isPlaying: Boolean) { - try { - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_PLAYING - - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("isPlaying", isPlaying) // true 開始遊戲，false 結束遊戲 - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfCaptainState(uid: String) { - try { - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_CAPTAIN - - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("curCaptainUID", uid) // 必填，指定隊長uid - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfKickState(uid: String) { - try { - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_KICK - - //狀態數據 - val jsonObject = JSONObject() - jsonObject.put("kickedUID", uid) // 被踢用戶uid - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - private fun notifySelfEndState() { - try { - //狀態名稱 - val state = SudMGPAPPState.APP_COMMON_SELF_END - - //狀態數據 - val jsonObject = JSONObject() - val dataJson = jsonObject.toString() - - //調用接口 - iSudFSTAPP?.notifyStateChange(state, dataJson, null) - } catch (e: Exception) { - e.printStackTrace() - } - } - - fun onStart() { - iSudFSTAPP?.startMG() //啟動遊戲 - } - - fun onResume() { - iSudFSTAPP?.playMG() //開始遊戲 - } - - fun onPause() { - iSudFSTAPP?.pauseMG() //暫停遊戲 - } - - fun onStop() { - iSudFSTAPP?.stopMG() //停止遊戲 - } - - fun onDestroy() { - updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) - iSudFSTAPP?.destroyMG() - } - -} - -internal interface AppLoginListener { - /** - * App Server 登陸失敗, App Server 不能返回CODE - */ - fun onLoginFailure(err: String?) - - /** - * App Server 登陸成功, App Server調用服務端接入SDK的API獲取Code 返回給 App - * App 就要用CODE和自己生成的UserID去調用SDK的初始化函數，登陸小遊戲 - * 小遊戲登陸成功後，其UserID，就是App傳的UserID - */ - fun onLoginSuccess(new_code: String, expire_Date: Long) -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt b/app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt deleted file mode 100644 index 0b5fc1e14..000000000 --- a/app/src/main/java/com/chwl/app/avroom/game/OnGameStatusChangeListener.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.chwl.app.avroom.game - -interface OnGameStatusChangeListener { - /** - * 游戏开始 - */ - fun onGameStart() - - /** - * 游戏结束 - */ - fun onGameEnd() -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java b/app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java deleted file mode 100644 index 667b34c45..000000000 --- a/app/src/main/java/com/chwl/app/avroom/game/SudMGPAPPState.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - Copyright © Sud.Tech - https://sud.tech - */ -package com.chwl.app.avroom.game; - -/** - * Time:2021/10/19 - * Description: APP to MG 的状态定义 - */ -public class SudMGPAPPState { - - // region 通用状态 - - /** - * 加入状态 - * 最低版本: v1.1.30.xx - */ - public static final String APP_COMMON_SELF_IN = "app_common_self_in"; - - /** - * 准备状态 - * 最低版本: v1.1.30.xx - */ - public static final String APP_COMMON_SELF_READY = "app_common_self_ready"; - - /** - * 游戏状态 - * 最低版本: v1.1.30.xx - */ - public static final String APP_COMMON_SELF_PLAYING = "app_common_self_playing"; - - /** - * 队长状态 - * 最低版本: v1.1.30.xx - */ - public static final String APP_COMMON_SELF_CAPTAIN = "app_common_self_captain"; - - /** - * 踢人 - * v1.1.30.xx - */ - public static final String APP_COMMON_SELF_KICK = "app_common_self_kick"; - - /** - * 结束游戏 - * v1.1.30.xx - */ - public static final String APP_COMMON_SELF_END = "app_common_self_end"; - - /** - * 麦克风状态 - */ - public static final String APP_COMMON_SELF_MICROPHONE = "app_common_self_microphone"; - - /** - * 文字命中状态 - */ - public static final String APP_COMMON_SELF_TEXT_HIT = "app_common_self_text_hit"; - -} diff --git a/app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java b/app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java deleted file mode 100644 index b4309738e..000000000 --- a/app/src/main/java/com/chwl/app/avroom/game/SudMGPMGState.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - Copyright © Sud.Tech - https://sud.tech - */ -package com.chwl.app.avroom.game; - -/** - * Time:2021/10/19 - * Description: MG to APP 的状态定义 - */ -public class SudMGPMGState { - - // region 通用状态-游戏 - - /** - * 公屏消息 （已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_PUBLIC_MESSAGE = "mg_common_public_message"; - - /** - * 关键词状态 - */ - public static final String MG_COMMON_KEY_WORD_TO_HIT = "mg_common_key_word_to_hit"; - - // endregion 通用状态-游戏 - - - // region 通用状态-玩家 - - /** - * 加入状态 （已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_PLAYER_IN = "mg_common_player_in"; - - /** - * 准备状态 （已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_PLAYER_READY = "mg_common_player_ready"; - - /** - * 队长状态 （已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_PLAYER_CAPTAIN = "mg_common_player_captain"; - - /** - * 游戏状态 （已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_PLAYER_PLAYING = "mg_common_player_playing"; - - /** - * 游戏状态（已修改） - * 最低版本: v1.1.30.xx - */ - public static final String MG_COMMON_GAME_STATE = "mg_common_game_state"; - - // endregion 通用状态-玩家 - - - // region 碰碰我最强 - // endregion 碰碰我最强 - - // region 飞刀达人 - // endregion 飞刀达人 - - // region 你画我猜 - - /** - * 选词中 - */ - public static final String MG_DG_SELECTING = "mg_dg_selecting"; - - /** - * 作画中 - */ - public static final String MG_DG_PAINTING = "mg_dg_painting"; - - /** - * 错误答案 - */ - public static final String MG_DG_ERRORANSWER = "mg_dg_erroranswer"; - - /** - * 总积分 - */ - public static final String MG_DG_TOTALSCORE = "mg_dg_totalscore"; - - /** - * 本次积分 - */ - public static final String MG_DG_SCORE = "mg_dg_score"; - - // endregion 你画我猜 - - - /** - * 加入游戏按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_JOIN_BTN = "mg_common_self_click_join_btn"; - /** - * 取消加入游戏按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_CANCEL_JOIN_BTN = "mg_common_self_click_cancel_join_btn"; - /** - * 准备按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_READY_BTN = "mg_common_self_click_ready_btn"; - /** - * 取消准备按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_CANCEL_READY_BTN = "mg_common_self_click_cancel_ready_btn"; - /** - * 开始游戏按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_START_BTN = "mg_common_self_click_start_btn"; - /** - * 分享按钮点击状态 - */ - public static final String APP_COMMON_SELF_CLICK_SHARE_BTN = "mg_common_self_click_share_btn"; - -} 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 deleted file mode 100644 index 5e2ca8b16..000000000 --- a/app/src/module_mini_world/res/layout/fragment_game_room.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file