diff --git a/android/build.gradle b/android/build.gradle index 9a05dca..c88f3ab 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b58c86a..fb174ad 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/android/src/main/java/com/reactor/RNMobileRTCModule.java b/android/src/main/java/com/reactor/RNMobileRTCModule.java index 0a80360..44a7265 100644 --- a/android/src/main/java/com/reactor/RNMobileRTCModule.java +++ b/android/src/main/java/com/reactor/RNMobileRTCModule.java @@ -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; @@ -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); } @@ -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!"); } diff --git a/android/zoomcommonlib/commonlib.aar b/android/zoomcommonlib/commonlib.aar index 6cbd9b0..e6ef67e 100755 Binary files a/android/zoomcommonlib/commonlib.aar and b/android/zoomcommonlib/commonlib.aar differ diff --git a/android/zoomsdk/mobilertc.aar b/android/zoomsdk/mobilertc.aar index 22b954a..30f6ebc 100755 Binary files a/android/zoomsdk/mobilertc.aar and b/android/zoomsdk/mobilertc.aar differ diff --git a/ios/RNMobileRTC.m b/ios/RNMobileRTC.m index 242c998..b112725 100644 --- a/ios/RNMobileRTC.m +++ b/ios/RNMobileRTC.m @@ -69,6 +69,7 @@ - (dispatch_queue_t)methodQueue MobileRTCMeetingService *ms = [[MobileRTC sharedRTC] getMeetingService]; [[[MobileRTC sharedRTC] getMeetingSettings] setAutoConnectInternetAudio:YES]; + [[[MobileRTC sharedRTC] getMeetingSettings] disableDriveMode:YES]; if (ms) { diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..42c78c2 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,83 @@ +{ + "name": "react-native-zoom-sdk", + "version": "0.19.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "base64-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz", + "integrity": "sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg=" + }, + "big-integer": { + "version": "1.6.40", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.40.tgz", + "integrity": "sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==" + }, + "bplist-creator": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz", + "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=", + "requires": { + "stream-buffers": "~2.2.0" + } + }, + "bplist-parser": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", + "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=", + "requires": { + "big-integer": "^1.6.7" + } + }, + "plist": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz", + "integrity": "sha1-CjLKlIGxw2TpLhjcVch23p0B2os=", + "requires": { + "base64-js": "1.1.2", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + }, + "simple-plist": { + "version": "0.2.1", + "resolved": "http://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz", + "integrity": "sha1-cXZts1IyaSjPOoByQrp2IyJjZyM=", + "requires": { + "bplist-creator": "0.0.7", + "bplist-parser": "0.1.1", + "plist": "2.0.1" + } + }, + "stream-buffers": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", + "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=" + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "xcode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xcode/-/xcode-1.1.0.tgz", + "integrity": "sha512-hllHFtfsNu5WbVzj8KbGNdI3NgOYmTLZqyF4a9c9J1aGMhAdxmLLsXlpG0Bz8fEtKh6I3pyargRXN0ZlLpcF5w==", + "requires": { + "simple-plist": "^0.2.1", + "uuid": "^3.3.2" + } + }, + "xmlbuilder": { + "version": "8.2.2", + "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", + "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=" + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + } + } +} diff --git a/scripts/postlink.js b/scripts/postlink.js index 1e62ed3..6d1ed01 100644 --- a/scripts/postlink.js +++ b/scripts/postlink.js @@ -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', ];