diff --git a/AR-Android-Tutorial-1to1/sample/app/build.gradle b/AR-Android-Tutorial-1to1/sample/app/build.gradle index f59e2d0..f83a096 100644 --- a/AR-Android-Tutorial-1to1/sample/app/build.gradle +++ b/AR-Android-Tutorial-1to1/sample/app/build.gradle @@ -36,5 +36,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation project(path: ':logger') - implementation 'org.ar:rtc:4.0.1.0' + implementation 'org.ar:rtc:4.1.0.1' } \ No newline at end of file diff --git a/AR-Android-Tutorial-1to1/sample/app/src/main/java/org/ar/ar_android_tutorial_1to1/VideoActivity.java b/AR-Android-Tutorial-1to1/sample/app/src/main/java/org/ar/ar_android_tutorial_1to1/VideoActivity.java index 7b61e96..805e7b8 100644 --- a/AR-Android-Tutorial-1to1/sample/app/src/main/java/org/ar/ar_android_tutorial_1to1/VideoActivity.java +++ b/AR-Android-Tutorial-1to1/sample/app/src/main/java/org/ar/ar_android_tutorial_1to1/VideoActivity.java @@ -35,7 +35,6 @@ public class VideoActivity extends AppCompatActivity implements View.OnClickList private ImageView ivSwitch,ivMuteAudio,ivMuteVideo,ivCall; private LoggerRecyclerView mLogView; private String userId = String.valueOf((int) ((Math.random() * 9 + 1) * 100000)); - private String CHANNEL_NAME = "808080"; private RtcEngine mRtcEngine; private boolean mCallEnd; private String remoteId= ""; @@ -93,7 +92,7 @@ private void initializeEngine() { private void joinChannel() { - mRtcEngine.joinChannel("", CHANNEL_NAME, "Extra Optional Data",userId ); + mRtcEngine.joinChannel("", getResources().getString(R.string.channel), "Extra Optional Data",userId ); } private void leaveChannel() { @@ -183,7 +182,7 @@ private void setupRemoteVideo(String uid) { remoteId = uid; TextureView mRemoteView = RtcEngine.CreateRendererView(getBaseContext()); rlRemote.addView(mRemoteView); - mRtcEngine.setupRemoteVideo(new VideoCanvas(mRemoteView, Constants.RENDER_MODE_HIDDEN,CHANNEL_NAME, uid,Constants.VIDEO_MIRROR_MODE_DISABLED)); + mRtcEngine.setupRemoteVideo(new VideoCanvas(mRemoteView, Constants.RENDER_MODE_HIDDEN,getResources().getString(R.string.channel), uid,Constants.VIDEO_MIRROR_MODE_DISABLED)); } @@ -201,7 +200,6 @@ private void removeLocalVideo() { } } private void startCall() { -// initializeEngine(); setupLocalVideo(); joinChannel(); } diff --git a/AR-Android-Tutorial-1to1/sample/app/src/main/res/values/strings_config.xml b/AR-Android-Tutorial-1to1/sample/app/src/main/res/values/strings_config.xml index fdc9d9f..a833482 100644 --- a/AR-Android-Tutorial-1to1/sample/app/src/main/res/values/strings_config.xml +++ b/AR-Android-Tutorial-1to1/sample/app/src/main/res/values/strings_config.xml @@ -1,4 +1,5 @@ + 808080 diff --git a/SDK/rtc-release.aar b/SDK/rtc-release.aar index af8a719..5ae7e4f 100644 Binary files a/SDK/rtc-release.aar and b/SDK/rtc-release.aar differ