diff --git a/Android-ZBLibrary.iml b/Android-ZBLibrary.iml
index 1b13b92b..485f70fa 100644
--- a/Android-ZBLibrary.iml
+++ b/Android-ZBLibrary.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/QRCodeLibrary/QRCodeLibrary.iml b/QRCodeLibrary/QRCodeLibrary.iml
index 17977b63..f36f8999 100644
--- a/QRCodeLibrary/QRCodeLibrary.iml
+++ b/QRCodeLibrary/QRCodeLibrary.iml
@@ -23,20 +23,20 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -71,13 +71,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -85,20 +78,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -107,6 +107,6 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Jason/SourceCode/PersonProjects/weij/android/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/QRCodeLibrary/build.gradle b/QRCodeLibrary/build.gradle
index db31fdfa..bc6ceee1 100755
--- a/QRCodeLibrary/build.gradle
+++ b/QRCodeLibrary/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 22
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -17,6 +17,10 @@ android {
     }
     productFlavors {
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/QRCodeLibrary/src/main/AndroidManifest.xml b/QRCodeLibrary/src/main/AndroidManifest.xml
index 7d9a031e..e56ad6fa 100755
--- a/QRCodeLibrary/src/main/AndroidManifest.xml
+++ b/QRCodeLibrary/src/main/AndroidManifest.xml
@@ -4,10 +4,6 @@
           android:versionCode="1"
           android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="22" />
-
     <!-- 复制粘贴到你的工程的AndroidManifest.xml内对应位置 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
 
 
diff --git a/QRCodeLibrary/src/main/res/layout/main.xml b/QRCodeLibrary/src/main/res/layout/main.xml
index b4583740..cf1aa3d8 100755
--- a/QRCodeLibrary/src/main/res/layout/main.xml
+++ b/QRCodeLibrary/src/main/res/layout/main.xml
@@ -38,7 +38,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
-        android:hint="Input the text"/>
+        android:hint="Input the text"
+        android:importantForAutofill="no" />
     
     <Button
         android:id="@+id/btn_add_qrcode"
diff --git a/ZBLibrary/ZBLibrary.iml b/ZBLibrary/ZBLibrary.iml
index 08f966e2..d27d8d59 100644
--- a/ZBLibrary/ZBLibrary.iml
+++ b/ZBLibrary/ZBLibrary.iml
@@ -23,20 +23,20 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -71,13 +71,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -85,20 +78,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -107,28 +107,33 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.0.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide-4.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.54@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder-4.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-27" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/ZBLibrary/build.gradle b/ZBLibrary/build.gradle
index c6e0c25f..ec0df659 100755
--- a/ZBLibrary/build.gradle
+++ b/ZBLibrary/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 22
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -18,17 +18,21 @@ android {
     useLibrary 'org.apache.http.legacy'
     productFlavors {
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
-dependencies { //TODO 如果这些依赖和你项目中的依赖有冲突，则需要统一版本号，或者删除重复的依赖
+dependencies {
+    //TODO 如果这些依赖和你项目中的依赖有冲突，则需要统一版本号，或者删除重复的依赖
     api fileTree(include: ['*.jar'], dir: 'libs')
-    api files('libs/fastjson-1.2.24.jar')
-    api files('libs/glide-full-4.1.1.jar')
-    api files('libs/universal-image-loader-1.9.4.jar') //TODO 只为兼容老用户的项目，建议删除这行，对应的jar包和ImageLoaderUtil.java
-
     api 'com.squareup.okhttp3:okhttp:3.11.0'
-    api 'com.android.support:appcompat-v7:27.0.1'//版本随意（必须）
-    api 'com.android.support:design:27.0.1'//版本随意（非必须，引用可以解决无法预览问题）
+    api 'com.android.support:appcompat-v7:27.1.1'
+    //版本随意（必须）
+    api 'com.android.support:design:27.1.1'
+    //版本随意（非必须，引用可以解决无法预览问题）
     api 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4'
-
+    api 'com.alibaba:fastjson:1.2.54'
+    api 'com.github.bumptech.glide:glide:4.8.0'
 }
diff --git a/ZBLibrary/libs/fastjson-1.2.24.jar b/ZBLibrary/libs/fastjson-1.2.24.jar
deleted file mode 100755
index 4a6652fb..00000000
Binary files a/ZBLibrary/libs/fastjson-1.2.24.jar and /dev/null differ
diff --git a/ZBLibrary/libs/glide-full-4.1.1.jar b/ZBLibrary/libs/glide-full-4.1.1.jar
deleted file mode 100755
index 62f4d357..00000000
Binary files a/ZBLibrary/libs/glide-full-4.1.1.jar and /dev/null differ
diff --git a/ZBLibrary/libs/universal-image-loader-1.9.4.jar b/ZBLibrary/libs/universal-image-loader-1.9.4.jar
deleted file mode 100755
index 871d0e8f..00000000
Binary files a/ZBLibrary/libs/universal-image-loader-1.9.4.jar and /dev/null differ
diff --git a/ZBLibrary/src/main/AndroidManifest.xml b/ZBLibrary/src/main/AndroidManifest.xml
index 85c13179..8f52458b 100755
--- a/ZBLibrary/src/main/AndroidManifest.xml
+++ b/ZBLibrary/src/main/AndroidManifest.xml
@@ -3,10 +3,6 @@
     android:versionCode="16"
     android:versionName="@string/app_version" >
 
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="22" />
-
     <!-- 复制粘贴到你的工程的AndroidManifest.xml内对应位置 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
 
 
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseApplication.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseApplication.java
index 2091f4f1..751b04d8 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseApplication.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseApplication.java
@@ -2,7 +2,6 @@
 
 import zuo.biao.library.R;
 import zuo.biao.library.util.DataKeeper;
-import zuo.biao.library.util.ImageLoaderUtil;
 import zuo.biao.library.util.Log;
 import zuo.biao.library.util.SettingUtil;
 import android.app.Application;
@@ -44,7 +43,6 @@ public static void init(Application application) {
 		
 		DataKeeper.init(instance);
 		SettingUtil.init(instance);
-		ImageLoaderUtil.init(instance);
 	}
 
 	/**获取应用名
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListActivity.java
index fe132de6..7b31c954 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListActivity.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListActivity.java
@@ -74,7 +74,7 @@ public void initView() {
 
 	@Override
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((BaseAdapter) adapter).setOnLoadListener(new OnLoadListener() {
 				@Override
 				public void onRefresh() {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListFragment.java
index 8b7b0cb2..4525bae2 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListFragment.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpListFragment.java
@@ -92,7 +92,7 @@ public void initView() {
 
 	@Override
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((BaseAdapter) adapter).setOnLoadListener(new OnLoadListener() {
 				@Override
 				public void onRefresh() {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java
index b404e2f6..652ffefc 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java
@@ -73,7 +73,7 @@ public void initView() {
 
 	@Override
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnLoadListener(new OnLoadListener() {
 				@Override
 				public void onRefresh() {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java
index d1539461..576fbafb 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java
@@ -91,7 +91,7 @@ public void initView() {
 
 	@Override
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnLoadListener(new OnLoadListener() {
 				@Override
 				public void onRefresh() {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListActivity.java
index 4eb8c3ac..c2956a02 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListActivity.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListActivity.java
@@ -93,7 +93,7 @@ public void initView() {//必须调用
 	 * @param adapter
 	 */
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemClickListener(this);
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemLongClickListener(this);
 		}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListFragment.java
index 60370d51..1e646b89 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListFragment.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseListFragment.java
@@ -127,7 +127,7 @@ public void initView() {//必须调用
 	 * @param adapter
 	 */
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemClickListener(this);
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemLongClickListener(this);
 		}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java
index 9e8e114a..f734a98b 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java
@@ -96,7 +96,7 @@ public void initView() {//必须调用
 	 * @param adapter
 	 */
 	public void setAdapter(A adapter) {
-		if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+		if (adapter instanceof BaseAdapter) {
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemClickListener(this);
 			((zuo.biao.library.base.BaseAdapter) adapter).setOnItemLongClickListener(this);
 		}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java
index b90d4866..270b4594 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java
@@ -128,7 +128,7 @@ public void initView() {//必须调用
      * @param adapter
      */
     public void setAdapter(A adapter) {
-        if (adapter != null && adapter instanceof zuo.biao.library.base.BaseAdapter) {
+        if (adapter instanceof BaseAdapter) {
             ((zuo.biao.library.base.BaseAdapter) adapter).setOnItemClickListener(this);
             ((zuo.biao.library.base.BaseAdapter) adapter).setOnItemLongClickListener(this);
         }
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/AlertDialog.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/AlertDialog.java
index e06b6c92..07fdf1d1 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/AlertDialog.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/AlertDialog.java
@@ -102,10 +102,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.alert_dialog); 
 		setCanceledOnTouchOutside(true);
 
-		tvTitle = (TextView) findViewById(R.id.tvAlertDialogTitle);
-		tvMessage = (TextView) findViewById(R.id.tvAlertDialogMessage);
-		btnPositive = (Button) findViewById(R.id.btnAlertDialogPositive);
-		btnNegative = (Button) findViewById(R.id.btnAlertDialogNegative);
+		tvTitle = findViewById(R.id.tvAlertDialogTitle);
+		tvMessage = findViewById(R.id.tvAlertDialogMessage);
+		btnPositive = findViewById(R.id.btnAlertDialogPositive);
+		btnNegative = findViewById(R.id.btnAlertDialogNegative);
 
 		tvTitle.setVisibility(StringUtil.isNotEmpty(title, true) ? View.VISIBLE : View.GONE);
 		tvTitle.setText("" + StringUtil.getCurrentString());
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/BottomMenuView.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/BottomMenuView.java
index bc6569f9..2bd95180 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/BottomMenuView.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/BottomMenuView.java
@@ -135,8 +135,8 @@ private void addItem(final boolean isMoreButton, final int position, final Menu
 		}
 
 		LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.icon_name_item, null);
-		ImageView iv = (ImageView) ll.findViewById(R.id.ivIconNameIcon);
-		TextView tv = (TextView) ll.findViewById(R.id.tvIconNameName);
+		ImageView iv = ll.findViewById(R.id.ivIconNameIcon);
+		TextView tv = ll.findViewById(R.id.tvIconNameName);
 		try {
 			iv.setImageResource(isMoreButton ? R.drawable.up_light : fsb.getImageRes());
 		} catch (Exception e) {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/GridAdapter.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/GridAdapter.java
index 03fa9e60..7b60b82b 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/GridAdapter.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/GridAdapter.java
@@ -155,12 +155,12 @@ public View getView(final int position, View convertView, ViewGroup parent) {
 			convertView = inflater.inflate(layoutRes, parent, false);
 
 			holder = new ViewHolder();
-			holder.ivGridItemHead = (ImageView) convertView.findViewById(R.id.ivGridItemHead);
+			holder.ivGridItemHead = convertView.findViewById(R.id.ivGridItemHead);
 			if (hasName) {
-				holder.tvGridItemName = (TextView) convertView.findViewById(R.id.tvGridItemName);
+				holder.tvGridItemName = convertView.findViewById(R.id.tvGridItemName);
 			}
 			if (hasCheck) {
-				holder.ivGridItemCheck = (ImageView) convertView.findViewById(R.id.ivGridItemCheck);
+				holder.ivGridItemCheck = convertView.findViewById(R.id.ivGridItemCheck);
 			}
 
 			convertView.setTag(holder);
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/GridPickerAdapter.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/GridPickerAdapter.java
index 70e2851a..8a576d4f 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/GridPickerAdapter.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/GridPickerAdapter.java
@@ -105,7 +105,7 @@ public View getView(final int position, View convertView, final ViewGroup parent
 			convertView = inflater.inflate(R.layout.grid_picker_item, parent, false);
 			holder = new ViewHolder();
 
-			holder.tv = (TextView) convertView.findViewById(R.id.tvGridPickerItem);
+			holder.tv = convertView.findViewById(R.id.tvGridPickerItem);
 
 			convertView.setTag(holder);
 		}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/ItemDialog.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/ItemDialog.java
index 5e73257b..d93bbb3c 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/ItemDialog.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/ItemDialog.java
@@ -76,8 +76,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.item_dialog); 
 		setCanceledOnTouchOutside(true);
 
-		tvItemDialogTitle = (TextView) findViewById(R.id.tvItemDialogTitle);
-		lvItemDialog = (ListView) findViewById(R.id.lvItemDialog);
+		tvItemDialogTitle = findViewById(R.id.tvItemDialogTitle);
+		lvItemDialog = findViewById(R.id.lvItemDialog);
 
 		tvItemDialogTitle.setVisibility(StringUtil.isNotEmpty(title, true) ? View.VISIBLE : View.GONE);
 		tvItemDialogTitle.setText("" + StringUtil.getCurrentString());
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/TopMenuWindow.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/TopMenuWindow.java
index 72cf1c91..373dbfe6 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/ui/TopMenuWindow.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/ui/TopMenuWindow.java
@@ -158,7 +158,7 @@ private void init() {
 
 		adapter = new ArrayAdapter<String>(this, R.layout.top_menu_list_item, R.id.tvTopMenuListItem, nameList);
 
-		lvTopMenu = (ListView) findViewById(R.id.lvTopMenuWindowMenu);
+		lvTopMenu = findViewById(R.id.lvTopMenuWindowMenu);
 		lvTopMenu.setAdapter(adapter);
 		lvTopMenu.setOnItemClickListener(this);
 	}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/DownloadUtil.java b/ZBLibrary/src/main/java/zuo/biao/library/util/DownloadUtil.java
index 16510bba..3e787c4a 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/util/DownloadUtil.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/util/DownloadUtil.java
@@ -35,11 +35,10 @@ public static File downLoadFile(Activity context, String name, String suffix, St
                 FileOutputStream fos = new FileOutputStream(file);
                 byte[] buf = new byte[256];
                 conn.connect();
-                double count = 0;
                 if (conn.getResponseCode() >= 400) {
                     CommonUtil.showShortToast(context, "连接超时");
                 } else {
-                    while (count <= 100) {
+                    while (true) {
                         if (is != null) {
                             int numRead = is.read(buf);
                             if (numRead <= 0) {
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/ImageLoaderUtil.java b/ZBLibrary/src/main/java/zuo/biao/library/util/ImageLoaderUtil.java
deleted file mode 100755
index 8a4821d0..00000000
--- a/ZBLibrary/src/main/java/zuo/biao/library/util/ImageLoaderUtil.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*Copyright ©2015 TommyLemon(https://github.com/TommyLemon)
-
-Licensed 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.*/
-
-package zuo.biao.library.util;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory.Options;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
-import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
-/**图片加载工具类，使用UniversalImageLoader，本工程已支持Glide，不需要UniversalImageLoader可这样减小包体积：
- * <br > 1.删除 ImageLoaderUtil.java
- * <br > 2.删除libs目录下的 universal-image-loader.jar
- * <br > 3.删除 BaseApplication.init 中的 ImageLoaderUtil.init 这行代码
- * @author Lemon
- * @use ImageLoaderUtil.loadImage(...)
- */
-@Deprecated
-public class ImageLoaderUtil {
-	private static final String TAG = "ImageLoaderUtil";
-
-	private static ImageLoader imageLoader;
-	/**初始化方法
-	 * @must 使用其它方法前必须调用，建议在自定义Application的onCreate方法中调用
-	 * @param context
-	 */
-	public static void init(Context context) {
-		if (context == null) {
-			Log.e(TAG, "\n\n\n\n\n !!!!!!  <<<<<< init  context == null >> return; >>>>>>>> \n\n\n\n");
-			return;
-		}
-		imageLoader = ImageLoader.getInstance();
-		ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(context)
-		.defaultDisplayImageOptions(getOption(0))
-		// .threadPoolSize(5)
-		// //.threadPriority(Thread.MIN_PRIORITY + 3)
-		.tasksProcessingOrder(QueueProcessingType.LIFO)
-		// .discCacheSize((int)(Runtime.getRuntime().maxMemory()/2))
-		// .discCache(new UnlimitedDiscCache(getCachePath()))
-		// .memoryCacheSize(2 * 1024 * 1024)
-		// .memoryCacheExtraOptions(147, 147)
-		// .writeDebugLogs()
-		// .httpConnectTimeout(5000)
-		// .httpReadTimeout(20000)
-		.diskCacheExtraOptions(ScreenUtil.getScreenWidth(context), ScreenUtil.getScreenHeight(context), null)
-		.threadPriority(Thread.NORM_PRIORITY - 2)
-		.denyCacheImageMultipleSizesInMemory()
-		.diskCacheSize(50 * 1024 * 1024) // 50 Mb
-		// .displayer(new RoundedBitmapDisplayer(5))
-		.build();
-
-		imageLoader.init(config);
-	}
-
-
-	/**加载图片
-	 * 加载小图应再调用该方法前使用getSmallUri处理uri
-	 * type = TYPE_DEFAULT
-	 * @param iv
-	 * @param uri 网址url或本地路径path
-	 */
-	public static void loadImage(ImageView iv, String uri) {
-		loadImage(iv, uri, TYPE_DEFAULT);
-	}
-
-	public static final int TYPE_DEFAULT = 0;//矩形
-	public static final int TYPE_ROUND_CORNER = 1;//圆角矩形
-	public static final int TYPE_OVAL = 2;//圆形
-	/**加载图片
-	 * 加载小图应再调用该方法前使用getSmallUri处理uri
-	 * @param type 图片显示类型
-	 * @param iv
-	 * @param uri 网址url或本地路径path
-	 */
-	public static void loadImage(final ImageView iv, String uri, final int type) {
-		if (iv == null) {// || iv.getWidth() <= 0) {
-			Log.i(TAG, "loadImage  iv == null >> return;");
-			return;
-		}
-		Log.i(TAG, "loadImage  iv" + (iv == null ? "==" : "!=") + "null; uri=" + uri);
-
-		uri = getCorrectUri(uri);
-
-		//新的加载图片
-		imageLoader.displayImage(uri, iv, new ImageLoadingListener() {
-			@Override
-			public void onLoadingStarted(String imageUri, View arg1) {
-				//XML代码直接设置src属性更直观方便
-				//				switch (type) {
-				//				case TYPE_OVAL:
-				//					iv.setImageResource(R.drawable.oval_alpha);
-				//					break;
-				//				case TYPE_ROUND_CORNER:
-				//					iv.setImageResource(R.drawable.round_alpha);
-				//					break;
-				//				default:
-				//					iv.setImageResource(R.drawable.square_alpha);
-				//					break;
-				//				}
-			}
-			@Override
-			public void onLoadingFailed(String imageUri, View arg1, FailReason arg2) {
-			}
-			@Override
-			public void onLoadingComplete(String imageUri, View arg1, Bitmap loadedImage) {
-				if (loadedImage == null) {
-					Log.e(TAG, "loadImage  imageLoader.displayImage.onLoadingComplete  loadedImage == null >> return;");
-					return;
-				}
-				switch (type) {
-				case TYPE_OVAL:
-					iv.setImageBitmap(CommonUtil.toRoundCorner(loadedImage, loadedImage.getWidth()/2));
-					break;
-				case TYPE_ROUND_CORNER:
-					iv.setImageBitmap(CommonUtil.toRoundCorner(loadedImage, loadedImage.getWidth()/10));
-					break;
-				default:
-					iv.setImageBitmap(loadedImage);
-					break;
-				}
-			}
-			@Override
-			public void onLoadingCancelled(String imageUri, View arg1) {
-			}
-		});
-
-	}
-
-
-	public static final String FILE_PATH_PREFIX = StringUtil.FILE_PATH_PREFIX;
-
-	/**如果需要加载小图请修改为小图实际标识
-	 */
-	public static String URL_SUFFIX_SMALL = "!common";
-	/**获取可用的uri
-	 * @param uri
-	 * @return
-	 */
-	@SuppressLint("DefaultLocale")
-	public static String getCorrectUri(String uri) {
-		Log.i(TAG, "<<<<  getCorrectUri  uri = " + uri);
-		uri = StringUtil.getNoBlankString(uri);
-
-		if (uri.toLowerCase().startsWith(StringUtil.HTTP) == false) {
-			uri = uri.startsWith(FILE_PATH_PREFIX) ? uri : FILE_PATH_PREFIX + uri;
-		}
-
-		Log.i(TAG, "getCorrectUri  return uri = " + uri + " >>>>> ");
-		return uri;
-	}
-
-
-	/**获取小图url或path
-	 * path不加URL_SUFFIX_SMALL
-	 * @param uri
-	 * @return
-	 */
-	public static String getSmallUri(String uri) {
-		return getSmallUri(uri, false);
-	}
-	/**获取小图url或path
-	 * path不加URL_SUFFIX_SMALL
-	 * @param uri
-	 * @param isLocalPath
-	 * @return
-	 */
-	public static String getSmallUri(String uri, boolean isLocalPath) {
-		if (uri == null) {
-			Log.e(TAG, "getSmallUri  uri == null >> return null;");
-			return null;
-		}
-
-		if (uri.startsWith("/") || uri.startsWith(FILE_PATH_PREFIX) || StringUtil.isFilePathExist(FILE_PATH_PREFIX + uri)) {
-			isLocalPath = true;
-		}
-		return isLocalPath || uri.endsWith(URL_SUFFIX_SMALL)
-				? uri : uri + URL_SUFFIX_SMALL;
-	}
-
-
-	/**获取配置
-	 * @param cornerRadiusSize
-	 * @return
-	 */
-	@SuppressWarnings("deprecation")
-	private static DisplayImageOptions getOption(int cornerRadiusSize) {
-		Options options0 = new Options();
-		options0.inPreferredConfig = Bitmap.Config.RGB_565;
-
-		DisplayImageOptions.Builder builder = new DisplayImageOptions.Builder();
-		if (cornerRadiusSize > 0) {
-			builder.displayer(new RoundedBitmapDisplayer(cornerRadiusSize));
-		}
-
-		return builder.cacheInMemory(true).cacheOnDisc(true).decodingOptions(options0).build();
-	}
-
-	
-
-}
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/SSLUtil.java b/ZBLibrary/src/main/java/zuo/biao/library/util/SSLUtil.java
index 799d7222..9f93a70b 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/util/SSLUtil.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/util/SSLUtil.java
@@ -54,6 +54,7 @@ public static SSLSocketFactory getSSLSocketFactory(KeyManager[] keyManagers, Inp
                     if (certificate != null)
                         certificate.close();
                 } catch (IOException e) {
+                    e.printStackTrace();
                 }
             }
             SSLContext sslContext = SSLContext.getInstance("TLS");
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/StringUtil.java b/ZBLibrary/src/main/java/zuo/biao/library/util/StringUtil.java
index 4e318b56..39d23988 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/util/StringUtil.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/util/StringUtil.java
@@ -391,7 +391,7 @@ public static boolean isEmail(String email) {
 			return false;
 		}
 
-		String str = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$";
+		String str = "^([a-zA-Z0-9_\\-.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(]?)$";
 		Pattern p = Pattern.compile(str);
 
 		currentString = email;
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/TimeUtil.java b/ZBLibrary/src/main/java/zuo/biao/library/util/TimeUtil.java
index d80e8a25..9c20d509 100755
--- a/ZBLibrary/src/main/java/zuo/biao/library/util/TimeUtil.java
+++ b/ZBLibrary/src/main/java/zuo/biao/library/util/TimeUtil.java
@@ -366,8 +366,8 @@ public static long getBetween(SimpleDateFormat sdf, long dateLong0, long dateLon
 		long between = 0;
 		try {
 
-			date0 = (Date) sdf.parse(sdf.format(new Date(dateLong0)));
-			date1 = (Date) sdf.parse(sdf.format(new Date(dateLong1)));
+			date0 = sdf.parse(sdf.format(new Date(dateLong0)));
+			date1 = sdf.parse(sdf.format(new Date(dateLong1)));
 			between = (date0.getTime() - date1.getTime())/1000;//除以1000是为了转换成秒
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
diff --git a/ZBLibrary/src/main/res/layout/edit_text_info_activity.xml b/ZBLibrary/src/main/res/layout/edit_text_info_activity.xml
index 02f8decb..b1f74e20 100755
--- a/ZBLibrary/src/main/res/layout/edit_text_info_activity.xml
+++ b/ZBLibrary/src/main/res/layout/edit_text_info_activity.xml
@@ -34,7 +34,8 @@
             android:focusableInTouchMode="true"
             android:hint="请在这里输入"
             android:textColor="@color/black"
-            android:textSize="17sp" >
+            android:textSize="17sp"
+            android:importantForAutofill="no">
 
             <requestFocus />
         </EditText>
diff --git a/ZBLibrary/src/main/res/layout/edit_text_info_window.xml b/ZBLibrary/src/main/res/layout/edit_text_info_window.xml
index c18b5c29..c5b69c0b 100755
--- a/ZBLibrary/src/main/res/layout/edit_text_info_window.xml
+++ b/ZBLibrary/src/main/res/layout/edit_text_info_window.xml
@@ -53,7 +53,8 @@
                 android:paddingRight="10dp"
                 android:textColor="@color/black"
                 android:textCursorDrawable="@drawable/edit_cusor"
-                android:textSize="17sp" >
+                android:textSize="17sp"
+                android:importantForAutofill="no">
 
                 <requestFocus />
             </EditText>
diff --git a/ZBLibrary/src/main/res/layout/server_setting_activity.xml b/ZBLibrary/src/main/res/layout/server_setting_activity.xml
index b085718c..967302f0 100755
--- a/ZBLibrary/src/main/res/layout/server_setting_activity.xml
+++ b/ZBLibrary/src/main/res/layout/server_setting_activity.xml
@@ -43,7 +43,8 @@
             android:id="@+id/etServerSettingNormal"
             style="@style/edit_item_right_et"
             android:layout_weight="1"
-            android:maxLength="100" />
+            android:maxLength="100"
+            android:importantForAutofill="no" />
     </LinearLayout>
 
     <View style="@style/divider_horizontal_1px" />
@@ -91,7 +92,8 @@
             android:id="@+id/etServerSettingTest"
             style="@style/edit_item_right_et"
             android:layout_weight="1"
-            android:maxLength="100" />
+            android:maxLength="100"
+            android:importantForAutofill="no" />
     </LinearLayout>
 
     <View style="@style/divider_horizontal_1px" />
diff --git a/ZBLibrary/src/main/res/values/ids.xml b/ZBLibrary/src/main/res/values/ids.xml
index 86d95df6..10e15395 100755
--- a/ZBLibrary/src/main/res/values/ids.xml
+++ b/ZBLibrary/src/main/res/values/ids.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <item name="tvBaseTitle" type="id">false</item>
-    <item name="pbBaseTitle" type="id">false</item>
-    <item name="tvBaseTabTitle" type="id">false</item>
-    <item name="ivBaseTabReturn" type="id">false</item>
-    <item name="tvBaseTabReturn" type="id">false</item>
-    <item name="llBaseTabTopRightButtonContainer" type="id">false</item>
-    <item name="llBaseTabTabContainer" type="id">false</item>
-    <item name="flBaseTabFragmentContainer" type="id">false</item>
-    <item name="vBaseBottomWindowRoot" type="id">false</item>
-    <item name="llBaseViewBottomWindowContainer" type="id">false</item>
-    <item name="tvBaseViewBottomWindowReturn" type="id">false</item>
-    <item name="tvBaseViewBottomWindowForward" type="id">false</item>
-    <item name="lvBaseList" type="id">false</item>
-    <item name="rvBaseList" type="id">false</item>
-    <item name="srlBaseHttpList" type="id">false</item>
-    <item name="rvBaseRecycler" type="id">false</item>
-    <item name="srlBaseHttpRecycler" type="id">false</item>
+    <item name="tvBaseTitle" type="id"/>
+    <item name="pbBaseTitle" type="id"/>
+    <item name="tvBaseTabTitle" type="id"/>
+    <item name="ivBaseTabReturn" type="id"/>
+    <item name="tvBaseTabReturn" type="id"/>
+    <item name="llBaseTabTopRightButtonContainer" type="id"/>
+    <item name="llBaseTabTabContainer" type="id"/>
+    <item name="flBaseTabFragmentContainer" type="id"/>
+    <item name="vBaseBottomWindowRoot" type="id"/>
+    <item name="llBaseViewBottomWindowContainer" type="id"/>
+    <item name="tvBaseViewBottomWindowReturn" type="id"/>
+    <item name="tvBaseViewBottomWindowForward" type="id"/>
+    <item name="lvBaseList" type="id"/>
+    <item name="rvBaseList" type="id"/>
+    <item name="srlBaseHttpList" type="id"/>
+    <item name="rvBaseRecycler" type="id"/>
+    <item name="srlBaseHttpRecycler" type="id"/>
 
 </resources>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 6a5eabff..07bc3cd9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -22,20 +22,20 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -70,13 +70,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,19 +77,33 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -104,31 +111,36 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide-4.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.0.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.2.54@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Jason/SourceCode/PersonProjects/weij/android/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder-4.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
     <orderEntry type="module" module-name="QRCodeLibrary" />
     <orderEntry type="module" module-name="ZBLibrary" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 50a519df..80a3a7a4 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "zblibrary.demo"
         minSdkVersion 15
-        targetSdkVersion 22
+        targetSdkVersion 27
         versionCode 28
         versionName "18.3"
     }
@@ -18,6 +18,10 @@ android {
     }
     productFlavors {
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5015e532..16ab5f33 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,10 +4,6 @@
     android:versionCode="28"
     android:versionName="@string/app_version" >
 
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="22" />
-
     <!-- 需要的权限和功能 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/zblibrary/demo/activity/ScanActivity.java b/app/src/main/java/zblibrary/demo/activity/ScanActivity.java
index f3b69f64..4570f576 100755
--- a/app/src/main/java/zblibrary/demo/activity/ScanActivity.java
+++ b/app/src/main/java/zblibrary/demo/activity/ScanActivity.java
@@ -58,7 +58,7 @@ public Activity getActivity() {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.scan_activity);
-		init(this, (SurfaceView) findViewById(R.id.svCameraScan), (ViewfinderView) findViewById(R.id.vfvCameraScan));
+		init(this, findViewById(R.id.svCameraScan), findViewById(R.id.vfvCameraScan));
 
 		//功能归类分区方法，必须调用<<<<<<<<<<
 		initView();
diff --git a/app/src/main/res/layout/demo_sql_activity.xml b/app/src/main/res/layout/demo_sql_activity.xml
index 2cef72ba..94a5d267 100755
--- a/app/src/main/res/layout/demo_sql_activity.xml
+++ b/app/src/main/res/layout/demo_sql_activity.xml
@@ -59,7 +59,8 @@
             android:id="@+id/etDemoSQLQueryColumn"
             style="@style/text_small_black"
             android:layout_weight="1"
-            android:text="_id" />
+            android:text="_id"
+            android:importantForAutofill="no" />
 
         <TextView
             android:id="@+id/tvDemoSQLQueryValue"
@@ -70,7 +71,8 @@
             android:id="@+id/etDemoSQLQueryValue"
             style="@style/text_small_black"
             android:layout_weight="1"
-            android:text="0" />
+            android:text="0"
+            android:importantForAutofill="no" />
     </LinearLayout>
 
     <LinearLayout style="@style/ll_horizontal_match_wrap" >
@@ -84,7 +86,8 @@
             android:id="@+id/etDemoSQLEditColumn"
             style="@style/text_small_black"
             android:layout_weight="1"
-            android:text="name" />
+            android:text="name"
+            android:importantForAutofill="no" />
 
         <TextView
             android:id="@+id/tvDemoSQLEditValue"
@@ -95,7 +98,8 @@
             android:id="@+id/etDemoSQLEditValue"
             style="@style/text_small_black"
             android:layout_weight="1"
-            android:text="xxx" />
+            android:text="xxx"
+            android:importantForAutofill="no" />
     </LinearLayout>
 
     <LinearLayout style="@style/ll_horizontal_match_wrap" >
diff --git a/app/src/main/res/layout/demo_time_refresher_activity.xml b/app/src/main/res/layout/demo_time_refresher_activity.xml
index d7901328..4f618879 100755
--- a/app/src/main/res/layout/demo_time_refresher_activity.xml
+++ b/app/src/main/res/layout/demo_time_refresher_activity.xml
@@ -38,7 +38,8 @@
             android:hint="请输入时间间隔"
             android:inputType="number"
             android:maxLength="6"
-            android:paddingLeft="6dp" />
+            android:paddingLeft="6dp"
+            android:importantForAutofill="no" />
 
         <ImageButton
             android:id="@+id/ibtnDemoTimeRefresher"
diff --git a/app/src/main/res/layout/user_activity.xml b/app/src/main/res/layout/user_activity.xml
index 5f937849..b5d67d0e 100755
--- a/app/src/main/res/layout/user_activity.xml
+++ b/app/src/main/res/layout/user_activity.xml
@@ -53,7 +53,8 @@
                     style="@style/edit_item_right_et"
                     android:layout_weight="1"
                     android:maxLength="90"
-                    android:hint="点击这里来编辑" />
+                    android:hint="点击这里来编辑"
+                    android:importantForAutofill="no" />
 
                 <ImageView
                     android:id="@+id/ivUserRemarkClear"
diff --git a/build.gradle b/build.gradle
index 4560c321..1de44f41 100755
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e15906e2..69bbfe6a 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 12 01:00:01 CST 2018
+#Fri Nov 30 12:04:43 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/local.properties b/local.properties
index 8acc2c6c..9be88f45 100644
--- a/local.properties
+++ b/local.properties
@@ -1,12 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun Jul 01 16:44:18 CST 2018
-ndk.dir=/Users/Tommy/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/Tommy/Library/Android/sdk
+#Fri Nov 30 12:04:04 CST 2018
+sdk.dir=/Users/Jason/SDKs/Android_sdk