Mercurial > party-buddy

changeset 14:a2e7c8de07f6 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sat, 01 Jun 2013 19:19:34 +0200
parents 3ba185e21a91 (current diff) 1d9ebcb40456 (diff)
children
files bin/build.prop
diffstat 5 files changed, 89 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/AndroidManifest.xml	Sat Jun 01 19:12:35 2013 +0200
+++ b/AndroidManifest.xml	Sat Jun 01 19:19:34 2013 +0200
@@ -29,6 +29,8 @@
         />
 
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
--- a/assets/www/index.html	Sat Jun 01 19:12:35 2013 +0200
+++ b/assets/www/index.html	Sat Jun 01 19:19:34 2013 +0200
@@ -34,11 +34,29 @@
     // Cordova is ready
     //
     function onDeviceReady() {
-        plugin = cordova.require('cordova/plugin/bluetooth');
+        plugin = window.plugins.bluetooth;
+        plugin.enableBT(null,
+                function(r){console.log(r)},
+                function(e){console.log(e)}
+                );
+        plugin.isBTEnabled(null,
+                function(r){console.log(r)},
+                function(e){console.log(e)}
+                );
         plugin.listDevices(null,
                 function(r){console.log(r)},
                 function(e){console.log(e)}
                 );
+
+        cordova.exec(sucCallback, failCallback, 'BluetoothPlugin', 'listDevices', [null]);
+    }
+
+    function sucCallback() {
+        console.log('success', arguments);
+    }
+
+    function failCallback() {
+        console.log('error', arguments);
     }
         //navigator.accelerometer.getCurrentAcceleration(onSuccess, onError);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/AndroidManifest.xml	Sat Jun 01 19:19:34 2013 +0200
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
+      package="com.nigmalabs.partybuddy" android:versionName="1.0" android:versionCode="1" android:hardwareAccelerated="true">
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+
+
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+        android:hardwareAccelerated="true"
+        android:debuggable="true">
+        <activity android:name="partybuddy" android:label="@string/app_name"
+                android:theme="@android:style/Theme.Black.NoTitleBar"
+                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
+</manifest> 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/proguard.txt	Sat Jun 01 19:19:34 2013 +0200
@@ -0,0 +1,3 @@
+# view AndroidManifest.xml #generated:54
+-keep class com.nigmalabs.partybuddy.partybuddy { <init>(...); }
+
Binary file src/com/phonegap/plugins/bluetooth/.BluetoothPlugin.java.swp has changed