diff --git a/README.md b/README.md
index cbbcf20..39f00fb 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Nativescript OpenTok
-[](https://www.npmjs.com/package/nativescript-opentok)
+[](https://www.npmjs.com/package/nativescript-opentok)
[](https://www.npmjs.com/package/nativescript-opentok)
A Nativescript plugin for the OpenTok iOS and (coming soon Android) SDK.
@@ -22,22 +22,23 @@ Node Package Manager (NPM)
### Integration
-#### Routed Sessions
+#### Routed Sessions
##### View
-You will first need to import the custom element into the {N} xml view. This can be accomplished by adding this snippet: `xmlns:OT="nativescript-opentok"` to your existing `Page` element tag.
+You will first need to import the custom element into the {N} xml view. This can be accomplished by adding this snippet: `xmlns:OT="nativescript-opentok"` to your existing `Page` element tag.
-The basic integration example would include the following declarations for publisher and subscriber. Notice subscriber is any element with `id="subscriber"`. You will need to provide a valid sessionId, api (key) and token to the publisher element.
+The basic integration example would include the following declarations for publisher and subscriber. Notice subscriber is any element with `id="subscriber"`. You will need to provide a valid sessionId, api (key) and token to the publisher element.
```
-
-
+
+
```
### Special Articles
- [Overlay UI on the Video Stream](https://github.com/sean-perkins/nativescript-opentok/wiki/Overlay-UI-on-Video-Stream)
### Images
-
-
+|iPhone|iPad|
+|---|---|
+|||
### Notes
- Publishing is not supported in the Simulator because it does not have access to your webcam. You may see a yellow tea-kettle instead.
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 579ca34..5947ace 100755
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -3,15 +3,16 @@
xmlns:OT="nativescript-opentok" loaded="pageLoaded">
-
-
+
+
-
-
+
+
+
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 644d33f..c4ad276 100755
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -31,4 +31,9 @@ export class Demo extends Observable {
this.publisher.ios.publishAudio = !this.publisher.ios.publishAudio;
}
+ unpublish() {
+ this.publisher.session.unpublish();
+ console.log('unpublish');
+ }
+
}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0c2fbc5..ee79347 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "nativescript-opentok",
- "version": "1.4.0",
+ "version": "1.4.1",
"description": "Integrates OpenTok for NativeScript.",
"main": "opentok.js",
"typings": "./index.d.ts",
diff --git a/src/ios/publisher.ts b/src/ios/publisher.ts
index 0b24988..e8384f4 100644
--- a/src/ios/publisher.ts
+++ b/src/ios/publisher.ts
@@ -12,8 +12,10 @@ declare var OTPublisher: any,
export class TNSOTPublisher extends ContentView {
- private _publisherKitDelegate: any;
private _ios: any;
+ private _publisherKitDelegate: any;
+ private _session: TNSOTSession;
+
private _sessionId: any;
private _apiKey: string;
private _token: string;
@@ -32,15 +34,15 @@ export class TNSOTPublisher extends ContentView {
private connect(): void {
if(this._apiKey && this._sessionId && this._token) {
- let session = new TNSOTSession(this._apiKey);
- session.initSession(this._sessionId).then((result) => {
- session.connect(this._token).then(() => {}, (error) => {
+ this._session = new TNSOTSession(this._apiKey);
+ this._session.initSession(this._sessionId).then((result) => {
+ this._session.connect(this._token).then(() => {}, (error) => {
console.log('Failed to connect to session: ' + error);
});
}, (error) => {
console.log('Failed to initialize session: ' + error);
});
- session.events.on('sessionDidConnect', (result) => {
+ this._session.events.on('sessionDidConnect', (result) => {
this.publishStream(result.object);
});
}
@@ -53,9 +55,6 @@ export class TNSOTPublisher extends ContentView {
} catch (error) {
console.log(error);
}
- if (this._ios) {
- this._ios.view.frame = CGRectMake(0, 0, screen.mainScreen.widthDIPs, screen.mainScreen.heightDIPs);
- }
}
get ios(): any {
@@ -92,18 +91,25 @@ export class TNSOTPublisher extends ContentView {
}
}
- toggleCamera() {
+ toggleCamera(): void {
if(this._ios) {
this._ios.publishVideo = !this._ios.publishVideo;
}
}
- toggleMute() {
+ toggleMute():void {
if(this._ios) {
this._ios.publishAudio = !this._ios.publishAudio;
}
}
+ get session(): TNSOTSession {
+ if(this._session) {
+ this._session.publisher = this._ios;
+ }
+ return this._session;
+ }
+
get events(): Observable {
return this._publisherKitDelegate.events;
}
@@ -146,6 +152,7 @@ class TNSPublisherKitDelegateImpl extends NSObject {
})
});
}
+ topmost().currentPage.ios.view.removeFromSuperview(publisher.view);
}
public publisherDidFailWithError(publisher: any, error: any) {
diff --git a/src/ios/session.ts b/src/ios/session.ts
index 9a0fbfb..b1ac906 100644
--- a/src/ios/session.ts
+++ b/src/ios/session.ts
@@ -1,5 +1,5 @@
import {Observable} from 'data/observable';
-
+import {topmost} from 'ui/frame';
import {TNSOTPublisher} from './publisher';
import {TNSOTSubscriber} from './subscriber';
@@ -69,18 +69,43 @@ export class TNSOTSession {
});
}
- disconnect(): Promise {
- return new Promise((resolve, reject) => {
- if(this._session) {
- try {
- this._session.disconnect();
- resolve();
- } catch(error) {
- console.log(error);
- reject(error);
- }
+ disconnect(): void {
+ let session = this._session;
+ if(session) {
+ try {
+ session.disconnect();
+ } catch(error) {
+ console.log(error);
}
- });
+ }
+ }
+
+ unpublish(): void {
+ let session = this._session;
+ try {
+ if(session) {
+ session.unpublish(this._publisher);
+ }
+ }
+ catch(error) {
+ console.log(error);
+ }
+ }
+
+ unsubscribe(): void {
+ let session = this._session;
+ try {
+ if(session) {
+ session.unsubscribe();
+ }
+ }
+ catch(error) {
+ console.log(error);
+ }
+ }
+
+ set publisher(publisher) {
+ this._publisher = publisher;
}
/**
@@ -185,7 +210,7 @@ class TNSSessionDelegateImpl extends NSObject {
owner.subscriber.subscribe(session, stream);
}
- sessionStreamDestoryed(session: any, stream: any) {
+ sessionStreamDestroyed(session: any, stream: any) {
if(this._events) {
this._events.notify({
eventName: 'streamDestroyed',
@@ -195,6 +220,10 @@ class TNSSessionDelegateImpl extends NSObject {
})
});
}
+ let view = topmost().currentPage.getViewById('subscriber');
+ if(view) {
+ // view.ios.removeFromSuperview();
+ }
}
sessionDidFailWithError(session: any, error: any) {
diff --git a/src/ios/subscriber.ts b/src/ios/subscriber.ts
index b638da2..cda7aaa 100644
--- a/src/ios/subscriber.ts
+++ b/src/ios/subscriber.ts
@@ -26,8 +26,10 @@ export class TNSOTSubscriber {
addSubscriberToView(subscriber: any) {
let view = topmost().currentPage.getViewById('subscriber');
- this._subscriber.view.frame = CGRectMake(view.originX, view.originY, view.width, view.height);
- view.ios.addSubview(this._subscriber.view);
+ if(view) {
+ this._subscriber.view.frame = CGRectMake(0, 0, screen.mainScreen.widthDIPs, screen.mainScreen.heightDIPs);
+ view.ios.addSubview(this._subscriber.view);
+ }
}
}