Skip to content

Commit 5794e97

Browse files
xgfd3xgfd3
committed
[Android]add global area setting.
1 parent 1fcc3d1 commit 5794e97

36 files changed

Lines changed: 213 additions & 92 deletions

‎Android/APIExample/app/src/main/java/io/agora/api/example/SettingActivity.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class SettingActivity extends AppCompatActivity implements AdapterView.On
2222
private static final String TAG = SettingActivity.class.getSimpleName();
2323

2424
private AppCompatTextView sdkVersion;
25-
private AppCompatSpinner orientationSpinner, fpsSpinner, dimensionSpinner;
25+
private AppCompatSpinner orientationSpinner, fpsSpinner, dimensionSpinner, areaSpinner;
2626

2727
@Override
2828
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -50,6 +50,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5050
orientationSpinner.setOnItemSelectedListener(this);
5151
fpsSpinner.setOnItemSelectedListener(this);
5252
dimensionSpinner.setOnItemSelectedListener(this);
53+
areaSpinner = findViewById(R.id.area_spinner);
54+
areaSpinner.setOnItemSelectedListener(this);
5355
fetchGlobalSettings();
5456
}
5557

@@ -90,6 +92,18 @@ private void fetchGlobalSettings(){
9092
}
9193
}
9294
dimensionSpinner.setSelection(i);
95+
mItems = getResources().getStringArray(R.array.areaCode);
96+
selectedItem = ((MainApplication) getApplication()).getGlobalSettings().getAreaCodeStr();
97+
i = 0;
98+
if(selectedItem!=null){
99+
for(String item : mItems){
100+
if(selectedItem.equals(item)){
101+
break;
102+
}
103+
i++;
104+
}
105+
}
106+
areaSpinner.setSelection(i);
93107
}
94108

95109
@Override
@@ -115,6 +129,10 @@ else if(adapterView.getId() == R.id.dimension_spinner){
115129
GlobalSettings globalSettings = ((MainApplication)getApplication()).getGlobalSettings();
116130
globalSettings.setVideoEncodingDimension(getResources().getStringArray(R.array.dimensions)[i]);
117131
}
132+
else if(adapterView.getId() == R.id.area_spinner){
133+
GlobalSettings globalSettings = ((MainApplication)getApplication()).getGlobalSettings();
134+
globalSettings.setAreaCodeStr(getResources().getStringArray(R.array.areaCode)[i]);
135+
}
118136
}
119137

120138
@Override

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

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package io.agora.api.example.common.model;
22

3+
import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
4+
import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
5+
import static io.agora.rtc2.video.VideoEncoderConfiguration.VD_640x360;
6+
37
import android.util.Log;
48

59
import java.lang.reflect.Field;
610

11+
import io.agora.rtc2.RtcEngineConfig;
712
import io.agora.rtc2.video.VideoEncoderConfiguration;
813

9-
import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
10-
import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
11-
import static io.agora.rtc2.video.VideoEncoderConfiguration.VD_640x360;
12-
1314
public class GlobalSettings {
1415
private String videoEncodingDimension;
1516
private String videoEncodingFrameRate;
1617
private String videoEncodingOrientation;
18+
private String areaCodeStr = "GLOBAL";
1719

1820
public String getVideoEncodingDimension() {
1921
if(videoEncodingDimension == null)
@@ -63,4 +65,36 @@ public String getVideoEncodingOrientation() {
6365
public void setVideoEncodingOrientation(String videoEncodingOrientation) {
6466
this.videoEncodingOrientation = videoEncodingOrientation;
6567
}
68+
69+
public String getAreaCodeStr() {
70+
return areaCodeStr;
71+
}
72+
73+
public void setAreaCodeStr(String areaCodeStr) {
74+
this.areaCodeStr = areaCodeStr;
75+
}
76+
77+
public int getAreaCode(){
78+
if("CN".equals(areaCodeStr)){
79+
return RtcEngineConfig.AreaCode.AREA_CODE_CN;
80+
}
81+
else if("NA".equals(areaCodeStr)){
82+
return RtcEngineConfig.AreaCode.AREA_CODE_NA;
83+
}
84+
else if("EU".equals(areaCodeStr)){
85+
return RtcEngineConfig.AreaCode.AREA_CODE_EU;
86+
}
87+
else if("AS".equals(areaCodeStr)){
88+
return RtcEngineConfig.AreaCode.AREA_CODE_AS;
89+
}
90+
else if("JP".equals(areaCodeStr)){
91+
return RtcEngineConfig.AreaCode.AREA_CODE_JP;
92+
}
93+
else if("IN".equals(areaCodeStr)){
94+
return RtcEngineConfig.AreaCode.AREA_CODE_IN;
95+
}
96+
else{
97+
return RtcEngineConfig.AreaCode.AREA_CODE_GLOB;
98+
}
99+
}
66100
}

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CDNStreaming/AudienceFragment.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
120120
* The SDK uses this class to report to the app on SDK runtime events.
121121
*/
122122
config.mEventHandler = iRtcEngineEventHandler;
123+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
123124
engine = RtcEngine.create(config);
124125
// Setup video encoding configs
125126
engine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CDNStreaming/HostFragment.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
143143
* The SDK uses this class to report to the app on SDK runtime events.
144144
*/
145145
config.mEventHandler = iRtcEngineEventHandler;
146+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
146147
engine = RtcEngine.create(config);
147148
setupEngineConfig(context);
148149
} catch (Exception e) {

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ChannelEncryption.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import java.nio.charset.StandardCharsets;
3030

31+
import io.agora.api.example.MainApplication;
3132
import io.agora.api.example.R;
3233
import io.agora.api.example.annotation.Example;
3334
import io.agora.api.example.common.BaseFragment;
@@ -115,6 +116,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
115116
*/
116117
config.mEventHandler = iRtcEngineEventHandler;
117118
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
119+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
118120
engine = RtcEngine.create(config);
119121
}
120122
catch (Exception e)

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ContentInspect.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
111111
*/
112112
config.mEventHandler = iRtcEngineEventHandler;
113113
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
114+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
114115
engine = RtcEngine.create(config);
115116

116117
} catch (Exception e) {

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/CustomRemoteVideoRender.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
126126
*/
127127
config.mEventHandler = iRtcEngineEventHandler;
128128
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
129+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
129130
engine = RtcEngine.create(config);
130131
}
131132
catch (Exception e) {

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/HostAcrossChannel.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
120120
*/
121121
config.mEventHandler = iRtcEngineEventHandler;
122122
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
123+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
123124
engine = RtcEngine.create(config);
124125
}
125126
catch (Exception e)

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/InCallReport.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
135135
*/
136136
config.mEventHandler = iRtcEngineEventHandler;
137137
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
138+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
138139
engine = RtcEngine.create(config);
139140
}
140141
catch (Exception e)

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/JoinMultipleChannel.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
115115
*/
116116
config.mEventHandler = iRtcEngineEventHandler;
117117
config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.DEFAULT);
118+
config.mAreaCode = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getAreaCode();
118119
engine = (RtcEngineEx) RtcEngine.create(config);
119120
}
120121
catch (Exception e)

0 commit comments

Comments
 (0)