Skip to content

Commit

Permalink
Fix bug, update sdk.
Browse files Browse the repository at this point in the history
  • Loading branch information
garyxgwang committed Mar 18, 2021
1 parent 8f61b4a commit 0500675
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Demo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> roomIdList) {
if (!CollectionUtils.isEmpty(roomIdList)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

0 comments on commit 0500675

Please sign in to comment.