diff --git a/Demo/app/build.gradle b/Demo/app/build.gradle index 3f4158bb..ecf3795e 100644 --- a/Demo/app/build.gradle +++ b/Demo/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 14 - versionName "8.5.673" + versionName "8.5.677" multiDexEnabled true ndk { diff --git a/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java b/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java index 1c97ea7f..3f54c751 100644 --- a/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java +++ b/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java @@ -66,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); mTvVersion = (TextView) findViewById(R.id.main_tv_version); - mTvVersion.setText("视频云工具包 v" + TXLiveBase.getSDKVersionStr()+"(8.5.673)"); + mTvVersion.setText("视频云工具包 v" + TXLiveBase.getSDKVersionStr()+"(8.5.677)"); mMainTitle = (TextView) findViewById(R.id.main_title); mMainTitle.setOnLongClickListener(new View.OnLongClickListener() { diff --git a/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java b/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java index 42f2e6b2..64fad109 100644 --- a/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java +++ b/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java @@ -44,7 +44,7 @@ public class SuperPlayerImpl implements SuperPlayer, ITXVodPlayListener, ITXLive private static final String TAG = "SuperPlayerImpl"; private static final int SUPERPLAYER_MODE = 1; private static final int SUPPORT_MAJOR_VERSION = 8; - private static final int SUPPORT_MINOR_VERSION = 2; + private static final int SUPPORT_MINOR_VERSION = 5; private Context mContext; private TXCloudVideoView mVideoView; // 腾讯云视频播放view @@ -447,8 +447,8 @@ private void playVodURL(String url) { } query += "spfileid=" + mFileId + "&spdrmtype=" + drmType + "&spappid=" + mAppId; Uri newUri = uri.buildUpon().query(query).build(); - TXCLog.i(TAG, "playVodURL: newurl = " + newUri.toString() + " ;url= " + url); - ret = mVodPlayer.startPlay(newUri.toString()); + TXCLog.i(TAG, "playVodURL: newurl = " + Uri.decode(newUri.toString()) + " ;url= " + url); + ret = mVodPlayer.startPlay(Uri.decode(newUri.toString())); } else { ret = mVodPlayer.startPlay(url); } diff --git a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/ChatSalonListFragment.java b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/ChatSalonListFragment.java index 6d634e00..66ca266e 100644 --- a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/ChatSalonListFragment.java +++ b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/ChatSalonListFragment.java @@ -142,7 +142,7 @@ public void onRefresh() { private void getRoomList() { mSwipeRefreshLayout.setRefreshing(true); // 首先从后台获取 房间列表的id - RoomManager.getInstance().getRoomList(TCConstants.TYPE_VOICE_ROOM, new RoomManager.GetRoomListCallback() { + RoomManager.getInstance().getRoomList(TCConstants.TYPE_CHAT_SALON, new RoomManager.GetRoomListCallback() { @Override public void onSuccess(final List roomIdList) { if (!CollectionUtils.isEmpty(roomIdList)) { diff --git a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/TCConstants.java b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/TCConstants.java index d67f40ae..5f401e82 100644 --- a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/TCConstants.java +++ b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/list/TCConstants.java @@ -12,8 +12,8 @@ public class TCConstants { */ //用于请求该分类下的列表 public static final String TYPE_VOICE_ROOM = "voiceRoom"; + public static final String TYPE_CHAT_SALON = "chatSalon"; public static final String CMD_REQUEST_TAKE_SEAT = "1"; public static final String CMD_PICK_UP_SEAT = "2"; } - diff --git a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/room/ChatSalonAnchorActivity.java b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/room/ChatSalonAnchorActivity.java index 6f47fa50..8f5098f2 100644 --- a/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/room/ChatSalonAnchorActivity.java +++ b/Demo/trtcchatsalondemo/src/main/java/com/tencent/liteav/trtcchatsalon/ui/room/ChatSalonAnchorActivity.java @@ -77,7 +77,7 @@ public void onClick() { } private void destroyRoom() { - RoomManager.getInstance().destroyRoom(mRoomId, TCConstants.TYPE_VOICE_ROOM, new RoomManager.ActionCallback() { + RoomManager.getInstance().destroyRoom(mRoomId, TCConstants.TYPE_CHAT_SALON, new RoomManager.ActionCallback() { @Override public void onSuccess() { Log.d(TAG, "destroyRoom success"); @@ -114,7 +114,7 @@ private void initAnchor() { mCurrentRole = TRTCCloudDef.TRTCRoleAnchor; //设置昵称、头像 mTRTCChatSalon.setSelfProfile(mUserName, mUserAvatar, null); - RoomManager.getInstance().createRoom(mRoomId, TCConstants.TYPE_VOICE_ROOM, new RoomManager.ActionCallback() { + RoomManager.getInstance().createRoom(mRoomId, TCConstants.TYPE_CHAT_SALON, new RoomManager.ActionCallback() { @Override public void onSuccess() { internalCreateRoom(); diff --git a/Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java b/Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java index 99bd4fcf..4c11ed44 100644 --- a/Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java +++ b/Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java @@ -4,7 +4,7 @@ * 视频上传常量定义 */ public class TVCConstants { - public static final String TVCVERSION = "8.5.10021"; + public static final String TVCVERSION = "8.5.10026"; public static String VOD_SERVER_HOST = "vod2.qcloud.com"; public static String VOD_SERVER_HOST_BAK = "vod2.dnsv1.com"; diff --git a/Demo/ugcvideouploaddemo/src/main/java/com/tencent/liteav/demo/videouploader/model/impl/TVCConstants.java b/Demo/ugcvideouploaddemo/src/main/java/com/tencent/liteav/demo/videouploader/model/impl/TVCConstants.java index 93b2b676..6b448b0b 100644 --- a/Demo/ugcvideouploaddemo/src/main/java/com/tencent/liteav/demo/videouploader/model/impl/TVCConstants.java +++ b/Demo/ugcvideouploaddemo/src/main/java/com/tencent/liteav/demo/videouploader/model/impl/TVCConstants.java @@ -4,7 +4,7 @@ * 视频上传常量定义 */ public class TVCConstants { - public static final String TVCVERSION = "8.5.10021"; + public static final String TVCVERSION = "8.5.10026"; public static String VOD_SERVER_HOST = "vod2.qcloud.com"; public static String VOD_SERVER_HOST_BAK = "vod2.dnsv1.com";