[wechat] adbout mqtt3.1

jiaomy2016 · Jan 19, 2017 · af16f55 · af16f55
1 parent 610bae0
commit af16f55
Show file tree

Hide file tree

Showing 32 changed files with 26,485 additions and 6 deletions.
diff --git a/android/FogLibraryDemo/.idea/gradle.xml b/android/FogLibraryDemo/.idea/gradle.xml
diff --git a/android/FogLibraryDemo/.idea/misc.xml b/android/FogLibraryDemo/.idea/misc.xml
diff --git a/android/FogLibraryDemo/.idea/modules.xml b/android/FogLibraryDemo/.idea/modules.xml
diff --git a/android/FogLibraryDemo/app/build.gradle b/android/FogLibraryDemo/app/build.gradle
@@ -40,6 +40,6 @@ dependencies {
     compile 'com.android.support:design:23.2.1'
     compile 'com.google.android.gms:play-services-appindexing:8.1.0'
 
-//    compile project(':Fog2_container:fog2_sdk')
-    compile 'io.fogcloud.sdk:fog2_sdk:0.1.1'
+    compile project(':Fog2_container:fog2_sdk')
+//    compile 'io.fogcloud.sdk:fog2_sdk:0.1.1'
 }
diff --git a/android/FogLibraryDemo/app/src/main/java/com/mxchip/fragments/EasyLinkFragment.java b/android/FogLibraryDemo/app/src/main/java/com/mxchip/fragments/EasyLinkFragment.java
@@ -96,7 +96,7 @@ public void onClick(View v) {
 
                     String ssid = ssid_et.getText().toString().trim();
                     String password = password_et.getText().toString().trim();
-                    micodev.startEasyLink(ssid, password, false, 40000, 20, "", "", new EasyLinkCallBack() {
+                    micodev.startEasyLink(ssid, password, true, 40000, 20, "", "", new EasyLinkCallBack() {
                         @Override
                         public void onSuccess(int code,String message) {
                             Log.d(TAG, message);

diff --git a/android/FogLibraryDemo/settings.gradle b/android/FogLibraryDemo/settings.gradle
@@ -1,5 +1,5 @@
 include ':app'
 
-//include ':Fog2_container'
-//project(':Fog2_container').projectDir = new File('../../../../../develop/androids/Fog2_container/')
-//include ':Fog2_container:fog2_sdk'
+include ':Fog2_container'
+project(':Fog2_container').projectDir = new File('../../../../../develop/androids/Fog2_container/')
+include ':Fog2_container:fog2_sdk'
diff --git a/wechat/css/bootstrap-theme.min.css → wechat/Demo/css/bootstrap-theme.min.css b/wechat/css/bootstrap-theme.min.css → wechat/Demo/css/bootstrap-theme.min.css
diff --git a/wechat/css/bootstrap.min.css → wechat/Demo/css/bootstrap.min.css b/wechat/css/bootstrap.min.css → wechat/Demo/css/bootstrap.min.css
diff --git a/wechat/css/foundation.css → wechat/Demo/css/foundation.css b/wechat/css/foundation.css → wechat/Demo/css/foundation.css
diff --git a/wechat/ws/index_ws.html → wechat/Demo/index_ws.html b/wechat/ws/index_ws.html → wechat/Demo/index_ws.html
diff --git a/wechat/js/bootstrap.min.js → wechat/Demo/js/bootstrap.min.js b/wechat/js/bootstrap.min.js → wechat/Demo/js/bootstrap.min.js
diff --git a/wechat/js/fog2.js → wechat/Demo/js/fog2.js b/wechat/js/fog2.js → wechat/Demo/js/fog2.js
diff --git a/wechat/js/jquery-2.1.3.js → wechat/Demo/js/jquery-2.1.3.js b/wechat/js/jquery-2.1.3.js → wechat/Demo/js/jquery-2.1.3.js
diff --git a/wechat/js/mqttws31.js → wechat/Demo/js/mqttws31.js b/wechat/js/mqttws31.js → wechat/Demo/js/mqttws31.js
diff --git a/wechat/js/mqttws31_bak.js → wechat/Demo/js/mqttws31_bak.js b/wechat/js/mqttws31_bak.js → wechat/Demo/js/mqttws31_bak.js
diff --git a/wechat/js/vue2.js → wechat/Demo/js/vue2.js b/wechat/js/vue2.js → wechat/Demo/js/vue2.js
diff --git a/wechat/README.md → wechat/test/README.md b/wechat/README.md → wechat/test/README.md
diff --git a/wechat/test/css/bootstrap-theme.min.css b/wechat/test/css/bootstrap-theme.min.css
diff --git a/wechat/test/css/bootstrap.min.css b/wechat/test/css/bootstrap.min.css