From: snickersun <scy@incartech.cn>
Date: Fri, 4 Sep 2020 17:01:20 +0000 (+0800)
Subject: 修复编译问题
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=406a91471f3f27c3fd90550368299096b72408b7;p=protocol_srv.git

修复编译问题
---

diff --git a/app/app.iml b/app/app.iml
index c1e97d3a..e442bebb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,137 +1,136 @@
-<?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">
+<?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">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
+        <option name="GRADLE_PROJECT_PATH" value=":app"/>
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3"/>
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3"/>
       </configuration>
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="debug"/>
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug"/>
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources"/>
         <afterSyncTasks>
           <task>generateDebugSources</task>
         </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false"/>
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug"/>
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
-    <exclude-output />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes"/>
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>
+    <exclude-output/>
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" 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/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" 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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <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" />
-      <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" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" 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/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" 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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource"/>
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false"/>
+      <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"/>
+      <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"/>
     </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project" />
-    <orderEntry type="module" module-name="dNSCache" />
-    <orderEntry type="module" module-name="core" />
+    <orderEntry type="sourceFolder" forTests="false"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>
+    <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>
+    <orderEntry type="module" module-name="dNSCache"/>
+    <orderEntry type="module" module-name="core"/>
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/app/build.gradle b/app/build.gradle
index 964a8d36..87d96a06 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,9 +81,7 @@ android {
 //    }
 }
 dependencies {
-    implementation project(path: ':core')
-    implementation project(path: ':dNSCache')
-    compileOnly files ('libs/frameworks-full-debug.jar')
+      compileOnly files ('libs/frameworks-full-debug.jar')
     provided files ('libs/telephony_common-full-debug.jar')
 
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
@@ -98,6 +96,8 @@ dependencies {
     compile files ('libs/android-logging-log4j-1.0.3.jar','libs/ftp4j-1.7.2.jar','libs/log4j-1.2.17.jar','libs/okio-2.4.3.jar' )
     compile files ('libs/mail.jar' )
     compile files ('libs/activation.jar','libs/additionnal.jar' )
+    implementation project(path: ':dNSCache')
+    implementation project(path: ':core')
 
 //    implementation 'se.wetcat.qatja:core:1.0.4'
 //    implementation "androidx.recyclerview:recyclerview:1.1.0
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 697fd984..554eb921 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -27,6 +27,7 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.Deliver;
 import com.enqualcomm.support.service.SmsDatabaseChaneObserver;
 import com.enqualcomm.support.utils.APNUtil;
+import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.ContextProxy;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
diff --git a/app/version_code.properties b/app/version_code.properties
index 60eafa32..c9b86e0e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Sep 01 11:24:02 CST 2020
-VERSION_CODE=510
+#Sat Sep 05 00:58:25 CST 2020
+VERSION_CODE=601
diff --git a/dNSCache/build.gradle b/dNSCache/build.gradle
index cacb7575..f62c8889 100644
--- a/dNSCache/build.gradle
+++ b/dNSCache/build.gradle
@@ -26,11 +26,10 @@ android {
 //            minifyEnabled true
 //            useProguard false
         }
-
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
     }
 }