加热棒摄像头修改

2019-09-26 17:51:36 +08:00
parent 68169041d6
commit 582361233f
82 changed files with 533 additions and 442 deletions
@@ -11,9 +11,9 @@
    </shared>
  </component>
  <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="ifishcamaer" />
+    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="SSSSR" />
    <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
-    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
+    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
    <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
  </component>
  <component name="BookmarkManager">
@@ -21,10 +21,6 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="4f982484-44de-4157-ae39-50f8654300bc" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/alicloud_android_beacon_1_0_3.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/alicloud_android_utdid_1_1_5_4.xml" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/alicloud_android_beacon_1_0_2.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/alicloud_android_utdid_1_1_5_3.xml" afterPath="" />
      <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" />
@@ -33,20 +29,42 @@
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/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$/iFish7/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" />
      <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$/BageView/build/outputs/aar/BageView-debug.aar" afterPath="$PROJECT_DIR$/BageView/build/outputs/aar/BageView-debug.aar" />
      <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/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$/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$/build/intermediates/jack-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/jack-cache/cache.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build.gradle" afterPath="$PROJECT_DIR$/iFish7/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.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/java/com/ifish/activity/MonitorActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MonitorActivity.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/geewe/SettingListener.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json" />
+      <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-nodpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-nodpi-v4.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/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/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java" />
+      <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/debug/single/color.json" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/debug/single/color.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_community_library/build/outputs/aar/umeng_community_library-debug.aar" afterPath="$PROJECT_DIR$/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar" afterPath="$PROJECT_DIR$/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar" />
+      <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" />
+      <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" />
    </list>
    <ignored path="$PROJECT_DIR$/build/classes/" />
@@ -80,51 +98,51 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="MonitorActivity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="296">
-              <caret line="364" column="12" selection-start-line="364" selection-start-column="12" selection-end-line="364" selection-end-column="12" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
      <file leaf-file-name="DeviceFragment.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="277">
-              <caret line="321" column="20" selection-start-line="321" selection-start-column="20" selection-end-line="321" selection-end-column="20" />
+            <state relative-caret-position="513">
+              <caret line="350" column="118" selection-start-line="346" selection-start-column="27" selection-end-line="350" selection-end-column="118" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/iFish7/build.gradle">
+      <file leaf-file-name="BindCameraActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="219">
-              <caret line="47" column="24" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" />
+            <state relative-caret-position="506">
+              <caret line="388" column="90" selection-start-line="388" selection-start-column="90" selection-end-line="388" selection-end-column="90" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="BaseApplication.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="WaitCameraActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="398">
+              <caret line="352" column="68" selection-start-line="352" selection-start-column="68" selection-end-line="352" selection-end-column="68" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BaseApplication.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
+            <state relative-caret-position="285">
+              <caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="P2PHandler.class" pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/.android/build-cache/174da8f573ab30246beed4ab2a4438f6e82bb30d/output/jars/classes.jar!/com/p2p/core/P2PHandler.class">
+      <file leaf-file-name="WaveCameraActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="177">
-              <caret line="765" column="15" selection-start-line="765" selection-start-column="15" selection-end-line="765" selection-end-column="15" />
+            <state relative-caret-position="228">
+              <caret line="233" column="29" selection-start-line="233" selection-start-column="29" selection-end-line="233" selection-end-column="29" />
              <folding />
            </state>
          </provider>
@@ -133,18 +151,8 @@
      <file leaf-file-name="SettingListener.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="426">
-              <caret line="1116" column="34" selection-start-line="1116" selection-start-column="16" selection-end-line="1116" selection-end-column="34" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Commons.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/utils/Commons.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="293">
-              <caret line="48" column="31" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="31" />
+            <state relative-caret-position="160">
+              <caret line="1102" column="13" selection-start-line="1102" selection-start-column="13" selection-end-line="1102" selection-end-column="13" />
              <folding />
            </state>
          </provider>
@@ -5548,23 +5556,23 @@
        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_hotdialog1.xml" />
        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_hotdialog2.xml" />
        <option value="$PROJECT_DIR$/iFish7/src/main/res/values/colors.xml" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_historydialog.xml" />
        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/activity_connect_device.xml" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/PlayBackListActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LookFishMonitorActivity.java" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LookAtMonitorActivity.java" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java" />
        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java" />
        <option value="$PROJECT_DIR$/iFish7/build.gradle" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_historydialog.xml" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java" />
+        <option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java" />
      </list>
    </option>
  </component>
@@ -5618,11 +5626,6 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView">
-        <subPane />
-      </pane>
-      <pane id="Scratches" />
      <pane id="ProjectPane">
        <subPane>
          <PATH>
@@ -5655,9 +5658,138 @@
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="iFish7" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="iFish7" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="com" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="iFish7" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="com" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="iFish7" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="com" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ifish" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="activity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
        </subPane>
      </pane>
+      <pane id="AndroidView">
+        <subPane />
+      </pane>
+      <pane id="Scratches" />
      <pane id="Scope" />
+      <pane id="PackagesPane" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -5665,7 +5797,7 @@
    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
    <property name="last_opened_file_path" value="F:/GwellDemo-master" />
    <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="device.picker.selection" value="4939168c" />
+    <property name="device.picker.selection" value="84B7N15A19002502" />
    <property name="ExportApk.ApkPath" value="C:\Users\Administrator\Desktop" />
    <property name="ExportApk.Flavors" value="" />
    <property name="ExportApk.BuildType" value="release" />
@@ -6034,12 +6166,13 @@
    <editor active="true" />
    <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.49841017" 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.407319" sideWeight="0.5290143" 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.407319" sideWeight="0.5290143" 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" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3484487" sideWeight="0.42408586" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5099443" sideWeight="0.57591414" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41686556" sideWeight="0.57591414" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26232114" sideWeight="0.7268171" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.52983296" sideWeight="0.49682036" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293556" sideWeight="0.48767886" order="12" side_tool="false" content_ui="tabs" />
@@ -6052,7 +6185,7 @@
      <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" />
      <window_info id="Theme Preview" 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="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2529833" sideWeight="0.53775835" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31901354" sideWeight="0.53775835" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -6066,7 +6199,6 @@
      <window_info id="Device File Explorer" 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="6" side_tool="true" content_ui="tabs" />
      <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="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26232114" sideWeight="0.7268171" order="8" 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="14" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
@@ -6083,108 +6215,10 @@
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java</url>
-          <line>95</line>
-          <properties />
-          <option name="timeStamp" value="441" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java</url>
-          <line>103</line>
-          <properties />
-          <option name="timeStamp" value="442" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>23</line>
-          <properties />
-          <option name="timeStamp" value="443" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>29</line>
-          <properties />
-          <option name="timeStamp" value="444" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>35</line>
-          <properties />
-          <option name="timeStamp" value="445" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>41</line>
-          <properties />
-          <option name="timeStamp" value="446" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>47</line>
-          <properties />
-          <option name="timeStamp" value="447" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>53</line>
-          <properties />
-          <option name="timeStamp" value="448" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>59</line>
-          <properties />
-          <option name="timeStamp" value="449" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>78</line>
-          <properties />
-          <option name="timeStamp" value="450" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>87</line>
-          <properties />
-          <option name="timeStamp" value="451" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>96</line>
-          <properties />
-          <option name="timeStamp" value="452" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>193</line>
-          <properties />
-          <option name="timeStamp" value="453" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>203</line>
-          <properties />
-          <option name="timeStamp" value="454" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>211</line>
-          <properties />
-          <option name="timeStamp" value="455" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
-          <line>219</line>
-          <properties />
-          <option name="timeStamp" value="457" />
-        </line-breakpoint>
-      </breakpoints>
      <breakpoints-dialog>
        <breakpoints-dialog />
      </breakpoints-dialog>
-      <option name="time" value="460" />
+      <option name="time" value="471" />
    </breakpoint-manager>
    <watches-manager>
      <configuration name="iFish7">
@@ -6238,110 +6272,15 @@
        <watch expression=" P2PHandler.getInstance().p2pConnect(geeWeUserId, s1, s2, parseInt, parseInt2, 0)" />
        <watch expression="contactId" />
        <watch expression="P2PHandler.getInstance().p2pConnect(geeWeUserId, s1, s2, parseInt, parseInt2, 0);" />
+        <watch expression="phs.getHeaterGatheringTime()" />
+        <watch expression="entries.get(i).getX() " />
+        <watch expression="entries.get(i).getX()" />
+        <watch expression="Integer.parseInt(phs.getHeaterGatheringTime())" />
+        <watch expression="e.getY() == 499" />
      </configuration>
    </watches-manager>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindWifiTankActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="73" column="45" selection-start-line="73" selection-start-column="45" selection-end-line="73" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6422">
-          <caret line="394" column="9" selection-start-line="382" selection-start-column="8" selection-end-line="394" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/utils/WifiAdmin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2793">
-          <caret line="172" column="17" selection-start-line="172" selection-start-column="11" selection-end-line="172" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/activity_connect_device.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2451">
-          <caret line="129" column="48" selection-start-line="129" selection-start-column="37" selection-end-line="129" selection-end-column="48" />
-        </state>
-      </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/basebean/ChangeHot.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1216">
-          <caret line="110" column="24" selection-start-line="110" selection-start-column="24" selection-end-line="110" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6441">
-          <caret line="388" column="90" selection-start-line="388" selection-start-column="90" selection-end-line="388" selection-end-column="90" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1216">
-          <caret line="127" column="59" selection-start-line="127" selection-start-column="59" selection-end-line="127" selection-end-column="59" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3320#3321#0" expanded="false" />
-            <element signature="e#3373#3374#0" expanded="false" />
-            <element signature="e#8767#8768#0" expanded="false" />
-            <element signature="e#8803#8804#0" expanded="false" />
-            <element signature="e#19803#19804#0" expanded="false" />
-            <element signature="e#19883#19884#0" expanded="false" />
-            <element signature="e#19963#19964#0" expanded="false" />
-            <element signature="e#20025#20026#0" expanded="false" />
-            <element signature="e#20917#20918#0" expanded="false" />
-            <element signature="e#21017#21018#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.p2p.core/p2p-core/0.4.4/2c0bc721496df8555d49877e63db75d339d23c56/p2p-core-0.4.4-sources.jar!/com/p2p/core/P2PHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.p2p.core/p2p-core/0.4.4.9/3145414d4b1ec480cb9bec2954c48f5f29fe200b/p2p-core-0.4.4.9-sources.jar!/com/p2p/core/P2PHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="206" column="17" selection-start-line="206" selection-start-column="17" selection-end-line="206" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/.android/build-cache/9520fbbaa6b9fa349127e0a6aab66074b4a4fc1f/output/jars/classes.jar!/com/p2p/core/MediaPlayer.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="70" column="0" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/android/os/Build.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="58" column="31" selection-start-line="58" selection-start-column="31" selection-end-line="58" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/.android/build-cache/9520fbbaa6b9fa349127e0a6aab66074b4a4fc1f/output/jars/classes.jar!/com/p2p/core/utils/MyUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="67" column="34" selection-start-line="67" selection-start-column="34" selection-end-line="67" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.p2p.core/p2p-core/0.4.4.9/3145414d4b1ec480cb9bec2954c48f5f29fe200b/p2p-core-0.4.4.9-sources.jar!/com/p2p/core/MediaPlayer.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="247">
@@ -6349,13 +6288,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="111" column="44" selection-start-line="111" selection-start-column="44" selection-end-line="111" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/PlayBackListActivity.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="314">
@@ -6384,13 +6316,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="327" column="0" selection-start-line="327" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/java/net/InetAddress.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="11989">
@@ -6508,14 +6433,14 @@
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/libs/p2p-core-release.aar">
+      <provider editor-type-id="apk-viewer">
+        <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" />
        </state>
      </provider>
-      <provider editor-type-id="apk-viewer">
-        <state />
-      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/libs/p2p-core.aar" />
    <entry file="jar://$USER_HOME$/.android/build-cache/8a012e9cbdec005ef54bb5c26d1e4157c7f4f8d3/output/jars/classes.jar!/com/p2p/core/MediaPlayer.class">
@@ -6526,39 +6451,12 @@
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/libs/pano-release.aar">
-      <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" />
-        </state>
-      </provider>
      <provider editor-type-id="apk-viewer">
        <state />
      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_hotdialog2.xml">
-      <provider 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" />
-        </state>
-      </provider>
-      <provider selected="true" editor-type-id="android-designer2">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_historydialog.xml">
-      <provider 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" />
-        </state>
-      </provider>
-      <provider selected="true" editor-type-id="android-designer2">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="848" column="34" selection-start-line="848" selection-start-column="34" selection-end-line="848" selection-end-column="34" />
+        <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" />
        </state>
      </provider>
    </entry>
@@ -6583,7 +6481,7 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/utils/Commons.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
+        <state relative-caret-position="551">
          <caret line="48" column="31" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="31" />
          <folding />
        </state>
@@ -6591,7 +6489,7 @@
    </entry>
    <entry file="jar://$USER_HOME$/.android/build-cache/174da8f573ab30246beed4ab2a4438f6e82bb30d/output/jars/classes.jar!/com/p2p/core/P2PHandler.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
+        <state relative-caret-position="13984">
          <caret line="765" column="15" selection-start-line="765" selection-start-column="15" selection-end-line="765" selection-end-column="15" />
          <folding />
        </state>
@@ -6599,40 +6497,191 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
+        <state relative-caret-position="4807">
          <caret line="364" column="12" selection-start-line="364" selection-start-column="12" selection-end-line="364" selection-end-column="12" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="1116" column="34" selection-start-line="1116" selection-start-column="16" selection-end-line="1116" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="321" column="20" selection-start-line="321" selection-start-column="20" selection-end-line="321" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/iFish7/build.gradle">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="47" column="24" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" />
+        <state relative-caret-position="665">
+          <caret line="81" column="41" selection-start-line="81" selection-start-column="41" selection-end-line="81" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/utils/HttpManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="381">
+          <caret line="1232" column="19" selection-start-line="1232" selection-start-column="19" selection-end-line="1232" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/utils/L.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="18" column="37" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="37" />
+          <folding>
+            <element signature="e#443#444#0" expanded="true" />
+            <element signature="e#465#466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.3/92fb46ea210fc3f0ab1125f28b33cf098583e8cf/MPAndroidChart-v3.0.3.jar!/com/github/mikephil/charting/data/Entry.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="57">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.3/92fb46ea210fc3f0ab1125f28b33cf098583e8cf/MPAndroidChart-v3.0.3.jar!/com/github/mikephil/charting/utils/Transformer.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="215">
+          <caret line="113" column="0" selection-start-line="113" selection-start-column="0" selection-end-line="113" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.3/92fb46ea210fc3f0ab1125f28b33cf098583e8cf/MPAndroidChart-v3.0.3.jar!/com/github/mikephil/charting/renderer/LineChartRenderer.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="389" column="0" selection-start-line="389" selection-start-column="0" selection-end-line="389" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.3/92fb46ea210fc3f0ab1125f28b33cf098583e8cf/MPAndroidChart-v3.0.3.jar!/com/github/mikephil/charting/charts/BarLineChartBase.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="181" column="0" selection-start-line="181" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/android/view/View.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="18141" column="0" selection-start-line="18141" selection-start-column="0" selection-end-line="18141" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/android/view/ViewGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="215">
+          <caret line="4219" column="0" selection-start-line="4219" selection-start-column="0" selection-end-line="4219" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_historydialog.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="28" column="21" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.3/92fb46ea210fc3f0ab1125f28b33cf098583e8cf/MPAndroidChart-v3.0.3.jar!/com/github/mikephil/charting/components/AxisBase.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="156" column="16" selection-start-line="156" selection-start-column="16" selection-end-line="156" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/java/text/NumberFormat.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="285" column="24" selection-start-line="285" selection-start-column="24" selection-end-line="285" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/main_hot_3a_control_activity.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="350">
+          <caret line="128" column="42" selection-start-line="128" selection-start-column="33" selection-end-line="128" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_hotdialog2.xml">
+      <provider 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>
+      <provider selected="true" editor-type-id="android-designer2">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainHot_3A_ControlActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="421" column="18" selection-start-line="421" selection-start-column="18" selection-end-line="421" selection-end-column="18" />
+          <folding>
+            <element signature="e#56417#57306#0" expanded="true" />
+            <element signature="e#57305#57306#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="388" column="90" selection-start-line="388" selection-start-column="90" selection-end-line="388" selection-end-column="90" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="513">
+          <caret line="350" column="118" selection-start-line="346" selection-start-column="27" selection-end-line="350" selection-end-column="118" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="398">
+          <caret line="352" column="68" selection-start-line="352" selection-start-column="68" selection-end-line="352" selection-end-column="68" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="1102" column="13" selection-start-line="1102" selection-start-column="13" selection-end-line="1102" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="233" column="29" selection-start-line="233" selection-start-column="29" selection-end-line="233" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="56" column="23" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="23" />
          <folding />
        </state>
      </provider>
@@ -1 +1 @@
-#Wed Sep 25 20:05:04 CST 2019
+#Thu Sep 26 17:50:48 CST 2019
@@ -1 +1 @@
-#Wed Sep 25 20:05:04 CST 2019
+#Thu Sep 26 17:50:48 CST 2019
@@ -1 +1 @@
-#Wed Sep 25 20:05:07 CST 2019
+#Thu Sep 26 17:50:50 CST 2019
@@ -139,14 +139,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
-        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png",
        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
+        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png",
        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png"
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:06 CST 2019
+#Thu Sep 26 17:50:49 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:05 CST 2019
+#Thu Sep 26 17:50:49 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:06 CST 2019
+#Thu Sep 26 17:50:49 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
@@ -10,8 +10,8 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_dialog_
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_title_bg.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_title_bg.9.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_add_volume.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_add_volume.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_progress.xml
-C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_normal.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\quit_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\quit_fullscreen.xml
+C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_normal.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_pressed.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png
 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_dialog_volume.xml
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:07 CST 2019
+#Thu Sep 26 17:50:50 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
@@ -151,6 +151,12 @@
        sha1="dace4ae4c64a1c4637b8d48dd7f266fb80e98475">
        <dex dex="C:\beifen\ifish\ifish\iFish7\build\intermediates\transforms\preJackPackagedLibraries\release\jars\8000\1f\opush-1.0.1-0fdca0920680c48ba025bfc70fa1b6c5e72493e4.jar" />
    </item>
+    <item
+        jar="C:\Users\Administrator\AppData\Local\Android\Sdk\platforms\android-25\android.jar"
+        revision="25.0.2"
+        sha1="712a0312fe844a21a1b3812fa960c363a1578984">
+        <dex dex="C:\beifen\ifish\ifish\iFish7\build\intermediates\transforms\preJackRuntimeLibraries\release\jars\8000\40\android-6a3cf0860eacd6be2312c0fc5cb721fe4bbba7c1.jar" />
+    </item>
    <item
        jar="C:\Users\Administrator\.android\build-cache\174da8f573ab30246beed4ab2a4438f6e82bb30d\output\jars\classes.jar"
        revision="25.0.2"
@@ -373,6 +379,12 @@
        sha1="a8762d07e76cfde2395257a5da47ba7c1dbd3dce">
        <dex dex="C:\beifen\ifish\ifish\iFish7\build\intermediates\transforms\preJackPackagedLibraries\release\jars\8000\1f\commons-io-1.4-4be00d7d2b83cd014914f7cacdd7d95d899c0a18.jar" />
    </item>
+    <item
+        jar="C:\Users\Administrator\AppData\Local\Android\Sdk\platforms\android-25\optional\org.apache.http.legacy.jar"
+        revision="25.0.2"
+        sha1="5f0541a4298daa0590b22cfbde43f85e2a675545">
+        <dex dex="C:\beifen\ifish\ifish\iFish7\build\intermediates\transforms\preJackRuntimeLibraries\release\jars\8000\40\org.apache.http.legacy-35b8c53a4a050106877bf33146d0619857e79ca2.jar" />
+    </item>
    <item
        jar="C:\Users\Administrator\.android\build-cache\abe1e7455da99c377bcc6db1b53e7b06418d29e5\output\jars\classes.jar"
        revision="25.0.2"
@@ -219,14 +219,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\messenger_bubble_large_white.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\messenger_bubble_large_white.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png",
-        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_fishdoctor.jpg",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_fishdoctor.jpg"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png",
+        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\messenger_bubble_small_blue.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\messenger_bubble_small_blue.png"
@@ -1227,14 +1227,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\\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\\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_lookat_shopcar.png",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lookat_shopcar.png"
@@ -447,14 +447,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44e.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44e.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f633.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f633.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61d.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61d.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f633.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f633.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f433.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f433.png"
@@ -783,14 +783,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44f.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44f.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63b.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63b.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63b.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63b.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f351.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f351.png"
@@ -155,26 +155,26 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png",
        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png",
        "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\design_ic_visibility.png",
-        "source": "C:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-xxxhdpi-v4\\design_ic_visibility.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\design_ic_visibility.png",
+        "source": "C:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-xxxhdpi-v4\\design_ic_visibility.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png"
@@ -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"
@@ -459,14 +459,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_location_selector.xml",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_location_selector.xml"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_hot_btn_shape_round.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_hot_btn_shape_round.xml"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_hot_btn_shape_round.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_hot_btn_shape_round.xml"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_share_music.png",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_share_music.png"
@@ -791,14 +791,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\\umeng_simplify_feed_detail_comment_input_bg.xml",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_feed_detail_comment_input_bg.xml"
@@ -895,14 +895,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_not_found.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_not_found.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_smallbutton.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_smallbutton.xml"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\sevenpopbg.xml",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\sevenpopbg.xml"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_smallbutton.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_smallbutton.xml"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_volume_progress_bg.xml",
        "source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_volume_progress_bg.xml"
@@ -1251,10 +1251,6 @@
        "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\\monitor_radiobutton_select.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\monitor_radiobutton_select.xml"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_tab_left_pressed.png",
        "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_pressed.png"
@@ -1263,6 +1259,10 @@
        "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"
+    },
    {
        "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"
@@ -1299,14 +1299,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"
@@ -1371,14 +1371,14 @@
        "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_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_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"
@@ -1671,14 +1671,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"
@@ -1 +1 @@
-#Wed Sep 25 20:05:16 CST 2019
+#Thu Sep 26 17:50:56 CST 2019
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:13 CST 2019
+#Thu Sep 26 17:50:54 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
@@ -10,6 +10,7 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -425,6 +426,11 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR
        dismissProgressDialog();
        dismissProgressDialogCancelble();
        backInfoModelHot_3A = event;
+        short low_wendu = backInfoModelHot_3A.getLow_wendu();
+        short high_wendu = backInfoModelHot_3A.getHigh_wendu();
+        low_wendu = (short) (low_wendu / 10);
+        high_wendu = (short) (high_wendu / 10);
+        tv_volume.setText(low_wendu + "℃-" + high_wendu + "℃");
        DeviceOnLine = true;
        stopAllTimer();
        sw.setRefreshing(false);
@@ -747,7 +753,11 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR

        @Override
        public void refreshContent(Entry e, Highlight highlight) {
-            if (e.getY() > 100) {
+            if (e.getY() == 499) {
+                tvContent.setText("正常");
+            } else if (e.getY() == 0) {
+                tvContent.setText("无水");
+            } else if (e.getY() > 100) {
                tvContent.setText(format.format(e.getY()));
            } else {
                tvContent.setText(e.getY() + "");
@@ -836,7 +846,7 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR
        leftYAxis.setGranularity(1f);
        leftYAxis.setAxisMaximum(35);
        leftYAxis.setAxisMinimum(25);
-        rightYaxis.setLabelCount(3, true);
+        rightYaxis.setLabelCount(6, true);
        rightYaxis.setGranularity(1f);
 //        int miny = 999999999;
 //        int maxy = 0;
@@ -854,12 +864,12 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR
 //        miny = miny - 50;
 //        maxy = maxy + 50;
        rightYaxis.setAxisMinimum(0);
-        rightYaxis.setAxisMaximum(2495);
+        rightYaxis.setAxisMaximum(2500);
        rightYaxis.setValueFormatter(new IAxisValueFormatter() {
            @Override
            public String getFormattedValue(float v, AxisBase axisBase) {
                int IValue = (int) v;
-                if (IValue == 499) {
+                if (IValue == 500) {
                    return "正常";
                } else if (IValue == 0) {
                    return "无水";
@@ -945,15 +955,10 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR
     * @param color    曲线颜色
     */
    public void showLineChart2(List<ChangeHot.Phs> dataList, String name, int color) {
-//        for (ChangeHot.Phs phs : dataList) {
-//            if (Integer.parseInt(phs.getHeaterGatheringTime()) > maxsize) {
-//                maxsize = Integer.parseInt(phs.getHeaterGatheringTime());
-//            }
-//        }
        Calendar calendars = Calendar.getInstance();
        int hour = calendars.get(Calendar.HOUR_OF_DAY);
        List<Entry> entries = new ArrayList<>();
-        for (int i = hour; i >= 0; i--) {
+        for (int i = 0; i <= hour; i++) {
            Entry entry = new Entry(i, 0);
            entries.add(entry);
        }
@@ -964,10 +969,23 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR
                 * 也可传入Drawable， Entry(float x, float y, Drawable icon) 可在XY轴交点 设置Drawable图像展示
                 */
                if (entries.get(i).getX() == Integer.parseInt(phs.getHeaterGatheringTime())) {
-                    entries.get(i).setY(Float.parseFloat(phs.getHeaterPh()));
+                    entries.get(i).setY((Float.parseFloat(phs.getHeaterPh())));
                }
            }
        }
+
+//        List<Entry> entries = new ArrayList<>();
+//        for (ChangeHot.Phs phs : dataList) {
+//            /**
+//             * 在此可查看 Entry构造方法，可发现 可传入数值 Entry(float x, float y)
+//             * 也可传入Drawable， Entry(float x, float y, Drawable icon) 可在XY轴交点 设置Drawable图像展示
+//             */
+//            Entry entry = new Entry(Float.parseFloat(phs.getHeaterGatheringTime()), (Float.parseFloat(phs.getHeaterPh())));
+//            entries.add(entry);
+//        }
+        for (Entry entry : entries) {
+            Log.i("SSSSR", entry.getX() + "----" + entry.getY());
+        }
        // 每一个LineDataSet代表一条线
        LineDataSet lineDataSet = new LineDataSet(entries, name);
        lineDataSet.setDrawValues(false);
@@ -39,6 +39,7 @@ import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDK;
 import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDKListener;
 import com.mediatek.elian.ElianNative;
 import com.p2p.core.P2PHandler;
+import com.p2p.core.global.P2PConstants;

 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -347,6 +348,11 @@ public class WaitCameraActivity extends BaseActivity {
                        Commons.CameraPosition = Commons.CAMERA.size() - 1;
                        sp.putInt(LoginSPKey.Camera_Position, Commons.CAMERA.size() - 1);
                    }
+                    String[] cameras = new String[Commons.CAMERA.size()];
+                    for (int i = 0; i < Commons.CAMERA.size(); i++) {
+                        cameras[i] = Commons.CAMERA.get(i).cameraId;
+                    }
+                    P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
                    Commons.HAVE_CAMERA = true;
                    Commons.IS_CAMERA = true;
                    EventBus.getDefault().post(new RefreshCamera());
@@ -43,6 +43,7 @@ import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDK;
 import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDKListener;
 import com.mediatek.elian.ElianNative;
 import com.p2p.core.P2PHandler;
+import com.p2p.core.global.P2PConstants;

 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -240,6 +241,11 @@ public class WaveCameraActivity extends BaseActivity {
                    }
                    Commons.HAVE_CAMERA = true;
                    Commons.IS_CAMERA = true;
+                    String[] cameras = new String[Commons.CAMERA.size()];
+                    for (int i = 0; i < Commons.CAMERA.size(); i++) {
+                        cameras[i] = Commons.CAMERA.get(i).cameraId;
+                    }
+                    P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
                    EventBus.getDefault().post(new RefreshCamera());
                    sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA);
                    ToastUtil.show(WaveCameraActivity.this, "绑定摄像头成功");
@@ -215,14 +215,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f467.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_270c.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_270c.png"
@@ -407,14 +407,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f630.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f630.png"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f627.png",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f627.png"
@@ -3,14 +3,14 @@
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_switch_textcolor.xml",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_switch_textcolor.xml"
    },
-    {
-        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_location_text.xml",
-        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_location_text.xml"
-    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_topic_toogle_color.xml",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_topic_toogle_color.xml"
    },
+    {
+        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_location_text.xml",
+        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_location_text.xml"
+    },
    {
        "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_toogle_color.xml",
        "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_toogle_color.xml"
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:17 CST 2019
+#Thu Sep 26 17:50:57 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
@@ -503,9 +503,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f418.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f418.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f629.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f629.png
 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:16 CST 2019
+#Thu Sep 26 17:50:56 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:17 CST 2019
+#Thu Sep 26 17:50:57 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:08 CST 2019
+#Thu Sep 26 17:50:50 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:18 CST 2019
+#Thu Sep 26 17:50:58 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
@@ -155,8 +155,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\wechat_fav.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\wechat_fav.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_twitter.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_twitter.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_socialize_full_alert_dialog_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_socialize_full_alert_dialog_item.xml
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_wxcircle.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_wxcircle.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_socialize_post_share.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_socialize_post_share.xml
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_wxcircle.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_wxcircle.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sidebar_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sidebar_selector.xml
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_oauth_check_on.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_oauth_check_on.png
 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_selected.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_at_selected.png
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:18 CST 2019
+#Thu Sep 26 17:50:58 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
@@ -1,4 +1,4 @@
-#Wed Sep 25 20:05:08 CST 2019
+#Thu Sep 26 17:50:50 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