摄像头更新
This commit is contained in:
Long-PC\Long
parent
0a3e69a012
commit
68169041d6
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#Tue Sep 24 20:44:20 CST 2019
|
||||
#Wed Sep 25 20:05:04 CST 2019
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#Tue Sep 24 20:44:19 CST 2019
|
||||
#Wed Sep 25 20:05:04 CST 2019
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#Tue Sep 24 20:44:26 CST 2019
|
||||
#Wed Sep 25 20:05:07 CST 2019
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:25 CST 2019
|
||||
#Wed Sep 25 20:05:06 CST 2019
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
|
||||
|
|
@ -162,8 +162,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
|
|||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_dialog_material_background.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_dialog_material_background.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_48dp.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_tint_spinner.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_hint_foreground_material_dark.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_hint_foreground_material_dark.xml
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:22 CST 2019
|
||||
#Wed Sep 25 20:05:05 CST 2019
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:23 CST 2019
|
||||
#Wed Sep 25 20:05:06 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_play_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml
|
||||
|
|
@ -15,8 +15,8 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\quit_fullscree
|
|||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_pressed.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_dialog_volume.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\start_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\start_fullscreen.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_normal.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_normal.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\start_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\start_fullscreen.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_back_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_back_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_forward_icon.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_forward_icon.png
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_brightness_video.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_brightness_video.png
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:26 CST 2019
|
||||
#Wed Sep 25 20:05:07 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -21,8 +21,8 @@ android {
|
|||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
applicationId "com.ifish.activity"
|
||||
versionCode 30
|
||||
versionName "4.7.4"
|
||||
versionCode 31
|
||||
versionName "4.7.5"
|
||||
multiDexEnabled true
|
||||
ndk { abiFilters "armeabi" }
|
||||
jackOptions
|
||||
|
|
@ -45,7 +45,6 @@ android {
|
|||
}
|
||||
}
|
||||
dexOptions {
|
||||
incremental true
|
||||
javaMaxHeapSize '4g'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ public final class BuildConfig {
|
|||
public static final String APPLICATION_ID = "com.ifish.activity.test";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = 30;
|
||||
public static final String VERSION_NAME = "4.7.4";
|
||||
public static final int VERSION_CODE = 31;
|
||||
public static final String VERSION_NAME = "4.7.5";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ public final class BuildConfig {
|
|||
public static final String APPLICATION_ID = "com.ifish.activity";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = 30;
|
||||
public static final String VERSION_NAME = "4.7.4";
|
||||
public static final int VERSION_CODE = 31;
|
||||
public static final String VERSION_NAME = "4.7.5";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -187,14 +187,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_button_icon.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_button_icon.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_close.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_close.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_button_icon.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_button_icon.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_015.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_015.png"
|
||||
|
|
@ -339,12 +339,12 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_light.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_light.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_xout.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_xout.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png"
|
||||
}
|
||||
]
|
||||
|
|
@ -1227,14 +1227,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_addphoto.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_addphoto.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\goldcoupon_bg.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\goldcoupon_bg.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_lookat_shopcar.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lookat_shopcar.png"
|
||||
|
|
|
|||
|
|
@ -447,14 +447,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44e.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44e.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61d.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61d.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f633.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f633.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61d.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61d.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f433.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f433.png"
|
||||
|
|
@ -783,14 +783,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44f.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44f.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63b.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63b.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f351.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f351.png"
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\shareifishapp.jpg",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\shareifishapp.jpg"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
|
||||
|
|
|
|||
|
|
@ -135,14 +135,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_renren_on.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_renren_on.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nonet_bt_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\nonet_bt_select.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_bind_bg.9.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_bind_bg.9.png"
|
||||
|
|
@ -399,14 +399,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_dynamic_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_dynamic_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_segment_shape_middle.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_segment_shape_middle.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_wxcircle_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_wxcircle_gray.png"
|
||||
|
|
@ -423,14 +423,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_instagram_off.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_instagram_off.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_alibaba_bc_auth_ll_bg.xml",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable\\com_alibaba_bc_auth_ll_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sidebar_normal.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_sidebar_normal.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_alibaba_bc_auth_ll_bg.xml",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable\\com_alibaba_bc_auth_ll_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_back_tiny_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_back_tiny_selector.xml"
|
||||
|
|
@ -459,14 +459,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_location_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_location_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_hot_btn_shape_round.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_hot_btn_shape_round.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_share_music.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_share_music.png"
|
||||
|
|
@ -575,14 +575,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\messenger_button_white_bg_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\messenger_button_white_bg_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\lookfishdialog_bt_press_shape.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\lookfishdialog_bt_press_shape.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_select.xml"
|
||||
|
|
@ -663,14 +663,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_foursquare.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_foursquare.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_login.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_login.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white_blue.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white_blue.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_login.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_login.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shop_item_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\shop_item_select.xml"
|
||||
|
|
@ -859,14 +859,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_switch_centerbutton_bg.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_switch_centerbutton_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_material.xml",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ratingbar_material.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_tab_indicator_material.xml"
|
||||
|
|
@ -1067,14 +1067,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_ynote_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_ynote_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_at_normal.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_bottomnocircle_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_bottomnocircle_select.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_at_normal.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_send_bt.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_send_bt.xml"
|
||||
|
|
@ -1363,14 +1363,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_more_radius_none.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_more_radius_none.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_buy_bt_shape.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_buy_bt_shape.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_xiaolian.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_xiaolian.png"
|
||||
|
|
@ -1567,14 +1567,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_color_ff_bg.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_color_ff_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fragment_bg_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fragment_bg_select.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_error_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_error_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fragment_bg_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fragment_bg_select.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_facebook.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_facebook.png"
|
||||
|
|
@ -1587,14 +1587,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_on.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_on.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_edtext_noright_shape_f2.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_edtext_noright_shape_f2.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_on.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_on.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_tab_left_normal.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_normal.png"
|
||||
|
|
@ -1659,14 +1659,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_pause_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_pause_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_grey_blue.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_grey_blue.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_square_select.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_square_select.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_grey_blue.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_grey_blue.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_cancel_bt.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_cancel_bt.xml"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
[
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading12.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading12.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading03.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading03.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading12.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading12.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading09.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading09.png"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#Tue Sep 24 20:44:39 CST 2019
|
||||
#Wed Sep 25 20:05:16 CST 2019
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:35 CST 2019
|
||||
#Wed Sep 25 20:05:13 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\pop_camera.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\pop_camera.xml
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_1_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_1_on.png
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_jpush_wendu.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_jpush_wendu.png
|
||||
|
|
@ -452,8 +452,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_back_white.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_back_white.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\color-v23\\design_tint_password_toggle.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\design_tint_password_toggle.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_topic_recommend.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_topic_recommend.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f428.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f428.png
|
||||
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_play_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_image_delete.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_image_delete.png
|
||||
|
|
@ -889,8 +889,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lock.png=C\
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f605.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f605.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_x_button.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_x_button.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_x_button.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_x_button.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_img_browser_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_img_browser_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_lookfish.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_lookfish.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\xietiezi.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\xietiezi.png
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.ifish.activity"
|
||||
android:versionCode="30"
|
||||
android:versionName="4.7.4" >
|
||||
android:versionCode="31"
|
||||
android:versionName="4.7.5" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="16"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -78,9 +78,7 @@
|
|||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jack" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
|
|
@ -92,7 +90,6 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
@ -104,7 +101,7 @@
|
|||
<orderEntry type="library" exported="" name="SMSSDK-2.1.2-" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-third-push-3.0.6-" level="project" />
|
||||
<orderEntry type="library" exported="" name="core-3.3.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-beacon-1.0.2" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-beacon-1.0.3" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-utils-1.1.5" level="project" />
|
||||
<orderEntry type="library" exported="" name="rxandroid-2.0.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="mina-core-2.0.17" level="project" />
|
||||
|
|
@ -129,7 +126,6 @@
|
|||
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-utdid-1.1.5.3" level="project" />
|
||||
<orderEntry type="library" exported="" name="commons-io-1.4" level="project" />
|
||||
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
|
||||
<orderEntry type="library" exported="" name="mtopsdk_allinone_open-1.2.2.4" level="project" />
|
||||
|
|
@ -163,6 +159,7 @@
|
|||
<orderEntry type="library" exported="" name="logging-interceptor-3.8.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
|
||||
<orderEntry type="library" exported="" name="alicloud-android-utdid-1.1.5.4" level="project" />
|
||||
<orderEntry type="module" module-name="umeng_community_library" exported="" />
|
||||
<orderEntry type="module" module-name="JCVideo_Library" exported="" />
|
||||
<orderEntry type="module" module-name="BageView" exported="" />
|
||||
|
|
|
|||
|
|
@ -181,7 +181,6 @@ public class MonitorActivity extends BaseGradeMonitorActivity implements OnClick
|
|||
if (!Commons.FishKey.On.equals(mCamera.isActive)) {//摄像头未激活
|
||||
} else {
|
||||
mypro.setVisibility(View.VISIBLE);
|
||||
MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
|
||||
String pwd = P2PHandler.getInstance().EntryPassword(HttpManager.Camera_psw);//经过转换后的设备密码
|
||||
String contactId = sp.getString(LoginSPKey.GeeWeUserId, "");//登陆的用户账号
|
||||
P2PHandler.getInstance().call(contactId, pwd, true, 1, cameraId, "", "", 2, cameraId, 0);//呼叫监控
|
||||
|
|
@ -363,7 +362,6 @@ public class MonitorActivity extends BaseGradeMonitorActivity implements OnClick
|
|||
mypro.setVisibility(View.VISIBLE);
|
||||
String pwd = P2PHandler.getInstance().EntryPassword(HttpManager.Camera_psw);//经过转换后的设备密码
|
||||
String contactId = sp.getString(LoginSPKey.GeeWeUserId, "");//登陆的用户账号
|
||||
MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
|
||||
P2PHandler.getInstance().call(contactId, pwd, true, 1, cameraId, "", "", 2, cameraId, 0);//呼叫监控
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
|
|||
import com.p2p.core.MediaPlayer;
|
||||
import com.p2p.core.P2PHandler;
|
||||
import com.p2p.core.P2PSpecial.HttpSend;
|
||||
import com.p2p.core.global.P2PConstants;
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -318,7 +319,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
|||
String geeWeUserId = sp.getString(LoginSPKey.GeeWeUserId, "");
|
||||
if (p2PVerifyCode1.length() > 2 && p2PVerifyCode2.length() > 2 && geeWeUserId.length() > 2) {//"1005746664", 验证码格式长度必须都大于2 否则重新请求 满足条件p2pconect
|
||||
P2PHandler.getInstance().p2pInit(getActivity(), new P2PListener(), new SettingListener());//初始化技威
|
||||
MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
|
||||
int parseInt = Integer.parseInt(p2PVerifyCode1);
|
||||
int parseInt2 = Integer.parseInt(p2PVerifyCode2);
|
||||
int s1 = Integer.parseInt(sessionId);
|
||||
|
|
@ -327,6 +327,12 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
|||
s2 = Integer.parseInt(sessionId2);
|
||||
}
|
||||
boolean p2pConnect = P2PHandler.getInstance().p2pConnect(geeWeUserId, s1, s2, parseInt, parseInt2, 0);//p2p连接
|
||||
String[] cameras = new String[Commons.CAMERA.size()];
|
||||
for (int i = 0; i < Commons.CAMERA.size(); i++) {
|
||||
cameras[i] = Commons.CAMERA.get(i).cameraId;
|
||||
}
|
||||
P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
|
||||
Log.i("ifishcamaer", "deveicever---" + cameras.toString());
|
||||
Log.i("devicetype", p2pConnect + "---");
|
||||
} else {
|
||||
hm.loginGeeWeUser(new HttpListener<GeeWeUser>() {
|
||||
|
|
@ -337,8 +343,13 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
|||
sp.putString(LoginSPKey.P2PVerifyCode1, baseBean.P2PVerifyCode1);
|
||||
sp.putString(LoginSPKey.P2PVerifyCode2, baseBean.P2PVerifyCode2);
|
||||
P2PHandler.getInstance().p2pInit(getActivity(), new P2PListener(), new SettingListener());//初始化技威
|
||||
MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
|
||||
boolean p2pConnect = P2PHandler.getInstance().p2pConnect(baseBean.UserID, Integer.parseInt(baseBean.sessionId), Integer.parseInt(baseBean.sessionId2), Integer.parseInt(baseBean.P2PVerifyCode1), Integer.parseInt(baseBean.P2PVerifyCode2), 0);//p2p连接
|
||||
String[] cameras = new String[Commons.CAMERA.size()];
|
||||
for (int i = 0; i < Commons.CAMERA.size(); i++) {
|
||||
cameras[i] = Commons.CAMERA.get(i).cameraId;
|
||||
}
|
||||
P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
|
||||
Log.i("ifishcamaer", "deveicever---" + cameras.toString());
|
||||
L.i("geeWeUserId=" + baseBean.UserID + "parseInt=" + Integer.parseInt(baseBean.P2PVerifyCode1) + "parseIn2=" + Integer.parseInt(baseBean.P2PVerifyCode2));
|
||||
L.i("p2pConnect=" + p2pConnect);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.content.Intent;
|
|||
import android.util.Log;
|
||||
|
||||
import com.ifish.baseclass.BaseApplication;
|
||||
import com.p2p.core.MediaPlayer;
|
||||
import com.p2p.core.P2PInterface.ISetting;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1105,8 +1106,16 @@ public class SettingListener implements ISetting {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void vRetGetIndexFriendStatus(int i, String[] strings, int[] ints, int[] ints1, int[] ints2, int[] ints3, int[] ints4, byte b, long[] longs, int[][] ints5, int[][] ints6, int[] ints7, short[] shorts) {
|
||||
|
||||
public void vRetGetIndexFriendStatus(int count, String[] contactIds, int[] IdProtery,
|
||||
int[] status, int[] DevTypes, int[] SubType, int[] DefenceState, byte bRequestResult,
|
||||
long[] defenceFlag, int[][] configs, int[][] infos, int[] startAuthManage, short[] p2pLibVersion) {
|
||||
if (contactIds != null) {
|
||||
int[] deviceid = new int[contactIds.length];
|
||||
for (int i = 0; i < contactIds.length; i++) {
|
||||
deviceid[i] = Integer.parseInt(contactIds[i]);
|
||||
}
|
||||
MediaPlayer.setP2PLibVersion(deviceid, p2pLibVersion, count);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -215,14 +215,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f467.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f467.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_270c.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_270c.png"
|
||||
|
|
@ -407,14 +407,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f630.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f630.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f627.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f627.png"
|
||||
|
|
|
|||
|
|
@ -63,14 +63,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_lock.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_lock.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_backward_white.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_backward_white.png"
|
||||
|
|
|
|||
|
|
@ -307,14 +307,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_delete.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_delete.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_backward.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_backward.png"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:43 CST 2019
|
||||
#Wed Sep 25 20:05:17 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f61a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f61a.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_image_selected_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_image_selected_item.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f420.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f420.png
|
||||
|
|
@ -14,9 +14,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_ic_loading_white.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_ic_loading_white.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_user_info_male.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_user_info_male.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_account_setting.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_account_setting.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_feed_item_like_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_feed_item_like_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_share.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_share.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_comment_reply_stub.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_comment_reply_stub.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_feed_item_like_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_feed_item_like_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_title.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_title.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_rounded_corner_backgroud.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_rounded_corner_backgroud.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f487.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f487.png
|
||||
|
|
@ -81,8 +81,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_more_dialog_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_more_dialog_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_album.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_album.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44e.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44e.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_retangle.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_retangle.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_user_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_user_n.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\xiangji.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\xiangji.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_feeds_activity.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_feeds_activity.xml
|
||||
|
|
@ -161,9 +161,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f693.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f693.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_topic_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_topic_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f63d.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f63d.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f608.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f608.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f443.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f443.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_fragment_title.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_fragment_title.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f443.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f443.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f608.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f608.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\xianghu.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\xianghu.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_photo_pick_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_photo_pick_bt.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_comment_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_comment_p.png
|
||||
|
|
@ -257,8 +257,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_recommend.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_recommend.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_topic_detail_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_topic_detail_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_item_bg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_item_bg.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_item.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_login_btnbg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_login_btnbg.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_item.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44c.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44c.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f417.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f417.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_at_friend_pressed.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_at_friend_pressed.png
|
||||
|
|
@ -307,8 +307,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_base_loading_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_base_loading_view.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_color_ff_bg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_color_ff_bg.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_activity.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_search_activity.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44f.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44f.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_setting.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_setting.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44f.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44f.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f49b.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f49b.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_at_friend_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_at_friend_bt.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f466.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f466.png
|
||||
|
|
@ -503,9 +503,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f418.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f418.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f629.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f629.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png
|
||||
|
|
@ -518,10 +518,10 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_report_reply_comment_dialog.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_report_reply_comment_dialog.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_chat_input_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_chat_input_view.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\kuangh.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\kuangh.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_emoji_btn_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_emoji_btn_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_comment_main_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_comment_main_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f636.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f636.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_emoji_btn_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_emoji_btn_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f471.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f471.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_n.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f682.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f682.png
|
||||
|
|
@ -604,8 +604,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_xiaolian.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_xiaolian.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f614.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f614.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_received_comment_triangle.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_received_comment_triangle.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_topic_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_topic_bt.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f60a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f60a.png
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:40 CST 2019
|
||||
#Wed Sep 25 20:05:16 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_camera.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_search_header_view.xml
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:41 CST 2019
|
||||
#Wed Sep 25 20:05:17 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_header_view.xml
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:27 CST 2019
|
||||
#Wed Sep 25 20:05:08 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_search_header_view.xml
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -211,14 +211,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_title_tab_right_pressed.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_title_tab_right_pressed.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_light_bar_bg.9.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_light_bar_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sidebar_selector.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sidebar_selector.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_light_bar_bg.9.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_light_bar_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_button_red_blue.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_red_blue.xml"
|
||||
|
|
@ -243,14 +243,14 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_send_background.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_send_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_window_shadow_pad.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_window_shadow_pad.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_evernote_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_evernote_gray.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_window_shadow_pad.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_window_shadow_pad.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_pocket_gray.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_pocket_gray.png"
|
||||
|
|
@ -411,6 +411,10 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_follow_check.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_follow_check.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_douban_on.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_douban_on.png"
|
||||
|
|
@ -419,10 +423,6 @@
|
|||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_location_off.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_location_off.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_google.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_google.png"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:44 CST 2019
|
||||
#Wed Sep 25 20:05:18 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_fetch_image.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_fetch_image.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_ynote.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_ynote.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png
|
||||
|
|
@ -148,8 +148,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
|
|||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxhdpi-v4\\messenger_bubble_large_white.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\messenger_bubble_large_white.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_line.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_line.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_qzone_on.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_qzone_on.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\messenger_button_send_blue_large.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\messenger_button_send_blue_large.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_laiwang.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_laiwang.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\messenger_button_send_blue_large.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\messenger_button_send_blue_large.xml
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sina_off.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sina_off.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_linkedin.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_linkedin.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\wechat_fav.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\wechat_fav.png
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:43 CST 2019
|
||||
#Wed Sep 25 20:05:18 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_normal.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_white.9.png
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#Tue Sep 24 20:44:28 CST 2019
|
||||
#Wed Sep 25 20:05:08 CST 2019
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_at_normal.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
|
||||
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_button_white.9.png
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue