Skip to content

Commit a3d31cd

Browse files
d-ukhanovd-ukhanov
authored
Merge pull request #16 from veselv2010/revert-15-revert-14-update_zoom_web_to_v3.0.0
Revert "Revert "Update zoom web sdk to v3.0.0""
2 parents d44faea + 074b318 commit a3d31cd

File tree

5 files changed

+27
-33
lines changed

5 files changed

+27
-33
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Windows: v5.16.10.26236
44

55
Android: v5.16.10.17706
66

7-
Web: v2.18.0
7+
Web: v3.0.0
88

99
# Flutter Zoom SDK
1010

‎example/pubspec.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.2"
43+
version: "1.18.0"
4444
crypto:
4545
dependency: transitive
4646
description:
@@ -94,7 +94,7 @@ packages:
9494
path: ".."
9595
relative: true
9696
source: path
97-
version: "1.2.0"
97+
version: "1.2.0+1"
9898
js:
9999
dependency: transitive
100100
description:
@@ -131,10 +131,10 @@ packages:
131131
dependency: transitive
132132
description:
133133
name: meta
134-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
134+
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
135135
url: "https://pub.dev"
136136
source: hosted
137-
version: "1.9.1"
137+
version: "1.10.0"
138138
path:
139139
dependency: transitive
140140
description:
@@ -168,18 +168,18 @@ packages:
168168
dependency: transitive
169169
description:
170170
name: stack_trace
171-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
171+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
172172
url: "https://pub.dev"
173173
source: hosted
174-
version: "1.11.0"
174+
version: "1.11.1"
175175
stream_channel:
176176
dependency: transitive
177177
description:
178178
name: stream_channel
179-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
179+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
180180
url: "https://pub.dev"
181181
source: hosted
182-
version: "2.1.1"
182+
version: "2.1.2"
183183
string_scanner:
184184
dependency: transitive
185185
description:
@@ -200,10 +200,10 @@ packages:
200200
dependency: transitive
201201
description:
202202
name: test_api
203-
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
203+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
204204
url: "https://pub.dev"
205205
source: hosted
206-
version: "0.6.0"
206+
version: "0.6.1"
207207
typed_data:
208208
dependency: transitive
209209
description:
@@ -224,9 +224,9 @@ packages:
224224
dependency: transitive
225225
description:
226226
name: web
227-
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
227+
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
228228
url: "https://pub.dev"
229229
source: hosted
230-
version: "0.1.4-beta"
230+
version: "0.3.0"
231231
sdks:
232-
dart: ">=3.1.0-185.0.dev <4.0.0"
232+
dart: ">=3.2.0-194.0.dev <4.0.0"

‎example/web/index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
<title>flutter_zoom_sdk_example</title>
3333
<link rel="manifest" href="manifest.json">
34-
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
35-
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/react-select.css" />
34+
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.0.0/css/bootstrap.css" />
35+
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.0.0/css/react-select.css" />
3636
</head>
3737
<body>
3838
<!-- This script installs service_worker.js to provide PWA functionality to
@@ -103,11 +103,11 @@
103103
}
104104
</script>
105105
<!-- import ZoomMtg dependencies -->
106-
<script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
107-
<script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
108-
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux.min.js"></script>
109-
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux-thunk.min.js"></script>
110-
<script src="https://source.zoom.us/2.18.0/lib/vendor/lodash.min.js"></script>
106+
<script src="https://source.zoom.us/3.0.0/lib/vendor/react.min.js"></script>
107+
<script src="https://source.zoom.us/3.0.0/lib/vendor/react-dom.min.js"></script>
108+
<script src="https://source.zoom.us/3.0.0/lib/vendor/redux.min.js"></script>
109+
<script src="https://source.zoom.us/3.0.0/lib/vendor/redux-thunk.min.js"></script>
110+
<script src="https://source.zoom.us/3.0.0/lib/vendor/lodash.min.js"></script>
111111

112112
<!-- import ZoomMtg -->
113113
<script src="https://source.zoom.us/zoom-meeting-2.18.0.min.js"></script>

‎lib/flutter_zoom_web.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class ZoomViewWeb extends ZoomPlatform {
3333

3434
ZoomMtg.preLoadWasm();
3535
ZoomMtg.prepareWebSDK();
36+
ZoomMtg.i18n.load(options.language);
3637
ZoomMtg.init(InitParams(
3738
debug: options.debug ?? kDebugMode,
3839
helper: options.helper,
@@ -85,18 +86,11 @@ class ZoomViewWeb extends ZoomPlatform {
8586
Future<bool> _connectAudio() async {
8687
final button = _getJoinButton();
8788

88-
if (button != null) {
89-
final res =
90-
await Future.delayed(const Duration(seconds: 1), _joinAudioAuto);
91-
92-
await Future.delayed(const Duration(seconds: 1), _clickOnAudioButton);
93-
94-
return res;
95-
} else {
89+
if (button == null) {
9690
await Future.delayed(const Duration(seconds: 1), _openJoinAudio);
97-
98-
return Future.delayed(const Duration(seconds: 1), _joinAudioAuto);
9991
}
92+
93+
return Future.delayed(const Duration(seconds: 1), _joinAudioAuto);
10094
}
10195

10296
Future<void> _openJoinAudio() async {

‎pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_zoom_sdk
22
description: Zoom SDK from ZOOM ported to flutter as plugin with all necessary features and with Null Safety which is implementation by EvilRATT
3-
version: 1.2.0+1
3+
version: 1.2.0+2
44
homepage: https://github.com/evilrat/flutter_zoom_sdk
55
repository: https://github.com/evilrat/flutter_zoom_sdk
66
issue_tracker: https://github.com/evilrat/flutter_zoom_sdk/issues

0 commit comments

Comments
 (0)