Skip to content

Commit 4c58c6b

Browse files
committed
[Android][JoinChannelVideo]fix crash
1 parent 5441d39 commit 4c58c6b

3 files changed

Lines changed: 27 additions & 19 deletions

File tree

Android/APIExample/app/src/main/java/io/agora/api/example/common/BaseFragment.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ public void onCreate(@Nullable Bundle savedInstanceState)
2323

2424
protected void showAlert(String message)
2525
{
26-
Context context = getContext();
27-
if (context == null) {
28-
return;
29-
}
26+
handler.post(()->{
27+
Context context = getContext();
28+
if (context == null) {
29+
return;
30+
}
3031

31-
new AlertDialog.Builder(context).setTitle("Tips").setMessage(message)
32-
.setPositiveButton("OK", (dialog, which) -> dialog.dismiss())
33-
.show();
32+
new AlertDialog.Builder(context).setTitle("Tips").setMessage(message)
33+
.setPositiveButton("OK", (dialog, which) -> dialog.dismiss())
34+
.show();
35+
});
3436
}
3537

3638
protected final void showLongToast(final String msg)

Android/APIExample/app/src/main/java/io/agora/api/example/common/model/StatisticsInfo.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package io.agora.api.example.common.model;
22

3-
import io.agora.rtc.IRtcEngineEventHandler.*;
3+
import io.agora.rtc.IRtcEngineEventHandler.LastmileProbeResult;
4+
import io.agora.rtc.IRtcEngineEventHandler.LocalAudioStats;
5+
import io.agora.rtc.IRtcEngineEventHandler.LocalVideoStats;
6+
import io.agora.rtc.IRtcEngineEventHandler.RemoteAudioStats;
7+
import io.agora.rtc.IRtcEngineEventHandler.RemoteVideoStats;
8+
import io.agora.rtc.IRtcEngineEventHandler.RtcStats;
49

510
public class StatisticsInfo {
611
private LocalVideoStats localVideoStats;
@@ -32,6 +37,9 @@ public void setRtcStats(RtcStats rtcStats) {
3237
}
3338

3439
public String getLocalVideoStats() {
40+
if(localVideoStats == null || localAudioStats == null){
41+
return "";
42+
}
3543
StringBuilder builder = new StringBuilder();
3644
return builder
3745
.append(localVideoStats.encodedFrameWidth)
@@ -70,6 +78,9 @@ public String getLocalVideoStats() {
7078
}
7179

7280
public String getRemoteVideoStats() {
81+
if(remoteAudioStats == null || remoteVideoStats == null){
82+
return "";
83+
}
7384
StringBuilder builder = new StringBuilder();
7485
return builder
7586
.append(remoteVideoStats.width)

Android/APIExample/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelVideo.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package io.agora.api.example.examples.basic;
22

3+
import static io.agora.api.example.common.model.Examples.BASIC;
4+
import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_HIDDEN;
5+
import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
6+
37
import android.content.Context;
48
import android.os.Bundle;
59
import android.text.TextUtils;
@@ -19,7 +23,6 @@
1923
import com.yanzhenjie.permission.AndPermission;
2024
import com.yanzhenjie.permission.runtime.Permission;
2125

22-
import java.util.HashMap;
2326
import java.util.Map;
2427
import java.util.concurrent.ConcurrentHashMap;
2528

@@ -38,14 +41,6 @@
3841
import io.agora.rtc.video.VideoEncoderConfiguration;
3942
import io.agora.rtc.video.WatermarkOptions;
4043

41-
import static io.agora.api.example.common.model.Examples.BASIC;
42-
import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_FIT;
43-
import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_HIDDEN;
44-
import static io.agora.rtc.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
45-
import static io.agora.rtc.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
46-
import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
47-
import static io.agora.rtc.video.VideoEncoderConfiguration.VD_640x360;
48-
4944
/**This demo demonstrates how to make a one-to-one video call*/
5045
@Example(
5146
index = 0,
@@ -97,11 +92,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
9792
}
9893

9994
private void updateLocalStats(){
100-
localStats.setText(statisticsInfo.getLocalVideoStats());
95+
handler.post(()-> localStats.setText(statisticsInfo.getLocalVideoStats()));
10196
}
10297

10398
private void updateRemoteStats(){
104-
remoteStats.setText(statisticsInfo.getRemoteVideoStats());
99+
handler.post(()->remoteStats.setText(statisticsInfo.getRemoteVideoStats()));
105100
}
106101

107102
@Override

0 commit comments

Comments
 (0)