Camera拍照，monitor录音都放在thread里执行。

diff --git a/app/app.iml b/app/app.iml
index 24e089e..c1e97d3 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,136 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="android-gradle" name="Android-Gradle">\r
       <configuration>\r
-        <option name="GRADLE_PROJECT_PATH" value=":app"/>\r
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3"/>\r
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3"/>\r
+        <option name="GRADLE_PROJECT_PATH" value=":app" />\r
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />\r
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />\r
       </configuration>\r
     </facet>\r
     <facet type="android" name="Android">\r
       <configuration>\r
-        <option name="SELECTED_BUILD_VARIANT" value="debug"/>\r
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug"/>\r
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources"/>\r
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />\r
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />\r
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />\r
         <afterSyncTasks>\r
           <task>generateDebugSources</task>\r
         </afterSyncTasks>\r
-        <option name="ALLOW_USER_CONFIGURATION" value="false"/>\r
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>\r
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>\r
-        <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"/>\r
-        <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"/>\r
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>\r
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />\r
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />\r
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />\r
+        <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" />\r
+        <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" />\r
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />\r
       </configuration>\r
     </facet>\r
   </component>\r
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">\r
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes"/>\r
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
-    <exclude-output/>\r
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />\r
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />\r
+    <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true"/>\r
-      <excludeFolder url="file://$MODULE_DIR$/build"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />\r
+      <excludeFolder url="file://$MODULE_DIR$/build" />\r
     </content>\r
-    <orderEntry type="sourceFolder" forTests="false"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>\r
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>\r
-    <orderEntry type="module" module-name="dNSCache"/>\r
-    <orderEntry type="module" module-name="core"/>\r
-    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
+    <orderEntry type="sourceFolder" forTests="false" />\r
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:25.1.0@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project" />\r
+    <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project" />\r
+    <orderEntry type="module" module-name="dNSCache" />\r
+    <orderEntry type="module" module-name="core" />\r
   </component>\r
-</module>\r
+</module>
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 7752df8..cc039bd 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -349,6 +349,7 @@ public class Config {
   public static boolean needAllwaysAlarmAntiOff=false;\r
   public static boolean needTemperature_abnormal_alarm=false;\r
   public static boolean A9_noBroadCastActionStrip=false;\r
+  public static boolean L004_BroadCastActionStrip=false;\r
   public static void LoadMessageConfigs(){\r
     String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG");\r
     boolean ret=false;\r
@@ -397,6 +398,7 @@ public class Config {
       needTemperature_abnormal_alarm=false;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
+      L004_BroadCastActionStrip=true;\r
     }else if (custom_branch_name.equals("YQ") ||custom_branch_name.equals("YQ_EN")  ) { //A9-YQ\r
       noPushTxtNotifyDialog=true;\r
       noSMSNotifyDialog=true;\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 1f7f2ce..697fd98 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -1094,6 +1094,26 @@ public class ICSmsManager  extends BroadcastReceiver {
                 sendSMS(phonenumber, "upload logfile format error!");\r
             }\r
 \r
+\r
+            }else if(sms.startsWith(ENCRYPED_HEADER+"#capture#")) {\r
+\r
+                    new Handler().post(new Runnable() {\r
+                        @Override\r
+                        public void run() {\r
+                            (new CameraUtil(mContext)).getPictur("capture"+TimeUtil.getSystemTime3());\r
+                        }\r
+                    });\r
+\r
+            }else if(sms.startsWith(ENCRYPED_HEADER+"#monitor#")) {\r
+\r
+                new Handler().post(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        CoreService.getInstance().DevliverStringMessage("StartMonitor","10");\r
+                    }\r
+                });\r
+\r
+\r
                 /***\r
                  *   }else if(sms.startsWith(ENCRYPED_HEADER+"#logctl#=")){\r
                  *   。。。。。\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index ac4e493..e13f78e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -179,7 +179,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     }\r
 \r
 \r
-    private void send_anti_event_broadcast(int antioff){\r
+    public void send_anti_event_broadcast(int antioff){\r
 \r
         Intent intent=new Intent();\r
         intent.setAction(ACTION_ANTI_OFF);\r
@@ -189,18 +189,33 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
             if(Config.A9_noBroadCastActionStrip) {\r
                 Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));\r
                 //                mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴\r
+            }else if (Config.L004_BroadCastActionStrip){\r
+                Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_on));\r
+                intent.putExtra(KEY_ANTI_TXT, "");\r
+                mContext.sendBroadcast(intent);\r
             }else{\r
                 intent.putExtra(KEY_ANTI_TXT, "");\r
                 mContext.sendBroadcast(intent);\r
             }\r
 \r
         }else{\r
-            if (mRuntime.getAntioffStatus()==true){\r
-                intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+\r
+            if (Config.A9_noBroadCastActionStrip) {\r
+\r
+                if (mRuntime.getAntioffStatus() == true) {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+                } else {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                }\r
             }else {\r
-                intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                if (mRuntime.getAntioffStatus() == true) {\r
+                    intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+                } else {\r
+                    intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                }\r
+                mContext.sendBroadcast(intent);\r
             }\r
-            mContext.sendBroadcast(intent);\r
+\r
         }\r
 \r
     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index ba984ce..463a4e3 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -507,8 +507,13 @@ public class Deliver extends AbstractConnectionService {
   }else if ("StartMonitor".equals(paramStringMessage.cmd())) {\r
 \r
       String recordfilepath=Util.getRecordfilePath(mRuntime, TimeUtil.getSystemTime3());\r
-      AudioService.getInstance().startRecord(recordfilepath);\r
-      int recordtime=Integer.parseInt(paramStringMessage.isFromCache());\r
+      int recordtime=Integer.parseInt(paramStringMessage.isFromCache().trim());\r
+      new Handler().post(new Runnable() {\r
+        @Override\r
+        public void run() {\r
+          AudioService.getInstance().startRecord(recordfilepath);\r
+        }\r
+      });\r
       new Handler().postDelayed(new Runnable() {\r
         @Override\r
         public void run() {\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
index a35c56a..fd5dd1f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
@@ -103,6 +103,8 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
   }\r
   \r
   private String savePicture(byte[] paramArrayOfByte) {\r
+\r
+    int jpg_quality=Util.getSystemPropertiesInt("persist.sys.capture_quality",50);\r
     String str = null;\r
     try {\r
       if (Environment.getExternalStorageState().equals("mounted")) {\r
@@ -125,12 +127,12 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
          // bitmap1 = Bitmap.createBitmap(bitmap2, 0, 0, bitmap2.getWidth(), bitmap2.getHeight(), matrix, true);\r
 //          bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),40,0xFF4000 ,25,-100);\r
         }\r
-        bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),30, Color.RED ,25,25);\r
+        bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),50, Color.RED ,25,25);\r
         File file = new File(str);\r
         if (!file.exists())\r
           file.createNewFile(); \r
         BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file));\r
-        bitmap3.compress(Bitmap.CompressFormat.JPEG, 100, bufferedOutputStream);\r
+        bitmap3.compress(Bitmap.CompressFormat.JPEG, jpg_quality, bufferedOutputStream);\r
         bufferedOutputStream.flush();\r
         bufferedOutputStream.close();\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index 1f24034..4a41b28 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -311,7 +311,12 @@ public class ProcessReceiver extends BroadcastReceiver {
       if (paramIntent.hasExtra("remote_number")){\r
         //接收拍照命令，执行拍照\r
         String str1 = paramIntent.getStringExtra("remote_number");\r
-        (new CameraUtil(paramContext)).getPictur(str1);\r
+        new Handler().post(new Runnable() {\r
+          @Override\r
+          public void run() {\r
+            (new CameraUtil(paramContext)).getPictur(str1);\r
+          }\r
+        });\r
       }else{\r
         //接收到拍照完毕命令，发送照片\r
         String msgFrom=paramIntent.getStringExtra("number");\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 0e5477c..2220ae6 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -2160,7 +2160,13 @@ public class protocol_ic {
 //            intent.putExtra("remote_number", id);\r
 //                context.startService(intent);\r
 //            runtime.getContextProxy().context.sendBroadcast(intent);\r
-                (new CameraUtil(context)).getPictur(id);\r
+                new Handler().post(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        (new CameraUtil(context)).getPictur(id);\r
+                    }\r
+                });\r
+\r
             }\r
         }else{\r
             ICLogger.i(" BP46 Format error！");\r