摄像头更新

This commit is contained in:
Long-PC\Long
2019-09-25 20:08:23 +08:00
parent 0a3e69a012
commit 68169041d6
73 changed files with 864 additions and 972 deletions
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="alicloud-android-beacon-1.0.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-beacon/1.0.2/3a07409e4aed804c28fe928ea281217e1df9b7d/alicloud-android-beacon-1.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
+9
View File
@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="alicloud-android-beacon-1.0.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-beacon/1.0.3/b6fb16d562c3fca37e61a73cc841c1b55940873/alicloud-android-beacon-1.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="alicloud-android-utdid-1.1.5.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-utdid/1.1.5.3/989c3bb13060da1e3154bfe00236f76453a2725f/alicloud-android-utdid-1.1.5.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
+9
View File
@@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="alicloud-android-utdid-1.1.5.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-utdid/1.1.5.4/b6dfdc83cc122ae88d2ac9b41c69dd15657ea477/alicloud-android-utdid-1.1.5.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
+172 -294
View File
@@ -11,6 +11,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="ifishcamaer" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
@@ -20,222 +21,32 @@
</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/pano_release_.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/libs/pano-release.aar" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/firebase_common_9_0_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/p2p_core_0_4_4_9.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_analytics_9_0_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_analytics_impl_9_0_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_base_9_0_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_basement_9_0_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_tasks_9_0_0.xml" afterPath="" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<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_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/p2p_core_release_.xml" afterPath="$PROJECT_DIR$/.idea/libraries/p2p_core_release_.xml" />
<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-xhdpi-v4.json" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-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/r/debug/cn/bingoogolapple/badgeview/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/cn/bingoogolapple/badgeview/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/umeng_community_library_project/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/umeng_community_library_project/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/umeng_social_sdk_res_lib/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/umeng_social_sdk_res_lib/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/fm/jiecao/jcvideoplayer_lib/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/fm/jiecao/jcvideoplayer_lib/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-af.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-af.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-am.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-am.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ar.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ar.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-bg.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-bg.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ca.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ca.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-cs.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-cs.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-da.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-da.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-de.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-de.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-el.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-el.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-en-rGB.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-en-rGB.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-es-rUS.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-es-rUS.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-es.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-es.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fa.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fa.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fi.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fi.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fr-rCA.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fr-rCA.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fr.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-fr.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hi.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hi.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hr.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hr.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hu.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-hu.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-in.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-in.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-it.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-it.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-iw.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-iw.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ja.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ja.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ko.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ko.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-lt.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-lt.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-lv.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-lv.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-nl.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-nl.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pl.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pl.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pt-rBR.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pt-rBR.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pt-rPT.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-pt-rPT.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ro.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ro.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ru.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-ru.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sk.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sk.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sl.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sl.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sr.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sr.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sv.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sv.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sw.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-sw.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-th.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-th.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-tr.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-tr.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-uk.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-uk.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-vi.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-vi.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rCN.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rCN.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rHK.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rHK.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rTW.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zh-rTW.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zu.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values-zu.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/multi/values.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/anim.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/anim.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/color.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/color.json" />
<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-mdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-mdpi-v4.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-xhdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-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/blame/res/debug/single/layout.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/layout.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/raw.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/raw.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/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/build/intermediates/res/merged/debug/values-af/values-af.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-af/values-af.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-am/values-am.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-am/values-am.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ar/values-ar.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ar/values-ar.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-bg/values-bg.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-bg/values-bg.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ca/values-ca.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ca/values-ca.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-cs/values-cs.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-cs/values-cs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-da/values-da.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-da/values-da.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-de/values-de.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-de/values-de.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-el/values-el.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-el/values-el.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-en-rGB/values-en-rGB.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-en-rGB/values-en-rGB.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-es-rUS/values-es-rUS.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-es-rUS/values-es-rUS.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-es/values-es.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-es/values-es.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fa/values-fa.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fa/values-fa.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fi/values-fi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fi/values-fi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fr-rCA/values-fr-rCA.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fr-rCA/values-fr-rCA.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fr/values-fr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-fr/values-fr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hi/values-hi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hi/values-hi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hr/values-hr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hr/values-hr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hu/values-hu.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-hu/values-hu.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-in/values-in.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-in/values-in.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-it/values-it.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-it/values-it.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-iw/values-iw.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-iw/values-iw.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ja/values-ja.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ja/values-ja.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ko/values-ko.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ko/values-ko.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-lt/values-lt.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-lt/values-lt.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-lv/values-lv.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-lv/values-lv.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-nl/values-nl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-nl/values-nl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pl/values-pl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pl/values-pl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pt-rBR/values-pt-rBR.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pt-rBR/values-pt-rBR.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pt-rPT/values-pt-rPT.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-pt-rPT/values-pt-rPT.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ro/values-ro.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ro/values-ro.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ru/values-ru.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-ru/values-ru.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sk/values-sk.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sk/values-sk.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sl/values-sl.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sl/values-sl.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sr/values-sr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sr/values-sr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sv/values-sv.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sv/values-sv.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sw/values-sw.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-sw/values-sw.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-th/values-th.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-th/values-th.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-tr/values-tr.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-tr/values-tr.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-uk/values-uk.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-uk/values-uk.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-vi/values-vi.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-vi/values-vi.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rCN/values-zh-rCN.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rCN/values-zh-rCN.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rHK/values-zh-rHK.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rHK/values-zh-rHK.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rTW/values-zh-rTW.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zh-rTW/values-zh-rTW.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zu/values-zu.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values-zu/values-zu.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values/values.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/values/values.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/outputs/logs/manifest-merger-debug-report.txt" afterPath="$PROJECT_DIR$/iFish7/build/outputs/logs/manifest-merger-debug-report.txt" />
<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/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/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/P2PListener.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.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/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$/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$/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/" />
@@ -268,12 +79,12 @@
<favorites_list name="ifish" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="MonitorActivity.java" pinned="false" current-in-tab="true">
<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="231">
<caret line="183" column="83" selection-start-line="183" selection-start-column="83" selection-end-line="183" selection-end-column="83" />
<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>
@@ -282,8 +93,58 @@
<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="455">
<caret line="339" column="99" selection-start-line="339" selection-start-column="99" selection-end-line="339" selection-end-column="99" />
<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>
</file>
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BaseApplication.java" pinned="false" current-in-tab="false">
<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>
</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">
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<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" />
<folding />
</state>
</provider>
@@ -4726,7 +4587,7 @@
</option>
<option name="modificationStamps">
<map>
<entry key="C:\beifen\ifish\ifish" value="10765817720297" />
<entry key="C:\beifen\ifish\ifish" value="10766168493123" />
<entry key="D:\ifish" value="13993149000795" />
</map>
</option>
@@ -5696,14 +5557,14 @@
<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/geewe/SettingListener.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/build.gradle" />
<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/fragment/DeviceFragment.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" />
</list>
</option>
</component>
@@ -5757,6 +5618,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane />
</pane>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
@@ -5776,12 +5641,22 @@
<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>
</subPane>
</pane>
<pane id="AndroidView">
<subPane />
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
@@ -5790,7 +5665,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="84B7N15A19002502" />
<property name="device.picker.selection" value="4939168c" />
<property name="ExportApk.ApkPath" value="C:\Users\Administrator\Desktop" />
<property name="ExportApk.Flavors" value="" />
<property name="ExportApk.BuildType" value="release" />
@@ -6155,16 +6030,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1416" extended-state="7" />
<editor active="false" />
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<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.433572" 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="false" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.592681" 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.5099443" sideWeight="0.57591414" order="15" 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" />
@@ -6172,7 +6047,7 @@
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6587112" sideWeight="0.5063593" order="13" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21939586" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23786794" sideWeight="0.49046105" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24661893" sideWeight="0.49046105" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27941176" sideWeight="0.27318296" order="9" side_tool="false" content_ui="tabs" />
@@ -6223,85 +6098,85 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java</url>
<line>22</line>
<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>28</line>
<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>34</line>
<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>40</line>
<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>46</line>
<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>52</line>
<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>58</line>
<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>77</line>
<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>86</line>
<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>95</line>
<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>192</line>
<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>202</line>
<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>210</line>
<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>218</line>
<line>219</line>
<properties />
<option name="timeStamp" value="457" />
</line-breakpoint>
@@ -6309,7 +6184,7 @@
<breakpoints-dialog>
<breakpoints-dialog />
</breakpoints-dialog>
<option name="time" value="458" />
<option name="time" value="460" />
</breakpoint-manager>
<watches-manager>
<configuration name="iFish7">
@@ -6389,14 +6264,14 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/activity_connect_device.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<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">
@@ -6516,13 +6391,6 @@
</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="646">
<caret line="63" column="5" selection-start-line="63" selection-start-column="5" selection-end-line="63" selection-end-column="5" />
</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">
@@ -6558,14 +6426,6 @@
</state>
</provider>
</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="300">
<caret line="48" column="37" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-25/android/os/Handler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1805">
@@ -6647,23 +6507,15 @@
</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="-3002">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</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">
@@ -6674,48 +6526,34 @@
</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>
<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>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="981">
<caret line="135" column="40" selection-start-line="135" selection-start-column="40" selection-end-line="135" selection-end-column="40" />
</state>
</provider>
</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="-632">
<caret line="710" column="15" selection-start-line="710" selection-start-column="15" selection-end-line="710" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/setwatertemp_hotdialog2.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<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 selected="true" editor-type-id="android-designer2">
<state />
</provider>
<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">
@@ -6733,28 +6571,68 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="904" column="28" selection-start-line="904" selection-start-column="28" selection-end-line="904" selection-end-column="28" />
<folding />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java">
<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="455">
<caret line="339" column="99" selection-start-line="339" selection-start-column="99" selection-end-line="339" selection-end-column="99" />
<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" />
<folding />
</state>
</provider>
</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">
<caret line="765" column="15" selection-start-line="765" selection-start-column="15" selection-end-line="765" selection-end-column="15" />
<folding />
</state>
</provider>
</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="231">
<caret line="183" column="83" selection-start-line="183" selection-start-column="83" selection-end-line="183" selection-end-column="83" />
<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>
<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" />
<folding />
</state>
</provider>