Skip to content

【API-Example】【Android】TRTC-Example 高版本权限适配&数字房间号改为字符串房间号 #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bryceezhang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

【API-Example】【Android】TRTC-Example 高版本权限适配&数字房间号改为字符串房间号 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...vanced/CustomCamera/src/main/java/com/tencent/trtc/customcamera/CustomCameraActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;
mTRTCCloud.enterRoom(mTRTCParams, TRTCCloudDef.TRTC_APP_SCENE_LIVE);
Expand Down
2 changes: 1 addition & 1 deletion ...ultipleRoom/src/main/java/com/tencent/trtc/joinmultipleroom/JoinMultipleRoomActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAudience;

Expand Down
2 changes: 1 addition & 1 deletion .../Advanced/LocalRecord/src/main/java/com/tencent/trtc/localrecord/LocalRecordActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private void enterRoom(String roomId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = new Random().nextInt(100000) + 1000000 + "";
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...ed/LocalVideoShare/src/main/java/com/tencent/trtc/mediashare/LocalVideoShareActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;
mTRTCCloud.enterRoom(mTRTCParams, TRTCCloudDef.TRTC_APP_SCENE_LIVE);
Expand Down
2 changes: 1 addition & 1 deletion ...xample/Advanced/PushCDN/src/main/java/com/tencent/trtc/pushcdn/PushCDNAnchorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ private void enterRoom() {
TRTCCloudDef.TRTCParams trtcParams = new TRTCCloudDef.TRTCParams();
trtcParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
trtcParams.userId = mUserId;
trtcParams.roomId = Integer.parseInt(mRoomId);
trtcParams.strRoomId = mRoomId;
trtcParams.userSig = GenerateTestUserSig.genTestUserSig(mUserId);
trtcParams.streamId = mStreamId;
trtcParams.role = TRTCCloudDef.TRTCRoleAnchor;
Expand Down
2 changes: 1 addition & 1 deletion TRTC-API-Example/Advanced/RoomPk/src/main/java/com/tencent/trtc/pk/RoomPKActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...EIMessage/src/main/java/com/tencent/trtc/seimessage/SendAndReceiveSEIMessageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...ced/SetAudioEffect/src/main/java/com/tencent/trtc/audioeffect/SetAudioEffectActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion .../SetAudioQuality/src/main/java/com/tencent/trtc/audioquality/SetAudioQualityActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...xample/Advanced/SetBackgroundMusic/src/main/java/com/tencent/trtc/bgm/SetBGMActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion .../SetRenderParams/src/main/java/com/tencent/trtc/renderparams/SetRenderParamsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion .../SetVideoQuality/src/main/java/com/tencent/trtc/videoquality/SetVideoQualityActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
4 changes: 2 additions & 2 deletions ...ple/Advanced/SwitchRoom/src/main/java/com/tencent/trtc/switchroom/SwitchRoomActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down Expand Up @@ -159,7 +159,7 @@ public static boolean isRoomNumber(String roomId) {

private void switchRoom(String roomId) {
TRTCCloudDef.TRTCSwitchRoomConfig config = new TRTCCloudDef.TRTCSwitchRoomConfig();
config.roomId = Integer.parseInt(roomId);
config.strRoomId = roomId;
mTRTCCloud.switchRoom(config);
}

Expand Down
2 changes: 1 addition & 1 deletion .../ThirdBeauty/src/main/java/com/tencent/trtc/thirdbeauty/ThirdBeautyByteDanceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion .../ThirdBeauty/src/main/java/com/tencent/trtc/thirdbeauty/ThirdBeautyFaceUnityActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...rdBeauty/src/main/java/com/tencent/trtc/thirdbeauty/ThirdBeautyTencentEffectActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private void enterRoom(String roomId, String userId) {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = userId;
mTRTCParams.roomId = Integer.parseInt(roomId);
mTRTCParams.strRoomId = roomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
11 changes: 9 additions & 2 deletions TRTC-API-Example/App/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- Android 12 及以下存储权限 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<!-- Android 13+ 新的媒体权限 -->
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
Expand Down
2 changes: 1 addition & 1 deletion ...xample/Basic/AudioCall/src/main/java/com/tencent/trtc/audiocall/AudioCallingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protected void enterRoom() {
TRTCCloudDef.TRTCParams trtcParams = new TRTCCloudDef.TRTCParams();
trtcParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
trtcParams.userId = mUserId;
trtcParams.roomId = Integer.parseInt(mRoomId);
trtcParams.strRoomId = mRoomId;
trtcParams.userSig = GenerateTestUserSig.genTestUserSig(trtcParams.userId);

mTRTCCloud.enableAudioVolumeEvaluation(2000, true);
Expand Down
2 changes: 1 addition & 1 deletion TRTC-API-Example/Basic/Live/src/main/java/com/tencent/trtc/live/LiveAnchorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void enterRoom() {
mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = mUserId;
mTRTCParams.roomId = Integer.parseInt(mRoomId);
mTRTCParams.strRoomId = mRoomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion TRTC-API-Example/Basic/Live/src/main/java/com/tencent/trtc/live/LiveAudienceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected void enterRoom() {
mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = mUserId;
mTRTCParams.roomId = Integer.parseInt(mRoomId);
mTRTCParams.strRoomId = mRoomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCCloudDef.TRTCRoleAudience;

Expand Down
2 changes: 1 addition & 1 deletion ...le/Basic/ScreenShare/src/main/java/com/tencent/trtc/screenshare/ScreenAnchorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private void enterRoom() {
final TRTCCloudDef.TRTCParams screenParams = new TRTCCloudDef.TRTCParams();
screenParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
screenParams.userId = mUserId;
screenParams.roomId = Integer.parseInt(mRoomId);
screenParams.strRoomId = mRoomId;
screenParams.userSig = GenerateTestUserSig.genTestUserSig(screenParams.userId);
screenParams.role = TRTCRoleAnchor;

Expand Down
2 changes: 1 addition & 1 deletion ...e/Basic/ScreenShare/src/main/java/com/tencent/trtc/screenshare/ScreenAudienceActvity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected void enterRoom() {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = mUserId;
mTRTCParams.roomId = Integer.parseInt(mRoomId);
mTRTCParams.strRoomId = mRoomId;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);
mTRTCParams.role = TRTCRoleAudience;

Expand Down
2 changes: 1 addition & 1 deletion ...xample/Basic/VideoCall/src/main/java/com/tencent/trtc/videocall/VideoCallingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private void enterRoom() {
TRTCCloudDef.TRTCParams trtcParams = new TRTCCloudDef.TRTCParams();
trtcParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
trtcParams.userId = mUserId;
trtcParams.roomId = Integer.parseInt(mRoomId);
trtcParams.strRoomId = mRoomId;
trtcParams.userSig = GenerateTestUserSig.genTestUserSig(trtcParams.userId);

mTRTCCloud.startLocalPreview(mIsFrontCamera, mTXCVVLocalPreviewView);
Expand Down
2 changes: 1 addition & 1 deletion ...oiceChatRoom/src/main/java/com/tencent/trtc/voicechatoom/VoiceChatRoomAnchorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void enterRoom() {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = mUserId;
mTRTCParams.roomId = Integer.parseInt(mRoomId);
mTRTCParams.strRoomId = mRoomId;
mTRTCParams.role = TRTCCloudDef.TRTCRoleAnchor;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);

Expand Down
2 changes: 1 addition & 1 deletion ...ceChatRoom/src/main/java/com/tencent/trtc/voicechatoom/VoiceChatRoomAudienceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void enterRoom() {
TRTCCloudDef.TRTCParams mTRTCParams = new TRTCCloudDef.TRTCParams();
mTRTCParams.sdkAppId = GenerateTestUserSig.SDKAPPID;
mTRTCParams.userId = mUserId;
mTRTCParams.roomId = Integer.parseInt(mRoomId);
mTRTCParams.strRoomId = mRoomId;
mTRTCParams.role = TRTCCloudDef.TRTCRoleAudience;
mTRTCParams.userSig = GenerateTestUserSig.genTestUserSig(mTRTCParams.userId);

Expand Down