diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin index ce2680b49..eb6a142b6 100644 Binary files a/.gradle/3.3/taskArtifacts/fileHashes.bin and b/.gradle/3.3/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin index 0541475ef..e93e6c28d 100644 Binary files a/.gradle/3.3/taskArtifacts/fileSnapshots.bin and b/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin index b52b385e4..13a2fb9f4 100644 Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.bin and b/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock index a35236d7b..f51c0e988 100644 Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index a4c413f1c..a9677d511 100644 Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 759959b45..345f98068 100644 Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 6f763fdfc..bf7e202a9 100644 Binary files a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index a7b805f86..dc9db50db 100644 Binary files a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 6213a2902..ec1f40388 100644 Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 13d54089d..edba6e3e1 100644 Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index ac5b582f5..20f2dddbe 100644 Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 55c83084e..81218adb5 100644 Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 38c7158ac..21aa5ed2f 100644 Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin index 41e078396..12881da71 100644 Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index ec32837ad..47821d651 100644 Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.idea/libraries/firebase_common_9_0_0.xml b/.idea/libraries/firebase_common_9_0_0.xml deleted file mode 100644 index 6e48a5af2..000000000 --- a/.idea/libraries/firebase_common_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/p2p_core_0_4_4_9.xml b/.idea/libraries/p2p_core_0_4_4_9.xml deleted file mode 100644 index 406937a31..000000000 --- a/.idea/libraries/p2p_core_0_4_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/p2p_core_release_.xml b/.idea/libraries/p2p_core_release_.xml index 2d1a5f94d..f59ec444e 100644 --- a/.idea/libraries/p2p_core_release_.xml +++ b/.idea/libraries/p2p_core_release_.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/pano_release_.xml b/.idea/libraries/pano_release_.xml new file mode 100644 index 000000000..74209f2f7 --- /dev/null +++ b/.idea/libraries/pano_release_.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_analytics_9_0_0.xml b/.idea/libraries/play_services_analytics_9_0_0.xml deleted file mode 100644 index 53ed629ef..000000000 --- a/.idea/libraries/play_services_analytics_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_analytics_impl_9_0_0.xml b/.idea/libraries/play_services_analytics_impl_9_0_0.xml deleted file mode 100644 index f16adf22f..000000000 --- a/.idea/libraries/play_services_analytics_impl_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_base_9_0_0.xml b/.idea/libraries/play_services_base_9_0_0.xml deleted file mode 100644 index 8c50a0286..000000000 --- a/.idea/libraries/play_services_base_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_basement_9_0_0.xml b/.idea/libraries/play_services_basement_9_0_0.xml deleted file mode 100644 index 218d18a86..000000000 --- a/.idea/libraries/play_services_basement_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_tasks_9_0_0.xml b/.idea/libraries/play_services_tasks_9_0_0.xml deleted file mode 100644 index aae61ea16..000000000 --- a/.idea/libraries/play_services_tasks_9_0_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78d4765df..9d62365af 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,9 +11,8 @@ - @@ -21,27 +20,15 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -54,19 +41,18 @@ - + + - - @@ -75,35 +61,177 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - @@ -140,106 +268,27 @@ - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -563,6 +612,11 @@ @@ -5698,7 +5757,6 @@ - @@ -5707,102 +5765,6 @@ + @@ -5983,7 +5790,7 @@ - + @@ -6348,18 +6155,18 @@ - - + + - + - - - + + + @@ -6370,8 +6177,8 @@ - + @@ -6404,15 +6211,105 @@ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java - 25 + 95 - + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java + 103 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 22 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 28 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 34 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 40 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 46 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 52 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 58 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 77 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 86 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 95 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 192 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 202 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 210 + + + + file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java + 218 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6619,13 +6432,6 @@ - - - - - - - @@ -6640,26 +6446,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -6734,15 +6520,6 @@ - - - - - - - - - @@ -6750,7 +6527,6 @@ - @@ -6758,10 +6534,6 @@ - - - - @@ -6769,7 +6541,6 @@ - @@ -6777,9 +6548,6 @@ - - - @@ -6787,17 +6555,6 @@ - - - - - - - - - - - @@ -6809,10 +6566,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6822,86 +6737,24 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index e49110dd1..7d5d15f42 100644 --- a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Sep 21 15:03:09 CST 2019 +#Tue Sep 24 20:44:20 CST 2019 diff --git a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index e49110dd1..627da72fc 100644 --- a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Sep 21 15:03:09 CST 2019 +#Tue Sep 24 20:44:19 CST 2019 diff --git a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index 537497356..2d29f1364 100644 --- a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Sep 21 15:03:11 CST 2019 +#Tue Sep 24 20:44:26 CST 2019 diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar index d01cccfb7..cbd2e3773 100644 Binary files a/BageView/build/outputs/aar/BageView-debug.aar and b/BageView/build/outputs/aar/BageView-debug.aar differ diff --git a/BageView/build/outputs/aar/BageView-release.aar b/BageView/build/outputs/aar/BageView-release.aar index 98b7ac97c..8ea37f964 100644 Binary files a/BageView/build/outputs/aar/BageView-release.aar and b/BageView/build/outputs/aar/BageView-release.aar differ diff --git a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json index 806a9ef62..678bfee93 100644 --- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json +++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json @@ -139,14 +139,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png", - "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png", + "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png" diff --git a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json index 897d2f33b..23d900e31 100644 --- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json +++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json @@ -219,14 +219,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png", "source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png", - "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png", + "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png" diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index f4c995382..672189cf9 100644 --- a/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 21 15:03:11 CST 2019 +#Tue Sep 24 20:44:25 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 @@ -26,8 +26,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_pressed_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_pressed_holo_dark.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_pressed_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_pressed_holo_dark.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_pressed_holo_light.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_secondary_text_material_dark.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_secondary_text_material_dark.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png @@ -101,8 +101,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_enlarge.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_enlarge.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_seekbar_track_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_seekbar_track_material.xml -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\select_dialog_item_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\select_dialog_item_material.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_title_bg.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_title_bg.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png @@ -111,10 +111,10 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout-v16\\notification_template_custom_big.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout-v16\\notification_template_custom_big.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\notification_bg_normal_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notification_bg_normal_pressed.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ic_voice_search_api_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_ic_voice_search_api_material.xml -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_action_bar_view_list_nav_layout.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_action_bar_view_list_nav_layout.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png @@ -140,11 +140,11 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_popup_menu_header_item_layout.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_popup_menu_header_item_layout.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_cab_background_top_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_cab_background_top_material.xml -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_longpressed_holo.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_longpressed_holo.9.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_longpressed_holo.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_longpressed_holo.9.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_normal.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_seek_thumb_normal.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_menu_hardkey_panel_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\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png @@ -211,8 +211,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_divider_mtrl_alpha.9.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\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_normal.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-v21\\notification_action_background.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-v21\\notification_action_background.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_borderless_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_btn_borderless_material.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-v21\\notification_action_background.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-v21\\notification_action_background.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\anim\\abc_fade_out.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\anim\\abc_fade_out.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_layout_standard.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\jc_layout_standard.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_dialog_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_dialog_progress.xml @@ -228,10 +228,10 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_btn_checkable.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_btn_checkable.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_check_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_btn_check_material.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-mdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-mdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\switch_thumb_material_light.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\switch_thumb_material_light.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png @@ -314,8 +314,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_volume_progress_bg.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_volume_progress_bg.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\support_simple_spinner_dropdown_item.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\support_simple_spinner_dropdown_item.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_focused_holo.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_focused_holo.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_seekbar_thumb_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_seekbar_thumb_material.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-xhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png @@ -331,8 +331,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_loading_bg.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_loading_bg.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_error_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_error_normal.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_ratingbar_indicator_material.xml @@ -364,8 +364,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_black_48dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\notification_tile_bg.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\notification_tile_bg.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_textfield_default_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout-v11\\notification_media_action.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout-v11\\notification_media_action.xml @@ -379,14 +379,14 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout-v11\\notification_media_cancel_action.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout-v11\\notification_media_cancel_action.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png -C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_close_volume.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_close_volume.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_tint_seek_thumb.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_tint_seek_thumb.xml +C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_close_volume.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_close_volume.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_half_black_36dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_default.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_default.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_list_pressed_holo_light.9.png @@ -398,13 +398,13 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_primary_text_material_dark.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_primary_text_material_dark.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_default_mtrl_shape.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_btn_default_mtrl_shape.xml -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_half_black_16dp.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_expanded_menu_layout.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_expanded_menu_layout.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_bg.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_bottom_bg.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\notification_bg_low_normal.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notification_bg_low_normal.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_alert_dialog_title_material.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_alert_dialog_title_material.xml +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.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\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\notification_template_media.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\notification_template_media.xml diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 4a9799d18..37202764e 100644 --- a/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 21 15:03:10 CST 2019 +#Tue Sep 24 20:44:22 CST 2019 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png diff --git a/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index 28760475d..6dcf69957 100644 --- a/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/JCVideo_Library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 21 15:03:10 CST 2019 +#Tue Sep 24 20:44:23 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\\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_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\\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 diff --git a/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index 9edf095fd..48f9da97f 100644 --- a/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/JCVideo_Library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 21 15:03:11 CST 2019 +#Tue Sep 24 20:44:26 CST 2019 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar index 36757804a..75e8d7951 100644 Binary files a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar and b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar differ diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar index 08a331584..eb9fec434 100644 Binary files a/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar and b/JCVideo_Library/build/outputs/aar/JCVideo_Library-release.aar differ diff --git a/build/android-profile/profile-2019-09-21-15-06-06-362.rawproto b/build/android-profile/profile-2019-09-21-15-06-06-362.rawproto new file mode 100644 index 000000000..51e4854cf Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-06-06-362.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-06-15-616.rawproto b/build/android-profile/profile-2019-09-21-15-06-15-616.rawproto new file mode 100644 index 000000000..1ace11633 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-06-15-616.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-07-20-953.rawproto b/build/android-profile/profile-2019-09-21-15-07-20-953.rawproto new file mode 100644 index 000000000..663abd611 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-07-20-953.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-07-23-939.rawproto b/build/android-profile/profile-2019-09-21-15-07-23-939.rawproto new file mode 100644 index 000000000..6658ba8e8 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-07-23-939.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-08-08-066.rawproto b/build/android-profile/profile-2019-09-21-15-08-08-066.rawproto new file mode 100644 index 000000000..1b59f73da Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-08-08-066.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-15-05-516.rawproto b/build/android-profile/profile-2019-09-21-15-15-05-516.rawproto new file mode 100644 index 000000000..69bb3dd10 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-15-05-516.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-16-40-650.rawproto b/build/android-profile/profile-2019-09-21-15-16-40-650.rawproto new file mode 100644 index 000000000..dd0742979 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-16-40-650.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-27-18-680.rawproto b/build/android-profile/profile-2019-09-21-15-27-18-680.rawproto new file mode 100644 index 000000000..4cf132f73 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-27-18-680.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-27-21-045.rawproto b/build/android-profile/profile-2019-09-21-15-27-21-045.rawproto new file mode 100644 index 000000000..3d3d631dd Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-27-21-045.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-54-08-712.rawproto b/build/android-profile/profile-2019-09-21-15-54-08-712.rawproto new file mode 100644 index 000000000..ff694749d Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-54-08-712.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-15-54-16-679.rawproto b/build/android-profile/profile-2019-09-21-15-54-16-679.rawproto new file mode 100644 index 000000000..84806c98a Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-54-16-679.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-07-21-563.rawproto b/build/android-profile/profile-2019-09-21-16-07-21-563.rawproto new file mode 100644 index 000000000..d76c851c3 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-07-21-563.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-07-24-873.rawproto b/build/android-profile/profile-2019-09-21-16-07-24-873.rawproto new file mode 100644 index 000000000..5f921f275 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-07-24-873.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-23-41-476.rawproto b/build/android-profile/profile-2019-09-21-16-23-41-476.rawproto new file mode 100644 index 000000000..8e0320497 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-23-41-476.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-26-07-991.rawproto b/build/android-profile/profile-2019-09-21-16-26-07-991.rawproto new file mode 100644 index 000000000..302ae59fb Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-26-07-991.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-48-35-958.rawproto b/build/android-profile/profile-2019-09-21-16-48-35-958.rawproto new file mode 100644 index 000000000..4c3390353 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-48-35-958.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-49-40-629.rawproto b/build/android-profile/profile-2019-09-21-16-49-40-629.rawproto new file mode 100644 index 000000000..8406356d4 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-49-40-629.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-52-23-886.rawproto b/build/android-profile/profile-2019-09-21-16-52-23-886.rawproto new file mode 100644 index 000000000..7f0d9b9ec Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-52-23-886.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-16-55-01-189.rawproto b/build/android-profile/profile-2019-09-21-16-55-01-189.rawproto new file mode 100644 index 000000000..22e7096f1 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-16-55-01-189.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-10-42-994.rawproto b/build/android-profile/profile-2019-09-21-17-10-42-994.rawproto new file mode 100644 index 000000000..d5e73ee73 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-10-42-994.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-10-47-686.rawproto b/build/android-profile/profile-2019-09-21-17-10-47-686.rawproto new file mode 100644 index 000000000..9c51cecc7 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-10-47-686.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-48-26-692.rawproto b/build/android-profile/profile-2019-09-21-17-48-26-692.rawproto new file mode 100644 index 000000000..fc29a3e2d Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-48-26-692.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-51-34-540.rawproto b/build/android-profile/profile-2019-09-21-17-51-34-540.rawproto new file mode 100644 index 000000000..c39e0e159 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-51-34-540.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-58-06-013.rawproto b/build/android-profile/profile-2019-09-21-17-58-06-013.rawproto new file mode 100644 index 000000000..6eb69f19e Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-58-06-013.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-58-38-392.rawproto b/build/android-profile/profile-2019-09-21-17-58-38-392.rawproto new file mode 100644 index 000000000..f198017ac Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-58-38-392.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-17-59-06-880.rawproto b/build/android-profile/profile-2019-09-21-17-59-06-880.rawproto new file mode 100644 index 000000000..2d9e08b8c Binary files /dev/null and b/build/android-profile/profile-2019-09-21-17-59-06-880.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-16-08-343.rawproto b/build/android-profile/profile-2019-09-21-18-16-08-343.rawproto new file mode 100644 index 000000000..567a99bad Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-16-08-343.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-16-10-900.rawproto b/build/android-profile/profile-2019-09-21-18-16-10-900.rawproto new file mode 100644 index 000000000..1200adccd Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-16-10-900.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-16-52-299.rawproto b/build/android-profile/profile-2019-09-21-18-16-52-299.rawproto new file mode 100644 index 000000000..eccc5015c Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-16-52-299.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-20-44-565.rawproto b/build/android-profile/profile-2019-09-21-18-20-44-565.rawproto new file mode 100644 index 000000000..11fc104bd Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-20-44-565.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-28-51-983.rawproto b/build/android-profile/profile-2019-09-21-18-28-51-983.rawproto new file mode 100644 index 000000000..89be8d621 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-28-51-983.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-33-09-161.rawproto b/build/android-profile/profile-2019-09-21-18-33-09-161.rawproto new file mode 100644 index 000000000..116c599be Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-33-09-161.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-33-10-588.rawproto b/build/android-profile/profile-2019-09-21-18-33-10-588.rawproto new file mode 100644 index 000000000..8fefea101 Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-33-10-588.rawproto differ diff --git a/build/android-profile/profile-2019-09-21-18-41-19-631.rawproto b/build/android-profile/profile-2019-09-21-18-41-19-631.rawproto new file mode 100644 index 000000000..7b2616cab Binary files /dev/null and b/build/android-profile/profile-2019-09-21-18-41-19-631.rawproto differ diff --git a/build/android-profile/profile-2019-09-24-19-50-51-369.rawproto b/build/android-profile/profile-2019-09-24-19-50-51-369.rawproto new file mode 100644 index 000000000..966a16845 Binary files /dev/null and b/build/android-profile/profile-2019-09-24-19-50-51-369.rawproto differ diff --git a/build/android-profile/profile-2019-09-24-19-51-14-159.rawproto b/build/android-profile/profile-2019-09-24-19-51-14-159.rawproto new file mode 100644 index 000000000..47dcc0b12 Binary files /dev/null and b/build/android-profile/profile-2019-09-24-19-51-14-159.rawproto differ diff --git a/build/android-profile/profile-2019-09-24-19-53-50-971.rawproto b/build/android-profile/profile-2019-09-24-19-53-50-971.rawproto new file mode 100644 index 000000000..88dede0df Binary files /dev/null and b/build/android-profile/profile-2019-09-24-19-53-50-971.rawproto differ diff --git a/build/android-profile/profile-2019-09-24-20-01-02-901.rawproto b/build/android-profile/profile-2019-09-24-20-01-02-901.rawproto new file mode 100644 index 000000000..8f68044ca Binary files /dev/null and b/build/android-profile/profile-2019-09-24-20-01-02-901.rawproto differ diff --git a/build/android-profile/profile-2019-09-24-20-44-01-335.rawproto b/build/android-profile/profile-2019-09-24-20-44-01-335.rawproto new file mode 100644 index 000000000..dd5079527 Binary files /dev/null and b/build/android-profile/profile-2019-09-24-20-44-01-335.rawproto differ diff --git a/build/intermediates/jack-cache/cache.xml b/build/intermediates/jack-cache/cache.xml index c5c33bd8d..410f97b18 100644 --- a/build/intermediates/jack-cache/cache.xml +++ b/build/intermediates/jack-cache/cache.xml @@ -2,88 +2,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sha1="db7b11f0b78751aa4718b8de83b1e2a7ed908865"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sha1="b5b9e13580c0df1c02a870d78e5998230644fe51"> + - - - - - - - - - - - - - - - - - - - - - - + sha1="150252b33b00274cc868578ade018fda0d43a3eb"> + - + sha1="efb8cb62d47d157c29d1521daac7eefd4cb881ee"> + - + sha1="a9afca2de7820da004003340f184ba644be2f174"> + - + sha1="a8762d07e76cfde2395257a5da47ba7c1dbd3dce"> + - + sha1="a6b324c544ba7f20cdbe17e2c266d5d44ee83d6a"> + - + sha1="7a15d5a813be64fd9fd1f1a46e8b8775e7f93c01"> + - + sha1="d7b70793524976906c2cda028d2160642ede51e2"> + - + sha1="5f1feb4976f79b0cb8268f7883c20f969a56668f"> + - + sha1="49061961b11c40ba0951119b2ee519a4579dda0b"> + - - - - - - - + sha1="f3ae2e2564a828d14f08a7768d08f563bbffd273"> + - + sha1="54a972c6f0b96724f0f1475cbfc1daefbf01122d"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 560e76744..d515f5af3 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -132,7 +132,7 @@ dependencies { compile(name: 'alicloud-android-third-push-3.0.6', ext: 'aar') // compile 'com.p2p.core:p2p-core:0.4.4.9' compile(name: 'p2p-core-release', ext: 'aar') -// compile(name: 'pano-release', ext: 'aar') + compile(name: 'pano-release', ext: 'aar') compile 'com.libhttp:libhttp:v0.5.5' //声波配网库 compile 'com.github.jwkj:SoundWaveSender:v2.0.2' diff --git a/iFish7/build/generated/source/r/debug/com/gwell/pano/R.java b/iFish7/build/generated/source/r/debug/com/gwell/pano/R.java new file mode 100644 index 000000000..e5a639726 --- /dev/null +++ b/iFish7/build/generated/source/r/debug/com/gwell/pano/R.java @@ -0,0 +1,13 @@ +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This class was automatically generated by the + * gradle plugin from the resource data it found. It + * should not be modified by hand. + */ +package com.gwell.pano; + +public final class R { + public static final class string { + public static final int app_name = 0x7f0800c9; + } +} diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json index 54499306b..6114e0a21 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json +++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json @@ -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_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\\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\\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" @@ -219,14 +219,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\messenger_bubble_large_white.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\messenger_bubble_large_white.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_fishdoctor.jpg", - "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_fishdoctor.jpg" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\banner_fishdoctor.jpg", + "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\banner_fishdoctor.jpg" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\messenger_bubble_small_blue.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\messenger_bubble_small_blue.png" @@ -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\\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" + }, + { + "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" } ] \ No newline at end of file diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json index 5a71d5b26..69a0315f7 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json +++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-hdpi.json @@ -1227,14 +1227,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_addphoto.png", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_addphoto.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\goldcoupon_bg.png", - "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\goldcoupon_bg.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\goldcoupon_bg.png", + "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\goldcoupon_bg.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_lookat_shopcar.png", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lookat_shopcar.png" diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json index eab6e2566..a63bdf2ed 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json +++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json @@ -51,14 +51,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\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\\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_scrubber_control_to_pressed_mtrl_000.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png" diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json index 07b7e57a3..d56a80799 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json +++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json @@ -155,26 +155,26 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\design_ic_visibility.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\drawable-xxxhdpi-v4\\design_ic_visibility.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_p.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png" diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable.json b/iFish7/build/intermediates/blame/res/debug/single/drawable.json index bafee0287..d0e9823c7 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/drawable.json +++ b/iFish7/build/intermediates/blame/res/debug/single/drawable.json @@ -15,14 +15,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_flickr.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_flickr.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_topic_selector.xml", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_topic_selector.xml" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sina_off.png", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_sina_off.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_topic_selector.xml", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_topic_selector.xml" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ic_menu_overflow_material.xml", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ic_menu_overflow_material.xml" @@ -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\\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\\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_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_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_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_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\\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\\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\\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" @@ -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\\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\\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\\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_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\\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\\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\\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_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\\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\\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\\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_comm_send_bt.xml", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_send_bt.xml" @@ -1299,14 +1299,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\yuanjiao.xml", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\yuanjiao.xml" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_press_shape.xml", - "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_press_shape.xml" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_bottom_bg.9.png", "source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_bg.9.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_press_shape.xml", + "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_press_shape.xml" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml" @@ -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\\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\\look_buy_bt_shape.xml", + "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_buy_bt_shape.xml" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_xiaolian.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_xiaolian.png" @@ -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\\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\\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\\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\\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\\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_title_tab_left_normal.png", "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_normal.png" @@ -1659,26 +1659,26 @@ "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\\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\\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_comm_cancel_bt.xml", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_cancel_bt.xml" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_yixin_gray.png", - "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_yixin_gray.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_twitter.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_twitter.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_yixin_gray.png", + "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_yixin_gray.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_btn_colored_material.xml" diff --git a/iFish7/build/intermediates/blame/res/debug/single/mipmap-hdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/mipmap-hdpi-v4.json index cdc1d337a..531938df5 100644 --- a/iFish7/build/intermediates/blame/res/debug/single/mipmap-hdpi-v4.json +++ b/iFish7/build/intermediates/blame/res/debug/single/mipmap-hdpi-v4.json @@ -1,12 +1,12 @@ [ - { - "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_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_loading09.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading09.png" diff --git a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index 749c31cf3..396444c70 100644 --- a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Sep 21 15:03:18 CST 2019 +#Tue Sep 24 20:44:39 CST 2019 diff --git a/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 55ba1dd4a..2b4a923c5 100644 --- a/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/iFish7/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 21 15:03:16 CST 2019 +#Tue Sep 24 20:44:35 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_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\\layout\\umeng_comm_topic_recommend.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_topic_recommend.xml C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f428.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f428.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_play_selector.xml C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\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\:\\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\:\\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\\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 diff --git a/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml b/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml index 2cbcafdfa..6b50aef7f 100644 --- a/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -UDPSenderLibSoundWaveLibhttpP2P-Corehuawei-xiaomi-push-support-aarpush sdk