Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Release 1.5.0 #20

Merged
merged 5 commits into from
Sep 6, 2016
Merged

Release 1.5.0 #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac1db08
Access to FrameRate and Resolution, Rework JS approach
Sep 2, 2016
512f644
Keep Alive for iOS, example hook to unpublish event
Sep 6, 2016
039c3c2
Update README.md
Sep 6, 2016
bb8014a
Add Controlling Resolution and FPS article link
Sep 6, 2016
0130698
Create blank view on load
Sep 6, 2016
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
Next Next commit
Access to FrameRate and Resolution, Rework JS approach
  • Loading branch information
Sean Perkins committed Sep 2, 2016
commit ac1db08caa2e8375e5da6792d8708199d143c994
2 changes: 1 addition & 1 deletion demo/app/main-page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<GridLayout rows="*,auto,auto">
<GridLayout>
<StackLayout id="subscriber" width="100%" height="100%"></StackLayout>
<OT:TNSOTPublisher id="publisher" sessionId="{{ sessionId }}" api="{{ api }}" token="{{ publisherToken }}" verticalAlignment="top" horizontalAlignment="right" margin="10" width="100" height="100"></OT:TNSOTPublisher>
<OT:TNSOTPublisher id="publisher" verticalAlignment="top" horizontalAlignment="right" margin="10" width="200" height="200"></OT:TNSOTPublisher>
</GridLayout>

<StackLayout verticalAlignment="bottom" marginBottom="50">
Expand Down
22 changes: 14 additions & 8 deletions demo/app/main-view-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,27 @@ import {Observable, EventData} from 'data/observable';
import {isAndroid, isIOS} from 'platform';
import {Page} from 'ui/page';

import {TNSOTPublisher} from 'nativescript-opentok';
import {TNSOTSession, TNSOTPublisher} from 'nativescript-opentok';

export class Demo extends Observable {

public api:string = '45644202';
public _apiKey:string = '45644202';
public sessionId: string = '1_MX40NTY0NDIwMn5-MTQ3MjIyNzU3NTAwM35FczFWMHdVekNxeXNabWRSTUdIUkpjRmR-fg';
public publisherToken: string = 'T1==cGFydG5lcl9pZD00NTY0NDIwMiZzaWc9NTkwNmVhZWZjNDMzNWRlNDY5ZTZmZTkwMjg0Yjk0ODJlZmE4NjFjODpzZXNzaW9uX2lkPTFfTVg0ME5UWTBOREl3TW41LU1UUTNNakl5TnpVM05UQXdNMzVGY3pGV01IZFZla054ZVhOYWJXUlNUVWRJVWtwalJtUi1mZyZjcmVhdGVfdGltZT0xNDcyMjI3NTg4Jm5vbmNlPTAuNzY3MTczMTA0Njg2NjYyNiZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNDc0ODE5NTg3';
public publisherToken2: string = 'T1==cGFydG5lcl9pZD00NTY0NDIwMiZzaWc9YTM5NTVmODVmYWU0NjkwNThiN2YzMjU3YzM0ZmI4YTYwNTg2YjU0MjpzZXNzaW9uX2lkPTFfTVg0ME5UWTBOREl3TW41LU1UUTNNakl5TnpVM05UQXdNMzVGY3pGV01IZFZla054ZVhOYWJXUlNUVWRJVWtwalJtUi1mZyZjcmVhdGVfdGltZT0xNDcyMjQyNDgwJm5vbmNlPTAuMjU5ODA5NDU5MzI2Nzg4OCZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNDc0ODM0NDgw';
public publisherToken: string = 'T1==cGFydG5lcl9pZD00NTY0NDIwMiZzaWc9ODMwYzUyMTEwMjk5ODQ1OGQ3YmJlOWY1MDFhOGU2MGQwZGQyMmQyYjpzZXNzaW9uX2lkPTFfTVg0ME5UWTBOREl3TW41LU1UUTNNakl5TnpVM05UQXdNMzVGY3pGV01IZFZla054ZVhOYWJXUlNUVWRJVWtwalJtUi1mZyZjcmVhdGVfdGltZT0xNDcyODQ4NDk1Jm5vbmNlPTAuNjYyMzAzOTA2MTY2OTI2JnJvbGU9cHVibGlzaGVyJmV4cGlyZV90aW1lPTE0NzU0NDA0OTU=';

private publisher: any;
private publisher: TNSOTPublisher;
private session:TNSOTSession;

constructor(private page: Page) {
super();
this.publisher = this.page.getViewById('publisher');
this.session = TNSOTSession.initWithApiKeySessionId(this._apiKey, this.sessionId);
this.publisher = <TNSOTPublisher> this.page.getViewById('publisher');
this.initPublisher();
}

initPublisher() {
this.session.connect(this.publisherToken);
this.publisher.publish(this.session, '', 'HIGH', '30');
}

switchCamera() {
Expand All @@ -32,8 +39,7 @@ export class Demo extends Observable {
}

unpublish() {
this.publisher.session.unpublish();
console.log('unpublish');
this.publisher.unpublish(this.session);
}

}
91 changes: 54 additions & 37 deletions src/ios/publisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,48 @@ import {TNSOTSession} from './session';
declare var OTPublisher: any,
CGRectMake: any,
OTPublisherKitDelegate: any,
OTCameraCaptureResolution: any,
OTCameraCaptureFrameRate: any,
AVCaptureDevicePositionBack: any,
AVCaptureDevicePositionFront: any;

export class TNSOTPublisher extends ContentView {

private _ios: any;
private _ios: any = {};
private _publisherKitDelegate: any;
private _session: TNSOTSession;

private _sessionId: any;
private _apiKey: string;
private _token: string;

constructor() {
super();
this._publisherKitDelegate = TNSPublisherKitDelegateImpl.initWithOwner(new WeakRef(this));
this._ios = new OTPublisher(this._publisherKitDelegate);
}

private connect(): void {
if(this._apiKey && this._sessionId && this._token) {
this._session = TNSOTSession.initWithApiKeySessionIdToken(this._apiKey, this._sessionId, this._token);
this._session.events.on('sessionDidConnect', (result) => {
this.publishStream(result.object);
});
}
publish(session: TNSOTSession, name?:string, cameraResolution?: string, cameraFrameRate?: string): void {
this._ios = OTPublisher.alloc().initWithDelegateNameCameraResolutionCameraFrameRate(
this._publisherKitDelegate,
name ? name : '',
this.getCameraResolution(cameraResolution),
this.getCameraFrameRate(cameraFrameRate)
);

session.events.on('sessionDidConnect', (result) => {
this._ios.publishAudio = true;
try {
let stream: any = result.object;
stream.publish(this._ios);
} catch(error) {
console.log(error);
}
});
}

private publishStream(session: any): void {
this._ios.publishAudio = true;
unpublish(session: TNSOTSession): void {
try {
session.publish(this._ios);
} catch (error) {
if(session) {
session._ios.unpublish(this._ios);
}
}
catch(error) {
console.log(error);
}
}
Expand All @@ -52,19 +61,34 @@ export class TNSOTPublisher extends ContentView {
return this._ios.view;
}

set sessionId(sessionId: string) {
this._sessionId = sessionId;
this.connect();
}

set api(apiKey: string) {
this._apiKey = apiKey;
this.connect();
}

set token(token: string) {
this._token = token;
this.connect();
private getCameraResolution(cameraResolution: string): any {
if(cameraResolution) {
switch(cameraResolution.toString().toUpperCase()) {
case 'LOW':
return OTCameraCaptureResolution.OTCameraCaptureResolutionLow;
case 'MEDIUM':
return OTCameraCaptureResolution.OTCameraCaptureResolutionMedium;
case 'HIGH':
return OTCameraCaptureResolution.OTCameraCaptureResolutionHigh;
}
}
return OTCameraCaptureResolution.OTCameraCaptureResolutionMedium;
}

private getCameraFrameRate(cameraFrameRate: string): any {
if(cameraFrameRate) {
switch(Number(cameraFrameRate)) {
case 30:
return OTCameraCaptureFrameRate.OTCameraCaptureFrameRate30FPS;
case 15:
return OTCameraCaptureFrameRate.OTCameraCaptureFrameRate15FPS;
case 7:
return OTCameraCaptureFrameRate.OTCameraCaptureFrameRate7FPS;
case 1:
return OTCameraCaptureFrameRate.OTCameraCaptureFrameRate1FPS;
}
}
return OTCameraCaptureFrameRate.OTCameraCaptureFrameRate30FPS;
}

cycleCamera(): void {
Expand All @@ -90,13 +114,6 @@ export class TNSOTPublisher extends ContentView {
}
}

get session(): TNSOTSession {
if(this._session) {
this._session.publisher = this._ios;
}
return this._session;
}

get events(): Observable {
return this._publisherKitDelegate.events;
}
Expand Down
40 changes: 16 additions & 24 deletions src/ios/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,57 +13,49 @@ export class TNSOTSession extends NSObject {
public static ObjCProtocols = [OTSessionDelegate];

public subscriber: TNSOTSubscriber;
public events: Observable;
public session: any;
public _ios: any;

private _events: Observable;
private _publisher: TNSOTPublisher;

public static initWithApiKeySessionIdToken(apiKey: string, sessionId: string, token:string): TNSOTSession {
public static initWithApiKeySessionId(apiKey: string, sessionId: string): TNSOTSession {
let instance = <TNSOTSession>TNSOTSession.new();
instance.events = new Observable();
instance.session = OTSession.alloc().initWithApiKeySessionIdDelegate(apiKey.toString(), sessionId.toString(), instance);
instance._events = new Observable();
instance._ios = OTSession.alloc().initWithApiKeySessionIdDelegate(apiKey.toString(), sessionId.toString(), instance);
return instance;
}

connect(token: string): void {
let errorRef = new interop.Reference();
instance.session.connectWithTokenError(token, errorRef);
this._ios.connectWithTokenError(token, errorRef);
if(errorRef.value) {
console.log(errorRef.value);
}
return instance;
}

disconnect(): void {
if(this.session) {
if(this._ios) {
try {
this.session.disconnect();
this._ios.disconnect();
} catch(error) {
console.log(error);
}
}
}

unpublish(): void {
try {
if(this.session) {
this.session.unpublish(this._publisher);
}
}
catch(error) {
console.log(error);
}
}

unsubscribe(): void {
try {
if(this.session) {
this.session.unsubscribe();
if(this._ios) {
this._ios.unsubscribe();
}
}
catch(error) {
console.log(error);
}
}

set publisher(publisher) {
this._publisher = publisher;
get events(): Observable {
return this._events;
}

public sessionDidConnect(session: any) {
Expand Down