summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTonyCave2013-12-10 16:22:11 -0600
committerTonyCave2013-12-10 16:22:11 -0600
commit595727bc69037f52ffe502671c58206db4bb871b (patch)
tree418e5b53ac9783b342d799de6925b7f735c239d9
parent23f4edaa9116a2b6cfc92eb469a290124616a67d (diff)
downloadlighting-gateway-595727bc69037f52ffe502671c58206db4bb871b.tar.gz
lighting-gateway-595727bc69037f52ffe502671c58206db4bb871b.tar.xz
lighting-gateway-595727bc69037f52ffe502671c58206db4bb871b.zip
Updated Android App
-rwxr-xr-xclient/AndroidClients/LightingController/.classpath2
-rwxr-xr-xclient/AndroidClients/LightingController/.project66
-rwxr-xr-xclient/AndroidClients/LightingController/AndroidManifest.xml2
-rwxr-xr-xclient/AndroidClients/LightingController/bin/AndroidManifest.xml2
-rw-r--r--client/AndroidClients/LightingController/bin/LightingController.apkbin337434 -> 90216 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.classbin865 -> 866 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.classbin858 -> 858 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.classbin886 -> 886 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.classbin2034 -> 2034 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.classbin980 -> 980 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.classbin3017 -> 3017 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.classbin4115 -> 3166 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.classbin10923 -> 10923 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/gen/com/lightingcontroller/R.java2
-rw-r--r--client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.pngbin0 -> 14193 bytes
-rwxr-xr-xclient/AndroidClients/LightingController/res/values/strings.xml2
-rwxr-xr-xclient/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java3
17 files changed, 40 insertions, 39 deletions
diff --git a/client/AndroidClients/LightingController/.classpath b/client/AndroidClients/LightingController/.classpath
index ce3da48..f9dcfda 100755
--- a/client/AndroidClients/LightingController/.classpath
+++ b/client/AndroidClients/LightingController/.classpath
@@ -2,8 +2,8 @@
2<classpath> 2<classpath>
3 <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> 3 <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4 <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> 4 <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5 <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
5 <classpathentry kind="src" path="src"/> 6 <classpathentry kind="src" path="src"/>
6 <classpathentry kind="src" path="gen"/> 7 <classpathentry kind="src" path="gen"/>
7 <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
8 <classpathentry kind="output" path="bin/classes"/> 8 <classpathentry kind="output" path="bin/classes"/>
9</classpath> 9</classpath>
diff --git a/client/AndroidClients/LightingController/.project b/client/AndroidClients/LightingController/.project
index bb70ac8..7e9206a 100755
--- a/client/AndroidClients/LightingController/.project
+++ b/client/AndroidClients/LightingController/.project
@@ -1,33 +1,33 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription> 2<projectDescription>
3 <name>LightingController</name> 3 <name>LightingController</name>
4 <comment></comment> 4 <comment></comment>
5 <projects> 5 <projects>
6 </projects> 6 </projects>
7 <buildSpec> 7 <buildSpec>
8 <buildCommand> 8 <buildCommand>
9 <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> 9 <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10 <arguments> 10 <arguments>
11 </arguments> 11 </arguments>
12 </buildCommand> 12 </buildCommand>
13 <buildCommand> 13 <buildCommand>
14 <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> 14 <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15 <arguments> 15 <arguments>
16 </arguments> 16 </arguments>
17 </buildCommand> 17 </buildCommand>
18 <buildCommand> 18 <buildCommand>
19 <name>org.eclipse.jdt.core.javabuilder</name> 19 <name>org.eclipse.jdt.core.javabuilder</name>
20 <arguments> 20 <arguments>
21 </arguments> 21 </arguments>
22 </buildCommand> 22 </buildCommand>
23 <buildCommand> 23 <buildCommand>
24 <name>com.android.ide.eclipse.adt.ApkBuilder</name> 24 <name>com.android.ide.eclipse.adt.ApkBuilder</name>
25 <arguments> 25 <arguments>
26 </arguments> 26 </arguments>
27 </buildCommand> 27 </buildCommand>
28 </buildSpec> 28 </buildSpec>
29 <natures> 29 <natures>
30 <nature>com.android.ide.eclipse.adt.AndroidNature</nature> 30 <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31 <nature>org.eclipse.jdt.core.javanature</nature> 31 <nature>org.eclipse.jdt.core.javanature</nature>
32 </natures> 32 </natures>
33</projectDescription> 33</projectDescription>
diff --git a/client/AndroidClients/LightingController/AndroidManifest.xml b/client/AndroidClients/LightingController/AndroidManifest.xml
index 45fb8cd..c420eec 100755
--- a/client/AndroidClients/LightingController/AndroidManifest.xml
+++ b/client/AndroidClients/LightingController/AndroidManifest.xml
@@ -15,7 +15,7 @@
15 android:anyDensity="true"/> 15 android:anyDensity="true"/>
16 16
17 <application 17 <application
18 android:icon="@drawable/tizllicon" 18 android:icon="@drawable/zllapplogo"
19 android:label="@string/app_name" > 19 android:label="@string/app_name" >
20 <activity 20 <activity
21 android:label="@string/app_name" 21 android:label="@string/app_name"
diff --git a/client/AndroidClients/LightingController/bin/AndroidManifest.xml b/client/AndroidClients/LightingController/bin/AndroidManifest.xml
index 45fb8cd..c420eec 100755
--- a/client/AndroidClients/LightingController/bin/AndroidManifest.xml
+++ b/client/AndroidClients/LightingController/bin/AndroidManifest.xml
@@ -15,7 +15,7 @@
15 android:anyDensity="true"/> 15 android:anyDensity="true"/>
16 16
17 <application 17 <application
18 android:icon="@drawable/tizllicon" 18 android:icon="@drawable/zllapplogo"
19 android:label="@string/app_name" > 19 android:label="@string/app_name" >
20 <activity 20 <activity
21 android:label="@string/app_name" 21 android:label="@string/app_name"
diff --git a/client/AndroidClients/LightingController/bin/LightingController.apk b/client/AndroidClients/LightingController/bin/LightingController.apk
index 69593cc..013770d 100644
--- a/client/AndroidClients/LightingController/bin/LightingController.apk
+++ b/client/AndroidClients/LightingController/bin/LightingController.apk
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class
index 8e6dc24..02626be 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class
index ac26807..f47e6eb 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class
index 6c88c01..e1638a5 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class
index c2bf6ed..1d791b0 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class
index edcc641..ab4c583 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class
index d462643..dd0915e 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class
index eff697c..c168adf 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class
index ab55b41..a87bc2d 100755
--- a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class
+++ b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class
Binary files differ
diff --git a/client/AndroidClients/LightingController/gen/com/lightingcontroller/R.java b/client/AndroidClients/LightingController/gen/com/lightingcontroller/R.java
index 9e0e0d6..4ba2aa2 100755
--- a/client/AndroidClients/LightingController/gen/com/lightingcontroller/R.java
+++ b/client/AndroidClients/LightingController/gen/com/lightingcontroller/R.java
@@ -37,7 +37,7 @@ public final class R {
37 public static final int layoutborder=0x7f02000a; 37 public static final int layoutborder=0x7f02000a;
38 public static final int popup=0x7f02000b; 38 public static final int popup=0x7f02000b;
39 public static final int tilogo=0x7f02000c; 39 public static final int tilogo=0x7f02000c;
40 public static final int tizllicon=0x7f02000d; 40 public static final int zllapplogo=0x7f02000d;
41 } 41 }
42 public static final class id { 42 public static final class id {
43 public static final int FrameLable03=0x7f080034; 43 public static final int FrameLable03=0x7f080034;
diff --git a/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png b/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png
new file mode 100644
index 0000000..b6e34ed
--- /dev/null
+++ b/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png
Binary files differ
diff --git a/client/AndroidClients/LightingController/res/values/strings.xml b/client/AndroidClients/LightingController/res/values/strings.xml
index 4a3186b..b4f8083 100755
--- a/client/AndroidClients/LightingController/res/values/strings.xml
+++ b/client/AndroidClients/LightingController/res/values/strings.xml
@@ -2,7 +2,7 @@
2<resources> 2<resources>
3 3
4 <string name="hello">Hello World, UART_Jni!</string> 4 <string name="hello">Hello World, UART_Jni!</string>
5 <string name="app_name">ZllRemote</string> 5 <string name="app_name">ZllController</string>
6 <string-array name="OSC"> 6 <string-array name="OSC">
7 <item>Internal OSC</item>> 7 <item>Internal OSC</item>>
8 <item>External-16M</item>> 8 <item>External-16M</item>>
diff --git a/client/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java b/client/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java
index adfcc12..2867d65 100755
--- a/client/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java
+++ b/client/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java
@@ -299,6 +299,7 @@ public class zllMain extends Activity {
299 299
300 if (rspSuccess == false) 300 if (rspSuccess == false)
301 { 301 {
302 /* take no action for now
302 AlertDialog show = new AlertDialog.Builder(zllMain.this) 303 AlertDialog show = new AlertDialog.Builder(zllMain.this)
303 .setTitle(param) 304 .setTitle(param)
304 .setMessage("Device " + zllMain.currDevice.Name + " Not Responding.") 305 .setMessage("Device " + zllMain.currDevice.Name + " Not Responding.")
@@ -308,7 +309,7 @@ public class zllMain extends Activity {
308 public void onClick(DialogInterface dialoginterface,int i){ 309 public void onClick(DialogInterface dialoginterface,int i){
309 } 310 }
310 }) 311 })
311 .show(); 312 .show();*/
312 } 313 }
313 314
314 } 315 }