diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index 353c97b18..74c779934 100644
Binary files a/.gradle/3.3/taskArtifacts/fileHashes.bin and b/.gradle/3.3/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
index a3c04c284..6e068adc2 100644
Binary files a/.gradle/3.3/taskArtifacts/fileSnapshots.bin and b/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
index cb80db55b..c0b90fc2f 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.bin and b/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
index a2277615f..7c969cfac 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 59e36222a..4f079152c 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 144b3b8c1..21a252940 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index b08acfddd..0886ed0f7 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index ee7505b5b..7bdcd4702 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index f34f91fb8..db290c583 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 0badbcee3..8f0d3ae30 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index bf3fca7f8..82112e880 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index c30203885..4ac1affac 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index af5091bce..7a6df5f8d 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index e56693deb..243d9e646 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 23694e711..40698c0df 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 51d3a6e2a..6d86989ae 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 09ae124cb..ad4493d7d 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index e40fc7110..4569945a0 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 3ae47814d..95230f5b1 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 9ad9d6ff2..6eeca920f 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 971124de0..f5d99fe12 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index a63062f88..0f9f930d6 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index f94e4adbd..62eda921e 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index b7ba76079..93b52c193 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index af68e49e4..ce314c85d 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4db761108..ce8a95012 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,15 +14,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4f982484-44de-4157-ae39-50f8654300bc" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/SevenPopWindow.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/SevenScrollview.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/WheelView.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenadddialog1.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenadddialog2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenpopbg.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevenpop.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialog.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialogadd.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" />
@@ -35,10 +26,9 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
@@ -53,23 +43,6 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/outputs/aar/BageView-release.aar" afterPath="$PROJECT_DIR$/BageView/build/outputs/aar/BageView-release.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar" afterPath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar" afterPath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi-v4/sevenbg1.jpg" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi-v4/sevenbg1.jpg" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/lamp0bon4.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/lamp0bon4.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/sevensetadd.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/sevensetadd.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f1.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f1.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f2.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f2.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f3.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f3.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f4.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f4.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f5.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f5.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/lamp0bon4.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/lamp0bon4.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevenbg1.jpg" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevenbg1.jpg" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevensetadd.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevensetadd.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f1.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f1.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f2.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f2.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f3.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f3.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f4.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f4.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f5.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f5.png" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-debug.aar" afterPath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-debug.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-release.aar" afterPath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-release.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/outputs/aar/uikit-debug.aar" afterPath="$PROJECT_DIR$/uikit/build/outputs/aar/uikit-debug.aar" />
@@ -79,60 +52,8 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/design/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/design/R.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/v7/appcompat/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/v7/appcompat/R.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/cn/bingoogolapple/refreshlayout/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/cn/bingoogolapple/refreshlayout/R.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/ifish/activity/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/ifish/activity/R.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/meizu/cloud/pushinternal/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/meizu/cloud/pushinternal/R.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/layout.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/layout.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven2f_item.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven2f_item.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven_2f_activity.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/symbols/debug/R.txt" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/symbols/debug/R.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/Seven_2F_Fragment.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/Seven_2F_Fragment.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/iFish7.iml" afterPath="$PROJECT_DIR$/iFish7/iFish7.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven2f_item.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven2f_item.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven_2f_activity.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" afterPath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json" afterPath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
     </list>
     <ignored path="$PROJECT_DIR$/build/classes/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -165,38 +86,49 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ChangeDeviceName_2F_Activity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
+      <file leaf-file-name="MainSeven_2F_ControlActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1594">
-              <caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
-              <folding />
+            <state relative-caret-position="722">
+              <caret line="94" column="47" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" />
+              <folding>
+                <element signature="imports" expanded="false" />
+                <element signature="e#13336#13337#0" expanded="false" />
+                <element signature="e#13389#13390#0" expanded="false" />
+                <element signature="e#14296#14297#0" expanded="false" />
+                <element signature="e#14338#14339#0" expanded="false" />
+                <element signature="e#14510#14511#0" expanded="false" />
+                <element signature="e#14554#14555#0" expanded="false" />
+                <element signature="e#15840#15841#0" expanded="false" />
+                <element signature="e#15873#15874#0" expanded="false" />
+                <element signature="e#19059#19060#0" expanded="false" />
+                <element signature="e#19088#19089#0" expanded="false" />
+                <element signature="e#19168#19169#0" expanded="false" />
+                <element signature="e#19197#19198#0" expanded="false" />
+                <element signature="e#21272#21273#0" expanded="false" />
+                <element signature="e#21344#21345#0" expanded="false" />
+                <element signature="e#21418#21419#0" expanded="false" />
+                <element signature="e#21500#21501#0" expanded="false" />
+                <element signature="e#21596#21597#0" expanded="false" />
+                <element signature="e#21674#21675#0" expanded="false" />
+                <element signature="e#24720#24721#0" expanded="false" />
+                <element signature="e#24751#24752#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="changenickname_2f_activity.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
-          <provider selected="true" editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider editor-type-id="text-editor">
-            <state relative-caret-position="224">
-              <caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="title_layout.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
+      <file leaf-file-name="main_seven_2f_control_activity.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml">
           <provider editor-type-id="android-designer2">
             <state />
           </provider>
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-85">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="726">
+              <caret line="482" column="49" selection-start-line="482" selection-start-column="49" selection-end-line="482" selection-end-column="49" />
+              <folding>
+                <element signature="e#7129#15987#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -6979,8 +6911,8 @@
         <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialogadd.xml" />
         <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" />
         <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/WheelView.java" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
         <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
       </list>
     </option>
   </component>
@@ -7034,9 +6966,11 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="AndroidView">
         <subPane />
       </pane>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -7269,9 +7203,7 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -7646,7 +7578,7 @@
     <editor active="false" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293556" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21479714" sideWeight="0.47933227" order="16" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21559268" sideWeight="0.47933227" order="16" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -7660,7 +7592,6 @@
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="true" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28139904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25139222" sideWeight="0.4936407" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27941176" sideWeight="0.27318296" order="9" side_tool="false" content_ui="tabs" />
@@ -7680,6 +7611,7 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24264121" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25139222" sideWeight="0.4936407" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -7766,7 +7698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="19">
           <caret line="195" column="34" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7796,7 +7727,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4066">
           <caret line="271" column="19" selection-start-line="271" selection-start-column="19" selection-end-line="271" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7867,7 +7797,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="263">
           <caret line="102" column="31" selection-start-line="102" selection-start-column="31" selection-end-line="102" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7902,10 +7831,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4636">
           <caret line="333" column="21" selection-start-line="333" selection-start-column="21" selection-end-line="333" selection-end-column="21" />
-          <folding>
-            <element signature="e#7657#7658#0" expanded="false" />
-            <element signature="e#7690#7691#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -7913,7 +7838,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4674">
           <caret line="307" column="16" selection-start-line="307" selection-start-column="16" selection-end-line="307" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7921,7 +7845,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7940,7 +7863,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="39" column="78" selection-start-line="39" selection-start-column="78" selection-end-line="39" selection-end-column="78" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7958,7 +7880,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="296">
           <caret line="113" column="44" selection-start-line="113" selection-start-column="44" selection-end-line="113" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -7966,7 +7887,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="320">
           <caret line="155" column="35" selection-start-line="155" selection-start-column="35" selection-end-line="155" selection-end-column="35" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8028,28 +7948,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="798">
           <caret line="114" column="31" selection-start-line="114" selection-start-column="24" selection-end-line="114" selection-end-column="31" />
-          <folding>
-            <element signature="e#5289#5290#0" expanded="false" />
-            <element signature="e#5313#5314#0" expanded="false" />
-            <element signature="e#6660#6661#0" expanded="false" />
-            <element signature="e#6686#6687#0" expanded="false" />
-            <element signature="e#12762#12763#0" expanded="false" />
-            <element signature="e#12784#12785#0" expanded="false" />
-            <element signature="e#12859#12860#0" expanded="false" />
-            <element signature="e#12881#12882#0" expanded="false" />
-            <element signature="e#15105#15106#0" expanded="false" />
-            <element signature="e#15125#15126#0" expanded="false" />
-            <element signature="e#20839#20840#0" expanded="false" />
-            <element signature="e#20878#20879#0" expanded="false" />
-            <element signature="e#20927#20928#0" expanded="false" />
-            <element signature="e#20976#20977#0" expanded="false" />
-            <element signature="e#21047#21048#0" expanded="false" />
-            <element signature="e#21082#21083#0" expanded="false" />
-            <element signature="e#32830#32831#0" expanded="false" />
-            <element signature="e#32897#32898#0" expanded="false" />
-            <element signature="e#34006#34007#0" expanded="false" />
-            <element signature="e#34026#34027#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -8057,7 +7955,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="19">
           <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8065,7 +7962,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
           <caret line="32" column="28" selection-start-line="32" selection-start-column="28" selection-end-line="32" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8084,7 +7980,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="263">
           <caret line="165" column="0" selection-start-line="165" selection-start-column="0" selection-end-line="165" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8092,7 +7987,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="250">
           <caret line="36" column="9" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8100,7 +7994,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="361">
           <caret line="33" column="11" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8119,7 +8012,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
           <caret line="1406" column="33" selection-start-line="1406" selection-start-column="33" selection-end-line="1406" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -8127,24 +8019,64 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="304">
           <caret line="273" column="45" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="608">
+          <caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
+      <provider selected="true" editor-type-id="android-designer2">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="-4">
+          <caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="722">
+          <caret line="94" column="47" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1453#1454#0" expanded="true" />
-            <element signature="e#1481#1482#0" expanded="true" />
-            <element signature="e#1957#1958#0" expanded="true" />
-            <element signature="e#1986#1987#0" expanded="true" />
-            <element signature="e#2027#2028#0" expanded="true" />
-            <element signature="e#2063#2064#0" expanded="true" />
-            <element signature="e#2604#4431#0" expanded="true" />
-            <element signature="e#3306#3716#0" expanded="true" />
-            <element signature="e#3715#3716#0" expanded="true" />
-            <element signature="e#3800#4193#0" expanded="true" />
-            <element signature="e#4192#4193#0" expanded="true" />
-            <element signature="e#4430#4431#0" expanded="true" />
-            <element signature="e#10435#10436#0" expanded="true" />
-            <element signature="e#10493#10494#0" expanded="true" />
-            <element signature="e#11479#11480#0" expanded="true" />
-            <element signature="e#11524#11525#0" expanded="true" />
+            <element signature="imports" expanded="false" />
+            <element signature="e#13336#13337#0" expanded="false" />
+            <element signature="e#13389#13390#0" expanded="false" />
+            <element signature="e#14296#14297#0" expanded="false" />
+            <element signature="e#14338#14339#0" expanded="false" />
+            <element signature="e#14510#14511#0" expanded="false" />
+            <element signature="e#14554#14555#0" expanded="false" />
+            <element signature="e#15840#15841#0" expanded="false" />
+            <element signature="e#15873#15874#0" expanded="false" />
+            <element signature="e#19059#19060#0" expanded="false" />
+            <element signature="e#19088#19089#0" expanded="false" />
+            <element signature="e#19168#19169#0" expanded="false" />
+            <element signature="e#19197#19198#0" expanded="false" />
+            <element signature="e#21272#21273#0" expanded="false" />
+            <element signature="e#21344#21345#0" expanded="false" />
+            <element signature="e#21418#21419#0" expanded="false" />
+            <element signature="e#21500#21501#0" expanded="false" />
+            <element signature="e#21596#21597#0" expanded="false" />
+            <element signature="e#21674#21675#0" expanded="false" />
+            <element signature="e#24720#24721#0" expanded="false" />
+            <element signature="e#24751#24752#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -8154,47 +8086,11 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="586">
-          <caret line="166" column="40" selection-start-line="166" selection-start-column="40" selection-end-line="166" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="424">
-          <caret line="576" column="13" selection-start-line="576" selection-start-column="13" selection-end-line="576" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-85">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1594">
-          <caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
-      <provider selected="true" editor-type-id="android-designer2">
-        <state />
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
-          <folding />
+        <state relative-caret-position="726">
+          <caret line="482" column="49" selection-start-line="482" selection-start-column="49" selection-end-line="482" selection-end-column="49" />
+          <folding>
+            <element signature="e#7129#15987#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 3d92f1e41..4982db323 100644
--- a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:03 CST 2019
+#Thu Apr 25 21:26:51 CST 2019
diff --git a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 3d92f1e41..4982db323 100644
--- a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:03 CST 2019
+#Thu Apr 25 21:26:51 CST 2019
diff --git a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 09e3cf5aa..cb3a7bed9 100644
--- a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:06 CST 2019
+#Thu Apr 25 21:26:53 CST 2019
diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar
index f40c2d9a1..e3820c2c3 100644
Binary files a/BageView/build/outputs/aar/BageView-debug.aar and b/BageView/build/outputs/aar/BageView-debug.aar differ
diff --git a/BageView/build/outputs/aar/BageView-release.aar b/BageView/build/outputs/aar/BageView-release.aar
index 9fd3e0496..081d10691 100644
Binary files a/BageView/build/outputs/aar/BageView-release.aar and b/BageView/build/outputs/aar/BageView-release.aar differ
diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index adb70a349..779ec9935 100644
--- a/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:06 CST 2019
+#Thu Apr 25 21:26:52 CST 2019
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
@@ -115,8 +115,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_action_bar_view_list_nav_layout.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_action_bar_view_list_nav_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png
diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index e4b3e3587..c055cd418 100644
--- a/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:04 CST 2019
+#Thu Apr 25 21:26:52 CST 2019
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
diff --git a/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 5c6a2de57..9f3f385a6 100644
--- a/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:05 CST 2019
+#Thu Apr 25 21:26:52 CST 2019
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_play_selector.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml
diff --git a/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 9016891ec..dbbf78e33 100644
--- a/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:06 CST 2019
+#Thu Apr 25 21:26:53 CST 2019
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml
diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar
index 1f2db3523..f3fe1d81d 100644
Binary files a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar and b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar differ
diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar
index 7a924761c..ef2bcdced 100644
Binary files a/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar and b/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar differ
diff --git a/build/android-profile/profile-2019-04-25-21-13-56-889.rawproto b/build/android-profile/profile-2019-04-25-21-13-56-889.rawproto
new file mode 100644
index 000000000..f9d1997b1
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-13-56-889.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-14-04-298.rawproto b/build/android-profile/profile-2019-04-25-21-14-04-298.rawproto
new file mode 100644
index 000000000..8cfdb52c2
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-14-04-298.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-14-13-949.rawproto b/build/android-profile/profile-2019-04-25-21-14-13-949.rawproto
new file mode 100644
index 000000000..d45fa9a09
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-14-13-949.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-16-27-949.rawproto b/build/android-profile/profile-2019-04-25-21-16-27-949.rawproto
new file mode 100644
index 000000000..062de777c
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-16-27-949.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-16-34-548.rawproto b/build/android-profile/profile-2019-04-25-21-16-34-548.rawproto
new file mode 100644
index 000000000..8f808d587
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-16-34-548.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-19-29-384.rawproto b/build/android-profile/profile-2019-04-25-21-19-29-384.rawproto
new file mode 100644
index 000000000..d5d959b24
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-19-29-384.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-20-53-386.rawproto b/build/android-profile/profile-2019-04-25-21-20-53-386.rawproto
new file mode 100644
index 000000000..cf13a8157
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-20-53-386.rawproto differ
diff --git a/build/android-profile/profile-2019-04-25-21-26-46-351.rawproto b/build/android-profile/profile-2019-04-25-21-26-46-351.rawproto
new file mode 100644
index 000000000..31ad6a1cf
Binary files /dev/null and b/build/android-profile/profile-2019-04-25-21-26-46-351.rawproto differ
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json
index c9e2e334f..636a670d8 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json
@@ -243,6 +243,10 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\indicator_arrow.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\indicator_arrow.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_camera.jpg",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_camera.jpg"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_voice_normal.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_voice_normal.png"
@@ -251,10 +255,6 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_camera.jpg",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_camera.jpg"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_actionbar_white_back_icon.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_actionbar_white_back_icon.png"
@@ -339,14 +339,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_right_blue_bg.9.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_right_blue_bg.9.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png",
-        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_image_download_failed.jpg",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_image_download_failed.jpg"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png",
+        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_emotion.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_emotion.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json
index 64ffa0f6c..ff6b0d841 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json
@@ -7,14 +7,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\dialog_lookfish.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\dialog_lookfish.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\upbanner_device.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\upbanner_device.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\default_ptr_flip.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\default_ptr_flip.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\upbanner_device.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\upbanner_device.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\level_dialog_5.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\level_dialog_5.png"
@@ -1219,14 +1219,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_addphoto.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_addphoto.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\goldcoupon_bg.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\goldcoupon_bg.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_lookat_shopcar.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lookat_shopcar.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json
index 1f71aa0fb..b55e1aff4 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json
@@ -51,14 +51,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png",
-        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\shareifishapp.jpg",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\shareifishapp.jpg"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png",
+        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable.json b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
index 3cbd418c5..210e6fb0d 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
@@ -15,14 +15,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_flickr.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_flickr.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sina_off.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_sina_off.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_topic_selector.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_topic_selector.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sina_off.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_sina_off.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ic_menu_overflow_material.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ic_menu_overflow_material.xml"
@@ -163,14 +163,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_renren_on.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_renren_on.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nonet_bt_select.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\nonet_bt_select.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_bind_bg.9.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_bind_bg.9.png"
@@ -471,14 +471,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_dynamic_gray.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_dynamic_gray.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_segment_shape_middle.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_segment_shape_middle.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_wxcircle_gray.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_wxcircle_gray.png"
@@ -563,14 +563,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shopslist_item_select.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\shopslist_item_select.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\circle_shape.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\circle_shape.xml"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_actionbar_black_bg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_actionbar_black_bg.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\circle_shape.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\circle_shape.xml"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\navigation_empty_icon.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable\\navigation_empty_icon.xml"
@@ -647,14 +647,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_login_btnbg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_login_btnbg.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_blue.9.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_blue.9.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_cab_background_top_material.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_blue.9.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_blue.9.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_radius_bg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_radius_bg.xml"
@@ -675,14 +675,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_red_round_button_selector.xml",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_red_round_button_selector.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\lookfishdialog_bt_press_shape.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\lookfishdialog_bt_press_shape.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_select.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_select.xml"
@@ -915,14 +915,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_light_bar_bg.9.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_light_bar_bg.9.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_male.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_male.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\camera_start_select.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\camera_start_select.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_male.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_male.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_portrait_mask_square.xml",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_square.xml"
@@ -995,14 +995,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_switch_centerbutton_bg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_switch_centerbutton_bg.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_material.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ratingbar_material.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_message_item_round_bg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_item_round_bg.xml"
@@ -1423,6 +1423,10 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_action_back.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_action_back.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_red.9.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_red.9.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\monitor_radiobutton_select.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\monitor_radiobutton_select.xml"
@@ -1432,17 +1436,13 @@
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_pressed.png"
     },
     {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_red.9.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_red.9.png"
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_portrait_mask_round.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_round.xml"
     },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_follow_on.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_follow_on.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_portrait_mask_round.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_round.xml"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_toastbg.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_toastbg.xml"
@@ -1483,14 +1483,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\yuanjiao.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\yuanjiao.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_bottom_bg.9.png",
-        "source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_bg.9.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_press_shape.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_press_shape.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_bottom_bg.9.png",
+        "source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_bg.9.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
@@ -1547,22 +1547,22 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_more_radius_none.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_more_radius_none.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_buy_bt_shape.xml",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_buy_bt_shape.xml"
     },
     {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_xiaolian.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_xiaolian.png"
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
+        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
     },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_back_bt_selected.png",
         "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_back_bt_selected.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_xiaolian.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_xiaolian.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_alibc_trade_auth_close.png",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable\\com_alibc_trade_auth_close.png"
@@ -1879,14 +1879,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_cancel_bt.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_cancel_bt.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_twitter.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_twitter.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_yixin_gray.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_yixin_gray.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_twitter.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_twitter.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_colored_material.xml"
diff --git a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 33e3005eb..7687849ad 100644
--- a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:17 CST 2019
+#Thu Apr 25 21:27:00 CST 2019
diff --git a/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 199c59c61..29f286181 100644
--- a/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:14 CST 2019
+#Thu Apr 25 21:26:58 CST 2019
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\pop_camera.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\pop_camera.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_1_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_1_on.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_jpush_wendu.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_jpush_wendu.png
@@ -81,8 +81,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_on.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_xout.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_xout.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\anim\\icon_gone.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\icon_gone.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\share_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\share_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_select.xml
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\share_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\share_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\title_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\title_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\notification_bg_low_normal.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\notification_bg_low_normal.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0044.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0044.png
@@ -368,9 +368,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\shopscheckuserinfo_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\shopscheckuserinfo_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0035.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0035.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\popup.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\popup.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_close_n.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_close_n.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_record.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_record.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\popup.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\popup.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f623.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f623.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_follow_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_follow_on.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_post_feed_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_post_feed_layout.xml
@@ -393,8 +393,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_qzone_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_qzone_on.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_recent_contact_ic_sending.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_recent_contact_ic_sending.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_easy_alert_dialog_default_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_easy_alert_dialog_default_layout.xml
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_seek_thumb.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_seek_thumb.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_picker_orignal_checked.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_picker_orignal_checked.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_seek_thumb.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_seek_thumb.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_mine_shareapp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_mine_shareapp.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_new_post_btn_style.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_new_post_btn_style.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_indicator_material.xml
@@ -512,8 +512,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_topic_recommend.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_topic_recommend.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f428.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f428.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_play_selector.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_divide_line.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_divide_line.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_image_delete.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_image_delete.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_divide_line.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_divide_line.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\home_iocn_signin.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\home_iocn_signin.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\shopscheck_2_press.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\shopscheck_2_press.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sign_goldtasks.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\sign_goldtasks.png
@@ -538,8 +538,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\device_tank.pn
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_picker_image_normal.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_picker_image_normal.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_easy_alert_dialog_with_edit_text.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_easy_alert_dialog_with_edit_text.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\video_edit_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\video_edit_icon.png
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_dynamic_gray.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_dynamic_gray.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_ic.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_ic.png
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_dynamic_gray.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_dynamic_gray.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_feeds_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_feeds_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_send_button.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_send_button.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_wifi.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_wifi.xml
@@ -601,8 +601,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_5_pres
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_fourbd_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_fourbd_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_location_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_location_selector.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\m_sd_background.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\m_sd_background.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_edtext_shape_f2.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_edtext_shape_f2.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_icon_download_pause.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_icon_download_pause.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_edtext_shape_f2.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_edtext_shape_f2.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0058.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0058.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png
@@ -624,16 +624,16 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\messenger_bubble_small_white.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\messenger_bubble_small_white.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_zbra_loading_progress_bar.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_zbra_loading_progress_bar.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\discove_looklook.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\discove_looklook.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\customer_notitfication_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\customer_notitfication_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_8.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_8.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\customer_notitfication_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\customer_notitfication_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_send_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_send_pressed.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_rounded_corner_backgroud.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_rounded_corner_backgroud.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_tab_indicator_material.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_right_3.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_progress_bar_foreground.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_progress_bar_foreground.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_recommend_user_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_recommend_user_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_015.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_recommend_user_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_recommend_user_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f4a5.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f4a5.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_seven_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_seven_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\sevenadddialog2.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\sevenadddialog2.xml
@@ -679,8 +679,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\notification_icon_background.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\notification_icon_background.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxhdpi-v4\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\messenger_bubble_small_blue.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\fishgoods_error.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\fishgoods_error.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_topicpick_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_topicpick_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_search.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_search.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_topicpick_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_topicpick_layout.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_team_owner_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_team_owner_icon.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0052.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0052.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_seven_2f_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_seven_2f_activity.xml
@@ -695,29 +695,29 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\anim\\dragonfish.xml=C\:\\bei
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\more_brand_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\more_brand_activity.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0026.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0026.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\camera_bindtank_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\camera_bindtank_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_2.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_2.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\camera_bindtank_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\camera_bindtank_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\umeng_socialize_full_alert_dialog.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_socialize_full_alert_dialog.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f614.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f614.png
-C\:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\layout\\view_refresh_header_mooc_style.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\view_refresh_header_mooc_style.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\layout\\view_refresh_header_mooc_style.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\view_refresh_header_mooc_style.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_setting_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_setting_pressed.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_watch_video_download_progress_foreground.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_watch_video_download_progress_foreground.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\item_goldcoupon_use_press.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\item_goldcoupon_use_press.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-mdpi-v4\\messenger_bubble_small_white.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\messenger_bubble_small_white.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_contact_checkbox_checked_grey.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_contact_checkbox_checked_grey.png
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_list_selector_disabled_holo_light.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_list_selector_disabled_holo_light.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f40d.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f40d.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_feed_detail_like_bg_n.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_feed_detail_like_bg_n.xml
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_activity.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\pull_to_refresh_header_vertical.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\pull_to_refresh_header_vertical.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\com_facebook_tooltip_black_background.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\com_facebook_tooltip_black_background.9.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_pause_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_pause_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\anim\\umeng_comm_pb_default.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\umeng_comm_pb_default.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sevenbg2.jpg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\sevenbg2.jpg
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\bindtank_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\bindtank_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\umeng_socialize_light_bar_bg_pad.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\umeng_socialize_light_bar_bg_pad.9.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\bindtank_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\bindtank_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_checkbox_style.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_checkbox_style.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_default_mtrl_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_popup_menu_item_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_popup_menu_item_layout.xml
@@ -733,8 +733,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f611.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f611.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_plus_photo_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_plus_photo_pressed.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\main_hot_3a_control_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\main_hot_3a_control_activity.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\umeng_socialize_full_alert_dialog_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_socialize_full_alert_dialog_item.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\layout\\design_layout_snackbar_include.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\design_layout_snackbar_include.xml
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\umeng_socialize_full_alert_dialog_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_socialize_full_alert_dialog_item.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_1_press.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_1_press.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_radio_check.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_radio_check.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\discove_umeng.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\discove_umeng.png
@@ -760,16 +760,16 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish00
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\loading.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi\\loading.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\choiceshopnum_text.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\choiceshopnum_text.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_message_activity_text_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_message_activity_text_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_bg_album_border.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_bg_album_border.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_message_activity_text_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_message_activity_text_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_list_pressed_holo_light.9.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_default_img.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_default_img.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-v21\\abc_btn_colored_material.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_btn_colored_material.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\checkbox_login_true.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\checkbox_login_true.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\welcome_bt.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\welcome_bt.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xhdpi\\bindtwo_camera.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi\\bindtwo_camera.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_sign.jpg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_sign.jpg
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_sign.jpg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_sign.jpg
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\mysetting_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\mysetting_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_gmail_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_gmail_on.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\color\\vpi__dark_theme.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color\\vpi__dark_theme.xml
@@ -801,8 +801,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_2a_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_2a_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_v.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_v.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_line.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_line.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_square_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_square_select.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_audio_animation_list_right_1.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_audio_animation_list_right_1.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_square_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_square_select.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_more.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_more.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png
@@ -898,8 +898,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sign_bt_open.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\sign_bt_open.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_popup_menu_item_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_popup_menu_item_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_find_notity.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_find_notity.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout-sw550dp-large\\umeng_socialize_oauth_dialog.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout-sw550dp-large-v13\\umeng_socialize_oauth_dialog.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_richpush_actionbar_back.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_richpush_actionbar_back.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout-sw550dp-large\\umeng_socialize_oauth_dialog.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout-sw550dp-large-v13\\umeng_socialize_oauth_dialog.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_light_zero.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_light_zero.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xhdpi\\bindtwo_hot.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi\\bindtwo_hot.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_blue.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_blue.9.png
@@ -945,8 +945,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\d
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0049.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0049.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\tishib.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\tishib.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f637.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f637.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_user_info.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_user_info.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_qr.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_qr.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_user_info.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_user_info.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_plus_video_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_message_plus_video_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\com_facebook_button_like_background.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_facebook_button_like_background.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_received_comment_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_received_comment_layout.xml
@@ -1026,12 +1026,12 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_lookfish.
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\xietiezi.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\xietiezi.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\shopqrcode_bt_press_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shopqrcode_bt_press_shape.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\yuanjiao.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\yuanjiao.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\toast_gold_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\toast_gold_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\timeset_welcome_bt_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\timeset_welcome_bt_select.xml
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\toast_gold_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\toast_gold_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\label_new.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\label_new.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_emoji_item_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_emoji_item_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_recommendtopic_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_recommendtopic_item.xml
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_emoji_item_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_emoji_item_selector.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\vpi__tab_selected_focused_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\vpi__tab_selected_focused_holo.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0040.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0040.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_emoji_del.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_emoji_del.png
@@ -1084,13 +1084,13 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\shadowright.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shadowright.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_expanded_menu_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_expanded_menu_layout.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fishdoctor_btn_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fishdoctor_btn_select.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_star_half_black_48dp.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fishdoctor_btn_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fishdoctor_btn_select.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_feed_item_like_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_feed_item_like_selector.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_devicefragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_devicefragment.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f491.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f491.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\seekbar_thumb.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\seekbar_thumb.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f491.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f491.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_qq_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_qq_off.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f64b.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f64b.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\activity_connect_device.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\activity_connect_device.xml
@@ -1128,8 +1128,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_ref
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61c.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61c.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\main_zerocontrol_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\main_zerocontrol_activity.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_bt_nocircle_press_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_bt_nocircle_press_shape.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_36dp.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_bt_nocircle_press_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_bt_nocircle_press_shape.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\layout\\com_facebook_activity_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\com_facebook_activity_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f689.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f689.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\ic_launcher.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi\\ic_launcher.png
@@ -1155,8 +1155,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\hotsport.png=C
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_thumb.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_bottom_seek_thumb.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_image_pick.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_image_pick.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\layout\\messenger_button_send_white_small.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\messenger_button_send_white_small.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\splash_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\splash_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_topnub.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_topnub.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\splash_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\splash_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_like_user_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_like_user_item.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\main_threecontrol_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\main_threecontrol_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\four_control_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\four_control_fragment.xml
@@ -1179,8 +1179,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\lamp0boff2.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\title_layout_device_alpha.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\title_layout_device_alpha.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_emotion_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_emotion_pressed.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_picker_image_preview_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_picker_image_preview_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\pinglunpc.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\pinglunpc.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_picker_image_preview_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_picker_image_preview_activity.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_actionbar_black_bg.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_actionbar_black_bg.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\yishoucang.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\yishoucang.png
@@ -1270,8 +1270,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_mygold_ba
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_comment_main_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_comment_main_layout.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_message_item_video.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_message_item_video.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading09.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading09.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\device_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\device_fragment.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\zhonglan.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\zhonglan.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\device_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\device_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_levelrule.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_levelrule.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_realtime_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_realtime_icon.png
@@ -1302,8 +1302,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\vpi__tab_unselected_pressed_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\vpi__tab_unselected_pressed_holo.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_mygold.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_mygold.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_user_n.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_user_n.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_register_btnbg.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_register_btnbg.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_pinterest_gray.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_pinterest_gray.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_register_btnbg.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_register_btnbg.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_bottomnocircle_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_bottomnocircle_select.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_left_1.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_left_1.png
@@ -1415,8 +1415,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_bt_press_gall
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_share.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_share.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63c.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63c.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_setting_photo_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_setting_photo_icon.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_new_post_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_new_post_pressed.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_setting_photo_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_setting_photo_icon.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\shopscheckuserphoto_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\shopscheckuserphoto_fragment.xml
@@ -1562,8 +1562,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xhdpi\\scan_line.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\dialog_btcancel_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\dialog_btcancel_select.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_shape.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_edittext.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_edittext.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\wechat_fav.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\wechat_fav.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_edittext.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_edittext.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_10_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_10_off.png
 C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-mdpi-v4\\design_ic_visibility_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\design_ic_visibility_off.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sun_left.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\sun_left.png
@@ -1590,8 +1590,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\five_control_love_fra
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_add_click.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_add_click.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\sevenadddialog1.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\sevenadddialog1.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_like_normal.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_like_normal.png
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\com_facebook_button_background.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_facebook_button_background.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\postsmall.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\postsmall.png
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\com_facebook_button_background.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_facebook_button_background.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_back_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_back_pressed.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_off.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_yixin_circle_gray.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_yixin_circle_gray.png
@@ -1690,8 +1690,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_icon_download_resume.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_icon_download_resume.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0022.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0022.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_message_unread_news_icon_normal.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_message_unread_news_icon_normal.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_my_msg_arrow.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_my_msg_arrow.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_picker_image_selected.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_picker_image_selected.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_my_msg_arrow.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_my_msg_arrow.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_time.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_time.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\home_iocn_new.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\home_iocn_new.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f610.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f610.png
@@ -1718,16 +1718,16 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_audio_animation_list_right_3.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_audio_animation_list_right_3.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f370.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f370.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_2b_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_2b_activity.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fishdoctor_bt_press_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fishdoctor_bt_press_shape.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable-xhdpi-v4\\com_taobao_nb_sdk_web_view_title_bar_back.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\com_taobao_nb_sdk_web_view_title_bar_back.9.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fishdoctor_bt_press_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fishdoctor_bt_press_shape.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\tiezizanh.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\tiezizanh.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_share_pressed.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_share_pressed.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\two_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\two_fragment.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\zhuangfa.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\zhuangfa.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_gallery_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_gallery_select.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\devicerestart.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\devicerestart.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\vpi__tab_selected_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\vpi__tab_selected_holo.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\vpi__tab_selected_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\vpi__tab_selected_holo.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_search_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_search_icon.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\sevensettime_dialog.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\sevensettime_dialog.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\yw_1222.jpg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\yw_1222.jpg
@@ -1739,8 +1739,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_switch_state_disable.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_switch_state_disable.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\look_share_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\look_share_icon.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\timeset_btn_press.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\timeset_btn_press.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\brand_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\brand_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\device_add.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\device_add.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\brand_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\brand_activity.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f447.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f447.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_psw.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_psw.png
@@ -1760,8 +1760,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\shopscheck_add.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\shopscheck_add.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\circle_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\circle_shape.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f470.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f470.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_back_bt.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_back_bt.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f62a.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f62a.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_back_bt.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_back_bt.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\gengduo.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\gengduo.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\anim\\abc_fade_out.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_out.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_easy_edit_text_dialog_bg.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_easy_edit_text_dialog_bg.xml
@@ -1893,9 +1893,9 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\login_backgr
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\pop_set.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\pop_set.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0019.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0019.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_actionbar_dark_back_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_actionbar_dark_back_icon.png
+C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-xhdpi-v4\\design_ic_visibility_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\design_ic_visibility_off.png
 C\:\\Users\\Administrator\\.android\\build-cache\\fe0d2f94a4f79cf26abf1c02bb77b9d023ccc7bf\\output\\res\\drawable-xhdpi-v4\\com_taobao_tae_sdk_web_view_title_bar_back.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\com_taobao_tae_sdk_web_view_title_bar_back.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f42c.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f42c.png
-C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-xhdpi-v4\\design_ic_visibility_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\design_ic_visibility_off.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f607.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f607.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_2f_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_2f_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\anim\\umeng_comm_translate_down.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\umeng_comm_translate_down.xml
@@ -1929,12 +1929,12 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\defau
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0016.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0016.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_downloadapk.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_downloadapk.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_advanced_team_nickname_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_advanced_team_nickname_activity.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_find_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_find_layout.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f604.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f604.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_find_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_find_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_at_selected.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_at_selected.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_mylookat.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_mylookat.xml
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_list_divider_mtrl_alpha.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f496.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f496.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_play_normal.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_play_normal.png
@@ -1998,9 +1998,9 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\seekbar_lever_
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_usersex.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_usersex.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\layout\\messenger_button_send_white_round.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\messenger_button_send_white_round.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_red_blue.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_red_blue.xml
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_video_play_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_video_play_icon.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_bt_nocircle_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_bt_nocircle_shape.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_video_play_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_video_play_icon.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_add.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_add.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_setting_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_setting_off.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61e.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61e.png
@@ -2024,8 +2024,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\anim\\umeng_comm_translate_up.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\umeng_comm_translate_up.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_team_member_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_team_member_item.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\activity_connect_tutorial.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\activity_connect_tutorial.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_title_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_title_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\lamp0boff7.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\lamp0boff7.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_title_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_title_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\left_menu_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\left_menu_fragment.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_comment_comment_n.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_comment_comment_n.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\zhaopian.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\zhaopian.png
@@ -2063,8 +2063,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\seven_fragment.xml=C\
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_buy_bt_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_buy_bt_shape.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_facebook_close.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_facebook_close.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_gridview_device.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_gridview_device.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_tx_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_tx_on.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_gridview_device.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_gridview_device.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_263a.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_263a.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_icon_reddot.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_icon_reddot.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\shop_icon_qrcode.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\shop_icon_qrcode.png
@@ -2163,11 +2163,11 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxhdpi-v4\\messenger_bubble_large_blue.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\messenger_bubble_large_blue.png
 C\:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading08.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading08.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_progress.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_bottom_progress.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\left_menu_frame.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\left_menu_frame.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_user_p.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_user_p.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\left_menu_frame.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\left_menu_frame.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_fragment_fishtank.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_fragment_fishtank.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\title_layout_img_fill.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\title_layout_img_fill.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\title_layout_img_fill.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\title_layout_img_fill.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_recent_contacts.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_recent_contacts.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_square.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_portrait_mask_square.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\four_control_three_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\four_control_three_fragment.xml
@@ -2199,8 +2199,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sign_gift_fini
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\umeng_socialize_failed_load_page.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_socialize_failed_load_page.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_gridview_addcamera.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_gridview_addcamera.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_imgbrowser.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_imgbrowser.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_record_start.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_record_start.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\item_imgbrowser.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\item_imgbrowser.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\lever_headimg_1.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\lever_headimg_1.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_camera_play.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_camera_play.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_voice_trans_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_voice_trans_layout.xml
@@ -2311,8 +2311,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\pop_main.xml=C\:\\bei
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\looke5_bottom_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\looke5_bottom_shape.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\resetpsw_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\resetpsw_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\shop_adm.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\shop_adm.png
-C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\layout\\design_bottom_navigation_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\design_bottom_navigation_item.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\pop_lookatfood.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\pop_lookatfood.xml
+C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\layout\\design_bottom_navigation_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\design_bottom_navigation_item.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_contact_checkbox_unchecked.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_contact_checkbox_unchecked.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f60f.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f60f.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\changename_2a_blue.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\changename_2a_blue.png
@@ -2321,8 +2321,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\discove_lookat
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_feed_detail_blue_p.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_feed_detail_blue_p.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_easy_alert_dialog_title.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_easy_alert_dialog_title.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_feed_detail_favorite_n.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_detail_favorite_n.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_webview_fish.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_webview_fish.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f429.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f429.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_webview_fish.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_webview_fish.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\message_offline.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\message_offline.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\drawable_webview_progress.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\drawable_webview_progress.xml
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_seek_thumb_pressed.xml
@@ -2347,8 +2347,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\l
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_000.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_g_unread_badge.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_g_unread_badge.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f49e.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f49e.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\six_2a_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\six_2a_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\welcome3.jpg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\welcome3.jpg
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\six_2a_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\six_2a_fragment.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\nonet_bt_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nonet_bt_select.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_popup_menu_header_item_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_popup_menu_header_item_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_shape_solid_grey.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_shape_solid_grey.xml
@@ -2366,8 +2366,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\menu_new_right
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_0f_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_0f_activity.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\lookfishleft_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\lookfishleft_fragment.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_contacts_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_contacts_select.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\discove_gold.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\discove_gold.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_contacts_select.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_contacts_select.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color\\abc_tint_spinner.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_douban_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_douban_on.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\notification_bg_normal.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\notification_bg_normal.9.png
@@ -2407,8 +2407,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_progress_small_white.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_progress_small_white.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_7_off.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_7_off.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_picker_orignal_checked.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_picker_orignal_checked.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0059.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0059.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\tab_device_press.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\tab_device_press.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0059.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0059.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\anim\\umeng_socialize_slide_in_from_bottom.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\umeng_socialize_slide_in_from_bottom.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_bt_press_noright_shape.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_bt_press_noright_shape.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_mine_setting.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_mine_setting.png
@@ -2462,8 +2462,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_6.png=
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_switch_frame.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_switch_frame.png
 C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\anim\\design_snackbar_in.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_in.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f43d.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f43d.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_right_1.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_right_1.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_audio_animation_list_right_1.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_audio_animation_list_right_1.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_advanced_team_create_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_advanced_team_create_layout.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\line_mine.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\line_mine.png
@@ -2481,8 +2481,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_send_pressed.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_send_pressed.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0027.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0027.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_3.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_3.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\menu\\contacts_search_menu.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\menu\\contacts_search_menu.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f43a.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f43a.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\menu\\contacts_search_menu.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\menu\\contacts_search_menu.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f615.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f615.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\raw\\beep.ogg=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\raw\\beep.ogg
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_bottomnub.png
@@ -2500,8 +2500,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_fol
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\sun_right.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\sun_right.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_watertemp_six.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_watertemp_six.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\dialog_pickcity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_pickcity.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_at_friend_bt.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_at_friend_bt.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_list_longpressed_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_list_longpressed_holo.9.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_at_friend_bt.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_at_friend_bt.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_comment_action_dialog.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_comment_action_dialog.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\sign_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\sign_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_feed_lv_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_feed_lv_item.xml
@@ -2519,8 +2519,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\nextbindtank_c
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\umeng_socialize_simple_spinner_item.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_socialize_simple_spinner_item.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_add.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_add.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_imagepicker_view_photopreview.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_imagepicker_view_photopreview.xml
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\seven_control_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\seven_control_fragment.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\seven_control_fragment.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\seven_control_fragment.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_hotness_btn_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_hotness_btn_layout.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_action_mode_close_item_material.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_mode_close_item_material.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_preview_image_from_camera_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_preview_image_from_camera_activity.xml
@@ -2567,8 +2567,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_g_image_preview_white_btn_selecter.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_g_image_preview_white_btn_selecter.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f449.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f449.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_find_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_find_layout.xml
-C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\jc_dialog_volume.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_title.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_title.xml
+C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\jc_dialog_volume.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_audio_animation_list_right_2.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_audio_animation_list_right_2.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_cancel_record_red_bg.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_cancel_record_red_bg.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
@@ -2594,16 +2594,16 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_camera.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_camera.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_focused_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_focused_holo.9.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\changename_2a_end.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\changename_2a_end.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_backward_icon.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_backward_icon.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\changename_2a_end.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\changename_2a_end.png
 C\:\\Users\\Administrator\\.android\\build-cache\\fe0d2f94a4f79cf26abf1c02bb77b9d023ccc7bf\\output\\res\\layout\\login_hidden.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\login_hidden.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_button_bottom_text_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_message_button_bottom_text_selector.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\shopsuserlist_activity.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\shopsuserlist_activity.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jifen.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jifen.png
 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_btn2_on_six.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_btn2_on_six.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_listview_refresh.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_listview_refresh.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\shop_goods.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\shop_goods.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_listview_refresh.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_listview_refresh.xml
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_bind_bg.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_bind_bg.9.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\hotoff.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\hotoff.png
 C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\nim_message_item_sticker.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_message_item_sticker.xml
diff --git a/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml b/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml
index 496b26c73..62cfb9a13 100644
--- a/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml
+++ b/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml
@@ -330,7 +330,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="80dp"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="15dp"
                         android:orientation="horizontal">
                         <!-- 左边灯的布局 -->
                         <RelativeLayout
@@ -477,9 +477,12 @@
                                 android:textSize="12sp" />
                         </RelativeLayout>
                     </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="15dp" />
                 </LinearLayout>
             </RelativeLayout>
-
         </LinearLayout>
 
     </com.ifish.view.SwipeRefreshLayout>
diff --git a/iFish7/build/intermediates/res/resources-debug.ap_ b/iFish7/build/intermediates/res/resources-debug.ap_
index e7cc7720f..bdfa153c5 100644
Binary files a/iFish7/build/intermediates/res/resources-debug.ap_ and b/iFish7/build/intermediates/res/resources-debug.ap_ differ
diff --git a/iFish7/iFish7.iml b/iFish7/iFish7.iml
index ae119230d..3b2fc9d7b 100644
--- a/iFish7/iFish7.iml
+++ b/iFish7/iFish7.iml
@@ -78,25 +78,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <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/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
diff --git a/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml b/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml
index 496b26c73..62cfb9a13 100644
--- a/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml
+++ b/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml
@@ -330,7 +330,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="80dp"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="15dp"
                         android:orientation="horizontal">
                         <!-- 左边灯的布局 -->
                         <RelativeLayout
@@ -477,9 +477,12 @@
                                 android:textSize="12sp" />
                         </RelativeLayout>
                     </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="15dp" />
                 </LinearLayout>
             </RelativeLayout>
-
         </LinearLayout>
 
     </com.ifish.view.SwipeRefreshLayout>
diff --git a/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 33e3005eb..7687849ad 100644
--- a/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:17 CST 2019
+#Thu Apr 25 21:27:00 CST 2019
diff --git a/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 33e3005eb..7687849ad 100644
--- a/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:17 CST 2019
+#Thu Apr 25 21:27:00 CST 2019
diff --git a/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 33e3005eb..7687849ad 100644
--- a/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:17 CST 2019
+#Thu Apr 25 21:27:00 CST 2019
diff --git a/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 09e3cf5aa..cb3a7bed9 100644
--- a/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 25 20:52:06 CST 2019
+#Thu Apr 25 21:26:53 CST 2019
diff --git a/p2PCore/build/outputs/aar/p2PCore-debug.aar b/p2PCore/build/outputs/aar/p2PCore-debug.aar
index f41aa3fea..f479e6e59 100644
Binary files a/p2PCore/build/outputs/aar/p2PCore-debug.aar and b/p2PCore/build/outputs/aar/p2PCore-debug.aar differ
diff --git a/p2PCore/build/outputs/aar/p2PCore-release.aar b/p2PCore/build/outputs/aar/p2PCore-release.aar
index 05a2dc4a5..e4eb3ddc3 100644
Binary files a/p2PCore/build/outputs/aar/p2PCore-release.aar and b/p2PCore/build/outputs/aar/p2PCore-release.aar differ
diff --git a/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json b/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
index 419cedb42..235c27614 100644
--- a/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
+++ b/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
@@ -539,14 +539,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_cameras_hover.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_cameras_hover.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png",
-        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_actionbar_search_dark_icon.png",
         "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_actionbar_search_dark_icon.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png",
+        "source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_16dp.png",
         "source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_16dp.png"
diff --git a/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index fb6387fad..9292babf6 100644
--- a/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:21 CST 2019
+#Thu Apr 25 21:27:02 CST 2019
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_message_item_text.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_message_item_text.xml
@@ -362,8 +362,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\e28e9f72cf7aaec0512af176b1c20a
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_search_api_mtrl_alpha.png
-C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_crop_image_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_crop_image_activity.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png
+C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_crop_image_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_crop_image_activity.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_loading_small_white.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_loading_small_white.png
@@ -434,8 +434,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_input_emotion.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_input_emotion.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_message_input_voice_pressed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_message_input_voice_pressed.png
-C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\abc_list_menu_item_icon.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_list_menu_item_icon.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\abc_list_menu_item_icon.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_list_menu_item_icon.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_left_white_bg.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_left_white_bg.9.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\recording_backdrop.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\recording_backdrop.png
 C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_easy_alert_dialog_with_listview.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_easy_alert_dialog_with_listview.xml
diff --git a/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index b83da30e1..9f3e4f2a5 100644
--- a/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:18 CST 2019
+#Thu Apr 25 21:27:00 CST 2019
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_popup_menu_item_selector.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_popup_menu_item_selector.xml
 C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
diff --git a/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 796e646fd..e0fad939d 100644
--- a/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:19 CST 2019
+#Thu Apr 25 21:27:01 CST 2019
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_portrait_mask_square.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_portrait_mask_square.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\layout\\nim_recent_contacts.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_recent_contacts.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_view_bottom.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_message_view_bottom.xml
diff --git a/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index b6b817d00..e1ff496e1 100644
--- a/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:07 CST 2019
+#Thu Apr 25 21:26:53 CST 2019
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_portrait_mask_square.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_square.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\layout\\nim_recent_contacts.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_recent_contacts.xml
 C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_view_bottom.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_view_bottom.xml
diff --git a/uikit/build/outputs/aar/uikit-debug.aar b/uikit/build/outputs/aar/uikit-debug.aar
index 3cc9dc8de..3e4148dcd 100644
Binary files a/uikit/build/outputs/aar/uikit-debug.aar and b/uikit/build/outputs/aar/uikit-debug.aar differ
diff --git a/uikit/build/outputs/aar/uikit-release.aar b/uikit/build/outputs/aar/uikit-release.aar
index 197dae31a..d2bdf24f9 100644
Binary files a/uikit/build/outputs/aar/uikit-release.aar and b/uikit/build/outputs/aar/uikit-release.aar differ
diff --git a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
index 468f714c6..1a52b22ff 100644
--- a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
+++ b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
@@ -63,10 +63,6 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_lock.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_lock.png"
@@ -75,6 +71,10 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_backward_white.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_backward_white.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png"
@@ -115,14 +115,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_add.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_add.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_more.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_more.png"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_p.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_p.png"
diff --git a/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 8b02ae40b..65cb3a408 100644
--- a/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:25 CST 2019
+#Thu Apr 25 21:27:03 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f61a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f61a.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_image_selected_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_image_selected_item.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f420.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f420.png
diff --git a/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 9ce7cbb94..318d23c4d 100644
--- a/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:22 CST 2019
+#Thu Apr 25 21:27:02 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_camera.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_search_header_view.xml
@@ -626,8 +626,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable\\umeng_simplify_feed_detail_favorite_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_feed_detail_favorite_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable\\umeng_comm_feed_detail_comment_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_feed_detail_comment_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_simplify_image_selected_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_image_selected_item.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xxxhdpi\\umeng_simplify_write.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable\\umeng_comm_topic_icon.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_topic_icon.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xxxhdpi\\umeng_simplify_write.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable\\umeng_topicpick_item_bg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_topicpick_item_bg.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_simplify_feed_lv_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_feed_lv_item.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\guanzhuhuati.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\guanzhuhuati.png
diff --git a/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index daff40335..2cbdcb11d 100644
--- a/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:23 CST 2019
+#Thu Apr 25 21:27:03 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_header_view.xml
diff --git a/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 872aaeade..797169ff0 100644
--- a/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:08 CST 2019
+#Thu Apr 25 21:26:53 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_search_header_view.xml
diff --git a/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar b/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar
index 047b97995..2950baa1b 100644
Binary files a/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar and b/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar differ
diff --git a/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar b/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar
index 262440922..09fe4b63b 100644
Binary files a/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar and b/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar differ
diff --git a/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json b/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
index e1715cb5f..2070cf5c6 100644
--- a/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
+++ b/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
@@ -243,14 +243,14 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_send_background.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_send_background.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_evernote_gray.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_evernote_gray.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_window_shadow_pad.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_window_shadow_pad.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_evernote_gray.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_evernote_gray.png"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_pocket_gray.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_pocket_gray.png"
@@ -411,6 +411,10 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_follow_check.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_follow_check.xml"
     },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
+    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_douban_on.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_douban_on.png"
@@ -419,10 +423,6 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_location_off.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_location_off.png"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_google.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_google.png"
@@ -495,12 +495,12 @@
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_title_right_bt.xml",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_title_right_bt.xml"
     },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_alipay.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_alipay.png"
-    },
     {
         "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_qq_on.png",
         "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_qq_on.png"
+    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_alipay.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_alipay.png"
     }
 ]
\ No newline at end of file
diff --git a/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index fb85fbf3d..4ff532b93 100644
--- a/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:26 CST 2019
+#Thu Apr 25 21:27:04 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_fetch_image.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_fetch_image.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_ynote.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_ynote.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png
@@ -207,8 +207,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_login_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_button_login_normal.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\com_facebook_tooltip_blue_topnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_blue_topnub.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_kakao.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_kakao.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\com_facebook_close.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\com_facebook_close.png
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_kakao.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_kakao.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_tooltip_blue_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_blue_bottomnub.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_button_send_icon.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_button_send_icon.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\com_facebook_tooltip_black_bottomnub.png
diff --git a/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index e389bf00e..fe61a752d 100644
--- a/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:25 CST 2019
+#Thu Apr 25 21:27:04 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_normal.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_white.9.png
diff --git a/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 0b84934e8..caf09391c 100644
--- a/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 25 20:52:08 CST 2019
+#Thu Apr 25 21:26:54 CST 2019
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_at_normal.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_button_white.9.png
diff --git a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar
index 946b56153..d9e8b9c7d 100644
Binary files a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar and b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar differ
diff --git a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar
index 509c12357..d33222c62 100644
Binary files a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar and b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar differ