github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge conflict

Browse Source
This commit is contained in:
macdonst
2010-09-16 13:39:59 -04:00
parent 8da131cc45 5cd25316fa
commit c483ebd1d7
7 changed files with 276 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/device.js
+35 -34
View File
@@ -1,59 +1,60 @@
/**
* this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
* This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
* phone, etc.
* @constructor
*/
function Device() {
this.available = PhoneGap.available;
this.platform = null;
this.version = null;
this.name = null;
this.gap = null;
this.uuid = null;
try {
if (window.DroidGap) {
this.available = true;
this.uuid = window.DroidGap.getUuid();
this.version = window.DroidGap.getOSVersion();
this.gapVersion = window.DroidGap.getVersion();
this.platform = window.DroidGap.getPlatform();
this.name = window.DroidGap.getProductName();
this.line1Number = window.DroidGap.getLine1Number();
this.deviceId = window.DroidGap.getDeviceId();
this.simSerialNumber = window.DroidGap.getSimSerialNumber();
this.subscriberId = window.DroidGap.getSubscriberId();
}
} catch(e) {
this.available = false;
}
this.version = null;
this.name = null;
this.uuid = null;
this.phonegap = null;
var me = this;
PhoneGap.execAsync(
function(info) {
me.available = true;
me.platform = info.platform;
me.version = info.version;
me.uuid = info.uuid;
me.phonegap = info.phonegap;
},
function(e) {
me.available = false;
console.log("Error initializing PhoneGap: " + e);
alert("Error initializing PhoneGap: "+e);
},
"Device", "getDeviceInfo", []);
}
/*
* You must explicitly override the back button.
* This is only for Android.
*
* You must explicitly override the back button.
*/
Device.prototype.overrideBackButton = function()
{
BackButton.override();
Device.prototype.overrideBackButton = function() {
BackButton.override();
}
/*
* This is only for Android.
*
* This resets the back button to the default behaviour
*/
Device.prototype.resetBackButton = function()
{
BackButton.reset();
Device.prototype.resetBackButton = function() {
BackButton.reset();
}
/*
* This is only for Android.
*
* This terminates the activity!
*/
Device.prototype.exitApp = function()
{
BackButton.exitApp();
Device.prototype.exitApp = function() {
BackButton.exitApp();
}
PhoneGap.addConstructor(function() {
navigator.device = window.device = new Device();
});
});
framework/assets/js/notification.js
+6 -21
View File
@@ -2,7 +2,6 @@
* This class provides access to notifications on the device.
*/
function Notification() {
}
/**
@@ -34,7 +33,7 @@ Notification.prototype.activityStop = function() {
* @param {String} colour The colour of the light.
*/
Notification.prototype.blink = function(count, colour) {
};
/**
@@ -42,16 +41,17 @@ Notification.prototype.blink = function(count, colour) {
* @param {Integer} mills The number of milliseconds to vibrate for.
*/
Notification.prototype.vibrate = function(mills) {
PhoneGap.execAsync(null, null, "Device", "vibrate", [mills]);
};
/**
* Causes the device to beep.
* On Android, the default notification ringtone is played.
*
* @param {Integer} count The number of beeps.
* @param {Integer} volume The volume of the beep.
*/
Notification.prototype.beep = function(count, volume) {
Notification.prototype.beep = function(count) {
PhoneGap.execAsync(null, null, "Device", "beep", [count]);
};
// TODO: of course on Blackberry and Android there notifications in the UI as well
@@ -60,18 +60,3 @@ PhoneGap.addConstructor(function() {
if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
});
Notification.prototype.vibrate = function(mills)
{
DroidGap.vibrate(mills);
}
/*
* On the Android, we don't beep, we notify you with your
* notification! We shouldn't keep hammering on this, and should
* review what we want beep to do.
*/
Notification.prototype.beep = function(count, volume)
{
DroidGap.beep(count);
}
framework/assets/js/phonegap.js.base
+33 -3
View File
@@ -219,6 +219,36 @@ document.addEventListener = function(evt, handler, capture) {
}
};
/**
* If JSON not included, use our own stringify. (Android 1.6)
* The restriction on ours is that it must be an array of simple types.
*
* @param args
* @return
*/
PhoneGap.stringify = function(args) {
if (typeof JSON == "undefined") {
var s = "[";
for (var i=0; i<args.length; i++) {
if (i > 0) {
s = s + ",";
}
var type = typeof args[i];
if ((type == "number") || (type == "boolean")) {
s = s + args[i];
}
else {
s = s + '"' + args[i] + '"';
}
}
s = s + "]";
return s;
}
else {
return JSON.stringify(args);
}
};
PhoneGap.callbackId = 0;
PhoneGap.callbacks = {};
@@ -232,7 +262,7 @@ PhoneGap.callbacks = {};
PhoneGap.exec = function(clazz, action, args) {
try {
var callbackId = 0;
var r = PluginManager.exec(clazz, action, callbackId, JSON.stringify(args), false);
var r = PluginManager.exec(clazz, action, callbackId, this.stringify(args), false);
eval("var v="+r+";");
// If status is OK, then return value back to caller
@@ -256,10 +286,10 @@ PhoneGap.execAsync = function(success, fail, clazz, action, args) {
if (success || fail) {
PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
}
var r = PluginManager.exec(clazz, action, callbackId, JSON.stringify(args), true);
var r = PluginManager.exec(clazz, action, callbackId, this.stringify(args), true);
// If a result was returned
if (r) {
if (typeof r == "string") {
eval("var v="+r+";");
// If status is OK, then return value back to caller