TRTC SDK 升级

core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java

@@ -783,9 +783,6 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
             case TXLiteAVCode.ERR_SERVER_INFO_SERVICE_SUSPENDED:
                 errorInfo = "服务不可用。请检查：套餐包剩余分钟数是否大于0，腾讯云账号是否欠费";
                 break;
-            case TXLiteAVCode.ERR_ROOM_REQUEST_QUIT_ROOM_TIMEOUT:
-                errorInfo = "请求退房超时";
-                break;
             case TXLiteAVCode.ERR_CAMERA_START_FAIL:
                 errorInfo = "打开摄像头失败";
                 break;
@@ -888,69 +885,6 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
             case TXLiteAVCode.ERR_CONNECT_OTHER_ROOM_AS_AUDIENCE:
                 errorInfo = "当前是观众角色，不能请求或断开跨房连麦，需要先 switchRole() 到主播";
                 break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_NOT_SUPPORT:
-                errorInfo = "不支持跨房间连麦";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_REACH_MAX_NUM:
-                errorInfo = "达到跨房间连麦上限";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_REACH_MAX_RETRY_TIMES:
-                errorInfo = "跨房间连麦重试次数耗尽";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_REQ_TIMEOUT:
-                errorInfo = "跨房间连麦请求超时";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_REQ:
-                errorInfo = "跨房间连麦请求格式错误";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_NO_SIG:
-                errorInfo = "跨房间连麦无签名";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_DECRYPT_SIG:
-                errorInfo = "跨房间连麦签名解密失败";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_NO_KEY:
-                errorInfo = "未找到跨房间连麦签名解密密钥";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_PARSE_SIG:
-                errorInfo = "跨房间连麦签名解析错误";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_INVALID_SIG_TIME:
-                errorInfo = "跨房间连麦签名时间戳错误";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_SIG_GROUPID:
-                errorInfo = "跨房间连麦签名不匹配";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_NOT_CONNED:
-                errorInfo = "本房间无连麦";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_USER_NOT_CONNED:
-                errorInfo = "本用户未发起连麦";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_FAILED:
-                errorInfo = "跨房间连麦失败";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CANCEL_FAILED:
-                errorInfo = "取消跨房间连麦失败";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CONNED_ROOM_NOT_EXIST:
-                errorInfo = "被连麦房间不存在";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CONNED_REACH_MAX_ROOM:
-                errorInfo = "被连麦房间达到连麦上限";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CONNED_USER_NOT_EXIST:
-                errorInfo = "被连麦用户不存在";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CONNED_USER_DELETED:
-                errorInfo = "被连麦用户已被删除";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_CONNED_USER_FULL:
-                errorInfo = "被连麦用户达到资源上限";
-                break;
-            case TXLiteAVCode.ERR_SERVER_CENTER_CONN_ROOM_INVALID_SEQ:
-                errorInfo = "连麦请求序号错乱";
-                break;
         }
         return errorInfo;
     }
@@ -2678,7 +2612,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
             mLivePlayer.setPlayerView(view);
             mLivePlayer.setRenderRotation(TXLiveConstants.RENDER_ROTATION_PORTRAIT);
             mLivePlayer.setRenderMode(TXLiveConstants.RENDER_MODE_ADJUST_RESOLUTION);
-            mLivePlayer.startPlay(url, PLAY_TYPE_LIVE_FLV);
+            mLivePlayer.startLivePlay(url, PLAY_TYPE_LIVE_FLV);
         }
     }
 

core/src/model_music/java/com/mango/core/music/model/PlayerModel.java

@@ -53,7 +53,7 @@ public class PlayerModel extends BaseModel implements IPlayerModel {
         playerListMusicInfos = new ArrayList<>();
         state = STATE_STOP;
         volume = CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt("volume", 50);
-        recordingVolume = CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt("recordingVolume", 50);
+        recordingVolume = CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt("recordingVolume", 100);
 
         mDisposable = IMNetEaseManager.get().getChatRoomEventObservable()
                 .subscribe(new Consumer<RoomEvent>() {

trtc_release/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('LiteAVSDK_TRTC_9.9.0.26402.aar'))
+artifacts.add("default", file('LiteAVSDK_TRTC_11.0.0.13110.aar'))