Skip to content

Commit 8d20908

Browse files
author
xia ning
authored
Merge pull request #204 from oOJohn6Oo/4.0.0-preview
[FEAT] import agora sdk from maven, and fix a crash in SwitchCameraScreenShare.
2 parents 5a7e346 + 778c0ad commit 8d20908

6 files changed

Lines changed: 4 additions & 3 deletions

File tree

Binary file not shown.
Binary file not shown.

Android/APIExample/agora-simple-filter/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.4.1)
88
project(agora-simple-filter)
99

1010
#link agora so
11-
set(agora-lib-so ${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libagora-rtc-sdk-jni.so)
11+
set(agora-lib-so ${PROJECT_SOURCE_DIR}/../agoraLibs/${CMAKE_ANDROID_ARCH_ABI}/libagora-rtc-sdk-jni.so)
1212
link_libraries(${agora-lib-so})
1313

1414
#link opencv so

Android/APIExample/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ android {
3636

3737
dependencies {
3838
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
39+
implementation 'com.github.agorabuilder:agora-ffmpeg-player-preview:4.0.0'
3940

4041
implementation 'androidx.appcompat:appcompat:1.1.0'
4142
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class SwitchCameraScreenShare extends BaseFragment implements View.OnClic
7979
private static final int PROJECTION_REQ_CODE = 1 << 2;
8080
private static final int DEFAULT_SHARE_FRAME_RATE = 15;
8181
private FrameLayout fl_camera, fl_screen;
82-
private Button join, renderMode;
82+
private Button join;
8383
private Switch camera, screenShare;
8484
private EditText et_channel;
8585
private int myUid, remoteUid = -1;
@@ -108,7 +108,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
108108
fl_camera = view.findViewById(R.id.fl_camera);
109109
fl_screen = view.findViewById(R.id.fl_screenshare);
110110
join.setOnClickListener(this);
111-
renderMode.setOnClickListener(this);
112111
camera.setOnCheckedChangeListener(this);
113112
screenShare.setOnCheckedChangeListener(this);
114113
}

Android/APIExample/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ allprojects {
2222
mavenCentral()
2323
google()
2424
jcenter()
25+
maven { url 'https://jitpack.io' }
2526
}
2627
}
2728

0 commit comments

Comments
 (0)