Skip to content

Updated ZoomSDK to support targeting Android SdkVersion 26 #6

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
DGeoWils wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Updated ZoomSDK to support targeting Android SdkVersion 26 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0696c9f
Update Android Zoom MobileRTC and commonLib binaries
damiantw Jun 13, 2018
adbb49d
Added disable statement for drive mode
DGeoWils Jun 27, 2018
8cd17f3
Removed driving mode from Android
DGeoWils Jul 12, 2018
a0cde59
updated binaries
DGeoWils Dec 21, 2018
b39b41f
Changed MeetingEvent to MeetingStatus enum
DGeoWils Dec 21, 2018
737d825
Removed some white space
DGeoWils Dec 21, 2018
e8973a2
Updated android SDKs to v4.3
DGeoWils Feb 19, 2019
65bf426
Merge branch 'develop' into develop
DGeoWils Mar 5, 2019
9b6b286
removed libstdc++
DGeoWils Apr 8, 2019
b2398e3
Merge remote-tracking branch 'origin/develop' into develop
DGeoWils Apr 8, 2019
1479446
- Added pharmacy picker modal
DGeoWils Apr 19, 2019
b7d56ac
Updated android sdk
DGeoWils Aug 22, 2019
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
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ buildscript {
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 26
buildToolsVersion "26.0.3"

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jan 22 21:35:50 CET 2018
#Fri Dec 21 11:43:03 EST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
17 changes: 9 additions & 8 deletions android/src/main/java/com/reactor/RNMobileRTCModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import us.zoom.sdk.JoinMeetingOptions;
import us.zoom.sdk.StartMeetingOptions;
import us.zoom.sdk.MeetingError;
import us.zoom.sdk.MeetingEvent;
import us.zoom.sdk.MeetingStatus;
import us.zoom.sdk.MeetingOptions;
import us.zoom.sdk.MeetingService;
import us.zoom.sdk.MeetingServiceListener;
Expand Down Expand Up @@ -109,6 +109,7 @@ public void joinMeeting(ReadableMap options, Promise promise) {
JoinMeetingOptions opts = new JoinMeetingOptions();
opts.no_dial_in_via_phone = true;
opts.no_disconnect_audio = true;
opts.no_driving_mode = true;

int ret = meetingService.joinMeeting(this.getCurrentActivity(), meetingNo, userName, meetingPassword, opts);
}
Expand Down Expand Up @@ -256,22 +257,22 @@ public void onZoomSDKInitializeResult(int errorCode, int internalErrorCode) {
}

@Override
public void onMeetingEvent(int meetingEvent, int errorCode, int internalErrorCode) {
public void onMeetingStatusChanged(MeetingStatus meetingStatus, int errorCode, int internalErrorCode) {
if (mPromise == null) {
return;
}

if (meetingEvent == MeetingEvent.MEETING_CONNECT_FAILED &&
if (meetingStatus == MeetingStatus.MEETING_STATUS_FAILED &&
errorCode != MeetingError.MEETING_ERROR_SUCCESS) {
mPromise.reject("" + errorCode);
}

if (mbPendingStartMeeting && meetingEvent == MeetingEvent.MEETING_DISCONNECTED) {
if (mbPendingStartMeeting && meetingStatus == MeetingStatus.MEETING_STATUS_FAILED) {
mbPendingStartMeeting = false;
mPromise.reject("" + errorCode);
}

if (meetingEvent == MeetingEvent.MEETING_CONNECTED) {
if (meetingStatus == MeetingStatus.MEETING_STATUS_INMEETING) {
mPromise.resolve("Success!");
}

Expand Down
Binary file modified android/zoomcommonlib/commonlib.aar
View file
Open in desktop
Binary file not shown.
Binary file modified android/zoomsdk/mobilertc.aar
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions ios/RNMobileRTC.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ - (dispatch_queue_t)methodQueue

MobileRTCMeetingService *ms = [[MobileRTC sharedRTC] getMeetingService];
[[[MobileRTC sharedRTC] getMeetingSettings] setAutoConnectInternetAudio:YES];
[[[MobileRTC sharedRTC] getMeetingSettings] disableDriveMode:YES];
Copy link
Member

@SoHotSoup SoHotSoup Mar 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this?

Copy link
Author

@DGeoWils DGeoWils Mar 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this is not necessary for your library. I had a requirement in the project I was working on to remove the driving mode functionality to simplify the interface.


if (ms)
{
Expand Down
83 changes: 83 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/postlink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const packageJson = require('../../../package.json');

const frameworks = [
'libsqlite3.tbd',
'libstdc++.6.0.9.tbd',
'libc++.tbd',
'libz.1.2.5.tbd',
'VideoToolbox.framework',
];
Expand Down