From 2332fe2eaaed877248ac845491821cc5eb4179e5 Mon Sep 17 00:00:00 2001 From: Ritzlgrmft Date: Thu, 10 Sep 2015 10:36:36 +0200 Subject: [PATCH 1/5] Definitions added for Cordova plugin cordova-plugin-app-version (https://github.com/whiteoctober/cordova-plugin-app-version). --- cordova-plugin-app-version/appversion-tests.ts | 18 ++++++++++++++++++ cordova-plugin-app-version/appversion.d.ts | 8 ++++++++ 2 files changed, 26 insertions(+) create mode 100644 cordova-plugin-app-version/appversion-tests.ts create mode 100644 cordova-plugin-app-version/appversion.d.ts diff --git a/cordova-plugin-app-version/appversion-tests.ts b/cordova-plugin-app-version/appversion-tests.ts new file mode 100644 index 000000000..89858c3e5 --- /dev/null +++ b/cordova-plugin-app-version/appversion-tests.ts @@ -0,0 +1,18 @@ +/// +/// +cordova.getAppVersion.getAppName() + .then(appName=> { + console.log(appName) + }); +cordova.getAppVersion.getPackageName() + .then(packageName=> { + console.log(packageName); + }); +cordova.getAppVersion.getVersionCode() + .then(versionCode=> { + console.log(versionCode); + }); +cordova.getAppVersion.getVersionNumber() + .then(versionNumber=> { + console.log(versionNumber); + }); \ No newline at end of file diff --git a/cordova-plugin-app-version/appversion.d.ts b/cordova-plugin-app-version/appversion.d.ts new file mode 100644 index 000000000..4069e38da --- /dev/null +++ b/cordova-plugin-app-version/appversion.d.ts @@ -0,0 +1,8 @@ +interface Cordova { + getAppVersion: { + getAppName: () => ng.IPromise; + getPackageName: () => ng.IPromise; + getVersionCode: () => ng.IPromise; + getVersionNumber: () => ng.IPromise; + }; +} \ No newline at end of file From 3251d88b3a375de5043e7aa47d2706579954ac2a Mon Sep 17 00:00:00 2001 From: Ritzlgrmft Date: Thu, 17 Sep 2015 11:02:48 +0200 Subject: [PATCH 2/5] naming convention fixed Travis errors fixed --- cordova-plugin-app-version/appversion.d.ts | 8 -------- ...ests.ts => cordova-plugin-app-version-tests.ts} | 4 ++-- .../cordova-plugin-app-version.d.ts | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 cordova-plugin-app-version/appversion.d.ts rename cordova-plugin-app-version/{appversion-tests.ts => cordova-plugin-app-version-tests.ts} (77%) create mode 100644 cordova-plugin-app-version/cordova-plugin-app-version.d.ts diff --git a/cordova-plugin-app-version/appversion.d.ts b/cordova-plugin-app-version/appversion.d.ts deleted file mode 100644 index 4069e38da..000000000 --- a/cordova-plugin-app-version/appversion.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -interface Cordova { - getAppVersion: { - getAppName: () => ng.IPromise; - getPackageName: () => ng.IPromise; - getVersionCode: () => ng.IPromise; - getVersionNumber: () => ng.IPromise; - }; -} \ No newline at end of file diff --git a/cordova-plugin-app-version/appversion-tests.ts b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts similarity index 77% rename from cordova-plugin-app-version/appversion-tests.ts rename to cordova-plugin-app-version/cordova-plugin-app-version-tests.ts index 89858c3e5..9f366dfb8 100644 --- a/cordova-plugin-app-version/appversion-tests.ts +++ b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts @@ -1,5 +1,5 @@ -/// -/// +/// +/// cordova.getAppVersion.getAppName() .then(appName=> { console.log(appName) diff --git a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts new file mode 100644 index 000000000..8b99a9638 --- /dev/null +++ b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts @@ -0,0 +1,14 @@ +/// +// Type definitions for cordova-plugin-app-version v0.1.7 +// Project: https://github.com/whiteoctober/cordova-plugin-app-version +// Definitions by: Markus Wagner +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +interface Cordova { + getAppVersion: { + getAppName: () => Q.IPromise; + getPackageName: () => Q.IPromise; + getVersionCode: () => Q.IPromise; + getVersionNumber: () => Q.IPromise; + }; +} \ No newline at end of file From 781e4c294d0721cf31344e721e0107d307c1a66b Mon Sep 17 00:00:00 2001 From: Ritzlgrmft Date: Thu, 17 Sep 2015 14:51:02 +0200 Subject: [PATCH 3/5] Travis errors fixed --- .../cordova-plugin-app-version-tests.ts | 3 ++- cordova-plugin-app-version/cordova-plugin-app-version.d.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts index 9f366dfb8..3b27435bd 100644 --- a/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts +++ b/cordova-plugin-app-version/cordova-plugin-app-version-tests.ts @@ -1,5 +1,6 @@ /// -/// +/// + cordova.getAppVersion.getAppName() .then(appName=> { console.log(appName) diff --git a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts index 8b99a9638..a754368e3 100644 --- a/cordova-plugin-app-version/cordova-plugin-app-version.d.ts +++ b/cordova-plugin-app-version/cordova-plugin-app-version.d.ts @@ -1,9 +1,10 @@ -/// -// Type definitions for cordova-plugin-app-version v0.1.7 +// Type definitions for cordova-plugin-app-version v0.1.7 // Project: https://github.com/whiteoctober/cordova-plugin-app-version // Definitions by: Markus Wagner // Definitions: https://github.com/borisyankov/DefinitelyTyped +/// + interface Cordova { getAppVersion: { getAppName: () => Q.IPromise; From e9cc82ad94e783336c3cb82556dc8bdf62709be3 Mon Sep 17 00:00:00 2001 From: Ritzlgrmft Date: Thu, 17 Sep 2015 15:49:54 +0200 Subject: [PATCH 4/5] Internal logger logLog added --- log4javascript/log4javascript-tests.ts | 6 ++- log4javascript/log4javascript.d.ts | 60 +++++++++++++++----------- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/log4javascript/log4javascript-tests.ts b/log4javascript/log4javascript-tests.ts index 7d55c3891..c3b77c5b6 100644 --- a/log4javascript/log4javascript-tests.ts +++ b/log4javascript/log4javascript-tests.ts @@ -1,4 +1,4 @@ -/// +/// function aSimpleLoggingMessageString() { var log = log4javascript.getDefaultLogger(); @@ -47,4 +47,8 @@ function changingTheFormatOfLogMessages() { var popUpAppender = new log4javascript.PopUpAppender(); var layout = new log4javascript.PatternLayout("[%-5p] %m"); popUpAppender.setLayout(layout); +} + +function configureLogLog() { + log4javascript.logLog.setQuietMode(true); } \ No newline at end of file diff --git a/log4javascript/log4javascript.d.ts b/log4javascript/log4javascript.d.ts index 98f23d1f7..44d226d0b 100644 --- a/log4javascript/log4javascript.d.ts +++ b/log4javascript/log4javascript.d.ts @@ -1051,38 +1051,46 @@ declare module log4javascript { // #region log4javascript error handling /** - * Sets whether LogLog is in quiet mode or not. In quiet mode, no messages sent to LogLog have any visible effect. By default, - * quiet mode is switched off. - * @param quietMode Whether to turn quiet mode on or off. + * log4javascript has a single rudimentary logger-like object of its own to handle messages generated by log4javascript itself. + * This logger is called logLog and is accessed via log4javascript.logLog. */ - export function setQuietMode(quietMode: boolean): void; + export namespace logLog { - /** - * Sets how many errors LogLog will display alerts for. By default, only the first error encountered generates an alert to the - * user. If you turn all errors on by supplying true to this method then all errors will generate alerts. - * @param showAllErrors Whether to show all errors or just the first. - */ - export function setAlertAllErrors(alertAllErrors: boolean): void; + /** + * Sets whether logLog is in quiet mode or not. In quiet mode, no messages sent to logLog have any visible effect. By default, + * quiet mode is switched off. + * @param quietMode Whether to turn quiet mode on or off. + */ + export function setQuietMode(quietMode: boolean): void; - /** - * Logs a debugging message to an in-memory list. - */ - export function debug(message: string, exception?: Error): void; + /** + * Sets how many errors logLog will display alerts for. By default, only the first error encountered generates an alert to the + * user. If you turn all errors on by supplying true to this method then all errors will generate alerts. + * @param showAllErrors Whether to show all errors or just the first. + */ + export function setAlertAllErrors(alertAllErrors: boolean): void; - /** - * Displays an alert of all debugging messages. - */ - export function displayDebug(): void; + /** + * Logs a debugging message to an in-memory list. + */ + export function debug(message: string, exception?: Error): void; - /** - * Currently has no effect. - */ - export function warn(message: string, exception?: Error): void; + /** + * Displays an alert of all debugging messages. + */ + export function displayDebug(): void; - /** - * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called. - */ - export function error(message: string, exception?: Error): void; + /** + * Currently has no effect. + */ + export function warn(message: string, exception?: Error): void; + + /** + * Generates an alert to the user if and only if the error is the first one encountered and setAlertAllErrors(true) has not been called. + */ + export function error(message: string, exception?: Error): void; + + } // #endregion } From c3bb5bb17e0aac32c386b2ed11aa4d334b0f374b Mon Sep 17 00:00:00 2001 From: Ritzlgrmft Date: Thu, 17 Sep 2015 16:31:15 +0200 Subject: [PATCH 5/5] Definitions for cordova-plugin-ibeacon added --- .../cordova-plugin-ibeacon-tests.ts | 62 ++++++++++++ .../cordova-plugin-ibeacon.d.ts | 95 +++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts create mode 100644 cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts new file mode 100644 index 000000000..7520c39d5 --- /dev/null +++ b/cordova-plugin-ibeacon/cordova-plugin-ibeacon-tests.ts @@ -0,0 +1,62 @@ +/// +/// + +function registerDelegates() { + cordova.plugins.locationManager.enableDebugLogs(); + + cordova.plugins.locationManager.delegate.didRangeBeaconsInRegion = (pluginResult) => didRangeBeaconsInRegion(pluginResult); + cordova.plugins.locationManager.delegate.didEnterRegion = (pluginResult) => didEnterRegion(pluginResult); + cordova.plugins.locationManager.delegate.didExitRegion = (pluginResult) => didExitRegion(pluginResult); + cordova.plugins.locationManager.delegate.didDetermineStateForRegion = (pluginResult) => didDetermineStateForRegion(pluginResult); + cordova.plugins.locationManager.delegate.didChangeAuthorizationStatus = (authorizationStatus) => didChangeAuthorizationStatus(authorizationStatus); + cordova.plugins.locationManager.delegate.didStartMonitoringForRegion = (pluginResult) => didStartMonitoringForRegion(pluginResult); + cordova.plugins.locationManager.delegate.monitoringDidFailForRegionWithError = (pluginResult) => monitoringDidFailForRegionWithError(pluginResult); + + cordova.plugins.locationManager.onDomDelegateReady(); +} + +function didRangeBeaconsInRegion(pluginResult: BeaconPlugin.PluginResult): void { + for (var beacon of pluginResult.beacons) { + console.log(beacon.uuid, beacon.major, beacon.minor, beacon.accuracy, beacon.proximity, beacon.rssi, beacon.tx); + } +} + +function didEnterRegion(pluginResult: BeaconPlugin.PluginResult): void { + var region: BeaconPlugin.Region = new cordova.plugins.locationManager.BeaconRegion("identifier", "uuid", 1, 2);; + cordova.plugins.locationManager.startRangingBeaconsInRegion(this.createBeaconRegionFromPluginResult(pluginResult)) + .then(() => { + console.log("startRangingBeaconsInRegion succeeded"); + }) + .catch((reason: any) => { + console.error("startRangingBeaconsInRegion failed: " + reason); + }); +} + +function didExitRegion(pluginResult: BeaconPlugin.PluginResult): void { + var region: BeaconPlugin.Region; + cordova.plugins.locationManager.stopRangingBeaconsInRegion(region) + .then(() => { + console.log("stopRangingBeaconsInRegion succeeded"); + }) + .catch((reason: any) => { + console.error("stopRangingBeaconsInRegion failed: " + reason); + }); +} + +function didDetermineStateForRegion(pluginResult: BeaconPlugin.PluginResult): void { + if (pluginResult.state === "CLRegionStateInside") { + console.log(pluginResult.region.identifier); + } +} + +function didChangeAuthorizationStatus(authorizationStatus: string): void { + console.log(authorizationStatus); +} + +function didStartMonitoringForRegion(pluginResult: BeaconPlugin.PluginResult): void { + console.log(pluginResult.region.identifier); +} + +function monitoringDidFailForRegionWithError(pluginResult: BeaconPlugin.PluginResult): void { + console.log(pluginResult.region.identifier); +} \ No newline at end of file diff --git a/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts b/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts new file mode 100644 index 000000000..8f1f6af1a --- /dev/null +++ b/cordova-plugin-ibeacon/cordova-plugin-ibeacon.d.ts @@ -0,0 +1,95 @@ +// Type definitions for cordova-plugin-ibeacon v3.3.0 +// Project: https://github.com/petermetz/cordova-plugin-ibeacon +// Definitions by: Markus Wagner +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +interface CordovaPlugins { + locationManager: BeaconPlugin.LocationManager; +} + +declare module BeaconPlugin { + /** + * Beacon Plugin. + */ + export interface LocationManager { + delegate: Delegate; + BeaconRegion: BeaconRegion; + onDomDelegateReady(): void; + startMonitoringForRegion(region: Region): Q.Promise; + stopMonitoringForRegion(region: Region): Q.Promise; + requestStateForRegion(region: Region): Q.Promise; + startRangingBeaconsInRegion(region: Region): Q.Promise; + stopRangingBeaconsInRegion(region: Region): Q.Promise; + getAuthorizationStatus(): Q.Promise; + requestWhenInUseAuthorization(): Q.Promise; + requestAlwaysAuthorization(): Q.Promise; + getMonitoredRegions(): Q.Promise; + getRangedRegions(): Q.Promise; + isRangingAvailable(): Q.Promise; + isMonitoringAvailableForClass(region: Region): Q.Promise; + startAdvertising(region: Region, measuredPower: boolean): Q.Promise; + stopAdvertising(): Q.Promise; + isAdvertisingAvailable(): Q.Promise; + isAdvertising(): Q.Promise; + disableDebugLogs(): Q.Promise; + enableDebugNotifications(): Q.Promise; + disableDebugNotifications(): Q.Promise; + enableDebugLogs(): Q.Promise; + isBluetoothEnabled(): Q.Promise; + enableBluetooth(): Q.Promise; + disableBluetooth(): Q.Promise; + appendToDeviceLog(message: string): Q.Promise; + } + + export interface PluginResult { + eventType: string; + region: Region; + beacons: Beacon[]; + authorizationStatus: string; + state: string; + } + + export interface Delegate { + didDetermineStateForRegion(pluginResult: PluginResult): void; + didStartMonitoringForRegion(pluginResult: PluginResult): void; + didExitRegion(pluginResult: PluginResult): void; + didEnterRegion(pluginResult: PluginResult): void; + didRangeBeaconsInRegion(pluginResult: PluginResult): void; + peripheralManagerDidStartAdvertising(pluginResult: PluginResult): void; + peripheralManagerDidUpdateState(pluginResult: PluginResult): void; + didChangeAuthorizationStatus(authorizationStatus: string): void; + monitoringDidFailForRegionWithError(pluginResult: PluginResult): void; + } + + export interface Region { + identifier: string; + new (identifier: string): Region; + } + + export interface BeaconRegion extends Region { + uuid: string; + major: string; + minor: string; + notifyEntryStateOnDisplay: boolean; + new (identifier: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion; + } + + export interface CircularRegion extends Region { + latitude: number; + longitude: number; + radius: number; + new (identifier: string, latitude: number, longitude: number, radius: number): CircularRegion; + } + + export interface Beacon { + uuid: string; + major: string; + minor: string; + proximity: string; + tx: number; + rssi: number; + accuracy: number; + } +}