Merge pull request #24 from awong1900/dev

Dev
Seeed-Studio · Feb 14, 2016 · a1f09bc · a1f09bc
2 parents 7835ea2 + 0113797
commit a1f09bc
Show file tree

Hide file tree

Showing 65 changed files with 538 additions and 4,006 deletions.
diff --git a/android/app/app.iml b/android/app/app.iml
@@ -112,12 +112,12 @@
     <orderEntry type="library" exported="" name="ldrawer-0.1" level="project" />
     <orderEntry type="library" exported="" name="yamlbeans-1.09" level="project" />
     <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
-    <orderEntry type="library" exported="" name="core-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
+    <orderEntry type="library" exported="" name="core-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v13-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "cc.seeed.iot.ap"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 10
-        versionName "2.0.3"
+        versionCode 12
+        versionName "2.1.1"
     }
     buildTypes {
         release {

diff --git a/android/app/src/main/java/cc/seeed/iot/MyApplication.java b/android/app/src/main/java/cc/seeed/iot/MyApplication.java
@@ -5,7 +5,6 @@
 
 import cc.seeed.iot.datastruct.User;
 import cc.seeed.iot.util.Common;
-import cc.seeed.iot.webapi.ExchangeApi;
 import cc.seeed.iot.webapi.IotApi;
 
 /**
@@ -52,7 +51,6 @@ public void onCreate() {
 
     private void init() {
         IotApi.SetServerUrl(ota_server_url);
-        ExchangeApi.SetServerUrl(exchange_server_url);
     }
 
     public Boolean getLoginState() {

diff --git a/android/app/src/main/java/cc/seeed/iot/datastruct/Constant.java b/android/app/src/main/java/cc/seeed/iot/datastruct/Constant.java
@@ -9,6 +9,11 @@ public class Constant {
             "All",
             "Input",
             "Output",
+            "GPIO",
+            "ANALOG",
+            "UART",
+            "I2C",
+            "EVENT",
     };
 
 

diff --git a/android/app/src/main/java/cc/seeed/iot/esptouch/EsptouchResult.java b/android/app/src/main/java/cc/seeed/iot/esptouch/EsptouchResult.java
diff --git a/android/app/src/main/java/cc/seeed/iot/esptouch/EsptouchTask.java b/android/app/src/main/java/cc/seeed/iot/esptouch/EsptouchTask.java
diff --git a/android/app/src/main/java/cc/seeed/iot/esptouch/IEsptouchResult.java b/android/app/src/main/java/cc/seeed/iot/esptouch/IEsptouchResult.java
diff --git a/android/app/src/main/java/cc/seeed/iot/esptouch/IEsptouchTask.java b/android/app/src/main/java/cc/seeed/iot/esptouch/IEsptouchTask.java
diff --git a/android/app/src/main/java/cc/seeed/iot/esptouch/protocol/DataCode.java b/android/app/src/main/java/cc/seeed/iot/esptouch/protocol/DataCode.java