修改协议切换，增加 fzd,mqtt 支持

diff --git a/app/app.iml b/app/app.iml
index 77c19ca..24e089e 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="android-gradle" name="Android-Gradle">\r
       <configuration>\r
@@ -110,27 +110,27 @@
     <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: se.wetcat.qatja:core:1.0.4@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>\r
     <orderEntry type="module" module-name="dNSCache"/>\r
+    <orderEntry type="module" module-name="core"/>\r
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
   </component>\r
 </module>\r

diff --git a/settings.gradle b/settings.gradle
index 6b0a1a1..5220340 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
+include ':core'\r
 include ':app'\r
 include ':dNSCache'\r