Skip to content

Updates to fix with phone gap-nfc 0.2.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
don merged 5 commits into from
Sep 13, 2011
Merged

Updates to fix with phone gap-nfc 0.2.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae02653
fix to work with NFCPlugin 0.1.5
m00sey Sep 7, 2011
f468a56
updates to work with phonegap-nfc 0.2.0
m00sey Sep 7, 2011
6131ec3
updated to latest
m00sey Sep 7, 2011
00bd57c
removed logging
m00sey Sep 8, 2011
e66eeeb
using released 0.2.0 version
m00sey Sep 9, 2011
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
2 changes: 1 addition & 1 deletion assets/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>NFC Reader Demo</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script type="text/javascript" charset="utf-8" src="phonegap-1.0.0.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap-nfc-0.1.3.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap-nfc-0.2.0.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>

Expand Down
14 changes: 7 additions & 7 deletions assets/www/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
var tagMimeType = "text/pg";

function template(record) {
var recordType = Ndef.bytesToString(record.type),
var recordType = nfc.bytesToString(record.type),
payload;

if (recordType === "T") {
var langCodeLength = record.payload[0],
text = record.payload.slice((1 + langCodeLength), record.payload.length);

payload = Ndef.bytesToString(text);
payload = nfc.bytesToString(text);

} else if (recordType === "U") {
var url = Ndef.bytesToString(record.payload);
var url = nfc.bytesToString(record.payload);
payload = "<a href='" + url + "'>" + url + "<\/a>";

} else {
payload = Ndef.bytesToString(record.payload);
payload = nfc.bytesToString(record.payload);

}

Expand Down Expand Up @@ -91,9 +91,9 @@ var ready = function() {
navigator.notification.alert(reason, function() {}, "There was a problem");
}

navigator.nfc.addMimeTypeListener(tagMimeType, myNfcListener, win, fail);
nfc.addMimeTypeListener(tagMimeType, myNfcListener, win, fail);

navigator.nfc.addNdefListener(
nfc.addNdefListener(
// function() {
// showText("This is an NDEF tag but doesn't match the mime type " + tagMimeType + ".");
// },
Expand All @@ -104,7 +104,7 @@ var ready = function() {
fail
);

navigator.nfc.addNdefFormatableListener(
nfc.addNdefFormatableListener(
function() {
navigator.notification.vibrate(100);
showText("This tag is can be NDEF formatted. ");
Expand Down
115 changes: 68 additions & 47 deletions assets/www/phonegap-nfc-0.1.3.js → assets/www/phonegap-nfc-0.2.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ PhoneGap.addConstructor(
function () {
PhoneGap.exec(
function () {
console.log("Initialized the NdefPlugin");
console.log("Initialized the NfcPlugin");
},
function (reason) {
alert("Failed to initialize the NdefPlugin " + reason);
alert("Failed to initialize the NfcPlugin " + reason);
},
"NdefPlugin", "init", []
"NfcPlugin", "init", []
)
}
);

var Ndef = {
var ndef = {
// see android.nfc.NdefRecord for documentation about constants
// http://developer.android.com/reference/android/nfc/NdefRecord.html
TNF_EMPTY: 0x0,
Expand Down Expand Up @@ -68,10 +68,10 @@ var Ndef = {
if (!id) { id = []; }

payload.push(languageCode.length);
Ndef.concatArray(payload, Ndef.stringToBytes(languageCode));
Ndef.concatArray(payload, Ndef.stringToBytes(text));
nfc.concatArray(payload, nfc.stringToBytes(languageCode));
nfc.concatArray(payload, nfc.stringToBytes(text));

return Ndef.record(Ndef.TNF_WELL_KNOWN, Ndef.RTD_TEXT, id, payload);
return NFC.record(ndef.TNF_WELL_KNOWN, ndef.RTD_TEXT, id, payload);
},

/**
Expand All @@ -82,7 +82,7 @@ var Ndef = {
*/
uriRecord: function (text, id) {
if (!id) { id = []; }
return Ndef.record(Ndef.TNF_ABSOLUTE_URI, Ndef.RTD_URI, id, Ndef.stringToBytes(text));
return ndef.record(ndef.TNF_ABSOLUTE_URI, ndef.RTD_URI, id, nfc.stringToBytes(text));
},

/**
Expand All @@ -94,76 +94,97 @@ var Ndef = {
*/
mimeMediaRecord: function (mimeType, payload, id) {
if (!id) { id = []; }
return Ndef.record(Ndef.TNF_MIME_MEDIA, Ndef.stringToBytes(mimeType), id, payload);
return ndef.record(ndef.TNF_MIME_MEDIA, nfc.stringToBytes(mimeType), id, payload);
}
};

var nfc = {

addTagDiscoveredListener: function (callback, win, fail) {
document.addEventListener("tag", callback, false);
PhoneGap.exec(win, fail, "NfcPlugin", "registerTag", []);
},

addMimeTypeListener: function (mimeType, callback, win, fail) {
document.addEventListener("ndef-mime", callback, false);
PhoneGap.exec(win, fail, "NfcPlugin", "registerMimeType", [mimeType]);
},

addNdefListener: function (callback, win, fail) {
document.addEventListener("ndef", callback, false);
PhoneGap.exec(win, fail, "NfcPlugin", "registerNdef", []);
},

addNdefFormatableListener: function (callback, win, fail) {
document.addEventListener("ndef-formatable", callback, false);
PhoneGap.exec(win, fail, "NfcPlugin", "registerNdefFormatable", []);
},

write: function (ndefMessage, win, fail) {
PhoneGap.exec(win, fail, "NfcPlugin", "writeTag", [ndefMessage]);
},

share: function (ndefMessage, win, fail) {
PhoneGap.exec(win, fail, "NfcPlugin", "shareTag", [ndefMessage]);
},

unshare: function (win, fail) {
PhoneGap.exec(win, fail, "NfcPlugin", "unshareTag", []);
},

erase: function (win, fail) {
PhoneGap.exec(win, fail, "NfcPlugin", "writeTag", [[]]);
},

concatArray: function (a1, a2) { // this isn't built in?
for (var i = 0; i < a2.length; i++) {
a1.push(a2[i]);
}
return a1;
},

bytesToString: function (bytes) {
var bytesAsString = "";
for (var i = 0; i < bytes.length; i++) {
bytesAsString += String.fromCharCode(bytes[i]);
}
return bytesAsString;
},

// http://stackoverflow.com/questions/1240408/reading-bytes-from-a-javascript-string#1242596
stringToBytes: function ( str ) {
var ch, st, re = [];
for (var i = 0; i < str.length; i++ ) {
ch = str.charCodeAt(i); // get char
ch = str.charCodeAt(i); // get char
st = []; // set up "stack"
do {
st.push( ch & 0xFF ); // push byte to stack
ch = ch >> 8; // shift value down by 1 byte
}
}
while ( ch );
// add stack contents to result
// done because chars have "wrong" endianness
re = re.concat( st.reverse() );
}
// return an array of bytes
return re;
}

};

navigator.nfc = {

addMimeTypeListener: function (mimeType, callback, win, fail) {
document.addEventListener("ndef-mime", callback, false);
PhoneGap.exec(win, fail, "NdefPlugin", "registerMimeType", [mimeType]);
},

addNdefListener: function (callback, win, fail) {
document.addEventListener("ndef", callback, false);
PhoneGap.exec(win, fail, "NdefPlugin", "registerNdef", []);
},

addNdefFormatableListener: function (callback, win, fail) {
document.addEventListener("ndef-formatable", callback, false);
PhoneGap.exec(win, fail, "NdefPlugin", "registerNdefFormatable", []);
},

writeTag: function (ndefMessage, win, fail) {
PhoneGap.exec(win, fail, "NdefPlugin", "writeTag", [ndefMessage]);
},

shareTag: function (ndefMessage, win, fail) {
PhoneGap.exec(win, fail, "NdefPlugin", "shareTag", [ndefMessage]);
},

unshareTag: function (win, fail) {
PhoneGap.exec(win, fail, "NdefPlugin", "unshareTag", []);
},

eraseTag: function (win, fail) {
PhoneGap.exec(win, fail, "NdefPlugin", "writeTag", [[]]);
bytesToHexString: function (bytes) {
var bytesAsHexString = "";
for (var i = 0; i < bytes.length; i++) {
if(bytes[i] >= 0) {
dec = bytes[i];
} else {
dec = 256 + bytes[i];
}
hexstring = dec.toString(16);
// zero padding
if(hexstring.length == 1) {
hexstring = "0" + hexstring;
}
bytesAsHexString += hexstring;
}
return bytesAsHexString;
}

};
Binary file removed lib/phonegap-nfc-0.1.3.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/phonegap-nfc-0.2.0.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion res/xml/plugins.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
<plugin name="Temperature" value="com.phonegap.TempListener"/>
<plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
<plugin name="Capture" value="com.phonegap.Capture"/>
<plugin name="NdefPlugin" value="com.chariotsolutions.nfc.plugin.NdefPlugin"/>
<plugin name="NfcPlugin" value="com.chariotsolutions.nfc.plugin.NfcPlugin"/>
</plugins>