Skip to content

Commit ffb02d9

Browse files
authored
Merge pull request #93 from millicast/develop
Release 0.3.1
2 parents d93ae3c + 4654f61 commit ffb02d9

File tree

4 files changed

+43
-19
lines changed

4 files changed

+43
-19
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,13 @@ You should have an Android TV/mobile simulator on Android Studio.
260260

261261
## Troubleshooting
262262

263+
### WebRTC related errors during runtime
264+
If you have any issues related to WebRTC, and you already used this app it maybe due to an outdated node module. Follow this steps:
265+
1. Delete `node_modules` directory.
266+
2. Run `yarn cache clean`.
267+
3. Re install dependencies with `yarn` command.
268+
4. Continue with [Getting Started](#getting-started).
269+
263270
### Framework not found WebRTC
264271
Check inside the TestApp or TestApp-tvOS project (depending on which platform do you want to run the application) go to `General -> Framework, Libraries, and Embedded Content` and look for WebRTC.framework. You should to confirm that you are using the proper framework for the platform and it should be with `Embed && Sign` option.
265272

Viewer.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class MillicastWidget extends React.Component {
3232
sourceIds: ['main'],
3333
activeLayers: [],
3434
multiView: false,
35+
connected:false,
3536
playing: false,
3637
muted: false,
3738
millicastView: null,
@@ -116,6 +117,7 @@ class MillicastWidget extends React.Component {
116117

117118
this.setState({
118119
millicastView: view,
120+
connected: true,
119121
});
120122
} catch (e) {
121123
console.error('Connection failed. Reason:', e);
@@ -337,12 +339,17 @@ class MillicastWidget extends React.Component {
337339
{this.state.playing ? 'Pause' : 'Play'}
338340
</Text>
339341
</TouchableHighlight>
340-
{this.state.playing ? (
342+
{this.state.playing &&
343+
!(Platform.OS == 'android' && Platform.isTV) ? (
341344
<TouchableHighlight
342345
hasTVPreferredFocus
343346
tvParallaxProperties={{magnification: 1.5}}
344347
underlayColor="#AA33FF"
345-
onPress={this.multiView}>
348+
onPress={() => {
349+
if (this.state.connected) {
350+
this.multiView();
351+
}
352+
}}>
346353
<Text style={{color: 'white', fontWeight: 'bold'}}>
347354
{this.state.multiView ? 'Go back' : 'Multiview'}
348355
</Text>
@@ -360,7 +367,10 @@ export default function App({navigation, route}) {
360367
return (
361368
<>
362369
<SafeAreaView style={stylesContainer.container}>
363-
<MillicastWidget streamName={route.params.streamName} accountId={route.params.accountId} />
370+
<MillicastWidget
371+
streamName={route.params.streamName}
372+
accountId={route.params.accountId}
373+
/>
364374
</SafeAreaView>
365375
</>
366376
);

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
ext {
77
buildToolsVersion = "31.0.0"
88
minSdkVersion = 21
9-
compileSdkVersion = 31
9+
compileSdkVersion = 32
1010
targetSdkVersion = 31
1111

1212
if (System.properties['os.arch'] == "aarch64") {

yarn.lock

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,9 @@
739739
"@babel/types" "^7.22.15"
740740

741741
"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.23.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
742-
version "7.23.0"
743-
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.0.tgz#18196ddfbcf4ccea324b7f6d3ada00d8c5a99c53"
744-
integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==
742+
version "7.23.2"
743+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
744+
integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
745745
dependencies:
746746
"@babel/code-frame" "^7.22.13"
747747
"@babel/generator" "^7.23.0"
@@ -1055,9 +1055,9 @@
10551055
"@jridgewell/sourcemap-codec" "^1.4.14"
10561056

10571057
"@millicast/sdk@^0.1.39":
1058-
version "0.1.39"
1059-
resolved "https://registry.yarnpkg.com/@millicast/sdk/-/sdk-0.1.39.tgz#53021a022db161a09dfc41eea0717f6027da1c8e"
1060-
integrity sha512-+sqGzKTBeY0wQZxPa1+9iLLDOCyMiK9GeApIjQsMe7nILTKu9kmUZarpTPagCqCWqDz61f5LK9RPblHzu7Kjfw==
1058+
version "0.1.41"
1059+
resolved "https://registry.yarnpkg.com/@millicast/sdk/-/sdk-0.1.41.tgz#a39f2d59361cb919719257202bb769e6a18ffbb6"
1060+
integrity sha512-j8uedLif28Nm6jGXUdKC87McuKR+ag+xhq3MxJooKg/HYmrL90aJVFhtrYkTuLZn3W4YiCnpOIy+TK6YzIR3Ig==
10611061
dependencies:
10621062
"@types/node" "^18.11.10"
10631063
Base64 "^1.1.0"
@@ -1435,9 +1435,11 @@
14351435
undici-types "~5.25.1"
14361436

14371437
"@types/node@^18.11.10":
1438-
version "18.18.4"
1439-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.4.tgz#519fef47a13cf869be290c20fc6ae9b7fe887aa7"
1440-
integrity sha512-t3rNFBgJRugIhackit2mVcLfF6IRc0JE4oeizPQL8Zrm8n2WY/0wOdpOPhdtG0V9Q2TlW/axbF1MJ6z+Yj/kKQ==
1438+
version "18.18.8"
1439+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.8.tgz#2b285361f2357c8c8578ec86b5d097c7f464cfd6"
1440+
integrity sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==
1441+
dependencies:
1442+
undici-types "~5.26.4"
14411443

14421444
"@types/normalize-package-data@^2.4.0":
14431445
version "2.4.2"
@@ -6452,9 +6454,9 @@ sdp-transform@^2:
64526454
integrity sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw==
64536455

64546456
semantic-sdp@^3.22.0:
6455-
version "3.26.6"
6456-
resolved "https://registry.yarnpkg.com/semantic-sdp/-/semantic-sdp-3.26.6.tgz#76d6019622340def87611d033e122b1d21277476"
6457-
integrity sha512-Dg8lWMf5j38uYd7ULp/8kxKGHSPACUGpx+qwdbDxQfFSpPeFNtWpKOysun6o5JQpKE/VQKMeiBeWZIFhbCOpXA==
6457+
version "3.27.1"
6458+
resolved "https://registry.yarnpkg.com/semantic-sdp/-/semantic-sdp-3.27.1.tgz#b1e3a177fe6edd06086eb76caa208ac84311e51f"
6459+
integrity sha512-DGVxhWLVqBUxvvohQIUUwkS3c72IIjt/gSutDyDKiKsEr1iI0t8e5QwxO0vQ6t/u3Tg4OkPwSSoQWwZTltDRuA==
64586460
dependencies:
64596461
equals-ignore-case "^1.0.0"
64606462
randombytes "^2.0.3"
@@ -7183,9 +7185,9 @@ typedarray-to-buffer@^3.1.5:
71837185
is-typedarray "^1.0.0"
71847186

71857187
ua-parser-js@^0.7.30:
7186-
version "0.7.36"
7187-
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.36.tgz#382c5d6fc09141b6541be2cae446ecfcec284db2"
7188-
integrity sha512-CPPLoCts2p7D8VbybttE3P2ylv0OBZEAy7a12DsulIEcAiMtWJy+PBgMXgWDI80D5UwqE8oQPHYnk13tm38M2Q==
7188+
version "0.7.37"
7189+
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"
7190+
integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
71897191

71907192
uglify-es@^3.1.9:
71917193
version "3.3.9"
@@ -7210,6 +7212,11 @@ undici-types@~5.25.1:
72107212
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
72117213
integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
72127214

7215+
undici-types@~5.26.4:
7216+
version "5.26.5"
7217+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
7218+
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
7219+
72137220
unicode-canonical-property-names-ecmascript@^2.0.0:
72147221
version "2.0.0"
72157222
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"

0 commit comments

Comments
 (0)