距离修改

This commit is contained in:
Long-PC\Long
2019-04-25 21:30:39 +08:00
parent 834a5daba1
commit 71d1fbbbff
81 changed files with 296 additions and 403 deletions
+103 -207
View File
@@ -14,15 +14,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4f982484-44de-4157-ae39-50f8654300bc" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/SevenPopWindow.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/SevenScrollview.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/WheelView.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenadddialog1.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenadddialog2.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable/sevenpopbg.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevenpop.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialog.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialogadd.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" />
@@ -35,10 +26,9 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
@@ -53,23 +43,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/outputs/aar/BageView-release.aar" afterPath="$PROJECT_DIR$/BageView/build/outputs/aar/BageView-release.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar" afterPath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar" afterPath="$PROJECT_DIR$/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi-v4/sevenbg1.jpg" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi-v4/sevenbg1.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/lamp0bon4.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/lamp0bon4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/sevensetadd.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/sevensetadd.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f1.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f2.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f2.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f3.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f3.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f4.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f5.png" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/drawable-hdpi/time2f5.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/resources-debug.ap_" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/lamp0bon4.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/lamp0bon4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevenbg1.jpg" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevenbg1.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevensetadd.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/sevensetadd.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f1.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f2.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f2.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f3.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f3.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f4.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f5.png" afterPath="$PROJECT_DIR$/iFish7/src/main/res/drawable-hdpi/time2f5.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-debug.aar" afterPath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-debug.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-release.aar" afterPath="$PROJECT_DIR$/p2PCore/build/outputs/aar/p2PCore-release.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/outputs/aar/uikit-debug.aar" afterPath="$PROJECT_DIR$/uikit/build/outputs/aar/uikit-debug.aar" />
@@ -79,60 +52,8 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/design/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/design/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/v7/appcompat/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/android/support/v7/appcompat/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/cn/bingoogolapple/refreshlayout/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/cn/bingoogolapple/refreshlayout/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/ifish/activity/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/ifish/activity/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/meizu/cloud/pushinternal/R.java" afterPath="$PROJECT_DIR$/iFish7/build/generated/source/r/debug/com/meizu/cloud/pushinternal/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/drawable.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/layout.json" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/blame/res/debug/single/layout.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/main_seven_2f_control_activity.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven2f_item.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven2f_item.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/res/merged/debug/layout/timesetting_seven_2f_activity.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/build/intermediates/symbols/debug/R.txt" afterPath="$PROJECT_DIR$/iFish7/build/intermediates/symbols/debug/R.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/Seven_2F_Fragment.java" afterPath="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/Seven_2F_Fragment.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/iFish7.iml" afterPath="$PROJECT_DIR$/iFish7/iFish7.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven2f_item.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven2f_item.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven_2f_activity.xml" afterPath="$PROJECT_DIR$/iFish7/src/main/res/layout/timesetting_seven_2f_activity.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" afterPath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json" afterPath="$PROJECT_DIR$/uikit/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/uikit/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" />
</list>
<ignored path="$PROJECT_DIR$/build/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -165,38 +86,49 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ChangeDeviceName_2F_Activity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
<file leaf-file-name="MainSeven_2F_ControlActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1594">
<caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
<folding />
<state relative-caret-position="722">
<caret line="94" column="47" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#13336#13337#0" expanded="false" />
<element signature="e#13389#13390#0" expanded="false" />
<element signature="e#14296#14297#0" expanded="false" />
<element signature="e#14338#14339#0" expanded="false" />
<element signature="e#14510#14511#0" expanded="false" />
<element signature="e#14554#14555#0" expanded="false" />
<element signature="e#15840#15841#0" expanded="false" />
<element signature="e#15873#15874#0" expanded="false" />
<element signature="e#19059#19060#0" expanded="false" />
<element signature="e#19088#19089#0" expanded="false" />
<element signature="e#19168#19169#0" expanded="false" />
<element signature="e#19197#19198#0" expanded="false" />
<element signature="e#21272#21273#0" expanded="false" />
<element signature="e#21344#21345#0" expanded="false" />
<element signature="e#21418#21419#0" expanded="false" />
<element signature="e#21500#21501#0" expanded="false" />
<element signature="e#21596#21597#0" expanded="false" />
<element signature="e#21674#21675#0" expanded="false" />
<element signature="e#24720#24721#0" expanded="false" />
<element signature="e#24751#24752#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="changenickname_2f_activity.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="title_layout.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
<file leaf-file-name="main_seven_2f_control_activity.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-85">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<state relative-caret-position="726">
<caret line="482" column="49" selection-start-line="482" selection-start-column="49" selection-end-line="482" selection-end-column="49" />
<folding>
<element signature="e#7129#15987#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -6979,8 +6911,8 @@
<option value="$PROJECT_DIR$/iFish7/src/main/res/layout/sevensettime_dialogadd.xml" />
<option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2F.java" />
<option value="$PROJECT_DIR$/iFish7/src/main/java/com/ifish/view/WheelView.java" />
<option value="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
<option value="$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml" />
<option value="$PROJECT_DIR$/iFish7/src/main/res/layout/main_seven_2f_control_activity.xml" />
</list>
</option>
</component>
@@ -7034,9 +6966,11 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="AndroidView">
<subPane />
</pane>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -7269,9 +7203,7 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -7646,7 +7578,7 @@
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293556" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21479714" sideWeight="0.47933227" order="16" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21559268" sideWeight="0.47933227" order="16" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -7660,7 +7592,6 @@
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28139904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25139222" sideWeight="0.4936407" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27941176" sideWeight="0.27318296" order="9" side_tool="false" content_ui="tabs" />
@@ -7680,6 +7611,7 @@
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24264121" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25139222" sideWeight="0.4936407" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -7766,7 +7698,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="195" column="34" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
@@ -7796,7 +7727,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4066">
<caret line="271" column="19" selection-start-line="271" selection-start-column="19" selection-end-line="271" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@@ -7867,7 +7797,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="102" column="31" selection-start-line="102" selection-start-column="31" selection-end-line="102" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
@@ -7902,10 +7831,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4636">
<caret line="333" column="21" selection-start-line="333" selection-start-column="21" selection-end-line="333" selection-end-column="21" />
<folding>
<element signature="e#7657#7658#0" expanded="false" />
<element signature="e#7690#7691#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -7913,7 +7838,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4674">
<caret line="307" column="16" selection-start-line="307" selection-start-column="16" selection-end-line="307" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
@@ -7921,7 +7845,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
@@ -7940,7 +7863,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="39" column="78" selection-start-line="39" selection-start-column="78" selection-end-line="39" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
@@ -7958,7 +7880,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="113" column="44" selection-start-line="113" selection-start-column="44" selection-end-line="113" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
@@ -7966,7 +7887,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="155" column="35" selection-start-line="155" selection-start-column="35" selection-end-line="155" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
@@ -8028,28 +7948,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="798">
<caret line="114" column="31" selection-start-line="114" selection-start-column="24" selection-end-line="114" selection-end-column="31" />
<folding>
<element signature="e#5289#5290#0" expanded="false" />
<element signature="e#5313#5314#0" expanded="false" />
<element signature="e#6660#6661#0" expanded="false" />
<element signature="e#6686#6687#0" expanded="false" />
<element signature="e#12762#12763#0" expanded="false" />
<element signature="e#12784#12785#0" expanded="false" />
<element signature="e#12859#12860#0" expanded="false" />
<element signature="e#12881#12882#0" expanded="false" />
<element signature="e#15105#15106#0" expanded="false" />
<element signature="e#15125#15126#0" expanded="false" />
<element signature="e#20839#20840#0" expanded="false" />
<element signature="e#20878#20879#0" expanded="false" />
<element signature="e#20927#20928#0" expanded="false" />
<element signature="e#20976#20977#0" expanded="false" />
<element signature="e#21047#21048#0" expanded="false" />
<element signature="e#21082#21083#0" expanded="false" />
<element signature="e#32830#32831#0" expanded="false" />
<element signature="e#32897#32898#0" expanded="false" />
<element signature="e#34006#34007#0" expanded="false" />
<element signature="e#34026#34027#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -8057,7 +7955,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
@@ -8065,7 +7962,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="32" column="28" selection-start-line="32" selection-start-column="28" selection-end-line="32" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
@@ -8084,7 +7980,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="165" column="0" selection-start-line="165" selection-start-column="0" selection-end-line="165" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -8092,7 +7987,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="36" column="9" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
@@ -8100,7 +7994,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="33" column="11" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
@@ -8119,7 +8012,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="1406" column="33" selection-start-line="1406" selection-start-column="33" selection-end-line="1406" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
@@ -8127,24 +8019,64 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="273" column="45" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider editor-type-id="text-editor">
<state relative-caret-position="-4">
<caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="94" column="47" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1453#1454#0" expanded="true" />
<element signature="e#1481#1482#0" expanded="true" />
<element signature="e#1957#1958#0" expanded="true" />
<element signature="e#1986#1987#0" expanded="true" />
<element signature="e#2027#2028#0" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="e#2604#4431#0" expanded="true" />
<element signature="e#3306#3716#0" expanded="true" />
<element signature="e#3715#3716#0" expanded="true" />
<element signature="e#3800#4193#0" expanded="true" />
<element signature="e#4192#4193#0" expanded="true" />
<element signature="e#4430#4431#0" expanded="true" />
<element signature="e#10435#10436#0" expanded="true" />
<element signature="e#10493#10494#0" expanded="true" />
<element signature="e#11479#11480#0" expanded="true" />
<element signature="e#11524#11525#0" expanded="true" />
<element signature="imports" expanded="false" />
<element signature="e#13336#13337#0" expanded="false" />
<element signature="e#13389#13390#0" expanded="false" />
<element signature="e#14296#14297#0" expanded="false" />
<element signature="e#14338#14339#0" expanded="false" />
<element signature="e#14510#14511#0" expanded="false" />
<element signature="e#14554#14555#0" expanded="false" />
<element signature="e#15840#15841#0" expanded="false" />
<element signature="e#15873#15874#0" expanded="false" />
<element signature="e#19059#19060#0" expanded="false" />
<element signature="e#19088#19089#0" expanded="false" />
<element signature="e#19168#19169#0" expanded="false" />
<element signature="e#19197#19198#0" expanded="false" />
<element signature="e#21272#21273#0" expanded="false" />
<element signature="e#21344#21345#0" expanded="false" />
<element signature="e#21418#21419#0" expanded="false" />
<element signature="e#21500#21501#0" expanded="false" />
<element signature="e#21596#21597#0" expanded="false" />
<element signature="e#21674#21675#0" expanded="false" />
<element signature="e#24720#24721#0" expanded="false" />
<element signature="e#24751#24752#0" expanded="false" />
</folding>
</state>
</provider>
@@ -8154,47 +8086,11 @@
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="586">
<caret line="166" column="40" selection-start-line="166" selection-start-column="40" selection-end-line="166" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainSeven_2F_ControlActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="424">
<caret line="576" column="13" selection-start-line="576" selection-start-column="13" selection-end-line="576" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/title_layout.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-85">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1594">
<caret line="62" column="23" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/iFish7/src/main/res/layout/changenickname_2f_activity.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="47" column="41" selection-start-line="47" selection-start-column="28" selection-end-line="47" selection-end-column="41" />
<folding />
<state relative-caret-position="726">
<caret line="482" column="49" selection-start-line="482" selection-start-column="49" selection-end-line="482" selection-end-column="49" />
<folding>
<element signature="e#7129#15987#0" expanded="false" />
</folding>
</state>
</provider>
</entry>