医生机开发完成第一次提交

.idea/codeStyles/Project.xml

@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/gradle.xml

@@ -15,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/libraries/Gradle____local_jars___D__NewProjects_CallingDoctor_AmDemo_R_libs_android_support_v4_jar_unspecified_jar.xml

@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\AmDemo_R\libs\android-support-v4.jar:unspecified@jar">
+  <library name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\AmDemo_R\libs\android-support-v4.jar:unspecified@jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/AmDemo_R/libs/android-support-v4.jar!/" />
     </CLASSES>

.idea/libraries/Gradle____local_jars___D__NewProjects_CallingDoctor_app_libs_simpleftp_jar_unspecified_jar.xml

@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\app\libs\simpleftp.jar:unspecified@jar">
+  <library name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\app\libs\simpleftp.jar:unspecified@jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/libs/simpleftp.jar!/" />
     </CLASSES>

.idea/libraries/Gradle____local_jars___D__NewProjects_CallingDoctor_app_src_main_jniLibs_frame_jar_unspecified_jar.xml

@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\app\src\main\jniLibs\frame.jar:unspecified@jar">
+  <library name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\app\src\main\jniLibs\frame.jar:unspecified@jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/src/main/jniLibs/frame.jar!/" />
     </CLASSES>

.idea/libraries/Gradle____local_jars___D__NewProjects_CallingDoctor_test_libs_UdpLibs_jar_unspecified_jar.xml

@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\test\libs\UdpLibs.jar:unspecified@jar">
+  <library name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\test\libs\UdpLibs.jar:unspecified@jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/test/libs/UdpLibs.jar!/" />
     </CLASSES>

.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/a839160ee65754b6c2ee007d08def1a7451dc07a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/a839160ee65754b6c2ee007d08def1a7451dc07a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/26311662986817a272ee4e02ab8e037a5274296e/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/26311662986817a272ee4e02ab8e037a5274296e/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/Gradle__com_android_support_animated_vector_drawable_24_2_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:animated-vector-drawable:24.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/0e79f43b6207b147ff4911260791af9080873ff9/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/0e79f43b6207b147ff4911260791af9080873ff9/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/92ba0d4b38d345456571ad441538574dd9ee7964/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/92ba0d4b38d345456571ad441538574dd9ee7964/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/d65e3c6bd2ff56365b1dd5d8a0d6438bf4488cb8/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/d65e3c6bd2ff56365b1dd5d8a0d6438bf4488cb8/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2e402a19d7966246bff3f6e2cd0eda8ad56e927c/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/2e402a19d7966246bff3f6e2cd0eda8ad56e927c/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_appcompat_v7_24_2_0_aar.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/94c4265ed2fcd63266305b670eca15ddec05dca3/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/1db0ceac3e5c9f2dd9c22708a7903ca8c168b027/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/94c4265ed2fcd63266305b670eca15ddec05dca3/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/94c4265ed2fcd63266305b670eca15ddec05dca3/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/1db0ceac3e5c9f2dd9c22708a7903ca8c168b027/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/1db0ceac3e5c9f2dd9c22708a7903ca8c168b027/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_appcompat_v7_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/b58cfd596cba6209cdc91568612e72f6a25584b6/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/b58cfd596cba6209cdc91568612e72f6a25584b6/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/3b5463164abeb151c357133fe7460b2332b8cede/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/3b5463164abeb151c357133fe7460b2332b8cede/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_cardview_v7_23_2_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cardview-v7:23.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/1e67c41ab149d703de2136627183498302d262cf/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/1e67c41ab149d703de2136627183498302d262cf/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/dda882b5947b78b367b40f1ee1321a968573ebde/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/dda882b5947b78b367b40f1ee1321a968573ebde/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.constraint:constraint-layout:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4f97fb567a45c0dee5917fc6cb470585636e2ed0/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4f97fb567a45c0dee5917fc6cb470585636e2ed0/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/bd4410c01a4f7b62ed4013e66e5971a0c970aa21/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/bd4410c01a4f7b62ed4013e66e5971a0c970aa21/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_multidex_1_0_1_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:multidex:1.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/9cf0667d4a074c58c684f5ff3884b433856d276b/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/9cf0667d4a074c58c684f5ff3884b433856d276b/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/710ea3d5bf43b730b63580c2eeb1c6d15c1ecd0c/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/710ea3d5bf43b730b63580c2eeb1c6d15c1ecd0c/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:multidex-instrumentation:1.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/f7027d3ca06e6343ef9616c724fc77ccc129f9d3/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/f7027d3ca06e6343ef9616c724fc77ccc129f9d3/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/f7b7d28887848a62ab04ef92f150b55410dd88b8/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/f7b7d28887848a62ab04ef92f150b55410dd88b8/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_recyclerview_v7_24_2_0_aar.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:recyclerview-v7:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/14551c004422122902d0aa4efe0ebf9bda00badf/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2e2dc4cc6bab72b78a316eed6fd643a07a0540d1/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/14551c004422122902d0aa4efe0ebf9bda00badf/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/14551c004422122902d0aa4efe0ebf9bda00badf/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/2e2dc4cc6bab72b78a316eed6fd643a07a0540d1/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2e2dc4cc6bab72b78a316eed6fd643a07a0540d1/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_compat_24_2_0_aar.xml

@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/1643402144d4c91942436f0b108f949e82be9637/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e1e4af59b9f32aa2c3369d151f24d5df6057a154/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/1643402144d4c91942436f0b108f949e82be9637/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/1643402144d4c91942436f0b108f949e82be9637/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/1643402144d4c91942436f0b108f949e82be9637/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e1e4af59b9f32aa2c3369d151f24d5df6057a154/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/e1e4af59b9f32aa2c3369d151f24d5df6057a154/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e1e4af59b9f32aa2c3369d151f24d5df6057a154/output/jars/libs/internal_impl-24.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_compat_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4d75f3f3943a70194283bb532405a54c4f008fe0/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4d75f3f3943a70194283bb532405a54c4f008fe0/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/871146ee99900c18f1f65be16d44eb46e929660e/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/871146ee99900c18f1f65be16d44eb46e929660e/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0_aar.xml

@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-ui:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/da18a5bbe27e4ecae19652f81735e6b980d2103a/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/02a10fbe71fbda3afd32fc3e0b3828ca5f4e7428/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/da18a5bbe27e4ecae19652f81735e6b980d2103a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/da18a5bbe27e4ecae19652f81735e6b980d2103a/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/da18a5bbe27e4ecae19652f81735e6b980d2103a/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/02a10fbe71fbda3afd32fc3e0b3828ca5f4e7428/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/02a10fbe71fbda3afd32fc3e0b3828ca5f4e7428/output/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/02a10fbe71fbda3afd32fc3e0b3828ca5f4e7428/output/jars/libs/internal_impl-24.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-ui:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/2aaf553c0844d3cf2f988ab36d0533a74360e2e3/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/2aaf553c0844d3cf2f988ab36d0533a74360e2e3/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/99f1c27e7c84e0fc32fa1681574f1153550c8d09/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/99f1c27e7c84e0fc32fa1681574f1153550c8d09/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0_aar.xml

@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils:24.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4e937a8734842afe346b1bfe7832132b7d38ecd2/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4e937a8734842afe346b1bfe7832132b7d38ecd2/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/4e937a8734842afe346b1bfe7832132b7d38ecd2/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/d4aa8d0458a8b8d8d12f39c6e3f082b533077b8e/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/d4aa8d0458a8b8d8d12f39c6e3f082b533077b8e/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/d4aa8d0458a8b8d8d12f39c6e3f082b533077b8e/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/627c2aa9d24446cbd535ef3134a001c2496858cd/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/627c2aa9d24446cbd535ef3134a001c2496858cd/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/bb1a271661412ab33c21a04df1ecb3865875d481/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/bb1a271661412ab33c21a04df1ecb3865875d481/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0_aar.xml

@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/25d3ed0293f1b42b4abb5184ae1cb7639c334c3c/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2ef6988438186e8b9ade9958125d43f6a25dee89/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/25d3ed0293f1b42b4abb5184ae1cb7639c334c3c/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/25d3ed0293f1b42b4abb5184ae1cb7639c334c3c/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/25d3ed0293f1b42b4abb5184ae1cb7639c334c3c/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2ef6988438186e8b9ade9958125d43f6a25dee89/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/2ef6988438186e8b9ade9958125d43f6a25dee89/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/2ef6988438186e8b9ade9958125d43f6a25dee89/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/eb4214718964ab51342d2c492eb6b2590f0eef9f/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/eb4214718964ab51342d2c492eb6b2590f0eef9f/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/4b4727fb9055fbd0341b5529189a80b0cfc2f9bd/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/4b4727fb9055fbd0341b5529189a80b0cfc2f9bd/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0_aar.xml

@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat:24.2.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/dbdcab5ae9a059e246063edde532ad8c6d5c24fd/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/060f0276659a074a1cb6aa8815b246de72bc128c/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/dbdcab5ae9a059e246063edde532ad8c6d5c24fd/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/dbdcab5ae9a059e246063edde532ad8c6d5c24fd/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/dbdcab5ae9a059e246063edde532ad8c6d5c24fd/output/jars/libs/internal_impl-24.2.0.jar!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/060f0276659a074a1cb6aa8815b246de72bc128c/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/060f0276659a074a1cb6aa8815b246de72bc128c/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/060f0276659a074a1cb6aa8815b246de72bc128c/output/jars/libs/internal_impl-24.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4a12d92ba5d3a6888b32bad2c625fcbfd60c1c83/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4a12d92ba5d3a6888b32bad2c625fcbfd60c1c83/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/b55e26230c23da8368e8baa0a4fdb527ab8eef37/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/b55e26230c23da8368e8baa0a4fdb527ab8eef37/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_v4_24_2_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4:24.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/60c5d2d533981715dc17a646f347d11025e11952/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/60c5d2d533981715dc17a646f347d11025e11952/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/7f9f321799b059d152245ac926a8991f69aacd6e/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/7f9f321799b059d152245ac926a8991f69aacd6e/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/6c8094571536307e6e5f2b885e20c6a18c354f8f/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/6c8094571536307e6e5f2b885e20c6a18c354f8f/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/320d8cfb9cdc000d51de63950b23720432d6ffe3/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/320d8cfb9cdc000d51de63950b23720432d6ffe3/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_vector_drawable_24_2_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable:24.2.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/4fd2a6c5a0f20c859aaff95224cb2d207a1fbcbe/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/4fd2a6c5a0f20c859aaff95224cb2d207a1fbcbe/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/b5775c2afd9b05a3ae3a47682cc6f25ba439bf40/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/b5775c2afd9b05a3ae3a47682cc6f25ba439bf40/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_support_vector_drawable_26_1_0_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/12eea67ec8125164e7639745c48bc9b59ac724fe/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/12eea67ec8125164e7639745c48bc9b59ac724fe/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e725a0e4cf6318effe638809b25b65a2b99c4cc2/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/e725a0e4cf6318effe638809b25b65a2b99c4cc2/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml

@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/c63d25ae58ebc0a67a4c9a9a4fa2fc3d917f460e/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/c63d25ae58ebc0a67a4c9a9a4fa2fc3d917f460e/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/dca950b14da5a7b424e6551e326443aca1dd2cda/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/dca950b14da5a7b424e6551e326443aca1dd2cda/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/2.2.2/114039ff105fc481a629b55882f2c5c7a614e32a/espresso-core-2.2.2-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml

@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/b44cfdf08da5db4f94bb02040c9edf1eb29d0050/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/b44cfdf08da5db4f94bb02040c9edf1eb29d0050/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/6ad1159993b23cc40288c6a963cbaf1a4f071ddc/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/6ad1159993b23cc40288c6a963cbaf1a4f071ddc/output/res" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/2.2.2/bc8e66874feb004144562e64053cf95b4c7b3eb7/espresso-idling-resource-2.2.2-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml

@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/81c827fab4bd8bcb83c8d052d26eeec9681a5be3/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/81c827fab4bd8bcb83c8d052d26eeec9681a5be3/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/18089ac4755bdb2e785f1e616b811aca166fc7df/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/18089ac4755bdb2e785f1e616b811aca166fc7df/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/exposed-instrumentation-api-publish/0.5/493e9b2f2905ddc7f1a152446cc1d9d00ded10b0/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml

@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:rules:0.5@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/0868741ffce28e20c85d33ef09cf9a44f52ab66a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/0868741ffce28e20c85d33ef09cf9a44f52ab66a/output/res" />
+      <root url="file://$USER_HOME$/.android/build-cache/bcb524d66cfde13358aca0c7f9084b6b3298042b/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/bcb524d66cfde13358aca0c7f9084b6b3298042b/output/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/0.5/eb0523edeca93697d4c4b767277b407ed5920258/rules-0.5-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml

@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:runner:0.5@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/78734c5bd5d0e1263e46976d68ea7353fcd3c0c5/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/78734c5bd5d0e1263e46976d68ea7353fcd3c0c5/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/e8ca1fef859aa633dfec96aab81039a058c71717/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/e8ca1fef859aa633dfec96aab81039a058c71717/output/res" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/0.5/d13156b1f4d8dc7013cd8b3b1284b22bd3b44d23/runner-0.5-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml

@@ -4,8 +4,6 @@
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/bbb63ca253b483da8ee53a50374593923e3de2e2/gson-2.7-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__com_jakewharton_butterknife_7_0_1_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/7.0.1/d5d13ea991eab0252e3710e5df3d6a9d4b21d461/butterknife-7.0.1.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/7.0.1/867428bbfb3e6ac875c244d6524bb5b94f9da847/butterknife-7.0.1-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/7.0.1/ad53343e57ae0969aaf451a19eef381abe2ad3a1/butterknife-7.0.1-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__com_jude_easyrecyclerview_4_4_2_aar.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: com.jude:easyrecyclerview:4.4.2@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/07b66d8e74b3fe835382a441c98a13ffc9b4d17a/output/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.android/build-cache/4959dbe7563c4ed7a1efa8dbc0049a40094306ba/output/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/07b66d8e74b3fe835382a441c98a13ffc9b4d17a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/07b66d8e74b3fe835382a441c98a13ffc9b4d17a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/4959dbe7563c4ed7a1efa8dbc0049a40094306ba/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/4959dbe7563c4ed7a1efa8dbc0049a40094306ba/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>

.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/f591a105db78771d0a1e7a277b3747556c528c22/javawriter-2.1.1-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__com_zhy_autolayout_1_4_3_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.zhy:autolayout:1.4.3@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/dae69f80efdb79a9dfce69cf90dfbf6249e314a2/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/dae69f80efdb79a9dfce69cf90dfbf6249e314a2/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/58a6fd18c0bc764309a8ca893174d66c3c987854/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/58a6fd18c0bc764309a8ca893174d66c3c987854/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__com_zhy_okhttputils_2_6_2_aar.xml

@@ -1,14 +1,10 @@
 <component name="libraryTable">
   <library name="Gradle: com.zhy:okhttputils:2.6.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/5dd8ae9fcca9cca83ed429ec2c215aacdccf134a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/5dd8ae9fcca9cca83ed429ec2c215aacdccf134a/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/ceae73a7a09880228d5e9c160f5416bb34d2102c/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/ceae73a7a09880228d5e9c160f5416bb34d2102c/output/res" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.zhy/okhttputils/2.6.2/cb703a1f90cb621feef7fb85793cd631e97813b/okhttputils-2.6.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.zhy/okhttputils/2.6.2/a23d2e96bf2ff8235f01215e3ce0ceb3cdddff32/okhttputils-2.6.2-sources.jar!/" />
-    </SOURCES>
+    <JAVADOC />
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml

@@ -4,8 +4,6 @@
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/ad18a02db08eaee697f812e333f692fc51129e4a/javax.annotation-api-1.2-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>

.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/70ec961c25111ed9015d1af77772d96383c2d238/javax.inject-1-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__junit_junit_4_12_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/941a8be4506c65f0a9001c08812fb7da1e505e21/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__org_adw_library_discrete_seekbar_1_0_1_aar.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: org.adw.library:discrete-seekbar:1.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/3db24ac7880f275cdd79eea1e8ab446bcbe86401/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/3db24ac7880f275cdd79eea1e8ab446bcbe86401/output/res" />
+      <root url="jar://$USER_HOME$/.android/build-cache/3acdb70ecae2c305eedaa7bbd78a02496d863a3a/output/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.android/build-cache/3acdb70ecae2c305eedaa7bbd78a02496d863a3a/output/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/ad09811315f1d4f5756986575b0ea16b99cd686f/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/cc5884d4138d3376f574f6a3992acceedfc37bea/hamcrest-integration-1.3-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
     </SOURCES>

.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml

@@ -3,9 +3,7 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4324046c5f99f3dc91b5370899fa3ae65fd137d2/hamcrest-library-1.3-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
     </SOURCES>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

AmDemo_R/AmDemo_R.iml

@@ -4,8 +4,6 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":AmDemo_R" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="2.3.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="2.3.3" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -32,14 +30,14 @@
       <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/source/apt/debug" 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/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/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" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" 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/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
@@ -59,13 +57,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" 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" />
@@ -73,10 +64,30 @@
       <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$/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/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\AmDemo_R\libs\android-support-v4.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\AmDemo_R\libs\android-support-v4.jar:unspecified@jar" level="project" />
   </component>
 </module>

AmDemo_R/build/intermediates/incremental/mergeReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="D:\NewProjects\CallingDoctor\AmDemo_R\assets"/><source path="D:\NewProjects\CallingDoctor\AmDemo_R\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="D:\NewProjects\CallingDoctor\AmDemo_R\build-types\release\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\Users\90571\Desktop\CallingDoctor\AmDemo_R\assets"/><source path="C:\Users\90571\Desktop\CallingDoctor\AmDemo_R\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\Users\90571\Desktop\CallingDoctor\AmDemo_R\build-types\release\assets"/></dataSet></merger>

AmDemo_R/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="D:\NewProjects\CallingDoctor\AmDemo_R\src\main\shaders"/></dataSet><dataSet config="release"><source path="D:\NewProjects\CallingDoctor\AmDemo_R\build-types\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\Users\90571\Desktop\CallingDoctor\AmDemo_R\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\Users\90571\Desktop\CallingDoctor\AmDemo_R\build-types\release\shaders"/></dataSet></merger>

AmDemo_R/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,20 +1,20 @@
-#Sun Jun 28 10:44:14 CST 2020
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-mdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\advanced_pref.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\advanced_pref.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\splash_layout.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\splash_layout.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_account.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_sip_account.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\video_camera.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\video_camera.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_audio.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_advanced_audio.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-xxhdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-xxhdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_video.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_advanced_video.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\activity_main.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\activity_main.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_optional.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_sip_optional.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-xhdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_audio.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_audio.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\raw\\holdmusic.wav=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\raw\\holdmusic.wav
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_video.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_video.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\menu\\main.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\menu\\main.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_call_end_white_48dp.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_call_end_white_48dp.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\raw\\ringback.wav=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\raw\\ringback.wav
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_videocam_off_white_48dp.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_videocam_off_white_48dp.png
+#Sun Jun 28 12:01:36 CST 2020
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_audio.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_advanced_audio.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\advanced_pref.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\advanced_pref.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\video_camera.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\video_camera.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_video.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_advanced_video.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\splash_layout.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\splash_layout.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_account.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_sip_account.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_optional.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_sip_optional.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\raw\\ringback.wav=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\raw\\ringback.wav
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-mdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-xxhdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-xxhdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-xhdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_call_end_white_48dp.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_call_end_white_48dp.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\activity_main.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\layout\\activity_main.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_audio.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_audio.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\menu\\main.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\menu\\main.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_videocam_off_white_48dp.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\ic_videocam_off_white_48dp.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\raw\\holdmusic.wav=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\raw\\holdmusic.wav
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_video.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\debug\\res\\xml\\pref_media_video.xml

AmDemo_R/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,20 +1,20 @@
-#Sun Jun 28 10:43:50 CST 2020
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-mdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-mdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\advanced_pref.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\advanced_pref.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\splash_layout.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\splash_layout.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_account.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_sip_account.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\video_camera.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\video_camera.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_audio.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_advanced_audio.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-xxhdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-xxhdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_video.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_advanced_video.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\layout\\activity_main.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\activity_main.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_optional.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_sip_optional.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-xhdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_audio.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_audio.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_launcher.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_launcher.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\raw\\holdmusic.wav=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\raw\\holdmusic.wav
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_video.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_video.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\menu\\main.xml=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\menu\\main.xml
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_call_end_white_48dp.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_call_end_white_48dp.png
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\raw\\ringback.wav=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\raw\\ringback.wav
-D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_videocam_off_white_48dp.png=D\:\\NewProjects\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_videocam_off_white_48dp.png
+#Sun Jun 28 12:01:38 CST 2020
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_audio.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_advanced_audio.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\advanced_pref.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\advanced_pref.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_advanced_video.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_advanced_video.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\video_camera.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\video_camera.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\splash_layout.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\splash_layout.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_account.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_sip_account.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_sip_optional.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_sip_optional.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\raw\\ringback.wav=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\raw\\ringback.wav
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-mdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-mdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-xxhdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-xxhdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-xhdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_call_end_white_48dp.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_call_end_white_48dp.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\layout\\activity_main.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\layout\\activity_main.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_launcher.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_launcher.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_audio.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_audio.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\menu\\main.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\menu\\main.xml
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\drawable-hdpi\\ic_videocam_off_white_48dp.png=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\ic_videocam_off_white_48dp.png
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\raw\\holdmusic.wav=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\raw\\holdmusic.wav
+C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\res\\xml\\pref_media_video.xml=C\:\\Users\\90571\\Desktop\\CallingDoctor\\AmDemo_R\\build\\intermediates\\bundles\\default\\res\\xml\\pref_media_video.xml

CallingDoctor.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

app/app.iml

@@ -4,8 +4,6 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="2.3.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="2.3.3" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -34,14 +32,14 @@
       <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/source/apt/debug" 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/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/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" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" 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/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <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" />
@@ -63,13 +61,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" />
@@ -77,51 +68,76 @@
       <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$/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/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.1@aar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:24.2.0@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.greenrobot:eventbus:3.0.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: org.adw.library:discrete-seekbar:1.0.1@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.zhy:autolayout:1.4.3@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.jakewharton:butterknife:7.0.1@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.okhttp3:okhttp:3.3.1@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.okio:okio:1.8.0@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.code.gson:gson:2.7@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.github.anrwatchdog:anrwatchdog:1.3.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\app\src\main\jniLibs\frame.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\NewProjects\CallingDoctor\app\libs\simpleftp.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:multidex:1.0.1@aar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.okhttp3:okhttp:3.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-utils:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support.constraint:constraint-layout:1.0.2@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat:24.2.0@aar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:recyclerview-v7:24.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.zhy:autolayout:1.4.3@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.jude:easyrecyclerview:4.4.2@aar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.zhy:okhttputils:2.6.2@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.adw.library:discrete-seekbar:1.0.1@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:multidex:1.0.1@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support.constraint:constraint-layout:1.0.2@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.squareup.okio:okio:1.8.0@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:cardview-v7:23.2.0@aar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.jude:easyrecyclerview:4.4.2@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: org.greenrobot:eventbus:3.0.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat:24.2.0@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\app\src\main\jniLibs\frame.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:24.2.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.github.anrwatchdog:anrwatchdog:1.3.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: __local_jars__:C.\Users\90571\Desktop\CallingDoctor\app\libs\simpleftp.jar:unspecified@jar" level="project" />
     <orderEntry type="module" module-name="nurseMainLib" exported="" />
     <orderEntry type="module" module-name="AmDemo_R" exported="" />
   </component>

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0"
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingdoctor/MyApplication.java

@@ -8,6 +8,7 @@ import android.content.ServiceConnection;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
 
+import com.wdkl.callingdoctor.entity.AllNurseHostEntity;
 import com.wdkl.callingdoctor.entity.UdpEntity;
 import com.wdkl.callingdoctor.service.APPService;
 import com.wdkl.callingdoctor.util.ScreenExtinguishUtil;
@@ -16,6 +17,7 @@ import com.wdkl.callingdoctor.util.anrfcutil.AnrFcExceptionUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.ConnectionPool;
@@ -72,6 +74,10 @@ public class MyApplication extends Application {
         sAppContext = getAppContext();
     }
 
+    //全局科室列表
+    //public static List<AllNurseHostEntity.NurseHost> AllNurseHostList;
+
+
     private void initUdp() {
         wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
         helper = new UdpHelper(wifiManager, sAppContext);
@@ -101,6 +107,7 @@ public class MyApplication extends Application {
 
         sAppContext = getApplicationContext();
         callEntityList = new ArrayList<>();
+        //AllNurseHostList = new ArrayList<>();
         initUdp();
         initClient();
 

app/src/main/java/com/wdkl/callingdoctor/adapter/CallListAdapter.java

@@ -82,6 +82,7 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.tvName.setText(" 门口机 ");
                 break;
             case Constants.SON_CALL:
+            case Constants.MUlTITAP_CALL:
             case Constants.TRADITION_CALL:
                 holder.llBed.setVisibility(View.VISIBLE);
                 holder.llRoom.setVisibility(View.VISIBLE);
@@ -107,12 +108,12 @@ public class CallListAdapter extends RecyclerView.Adapter<CallListAdapter.MyView
                 holder.tvRoomNum.setText(list.get(position).getRoomNumber());
                 holder.tvName.setText(" 紧急呼叫 ");
                 break;
-            case Constants.MANAGER_CALL:
+            case Constants.NURSE_CALL:
                 holder.llBed.setVisibility(View.GONE);
                 holder.llRoom.setVisibility(View.VISIBLE);
 
-                holder.ivLogo.setImageResource(R.mipmap.ic_manager);
-                holder.tvRoomNum.setText("总控制室");
+                holder.ivLogo.setImageResource(R.mipmap.ic_nurse_right_in_call);
+                holder.tvRoomNum.setText("护士主机");
                 holder.tvName.setText(" 呼叫 ");
                 holder.tvRoomNumTail.setVisibility(View.GONE);
                 break;

app/src/main/java/com/wdkl/callingdoctor/adapter/DutyDoctorAdapter.java

@@ -41,6 +41,11 @@ public class DutyDoctorAdapter extends RecyclerView.Adapter<DutyDoctorAdapter.My
         notifyDataSetChanged();
     }
 
+    public void clear() {
+        this.list.clear();
+        notifyDataSetChanged();
+    }
+
     @Override
     public void onBindViewHolder(DutyDoctorAdapter.MyViewHolder holder, int position) {
         holder.tvName.setText("  "+list.get(position).subSequence(0, 1)+"医生  ");

app/src/main/java/com/wdkl/callingdoctor/adapter/DutyNurseAdapter.java

@@ -40,6 +40,10 @@ public class DutyNurseAdapter extends RecyclerView.Adapter<DutyNurseAdapter.MyVi
         this.list = list;
         notifyDataSetChanged();
     }
+    public void clear() {
+        this.list.clear();
+        notifyDataSetChanged();
+    }
 
     @Override
     public void onBindViewHolder(DutyNurseAdapter.MyViewHolder holder, int position) {

app/src/main/java/com/wdkl/callingdoctor/adapter/NurseHostAdapter.java

@@ -2,16 +2,21 @@ package com.wdkl.callingdoctor.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+
 import com.wdkl.callingdoctor.R;
+import com.wdkl.callingdoctor.entity.AllNurseHostEntity;
+import com.wdkl.callingdoctor.entity.DoctorHostEntity;
 import com.wdkl.callingdoctor.entity.NurseHostListInfo;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -22,6 +27,7 @@ import butterknife.ButterKnife;
 
 public class NurseHostAdapter extends RecyclerView.Adapter<NurseHostAdapter.MyViewHolder> {
 
+    private String TAG = NurseHostAdapter.class.getSimpleName();
     private Context mcontext;
     private ArrayList<NurseHostListInfo> list;
     private LayoutInflater inflater;
@@ -39,6 +45,7 @@ public class NurseHostAdapter extends RecyclerView.Adapter<NurseHostAdapter.MyVi
      * @param list
      */
     public void updateList(ArrayList<NurseHostListInfo> list) {
+        Log.e(TAG,"list个数 "+list.size());
         this.list = list;
         selectedPosition = -1;
         notifyDataSetChanged();

app/src/main/java/com/wdkl/callingdoctor/common/Constants.java

@@ -81,10 +81,12 @@ public class Constants {
     //系统设置数据
     public static final String SYSTEM_INFO = "/WDHS-I/callingMainNurse_systemInfo.aspx";
 
+    //所有设备信息
+    public static final String CALLINGMAINNURSE_DEVICE_INFO = "/Mgr/GetWD_DeviceInfoArray.aspx";
     /**
      * 检查APP更新版本
      */
-    public static final String APP_CHECK_UPDATE = "/WDHS-I/callingMainNurse_APP_CheckUpdate.aspx";
+    public static final String APP_CHECK_UPDATE = "WDYS-I/callingMainDoctor_APP_CheckUpdate.aspx";
     //public static final String APP_CHECK_UPDATE = "";
 
 
@@ -213,7 +215,7 @@ public class Constants {
 
     /**
      * 各种呼叫的机型
-     * type : 1门口机 2主机 3 子机  4请求增援 5卫生间 6总控机 优先等级依次升高   12传统机
+     * type : 1门口机 2主机 3 子机  4请求增援 5卫生间 6总控机  7护士主机   8医生机 9护士主机转接给医生机 优先等级依次升高   12传统机
      */
     public static final String DOOR_CALL = "1";
     public static final String MAIN_CALL = "2";
@@ -221,7 +223,14 @@ public class Constants {
     public static final String ROOMHELP_CALL = "4";
     public static final String WSHROOM_CALL = "5";
     public static final String MANAGER_CALL = "6";
+    public static final String NURSE_CALL = "7";
+    public static final String DOCTOR_CALL = "8";
+    public static final String MUlTITAP_CALL = "9";
     public static final String TRADITION_CALL = "12";
+    public static String CallType = "";
+    public static String NurseHostCallStatus = "0";//护士主机呼叫医生主机的状态
+    //呼叫护士主机id
+    public static String CALLING_HOST_ID = "";
 
     public static String MYSELF_ID = "";//自己的机器ID
     public static String CALLMAIN_ID = "";//所属主机机器ID

app/src/main/java/com/wdkl/callingdoctor/entity/AllNurseHostEntity.java

@@ -0,0 +1,62 @@
+package com.wdkl.callingdoctor.entity;
+
+import java.util.List;
+
+public class AllNurseHostEntity {
+
+    private List<NurseHost> PartInfoArray;
+
+
+
+    public List<NurseHost> getPartInfoArray() {
+        return PartInfoArray;
+    }
+
+    public void setPartInfoArray(List<NurseHost> NurseHostArray) {
+        this.PartInfoArray = NurseHostArray;
+    }
+
+  public class NurseHost{
+      //護士id
+      private String ID;
+      //
+      private String PART_HOSPITALNAME;
+      //科室名称
+      private String PART_NAME;
+      //是否选中
+      public boolean isChecked;
+
+      public String getID() {
+          return ID;
+      }
+
+      public void setID(String ID) {
+          this.ID = ID;
+      }
+
+      public String getPART_HOSPITALNAME() {
+          return PART_HOSPITALNAME;
+      }
+
+      public void setPART_HOSPITALNAME(String PART_HOSPITALNAME) {
+          this.PART_HOSPITALNAME = PART_HOSPITALNAME;
+      }
+
+      public String getPART_NAME() {
+          return PART_NAME;
+      }
+
+      public void setPART_NAME(String PART_NAME) {
+          this.PART_NAME = PART_NAME;
+      }
+
+      public boolean isChecked() {
+          return isChecked;
+      }
+
+      public void setChecked(boolean checked) {
+          isChecked = checked;
+      }
+  }
+
+}

app/src/main/java/com/wdkl/callingdoctor/ui/activity/InitActivity.java

@@ -54,6 +54,7 @@ import static com.wdkl.callingdoctor.MyApplication.serialPortUtil;
 
 public class InitActivity extends BaseActivity implements SerialPortUtil.IForBroadcastClick , SerialPortUtil.ISerialPortBedOnclickString{
 
+    private String TAG = InitActivity.class.getSimpleName();
     public static final int RESTART_SYSTEM = 2008;
     public static final int ETHRESTART_SYSTEM = 2009; //wuyq add
 
@@ -273,8 +274,9 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                                     if (jsonObj.getString("deviceStatus").equals("1")) {
                                         Gson gson = new Gson();
                                         InitDataEntity initDataEntity = gson.fromJson(data, InitDataEntity.class);
-                                        saveData(initDataEntity);
 
+                                        saveData(initDataEntity);
+                                        Log.e(TAG,"自己机器ID "+initDataEntity.getId());
                                         AutoRebootUtil.rebootContinueCounts(InitActivity.this, 0);//重启标识复位
 
                                         Intent intent = new Intent();
@@ -464,7 +466,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
             AutoRebootUtil.rebootContinueCounts(InitActivity.this, 0);//重启标识复位
 
             //有线mac地址，设备出场信息，无线mac地址
-            String str = "MGR_REG_A" + Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "1" + Constants.DELIMITER + android.os.Build.DISPLAY +"_"+Constants.MCU_VERSION_NUMBER +
+            String str = "MGR_REG_A" + Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "2" + Constants.DELIMITER + android.os.Build.DISPLAY +"_"+Constants.MCU_VERSION_NUMBER +
                     Constants.DELIMITER + Constants.MAC_ADDRESS + Constants.DELIMITER + "FF:FF:FF:FF:FF:FF" + Constants.DELIMITER + SerialPortUtil.KEY_ID;
             UdpSendUtil.sendManualReboot(str);
         }

app/src/main/java/com/wdkl/callingdoctor/ui/activity/MainFragmentActivity.java

@@ -80,6 +80,7 @@ import static com.wdkl.callingdoctor.util.ethernetwifiwithsipconnectstatus.WifiH
 
 public class MainFragmentActivity extends FragmentActivity implements IVvsipServiceListener, SipCallBackI {
 
+    private String TAG = MainFragmentActivity.class.getSimpleName();
     //病床呼叫的Fragment
     private CallingBedFragment callingSickBedFragment;
 
@@ -862,11 +863,12 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
 
     @Override
     public void onStatusVvsipCallEvent(VvsipCall call) {
-        LogUtil.d("QQWW", "call.mState：==" + call.mState
+        Log.e(TAG, "call.mState：==" + call.mState
                 + "\ncall.isIncomingCall()" + call.isIncomingCall());
         switch (call.mState) {
             case 0://正在呼叫中:子机自动接通 isIncomingCall() = true  mState = 0
                 Constants.CALL_STATE = Constants.IN_CALL;
+                SipHelperUtil.getInstance(this).getmSipCallBackI().autoTalking();//自动接听
                 EventBus.getDefault().post(new MessageEvent(call, Constants.EVENT_SIP));
                 break;
             case 1:

app/src/main/java/com/wdkl/callingdoctor/ui/fragment/CallingBedFragment.java

@@ -90,6 +90,8 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         SicknessRoomAdapter.CallingSicknessRoomItemOnclickListener, CallListAdapter.CallingListItemOnclickListener,
         SerialPortUtil.ISerialPortOnclickEvent, SerialPortUtil.IForkSpringSwiData, CallingQueuingInfoAdapter.CallingQueuingItemOnclickListener
         , SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
+
+    private String TAG = CallingBedFragment.class.getSimpleName();
     private View mView;
 
     /**
@@ -575,12 +577,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
             public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { //上滑删除item
                 upScrllPosition = viewHolder.getAdapterPosition();
                 UdpEntity upScrllUdpEntity = MyApplication.callEntityList.get(upScrllPosition);
-                if (Constants.MANAGER_CALL.equals(upScrllUdpEntity.getType())) {
+                if (Constants.NURSE_CALL.equals(upScrllUdpEntity.getType())) {
                     deleteManagerCallingItem(upScrllUdpEntity);
                 } else {
                     deleteCallingItem(upScrllUdpEntity, 0);
                 }
 
+                //发送医生主机挂断电话udp add wang
+                UdpSendUtil.sendDoctorHangUpPhone(callingEntity);
+                Constants.NurseHostCallStatus = Constants.STANDBY;
+
             }
         };
         //用Callback构造ItemtouchHelper
@@ -710,6 +716,8 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
 
     private void getRoomData() {
         if (!StringUtils.notEmpty(Constants.URL)) return;
+        Log.e(TAG,"病房URL "+Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_ROOM);
+        Log.e(TAG,"deviceId "+Constants.MYSELF_ID);
         OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_ROOM)
                 // .addParams("deviceId","5")
                 .addParams("deviceId", Constants.MYSELF_ID)
@@ -993,12 +1001,22 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                     callBed = false;
                     ivCallListPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
                     mainFragmentActivity.initiateCall(sipAddress, callingEntity.getType(), callingEntity.getDeviceMAC());
+
+                    //判断拨打类型 如果是护士主机转接，就发送udp通知取消 其他医生主机的呼叫 add wang
+                   if(callingEntity.getType().equals(Constants.MUlTITAP_CALL)){
+                       Log.e(TAG,"listCall接听时发送取消其他医生主机呼叫 ");
+                       UdpSendUtil.sendCancelMultitapCall(callingEntity);//要传自己的Mac 这样发去就可以判断是否是自己发出
+                   }
+
                 }
             } else {
                 if (null != loopingUdpentity && loopingUdpentity.equals(callingEntity)) {
                     loopVoice.setPalyDismiss(true);
                 }
                 endCall();
+                //发送医生主机挂断电话udp add wang
+                UdpSendUtil.sendDoctorHangUpPhone(callingEntity);
+                Constants.NurseHostCallStatus = Constants.STANDBY;
             }
         } else {
             ToastUtil.showToast("请勿频繁点击！");
@@ -1031,6 +1049,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         callBed = true;
                         ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
                         mainFragmentActivity.initiateCall(sipAddress, "", sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
+                        Constants.CallType = Constants.MAIN_CALL;//设置呼叫类型标记
                     }
                 }
             } else {
@@ -1120,10 +1139,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         if (null == sickbedInformationList || null == sickbedInformationList.get(position) || null == sickbedInformationList.get(position).getPatientID()) {
             return;
         }
+        Log.e(TAG,"sickBedInfo "+sickBedInfo+" Constants.CALL_STATE "+Constants.CALL_STATE);
+        if(sickBedInfo != null){
         if (!Constants.CALL_STATE.equals(Constants.STANDBY) && !sickBedInfo.equals(sickbedInformationList.get(position))) {
             ToastUtil.showToast("请先取消当前呼叫");
             return;
         }
+        }else if(!Constants.CALL_STATE.equals(Constants.STANDBY)){
+            ToastUtil.showToast("请先取消当前呼叫....");
+            return;
+        }
         if (vRightCallInfo.getVisibility() == View.VISIBLE && sickBedInfo.equals(sickbedInformationList.get(position))) {
             if (null == sickBedInfo || !StringUtils.listNotEmpty(sickbedInformationList)) return;
             if (filterSipToast()) {
@@ -1133,6 +1158,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         callBed = true;
                         ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
                         mainFragmentActivity.initiateCall(sipAddress, "", sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
+                        Constants.CallType = Constants.MAIN_CALL;//设置呼叫类型标记
                     }
                 } else {
                     endCall();
@@ -1225,6 +1251,9 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                     }
                 } else {
                     endCall();
+                    Constants.NurseHostCallStatus = Constants.STANDBY;
+                    //发送医生主机挂断电话udp add wang
+                    UdpSendUtil.sendDoctorHangUpPhone(callingEntity);
                 }
             }
         } else {
@@ -1322,12 +1351,14 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 if (Constants.CALL_STATE.equals(Constants.IN_CALL)) {
                     tvBedCallState.setText("  正在呼叫中...");
                     tvCallListState.setText("  正在呼叫中...");
+                    tvCallListRoomMsg.setText("  正在呼叫中...");
                 } else if (Constants.CALL_STATE.equals(Constants.IN_CALLING)) {
                     have_Call = true;
                     setVolumePA(true);
                     upScrllPosition = -1;//通话的时候废掉上滑索引；以免与通话结束后自动删除CALL条目相冲突
                     tvBedCallState.setText("  正在通话中...");
                     tvCallListState.setText("  正在通话中...");
+                    tvCallListRoomMsg.setText("  正在通话中...");
 
                     if (null != MyApplication.serialPortUtil) { //正在呼叫；将关闭外部音响
                         MyApplication.serialPortUtil.stereoControl("0");
@@ -1372,9 +1403,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 LogUtil.d(CallingBedFragment.class, "udpEntityString==" + udpEntity.toString());
                 switch (udpEntity.getIndexes()) {
                     case "call_1": //子机呼叫护士主机
-                    case "call_2"://卫生间呼叫护士主机
-                    case "call_4"://增援呼叫护士主机
-                    case "call_6": //门口机呼叫护士主机
+                        //医生主机不需要这些呼叫
+//                    case "call_2"://卫生间呼叫护士主机
+//                    case "call_4"://增援呼叫护士主机
+//                    case "call_6": //门口机呼叫护士主机
                         if (isMySelfMachine(nurseHostID)) {//只有属于自己管的机器才能加进列表
                             if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
                                 addPhonetics(udpEntity); //在此加入列表队列 Waderson  20171101
@@ -1390,23 +1422,60 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                             roomAdapter.notifyDataSetChanged();
                         }
                         break;
-                    case "call_12": //总控制室呼叫护士主机
-                        if (isMySelfMachine(nurseHostID)) {
+                    case "call_13": //护士主机呼叫医生主机
+                        Log.e("qqq","nurseHostID "+nurseHostID+" "+Constants.MYSELF_ID);
+                        if (isBelongSupervisor(nurseHostID)) {
+                            Log.e("qqq222","nurseHostID "+nurseHostID);
                             if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
                                 addPhonetics(udpEntity);
                             }
                             if (!MyApplication.callEntityList.contains(udpEntity)) {
+
                                 MyApplication.callEntityList.add(udpEntity);
+                                Log.e("qqq333","nurseHostID "+MyApplication.callEntityList.size());
                                 setPowerLed("2");//有电话过来就让电源灯闪 Waderson  20171221
                                 sortList();//在此执行排序 Waderson  20171031
+                                Log.e("qqq444","nurseHostID "+MyApplication.callEntityList.size());
                                 //sendCallWaitingNumber(MyApplication.callEntityList.size());
                             }
                             callListAdapter.notifyDataSetChanged();
                             roomAdapter.notifyDataSetChanged();
+                            Constants.NurseHostCallStatus = Constants.IN_CALL;
                         }
                         break;
-                    case "call_12_hang_up": //总控制室主机取消呼叫 add by waderson 20191108
+                    case "call_13_hang_up": //医生主机取消呼叫 add by waderson 20191108
+                        Log.e(TAG,"call_13_hang_up.....");
+
                         deleteManagerCallingItem(udpEntity);
+                        Constants.NurseHostCallStatus = Constants.STANDBY;
+                        break;
+                    case "call_13_upremove"://护士主机上划删除了医生机的呼叫
+                        Log.e(TAG,"call_13_upremove.....");
+                        Constants.NurseHostCallStatus = Constants.STANDBY;
+                        Constants.CALL_STATE = Constants.STANDBY;
+                        break;
+                    case "call_15": //护士主机转接医生主机
+                        if (isBelongSupervisor(nurseHostID)) {
+                            Log.e("call_15","call_15 nurseHostID "+nurseHostID);
+                            if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
+                                addPhonetics(udpEntity);
+                            }
+                            if (!MyApplication.callEntityList.contains(udpEntity)) {
+                                MyApplication.callEntityList.add(udpEntity);
+                                Log.e("call_15","call_15 2222 "+MyApplication.callEntityList.size());
+                                setPowerLed("2");//有电话过来就让电源灯闪 Waderson  20171221
+                                sortList();//在此执行排序 Waderson  20171031
+                                //sendCallWaitingNumber(MyApplication.callEntityList.size());
+                            }
+                            callListAdapter.notifyDataSetChanged();
+                            roomAdapter.notifyDataSetChanged();
+                        }
+                        break;
+                    case "call_15_cancel"://如果有医生主机接听就取消其他医生主机转接 先排除是否是自己接了
+                        Log.e(TAG,"call_15_cancel.....mac"+udpEntity.getDeviceMAC()+" "+Constants.MAC_ADDRESS);
+                        if(!udpEntity.getDeviceMAC().equals(Constants.MAC_ADDRESS)){
+                            deleteCallingItem(udpEntity , 1);
+                        }
                         break;
                     case "call_1_b1": //护士已经退出护理
                         if (notEmpty(nurseHostID) && nurseHostID.equals(Constants.MYSELF_ID)) {
@@ -1527,11 +1596,30 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
             String his = nDis.split(",")[1];
             return Constants.MYSELF_ID.equals(my) && Constants.TRUST_OLD_MAIN_ID.equals(his);
         } else {
+            Log.e("isMySelfMachine","nurseHostID "+nurseHostID+" "+Constants.MYSELF_ID);
             return notEmpty(nurseHostID) && nurseHostID.equals(Constants.MYSELF_ID);
         }
     }
 
     /**
+     * 是否和管理机器的ID一样<br></>
+     */
+    private boolean isBelongSupervisor(String nurseHostID) {
+        String n = StringUtils.substringByLengh(nurseHostID, 0, 1);
+        if ("#".equals(n)) {
+            String nDis = StringUtils.deleteCharAt(nurseHostID, 0);
+            String my = nDis.split(",")[0];
+            String his = nDis.split(",")[1];
+            return Constants.MYSELF_ID.equals(my) && Constants.TRUST_OLD_MAIN_ID.equals(his);
+        } else {
+            Log.e("isMySelfMachine","nurseHostID "+nurseHostID+" "+Constants.CALLMAIN_ID);
+            return notEmpty(nurseHostID) && nurseHostID.equals(Constants.CALLMAIN_ID);
+        }
+    }
+
+
+
+    /**
      * 是否已经有该卫生间紧急呼叫<br></>
      */
     private boolean isHaveThisWSHtype(UdpEntity udpEntity) {
@@ -1774,8 +1862,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                     mainList.add(callList.get(i));
                 } else if (DOOR_CALL.equals(callList.get(i).getType())) {
                     doorList.add(callList.get(i));
-                } else if (Constants.MANAGER_CALL.equals(callList.get(i).getType())) {
+                } else if (Constants.NURSE_CALL.equals(callList.get(i).getType())) {
                     managerList.add(callList.get(i));
+                }else if (Constants.MUlTITAP_CALL.equals(callList.get(i).getType())) {
+                    bedList.add(callList.get(i));
                 }
             }
             if (wcList.size() > 1) {
@@ -1969,10 +2059,33 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         resIdlist.add(R.raw.jinjihujiao);
                     }
                     break;
-                case Constants.MANAGER_CALL://总控机
-                    resIdlist.add(R.raw.manager);
+                case Constants.NURSE_CALL://护士主机
+                    resIdlist.add(R.raw.nurse_host);
                     resIdlist.add(R.raw.hujiao);
                     break;
+                case Constants.MUlTITAP_CALL://护士主机转接给医生机
+                    ArrayList<String> list_str8 = StringUtils.substringBySing(roomnumber);
+                    ArrayList<String> list_str88 = StringUtils.substringBySing(bednumber);
+                    if (null != list_str8 && "1".equals(voiceBroadcastType)) {//是否要播报“房” 0不要  1要
+                        for (String s : list_str8) {
+                            resIdlist.add(PalyPhonetics.getResIdInt(s));
+                        }
+                        resIdlist.add(R.raw.fang);
+                    }
+
+                    if (null != list_str88) {
+                        if (haveVip) {// add by waderson 20191212
+                            resIdlist.add(R.raw.vip);
+                        }
+
+                        for (String s : list_str88) {
+                            resIdlist.add(PalyPhonetics.getResIdInt(s));
+                        }
+                        resIdlist.add(R.raw.chuang);
+                        resIdlist.add(R.raw.hujiao);
+                    }
+                    break;
+
             }
             if (null != loopVoice) {
                 try {
@@ -2169,14 +2282,14 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
             }
             return;
         }
-        if (callingEntity.getType().equals(Constants.MANAGER_CALL)) {
+        if (callingEntity.getType().equals(Constants.NURSE_CALL)) {
             if (Constants.CALL_STATE.equals(Constants.STANDBY)) {
                 vRightCallListInfo.setVisibility(View.VISIBLE);
                 rightCallListInfomation.setVisibility(View.INVISIBLE);
                 ivCallListPic.setVisibility(View.VISIBLE);
                 vRightPatientInfo.setVisibility(View.GONE);
                 vRightCallInfo.setVisibility(View.GONE);
-                tvCallListRoomMsg.setText("总控制室呼叫...");
+                tvCallListRoomMsg.setText("护士主机呼叫...");
             }
             return;
         }

app/src/main/java/com/wdkl/callingdoctor/ui/fragment/CallingHostFragment.java

@@ -1,9 +1,13 @@
 package com.wdkl.callingdoctor.ui.fragment;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -14,28 +18,40 @@ import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.wdkl.callingdoctor.MyApplication;
 import com.wdkl.callingdoctor.R;
 import com.wdkl.callingdoctor.adapter.DoctorHostAdapter;
+import com.wdkl.callingdoctor.adapter.DutyDoctorAdapter;
+import com.wdkl.callingdoctor.adapter.DutyNurseAdapter;
 import com.wdkl.callingdoctor.adapter.MedicalHostsCallingQueuingInfoAdapter;
 import com.wdkl.callingdoctor.adapter.NurseHostAdapter;
 import com.wdkl.callingdoctor.base.BaseFragment;
 import com.wdkl.callingdoctor.common.Constants;
+import com.wdkl.callingdoctor.entity.AllNurseHostEntity;
 import com.wdkl.callingdoctor.entity.CallingQueuingInfoEntity;
 import com.wdkl.callingdoctor.entity.DoctorHostEntity;
+import com.wdkl.callingdoctor.entity.HospitalInfoEntity;
 import com.wdkl.callingdoctor.entity.MessageEvent;
 import com.wdkl.callingdoctor.entity.NurseHostListInfo;
+import com.wdkl.callingdoctor.entity.UdpEntity;
+import com.wdkl.callingdoctor.ui.activity.MainFragmentActivity;
 import com.wdkl.callingdoctor.util.LogUtil;
+import com.wdkl.callingdoctor.util.PalyPhonetics;
 import com.wdkl.callingdoctor.util.StringUtils;
+import com.wdkl.callingdoctor.util.ToastUtil;
 import com.wdkl.callingdoctor.util.UIUtils;
+import com.wdkl.callingdoctor.util.UdpSendUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -44,6 +60,7 @@ import okhttp3.Call;
 import static com.wdkl.callingdoctor.util.StringUtils.notEmpty;
 import static com.wdkl.callingdoctor.util.ToastUtil.showToast;
 
+
 /**
  * Created by xuhuan on 2017/8/23.<br></>
  * Changed by Waderson  on 2017/12/1
@@ -51,7 +68,9 @@ import static com.wdkl.callingdoctor.util.ToastUtil.showToast;
 
 public class CallingHostFragment extends BaseFragment implements DoctorHostAdapter.DoctorHostItemOnclickListener,
         NurseHostAdapter.NurseHostItemOnclickListener, View.OnClickListener,
-        MedicalHostsCallingQueuingInfoAdapter.CallingQueuingBarItemOnClickListener, RecyclerView.OnItemTouchListener {
+        MedicalHostsCallingQueuingInfoAdapter.CallingQueuingBarItemOnClickListener, RecyclerView.OnItemTouchListener, SwipeRefreshLayout.OnRefreshListener {
+
+    private String TAG = CallingHostFragment.class.getSimpleName();
 
     private View mView;
 
@@ -69,6 +88,10 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
      * 医生主机的适配器
      */
     private DoctorHostAdapter doctorHostAdapter;
+
+    //护士主机刷新控件
+    @Bind(R.id.fragment_calling_nurse_layout_sr_refresh)
+    SwipeRefreshLayout swipeNurseRefreshLayout;
     /**
      * 护士主机RV
      */
@@ -127,6 +150,29 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
     @Bind(R.id.fragment_tv_doctor_nurse_no)
     TextView nurse_CallStaus;
 
+    //所有护士主机列表
+    private AllNurseHostEntity AllNurseHostEntity;
+
+    private    List<NurseHostListInfo> nurseHostListInfo = new ArrayList<>();
+
+    //值班医生
+    @Bind(R.id.fragment_rv_doctors)
+    RecyclerView rvDutyDoctors;
+
+    //值班护士
+    @Bind(R.id.fragment_rv_nurses)
+    RecyclerView rvDutyNurses;
+
+    private DutyDoctorAdapter dutyDoctorAdapter;
+    private DutyNurseAdapter dutyNurseAdapter;
+    private ArrayList<String> dutyDoctorsList = new ArrayList<>();
+    private ArrayList<String> dutyNursesList = new ArrayList<>();
+
+    //科室数据
+    private HospitalInfoEntity hospitalInfoEntity;
+
+
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -152,6 +198,7 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
         ivEndCalling.setOnClickListener(this);
         rvDoctor.addOnItemTouchListener(this);
         rvNurse.addOnItemTouchListener(this);
+        swipeNurseRefreshLayout.setOnRefreshListener(this);
     }
 
     @Override
@@ -184,15 +231,113 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
         rvDoctor.setAdapter(doctorHostAdapter);
         doctorHostAdapter.setDoctorHostItemOnclickListener(this);
 
-        LinearLayoutManager nurseManager = new LinearLayoutManager(getActivity());
-        nurseManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+//        LinearLayoutManager nurseManager = new LinearLayoutManager(getActivity());
+//        nurseManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        GridLayoutManager nurseManager = new GridLayoutManager(getActivity(), 4);
         rvNurse.setLayoutManager(nurseManager);
         nurseHostAdapter = new NurseHostAdapter(getActivity(), nurseHostList);
         rvNurse.setAdapter(nurseHostAdapter);
         nurseHostAdapter.setNurseHostItemOnclickListener(this);
 
-        getNurseHostList();
-        getDoctorHostList();
+        //责任医生列表
+        GridLayoutManager layoutManager = new GridLayoutManager(getActivity(), 3);
+        rvDutyDoctors.setLayoutManager(layoutManager);
+        dutyDoctorAdapter = new DutyDoctorAdapter(getActivity(), dutyDoctorsList);
+        rvDutyDoctors.setAdapter(dutyDoctorAdapter);
+
+        //责任护士列表
+        GridLayoutManager layoutManager2 = new GridLayoutManager(getActivity(), 3);
+        rvDutyNurses.setLayoutManager(layoutManager2);
+        dutyNurseAdapter = new DutyNurseAdapter(getActivity(), dutyNursesList);
+        rvDutyNurses.setAdapter(dutyNurseAdapter);
+
+          //  原有护士主机逻辑
+//        getNurseHostList();
+//        getDoctorHostList();
+
+        getAllNurseHosts();
+        getAllDeviceInfo();
+
+    }
+
+    private void getAllDeviceInfo() {
+        OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_DEVICE_INFO)
+                .addParams("PartID", Constants.PartID)
+                .build()
+                .execute(new StringCallback() {
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+                        if (swipeNurseRefreshLayout.isRefreshing()) {
+                            swipeNurseRefreshLayout.setRefreshing(false);
+                        }
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onResponse(String response, int id) {
+                        if (swipeNurseRefreshLayout.isRefreshing()) {
+                            swipeNurseRefreshLayout.setRefreshing(false);
+                        }
+                        if (notEmpty(response)) {
+                            LogUtil.d(CallingHostFragment.class, "device info==" + response);
+                        } else {
+                            LogUtil.i(CallingHostFragment.class, "数据返回为空！");
+                        }
+                    }
+                });
+    }
+
+    private void getAllNurseHosts() {
+
+//        OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_PART_INFO)
+             //   测试使用
+//        OkHttpUtils.post().url(Constants.URL + Constants.URL_END +"/Mgr/GetWD_PartInfoArray.aspx")
+        Log.e(TAG,"url "+Constants.URL + Constants.URL_END+"/WDHS-I/callingMainNurse_NurseHostList.aspx");
+        Log.e(TAG,"url "+Constants.MYSELF_ID+" "+Constants.PartID);
+        OkHttpUtils.post().url(Constants.URL + Constants.URL_END +Constants.CALLINGMAINNURSE_NURSELIST)
+                .addParams("deviceId", Constants.MYSELF_ID)
+                .addParams("PartID", Constants.PartID)
+                .build()
+                .execute(new StringCallback() {
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+                        Log.e(TAG,e.getMessage(),e);
+                        if (swipeNurseRefreshLayout.isRefreshing()) {
+                            swipeNurseRefreshLayout.setRefreshing(false);
+                        }
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onResponse(String response, int id) {
+                        if (swipeNurseRefreshLayout.isRefreshing()) {
+                            swipeNurseRefreshLayout.setRefreshing(false);
+                        }
+                        if (notEmpty(response)) {
+                            LogUtil.d(CallingHostFragment.class, "part info==" + response);
+                            String code = getStringData(response, "Code");
+                            Log.e(TAG,"code "+code);
+                            if (code.equals("OK!")) {
+                                String data = response.substring(0, response.length() - 4);
+                                Log.e(TAG,"返回的数据data "+data);
+                                Gson gson = new Gson();
+                                nurseHostList = gson.fromJson(getStringData(response, "hostList"),
+                                        new TypeToken<ArrayList<NurseHostListInfo>>() {
+                                        }.getType());
+                                if (null != nurseHostList) {
+                                    LogUtil.d(CallingHostFragment.class, "nurseHostListsize==" + nurseHostList.size());
+                                    nurseHostAdapter.updateList(nurseHostList);
+                                }
+                            } else {
+                                LogUtil.i(CallingHostFragment.class, "Code==" + code + "---数据返回错误！");
+                            }
+                        } else {
+                            LogUtil.i(CallingHostFragment.class, "数据返回为空！");
+                        }
+                    }
+                });
+
+
     }
 
     /**
@@ -251,42 +396,43 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
                 });
     }
 
-    /**
-     * 获取医护主机列表信息
-     */
-    private void getNurseHostList() {
-        if (!StringUtils.notEmpty(Constants.PartID)) return;
-        OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_NURSELIST)
-                .addParams("PartID", Constants.PartID)
-                .addParams("deviceId", Constants.MYSELF_ID)
-                .build()
-                .execute(new StringCallback() {
-                    @Override
-                    public void onError(Call call, Exception e, int id) {
-                        hideProgress();
-                    }
-
-                    @Override
-                    public void onResponse(String response, int id) {
-                        if (notEmpty(response)) {
-                            LogUtil.d(CallingHostFragment.class, "NurseHostListresponse==" + response);
-                            String code = getStringData(response, "Code");
-                            if (code.equals("OK!")) {
-                                nurseHostList = new Gson().fromJson(getStringData(response, "hostList"), new TypeToken<ArrayList<NurseHostListInfo>>() {
-                                }.getType());
-                                if (null != nurseHostList) {
-                                    LogUtil.d(CallingHostFragment.class, "nurseHostListsize==" + nurseHostList.size());
-                                    nurseHostAdapter.updateList(nurseHostList);
-                                }
-                            } else {
-                                LogUtil.i(CallingHostFragment.class, "Code==" + code + "---数据返回错误！");
-                            }
-                        } else {
-                            LogUtil.i(CallingHostFragment.class, "数据返回为空！");
-                        }
-                    }
-                });
-    }
+//    /**
+//     * 获取医护主机列表信息
+//     */
+//    private void getNurseHostList() {
+//        if (!StringUtils.notEmpty(Constants.PartID)) return;
+//        OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_NURSELIST)
+//                .addParams("PartID", Constants.PartID)
+//                .addParams("deviceId", Constants.MYSELF_ID)
+//                .build()
+//                .execute(new StringCallback() {
+//                    @Override
+//                    public void onError(Call call, Exception e, int id) {
+//                        hideProgress();
+//                    }
+//
+//                    @Override
+//                    public void onResponse(String response, int id) {
+//                        if (notEmpty(response)) {
+//                            LogUtil.d(CallingHostFragment.class, "NurseHostListresponse==" + response);
+//                            String code = getStringData(response, "Code");
+//                            if (code.equals("OK!")) {
+//                                nurseHostList = new Gson().fromJson(getStringData(response, "hostList"),
+//                                        new TypeToken<ArrayList<NurseHostListInfo>>() {
+//                                }.getType());
+//                                if (null != nurseHostList) {
+//                                    LogUtil.d(CallingHostFragment.class, "nurseHostListsize==" + nurseHostList.size());
+//                                    nurseHostAdapter.updateList(nurseHostList);
+//                                }
+//                            } else {
+//                                LogUtil.i(CallingHostFragment.class, "Code==" + code + "---数据返回错误！");
+//                            }
+//                        } else {
+//                            LogUtil.i(CallingHostFragment.class, "数据返回为空！");
+//                        }
+//                    }
+//                });
+//    }
 
 //    /**
 //     * 获取呼叫历史列表信息
@@ -344,6 +490,127 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
         doctorHostAdapter.notifyDataSetChanged();
     }
 
+
+
+
+    private void getPartData(String partId) {
+        if (!StringUtils.notEmpty(Constants.URL)) return;
+        if (!StringUtils.notEmpty(partId)) return;
+        OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_HOSPITAL)
+                .addParams("PartID", partId)
+                .build()
+                .execute(new StringCallback() {
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+                        LogUtil.d("getPartData", "===error===");
+                    }
+
+                    @Override
+                    public void onResponse(String response, int id) {
+                        String data = response.substring(0, response.length() - 4);
+                        LogUtil.d("getPartData", "data=="+data);
+                        try {
+                            JSONObject jsonObj = new JSONObject(data);
+                            if (jsonObj.getString("Code").equals("ERROR!")) {
+                                LogUtil.d("getPartData", "网络错误");
+                            } else {
+                                Gson gson = new Gson();
+                                hospitalInfoEntity = gson.fromJson(data, HospitalInfoEntity.class);
+                                ArrayList<String> doctorList = (ArrayList<String>) hospitalInfoEntity.getDutyDoctorList();
+                                ArrayList<String> nurseList = (ArrayList<String>) hospitalInfoEntity.getNurseOnDutyList();
+                                dutyDoctorAdapter.updateList(doctorList);
+                                dutyNurseAdapter.updateList(nurseList);
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
+    private void getNurseHostInfo(String partId) {
+        try {
+            OkHttpUtils.post().url(Constants.URL + Constants.URL_END + Constants.CALLINGMAINNURSE_NURSELIST)
+                    .addParams("PartID", partId)
+                    .build()
+                    .execute(new StringCallback() {
+                        @Override
+                        public void onError(Call call, Exception e, int id) {
+                            LogUtil.d("getNurseHostInfo", "===error===");
+                        }
+
+                        @Override
+                        public void onResponse(String response, int id) {
+                            try {
+                                JSONObject jsonObj = new JSONObject(response);
+                                if (jsonObj.getString("Code").equals("ERROR!")) {
+                                    LogUtil.d("getNurseHostInfo", "网络错误");
+                                } else {
+                                    if (jsonObj.getString("Code").equals("OK!")) {
+                                        String data = jsonObj.getString("hostList");
+                                        JSONArray array = new JSONArray(data);
+                                        Gson gson = new Gson();
+                                        List<NurseHostListInfo> nurseHostList = new ArrayList<>();
+                                        for (int i = 0; i < array.length(); i++) {
+                                            NurseHostListInfo nurseHostListInfo = gson.fromJson(array.get(i).toString(), NurseHostListInfo.class);
+                                            nurseHostList.add(nurseHostListInfo);
+                                        }
+
+                                        if (nurseHostList.size() > 0 && nurseHostList.get(0) != null) {
+                                            NurseHostListInfo hostInfo = nurseHostList.get(0);
+                                            final String hostId = hostInfo.getDeviceHostingID();
+                                            //final String sip = hostInfo.getDeviceSipIp();
+                                            //final String name = hostInfo.getDeviceName();
+                                            ivEndCalling.setOnClickListener(new View.OnClickListener() {
+                                                @Override
+                                                public void onClick(View v) {
+                                                    getActivity().runOnUiThread(new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            callClick(hostId);
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        }
+                                    } else {
+                                        LogUtil.d("Code", "网络错误");
+                                    }
+                                }
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void callClick(String hostId) {
+        if (Constants.CALL_STATE.equals(Constants.STANDBY)) {
+            //呼叫中
+            ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_hang_up);
+            nurse_CallStaus.setText("正在呼叫...");
+            Log.e(TAG,"callClick 正在呼叫");
+            UdpSendUtil.sendNurseHostCall(hostId);
+            Constants.CALL_STATE = Constants.IN_CALL;
+            Constants.CALLING_HOST_ID = hostId;
+            Constants.CallType = Constants.DOCTOR_CALL;
+        } else {
+            //主动挂断
+            if (Constants.CallType.equals(Constants.DOCTOR_CALL)) {
+                ((MainFragmentActivity) getActivity()).endCalled();
+                ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_calling);
+                nurse_CallStaus.setText("");
+                UdpSendUtil.sendNurseHostHangUp(hostId);
+                Constants.CALL_STATE = Constants.STANDBY;
+                Constants.CALLING_HOST_ID = "";
+            }
+        }
+    }
+
+
     /**
      * 护士主机适配器条目的点击事件
      *
@@ -352,27 +619,51 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
      */
     @Override
     public void nurseHostItemOnclick(View view, int position) {
-        if (null == nurseHostList || nurseHostList.size() <= 0 || null == nurseHostList.get(position))
+        if (!Constants.CALL_STATE.equals(Constants.STANDBY) && Constants.CallType.equals(Constants.DOCTOR_CALL)) {
+            ToastUtil.showToast("请先取消当前呼叫");
             return;
-        if (nurseHostList.get(position).isChecked()) {
-            nurseHostList.get(position).setChecked(false);
-            rlIncall.setVisibility(View.GONE);
-            rlNotInCallBg.setVisibility(View.VISIBLE);
-            tvCallingTips.setText("");
-        } else {
+        }else if(!Constants.NurseHostCallStatus.equals(Constants.STANDBY)){
+            ToastUtil.showToast("请先取消当前呼叫...");
+            return;
+        }
+        if (nurseHostList.size() <= 0 || position >= nurseHostList.size() || null == nurseHostList.get(position)) {
+            return;
+        }
+        final NurseHostListInfo  info = nurseHostList.get(position);
+        if (!info.isChecked()) {
             for (NurseHostListInfo entity : nurseHostList) {
                 if (null == entity) continue;
                 entity.setChecked(false);
             }
-            nurseHostList.get(position).setChecked(true);
-            tvCallingTips.setText(nurseHostList.get(position).getDeviceName());
-            nurse_CallStaus.setText(nurseHostList.get(position).getDeviceName());
+            info.setChecked(true);
+            nurseHostAdapter.notifyDataSetChanged();
+
+            tvCallingTips.setText("");
+            //nurse_CallStaus.setText(info.getPART_NAME());
             ivDoctorOrNurseCalling.setImageResource(R.mipmap.ic_nurse_right_in_call);
             ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_calling);
+            ivEndCalling.setVisibility(View.VISIBLE);
             rlIncall.setVisibility(View.VISIBLE);
             rlNotInCallBg.setVisibility(View.GONE);
+
+            getPartData(info.getDeviceSipStatus());
+            ivEndCalling.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if(!Constants.NurseHostCallStatus.equals(Constants.STANDBY)){
+                        ToastUtil.showToast("请先取消当前呼叫");
+                        return;
+                    }
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            callClick(info.getDeviceHostingID());
+                        }
+                    });
+                }
+            });
+           // getNurseHostInfo(info.getDeviceSipStatus());
         }
-        nurseHostAdapter.notifyDataSetChanged();
     }
 
     /**
@@ -409,6 +700,90 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
+        Log.e(TAG, "onMoonEvent返回。。。"+messageEvent.getType());
+        switch (messageEvent.getType()){
+            case Constants.EVENT_SIP:
+                Log.e(TAG, "Constants.CALL_STATE==" + Constants.CALL_STATE);
+                if (Constants.CALL_STATE.equals(Constants.STANDBY)) {
+                    LogUtil.d("onMoonEvent", "通话状态==STANDBY");
+
+                    if (null != MyApplication.serialPortUtil) { //呼叫结束了；打开外部音响
+                        MyApplication.serialPortUtil.stereoControl("1");
+                    }
+                    ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_calling);
+                    nurse_CallStaus.setText("");
+                }
+                if (Constants.CALL_STATE.equals(Constants.IN_CALL)) {
+
+                } else if (Constants.CALL_STATE.equals(Constants.IN_CALLING)) {
+
+
+                    Log.e(TAG,"Constants.CallType "+Constants.CallType);
+
+                    if(Constants.CallType != Constants.MAIN_CALL){
+                        ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_hang_up);
+                        nurse_CallStaus.setText("  正在通话中...");
+                    }
+
+                    if (null != MyApplication.serialPortUtil) { //正在呼叫；将关闭外部音响
+                        MyApplication.serialPortUtil.stereoControl("0");
+                    }
+
+                    MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
+                        }
+                    }, 100);
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
+                        }
+                    }, 600);
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
+                        }
+                    }, 1100);
+
+                }
+                break;
+            case Constants.EVENT_UDP:
+                Log.e(TAG, "onMoonEvent返回。。。EVENT_UDP");
+                UdpEntity udpEntity = (UdpEntity) messageEvent.getMessage();
+                String nurseHostID = udpEntity.getNurseHostID();
+                String headMachineID = udpEntity.getHeadMachineID();
+                switch (udpEntity.getIndexes()) {
+                  case "call_13_upremove"://护士主机上划删除了医生机的呼叫
+                      ivEndCalling.setBackgroundResource(R.mipmap.ic_calling_sickbed_right_calling);
+                      nurse_CallStaus.setText("");
+                      Constants.NurseHostCallStatus = Constants.STANDBY;
+                      Constants.CALL_STATE = Constants.STANDBY;
+
+                      break;
+                    case "call_13"://护士主机呼叫医生主机
+                        Constants.NurseHostCallStatus = Constants.IN_CALL;
+                        break;
+                    case "call_13_hang_up"://护士主机取消呼叫医生主机
+                        Constants.NurseHostCallStatus = Constants.STANDBY;
+                        break;
+                }
+
+                break;
+
+        }
+
+
+
+
+
+
+
+
+
     }
 
     /**
@@ -430,4 +805,21 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
         }
         return data;
     }
+
+    @Override
+    public void onRefresh() {
+        resetRightList();
+        getAllNurseHosts();
+    }
+
+    private void resetRightList() {
+        tvCallingTips.setText("");
+        nurse_CallStaus.setText("");
+        ivDoctorOrNurseCalling.setImageResource(R.mipmap.ic_trusteeship_n);
+        ivEndCalling.setVisibility(View.GONE);
+        rlIncall.setVisibility(View.VISIBLE);
+        rlNotInCallBg.setVisibility(View.GONE);
+        dutyDoctorAdapter.clear();
+        dutyNurseAdapter.clear();
+    }
 }

app/src/main/java/com/wdkl/callingdoctor/util/AnalysisUdpUtil.java

@@ -44,44 +44,67 @@ public class AnalysisUdpUtil {
             udpMsg = delHeadAndEnd(udpMsg, "$", "#");
             final String[] data = udpMsg.split(Character.toString((char) 3));
 
-            //总控制室主机呼叫
-            if (Constants.MANAGER_CALL.equals(data[8])) {
+
+            //护士主机呼叫
+            if (Constants.NURSE_CALL.equals(data[8])) {
+
+                Log.e("AnalysisUdpUtil",""+data[8]);
+
                 switch (data[0]) {
-                    case "call_12"://总控制室主机呼叫护士主机
-                        UdpEntity udpEntity = new UdpEntity();
-                        udpEntity.setIndexes(data[0]);
-                        udpEntity.setNurseHostID(data[1]);
-                        udpEntity.setDoorwayMachineID(data[2]);
-                        udpEntity.setHeadMachineID(data[3]);
-                        udpEntity.setSipAddress(data[4]);
-                        udpEntity.setRoomNumber(data[5]);
-                        udpEntity.setBedNumber(data[6]);
-                        udpEntity.setLevel(data[7]);
-                        udpEntity.setType(data[8]);
-                        udpEntity.setName(data[9]);
-                        udpEntity.setDeviceMAC(data[10]);
-                        udpEntity.setShowText("总控制室主机呼叫护士主机");
-                        EventBus.getDefault().post(new MessageEvent(udpEntity, Constants.EVENT_UDP));
+                    case "call_13"://护士主机呼叫医生主机
+                        UdpEntity nurse_call_doctor_udpEntity = new UdpEntity();
+                        nurse_call_doctor_udpEntity.setIndexes(data[0]);
+                        nurse_call_doctor_udpEntity.setNurseHostID(data[1]);
+                        nurse_call_doctor_udpEntity.setDoorwayMachineID(data[2]);
+                        nurse_call_doctor_udpEntity.setHeadMachineID(data[3]);
+                        nurse_call_doctor_udpEntity.setSipAddress(data[4]);
+                        nurse_call_doctor_udpEntity.setRoomNumber(data[5]);
+                        nurse_call_doctor_udpEntity.setBedNumber(data[6]);
+                        nurse_call_doctor_udpEntity.setLevel(data[7]);
+                        nurse_call_doctor_udpEntity.setType(data[8]);
+                        nurse_call_doctor_udpEntity.setName(data[9]);
+                        nurse_call_doctor_udpEntity.setDeviceMAC(data[10]);
+                        nurse_call_doctor_udpEntity.setShowText("总控制室主机呼叫护士主机");
+                        EventBus.getDefault().post(new MessageEvent(nurse_call_doctor_udpEntity, Constants.EVENT_UDP));
                         break;
-                    case "call_12_hang_up": //总控制室主机取消呼叫
-                        UdpEntity call_12_hang_up = new UdpEntity();
-                        call_12_hang_up.setIndexes(data[0]);
-                        call_12_hang_up.setNurseHostID(data[1]);
-                        call_12_hang_up.setDoorwayMachineID(data[2]);
-                        call_12_hang_up.setHeadMachineID(data[3]);
-                        call_12_hang_up.setSipAddress(data[4]);
-                        call_12_hang_up.setRoomNumber(data[5]);
-                        call_12_hang_up.setBedNumber(data[6]);
-                        call_12_hang_up.setLevel(data[7]);
-                        call_12_hang_up.setType(data[8]);
-                        call_12_hang_up.setName(data[9]);
-                        call_12_hang_up.setDeviceMAC(data[10]);
-                        call_12_hang_up.setShowText("总控制室主机取消呼叫");
-                        EventBus.getDefault().post(new MessageEvent(call_12_hang_up, Constants.EVENT_UDP));
+                    case "call_13_hang_up": //医生主机取消呼叫
+                        UdpEntity call_13_hang_up = new UdpEntity();
+                        call_13_hang_up.setIndexes(data[0]);
+                        call_13_hang_up.setNurseHostID(data[1]);
+                        call_13_hang_up.setDoorwayMachineID(data[2]);
+                        call_13_hang_up.setHeadMachineID(data[3]);
+                        call_13_hang_up.setSipAddress(data[4]);
+                        call_13_hang_up.setRoomNumber(data[5]);
+                        call_13_hang_up.setBedNumber(data[6]);
+                        call_13_hang_up.setLevel(data[7]);
+                        call_13_hang_up.setType(data[8]);
+                        call_13_hang_up.setName(data[9]);
+                        call_13_hang_up.setDeviceMAC(data[10]);
+                        call_13_hang_up.setShowText("总控制室主机取消呼叫");
+                        EventBus.getDefault().post(new MessageEvent(call_13_hang_up, Constants.EVENT_UDP));
                         break;
+                    case "call_13_upremove": //主机上滑移除了呼叫列表中的一个条目
+                        UdpEntity call_13_upremove = new UdpEntity();
+                        call_13_upremove.setIndexes(data[0]);
+                        call_13_upremove.setNurseHostID(data[1]);
+                        call_13_upremove.setDoorwayMachineID(data[2]);
+                        call_13_upremove.setHeadMachineID(data[3]);
+                        call_13_upremove.setSipAddress(data[4]);
+                        call_13_upremove.setRoomNumber(data[5]);
+                        call_13_upremove.setBedNumber(data[6]);
+                        call_13_upremove.setLevel(data[7]);
+                        call_13_upremove.setType(data[8]);
+                        call_13_upremove.setName(data[9]);
+                        call_13_upremove.setDeviceMAC(data[10]);
+                        call_13_upremove.setShowText("主机上滑移除呼叫列表中的一个条目");
+                        EventBus.getDefault().post(new MessageEvent(call_13_upremove, Constants.EVENT_UDP));
+                        break;
+
                 }
             }
 
+            Log.e("AnalysisUdpUtil","PartID"+Constants.PartID+" "+data[0]);
+
             if (StringUtils.notEmpty(Constants.PartID)) {
                 try {
                     LogUtil.d("AAGGH", "PartID==" + Constants.PartID + "-----UDPPartID==" + data[data.length - 1]);
@@ -98,6 +121,7 @@ public class AnalysisUdpUtil {
                 case "call_1"://床头机呼叫护士主机
                 case "call_2"://卫生间呼叫护士主机
                 case "call_4"://增援呼叫护士主机
+                    Log.e("AnalysisUdpUtil","PartID222"+Constants.PartID+" "+data[0]);
                     UdpEntity udpEntity = new UdpEntity();
                     udpEntity.setIndexes(data[0]);
                     udpEntity.setNurseHostID(data[1]);
@@ -211,6 +235,42 @@ public class AnalysisUdpUtil {
                 case "call_11":
                     //手表呼叫护士主机");
                     break;
+                case "call_15":
+                    //护士主机转接医生主机");
+                    UdpEntity call_15_multitap = new UdpEntity();
+                    call_15_multitap.setIndexes(data[0]);
+                    call_15_multitap.setNurseHostID(data[1]);
+                    call_15_multitap.setDoorwayMachineID(data[2]);
+                    call_15_multitap.setHeadMachineID(data[3]);
+                    call_15_multitap.setSipAddress(data[4]);
+                    call_15_multitap.setRoomNumber(data[5]);
+                    call_15_multitap.setBedNumber(data[6]);
+                    call_15_multitap.setLevel(data[7]);
+                    call_15_multitap.setType(data[8]);
+                    call_15_multitap.setName(data[9]);
+                    call_15_multitap.setDeviceMAC(data[10]);
+                    call_15_multitap.setShowText("护士主机转接医生主机");
+                    EventBus.getDefault().post(new MessageEvent(call_15_multitap, Constants.EVENT_UDP));
+
+                    break;
+                case "call_15_cancel":
+                    //取消其他医生主机转接");
+                    UdpEntity call_15_cancel = new UdpEntity();
+                    call_15_cancel.setIndexes(data[0]);
+                    call_15_cancel.setNurseHostID(data[1]);
+                    call_15_cancel.setDoorwayMachineID(data[2]);
+                    call_15_cancel.setHeadMachineID(data[3]);
+                    call_15_cancel.setSipAddress(data[4]);
+                    call_15_cancel.setRoomNumber(data[5]);
+                    call_15_cancel.setBedNumber(data[6]);
+                    call_15_cancel.setLevel(data[7]);
+                    call_15_cancel.setType(data[8]);
+                    call_15_cancel.setName(data[9]);
+                    call_15_cancel.setDeviceMAC(data[10]);
+                    call_15_cancel.setShowText("取消其他医生主机转接");
+                    EventBus.getDefault().post(new MessageEvent(call_15_cancel, Constants.EVENT_UDP));
+
+                    break;
                 case "end_1":
                     //挂断");
                     break;

app/src/main/java/com/wdkl/callingdoctor/util/UdpSendUtil.java

@@ -1,6 +1,7 @@
 package com.wdkl.callingdoctor.util;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import com.wdkl.callingdoctor.common.Constants;
 import com.wdkl.callingdoctor.entity.InitDataEntity;
@@ -175,13 +176,13 @@ public class UdpSendUtil {
     }
 
     /**
-     * 上滑移除后发UDP通知外面
+     * 医生主机上滑移除后发UDP通知外面
      *
      * @param udpEntity
      * @param hostId
      */
     public static void sendNotificationRemoveManagerCall(UdpEntity udpEntity, String hostId) {
-        AnalysisUdpUtil.sendUdpData("call_12_upremove",
+        AnalysisUdpUtil.sendUdpData("call_14_upremove",
                 hostId,
                 "",
                 "",
@@ -189,7 +190,7 @@ public class UdpSendUtil {
                 "",
                 "",
                 "",
-                Constants.MANAGER_CALL, //呼叫类型
+                Constants.DOCTOR_CALL, //呼叫类型
                 "",
                 "");
     }
@@ -243,6 +244,44 @@ public class UdpSendUtil {
     }
 
     /**
+     * 医生主机向护士主机请求通话
+     */
+    public static void sendNurseHostCall(String hostId) {
+        if (TextUtils.isEmpty(hostId)) {
+            return;
+        }
+        AnalysisUdpUtil.sendUdpData("call_14",
+                hostId, //接收通话请求的护士主机id
+                "",
+                "",
+                Constants.SIP_ID, //总控主机sip id
+                "",
+                "",
+                "",
+                Constants.DOCTOR_CALL, //呼叫类型
+                "",
+                Constants.MAC_ADDRESS);
+    }
+
+    /**
+     * 医生主机挂断通话,需要通知对方护士主机
+     */
+    public static void sendNurseHostHangUp(String hostId) {
+        AnalysisUdpUtil.sendUdpData("call_14_hang_up",
+                hostId, //通话对方的护士主机id
+                "",
+                "",
+                Constants.SIP_ID,
+                "",
+                "",
+                "",
+                Constants.DOCTOR_CALL, //呼叫类型
+                "",
+                Constants.MAC_ADDRESS);
+    }
+
+
+    /**
      * 安卓端接通电话；通知外面点阵屏；安卓端本身暂时没有用到这条UDP
      * 我将连发2次，防止UDP丢失
      *
@@ -334,4 +373,45 @@ public class UdpSendUtil {
                 messageEntity.getFileOriginalName(), messageEntity.getFileStoreName(),
                 messageEntity.getMessageTime(), messageEntity.getContent(), "0");
     }
+
+    /**
+     * 医生主机接听后取消其他医生主机转接
+     *
+     * @param udpEntity
+     */
+    public static void sendCancelMultitapCall(UdpEntity udpEntity) {
+        if (null == udpEntity) return;
+        AnalysisUdpUtil.sendUdpData("call_15_cancel"
+                , udpEntity.getNurseHostID()
+                , udpEntity.getDoorwayMachineID()
+                , udpEntity.getHeadMachineID()
+                , udpEntity.getSipAddress()
+                , udpEntity.getRoomNumber()
+                , udpEntity.getBedNumber()
+                , udpEntity.getLevel()
+                , Constants.MUlTITAP_CALL
+                , udpEntity.getName()
+                , Constants.MAC_ADDRESS);
+    }
+    /**
+     * 医生主机挂断电话
+     *
+     * @param udpEntity
+     */
+    public static void sendDoctorHangUpPhone(UdpEntity udpEntity) {
+        if (null == udpEntity) return;
+        AnalysisUdpUtil.sendUdpData("call_15_doctor_hang_up_phone"
+                , udpEntity.getNurseHostID()
+                , udpEntity.getDoorwayMachineID()
+                , udpEntity.getHeadMachineID()
+                , udpEntity.getSipAddress()
+                , udpEntity.getRoomNumber()
+                , udpEntity.getBedNumber()
+                , udpEntity.getLevel()
+                , Constants.MUlTITAP_CALL
+                , udpEntity.getName()
+                , Constants.MAC_ADDRESS);
+    }
+
+
 }

app/src/main/res/layout/activity_main_sideslip_popu_window.xml

@@ -51,7 +51,6 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:gravity="center"
-            android:visibility="gone"
             android:orientation="vertical">
 
             <ImageView
@@ -92,7 +91,8 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_broadcast"
@@ -120,7 +120,8 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_trusteeship"
@@ -149,7 +150,8 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_voice_message"
@@ -177,7 +179,8 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            >
 
             <ImageView
                 android:id="@+id/activity_main_layout_iv_system_setting"

app/src/main/res/layout/fragment_calling_doctor_medica_hosts.xml

@@ -18,12 +18,17 @@
             android:layout_marginRight="@dimen/margin_10dp"
             android:layout_weight="2"
             android:orientation="vertical">
-
+            <android.support.v4.widget.SwipeRefreshLayout
+                android:id="@+id/fragment_calling_nurse_layout_sr_refresh"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/margin_10dp">
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/fragment_rv_nurse"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:overScrollMode="never"></android.support.v7.widget.RecyclerView>
+            </android.support.v4.widget.SwipeRefreshLayout>
         </LinearLayout>
 
         <LinearLayout
@@ -32,7 +37,8 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/margin_10dp"
             android:layout_weight="2"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/fragment_rv_doctor"

app/src/main/res/layout/fragment_calling_sick_bed.xml

@@ -74,7 +74,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ems="1"
-                android:text="呼叫列表"
+                android:text="床位列表"
                 android:gravity="center"
                 android:textSize="21sp" />
         </LinearLayout>

app/src/main/res/layout/fragment_calling_sickbed_sickness_room_adapter_layout.xml

@@ -68,8 +68,6 @@
                 android:layout_marginTop="2dp"
                 android:text=""
                 android:textColor="@color/black"
-
-
                 android:textSize="@dimen/text_size_13px" />
         </LinearLayout>
     </RelativeLayout>

app/src/main/res/layout/fragment_medical_hosts_call_queuing_info_bar_layout.xml

@@ -8,7 +8,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <TextView
@@ -19,48 +19,89 @@
             android:paddingLeft="@dimen/margin_5dp"
             android:text="呼叫排队信息栏"
             android:textColor="@color/white"
-            android:textSize="20px" />
+            android:textSize="20px"
+            android:visibility="gone"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/fragment_rv_calling_queuing_info_bar"
             android:layout_width="match_parent"
             android:layout_height="240dp"
-            android:overScrollMode="never">
-
-        </android.support.v7.widget.RecyclerView>
-
-        <TextView
-            android:id="@+id/fragment_tv_calling_tips"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="center"
-            android:layout_marginLeft="0.5dp"
-            android:layout_marginRight="0.5dp"
-            android:background="#1d5e8b"
-            android:gravity="center_vertical"
-            android:paddingLeft="@dimen/margin_5dp"
-            android:textColor="@color/yellow_color"
-            android:textSize="20px" />
+            android:overScrollMode="never"
+            android:background="@drawable/shape_medical_host_not_in_call_bg"
+            android:visibility="gone"/>
 
         <RelativeLayout
             android:id="@+id/fragment_rl_not_in_call_bg"
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@drawable/shape_medical_host_not_in_call_bg"></RelativeLayout>
+            android:layout_height="match_parent"
+            android:background="@drawable/shape_medical_host_not_in_call_bg"
+            android:visibility="gone">
+        </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/fragment_medical_host_rl_in_call"
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:background="@drawable/shape_medical_host_in_call_bg"
-            android:visibility="gone">
+            android:layout_height="match_parent"
+            android:background="#2e95cf">
+
+            <TextView
+                android:id="@+id/tv_doctor_on_duty"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="#287fa8"
+                android:gravity="center"
+                android:paddingLeft="@dimen/margin_5dp"
+                android:text="值班医生"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/fragment_rv_doctors"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginTop="10dp"
+                android:layout_below="@id/tv_doctor_on_duty"
+                android:overScrollMode="never"
+                android:background="#2e95cf" />
+
+            <TextView
+                android:id="@+id/tv_nurse_on_duty"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_below="@id/fragment_rv_doctors"
+                android:background="#287fa8"
+                android:gravity="center"
+                android:paddingLeft="@dimen/margin_5dp"
+                android:text="值班护士"
+                android:textColor="@color/white"
+                android:textSize="20sp" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/fragment_rv_nurses"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginTop="10dp"
+                android:layout_below="@id/tv_nurse_on_duty"
+                android:overScrollMode="never"
+                android:background="#2e95cf" />
+
+            <TextView
+                android:id="@+id/fragment_tv_calling_tips"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_below="@id/fragment_rv_nurses"
+                android:background="#1d5e8b"
+                android:gravity="center"
+                android:textColor="@color/yellow_color"
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/fragment_iv_doctor_or_nurse_calling"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
+                android:layout_below="@id/fragment_tv_calling_tips"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/margin_30dp"
+                android:layout_marginTop="80dp"
                 android:background="@mipmap/ic_trusteeship_n" />
 
             <TextView
@@ -70,19 +111,17 @@
                 android:layout_below="@+id/fragment_iv_doctor_or_nurse_calling"
                 android:layout_centerInParent="true"
                 android:layout_marginTop="@dimen/margin_10dp"
-                android:text="医生主机二"
                 android:textColor="@color/white"
-                android:textSize="20px" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/fragment_iv_end_calling"
-                android:layout_width="100dp"
-                android:layout_height="40dp"
+                android:layout_width="200dp"
+                android:layout_height="60dp"
                 android:layout_below="@+id/fragment_tv_doctor_nurse_no"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="130dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="80dp"
                 android:background="@mipmap/ic_calling_sickbed_right_calling" />
-
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>