diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin index 137614836..09ec4a3c7 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 0c8bdb7ba..d94109c9b 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 f98dd6a7e..91948e321 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 8cf5b1bf1..bbacf2299 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_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 31d8b3eeb..1706044fe 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 e046388a6..2b79bab51 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_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 1c6ce7167..97198ff95 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 bfb0de544..7aef71e3c 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/.idea/workspace.xml b/.idea/workspace.xml index 021c25f16..10dd87cab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,9 +11,9 @@ - @@ -21,10 +21,6 @@ - - - - @@ -33,20 +29,42 @@ - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -80,51 +98,51 @@ - - - - - - - - - - - - + + - - + + - - + + - + + + + + + + + + + + - - + + - - + + - - + + @@ -133,18 +151,8 @@ - - - - - - - - - - - - + + @@ -5548,23 +5556,23 @@ @@ -5618,11 +5626,6 @@ - - - - - @@ -5655,9 +5658,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5665,7 +5797,7 @@ - + @@ -6034,12 +6166,13 @@ - + - + + @@ -6052,7 +6185,7 @@ - + @@ -6066,7 +6199,6 @@ - @@ -6083,108 +6215,10 @@ - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java - 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 - 23 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 29 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 35 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 41 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 47 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 53 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 59 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 78 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 87 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 96 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 193 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 203 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 211 - - - - file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java - 219 - - - - @@ -6238,110 +6272,15 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6349,13 +6288,6 @@ - - - - - - - @@ -6384,13 +6316,6 @@ - - - - - - - @@ -6508,14 +6433,14 @@ + + + - - - @@ -6526,39 +6451,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -6583,7 +6481,7 @@ - + @@ -6591,7 +6489,7 @@ - + @@ -6599,40 +6497,191 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index 1a09c67e6..c1717256a 100644 --- a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Wed Sep 25 20:05:04 CST 2019 +#Thu Sep 26 17:50:48 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 1a09c67e6..c1717256a 100644 --- a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Wed Sep 25 20:05:04 CST 2019 +#Thu Sep 26 17:50:48 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 4ebb77f8b..2d8a09da0 100644 --- a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1 +1 @@ -#Wed Sep 25 20:05:07 CST 2019 +#Thu Sep 26 17:50:50 CST 2019 diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar index c87d5e8e7..92318066f 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 0926fbba8..588a65652 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 678bfee93..806a9ef62 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_menu_paste_mtrl_am_alpha.png", - "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png", + "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png", "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png" 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 5144ab138..880ac17aa 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 @@ -#Wed Sep 25 20:05:06 CST 2019 +#Thu Sep 26 17:50:49 CST 2019 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png @@ -115,8 +115,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\layout\\abc_action_bar_view_list_nav_layout.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_action_bar_view_list_nav_layout.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_low_pressed.9.png -C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png +C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png 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 d4822ea16..aa93cb2fc 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 @@ -#Wed Sep 25 20:05:05 CST 2019 +#Thu Sep 26 17:50:49 CST 2019 C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png 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 5e94b44b3..2a7f9cb85 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 @@ -#Wed Sep 25 20:05:06 CST 2019 +#Thu Sep 26 17:50:49 CST 2019 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_play_selector.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml @@ -10,8 +10,8 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_dialog_ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_title_bg.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_title_bg.9.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_add_volume.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_add_volume.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_progress.xml -C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_normal.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\quit_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\quit_fullscreen.xml +C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_normal.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_pressed.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_dialog_volume.xml 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 f35eca353..68df61ce5 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 @@ -#Wed Sep 25 20:05:07 CST 2019 +#Thu Sep 26 17:50:50 CST 2019 C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar index 83f65e8ef..facd08e92 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 84306e08c..aa50152b9 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-26-14-24-23-248.rawproto b/build/android-profile/profile-2019-09-26-14-24-23-248.rawproto new file mode 100644 index 000000000..383c9dc66 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-14-24-23-248.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-14-24-28-809.rawproto b/build/android-profile/profile-2019-09-26-14-24-28-809.rawproto new file mode 100644 index 000000000..ce01fbb94 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-14-24-28-809.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-12-31-513.rawproto b/build/android-profile/profile-2019-09-26-15-12-31-513.rawproto new file mode 100644 index 000000000..a562e8055 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-12-31-513.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-40-38-969.rawproto b/build/android-profile/profile-2019-09-26-15-40-38-969.rawproto new file mode 100644 index 000000000..5d3f29012 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-40-38-969.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-44-24-026.rawproto b/build/android-profile/profile-2019-09-26-15-44-24-026.rawproto new file mode 100644 index 000000000..0f3f14b1e Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-44-24-026.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-48-59-950.rawproto b/build/android-profile/profile-2019-09-26-15-48-59-950.rawproto new file mode 100644 index 000000000..09e3f74c1 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-48-59-950.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-51-44-913.rawproto b/build/android-profile/profile-2019-09-26-15-51-44-913.rawproto new file mode 100644 index 000000000..e4efc545a Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-51-44-913.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-57-27-640.rawproto b/build/android-profile/profile-2019-09-26-15-57-27-640.rawproto new file mode 100644 index 000000000..82b7f077f Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-57-27-640.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-15-59-45-621.rawproto b/build/android-profile/profile-2019-09-26-15-59-45-621.rawproto new file mode 100644 index 000000000..43ff998f7 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-15-59-45-621.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-01-19-611.rawproto b/build/android-profile/profile-2019-09-26-16-01-19-611.rawproto new file mode 100644 index 000000000..becaec37c Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-01-19-611.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-03-51-257.rawproto b/build/android-profile/profile-2019-09-26-16-03-51-257.rawproto new file mode 100644 index 000000000..d02a02a7f Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-03-51-257.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-07-26-472.rawproto b/build/android-profile/profile-2019-09-26-16-07-26-472.rawproto new file mode 100644 index 000000000..da4d7e6e1 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-07-26-472.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-11-56-394.rawproto b/build/android-profile/profile-2019-09-26-16-11-56-394.rawproto new file mode 100644 index 000000000..305b26054 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-11-56-394.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-15-08-939.rawproto b/build/android-profile/profile-2019-09-26-16-15-08-939.rawproto new file mode 100644 index 000000000..6e4be5246 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-15-08-939.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-17-53-293.rawproto b/build/android-profile/profile-2019-09-26-16-17-53-293.rawproto new file mode 100644 index 000000000..36a207ab2 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-17-53-293.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-21-26-829.rawproto b/build/android-profile/profile-2019-09-26-16-21-26-829.rawproto new file mode 100644 index 000000000..f214dbe04 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-21-26-829.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-24-41-156.rawproto b/build/android-profile/profile-2019-09-26-16-24-41-156.rawproto new file mode 100644 index 000000000..9b2d3c9d3 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-24-41-156.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-27-45-601.rawproto b/build/android-profile/profile-2019-09-26-16-27-45-601.rawproto new file mode 100644 index 000000000..16fbcc467 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-27-45-601.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-30-07-891.rawproto b/build/android-profile/profile-2019-09-26-16-30-07-891.rawproto new file mode 100644 index 000000000..b93c12713 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-30-07-891.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-31-29-325.rawproto b/build/android-profile/profile-2019-09-26-16-31-29-325.rawproto new file mode 100644 index 000000000..9c7ce2bc1 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-31-29-325.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-32-52-502.rawproto b/build/android-profile/profile-2019-09-26-16-32-52-502.rawproto new file mode 100644 index 000000000..9eb191a0b Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-32-52-502.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-34-17-972.rawproto b/build/android-profile/profile-2019-09-26-16-34-17-972.rawproto new file mode 100644 index 000000000..e2d151a20 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-34-17-972.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-37-17-557.rawproto b/build/android-profile/profile-2019-09-26-16-37-17-557.rawproto new file mode 100644 index 000000000..a5ba90e7d Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-37-17-557.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-39-08-362.rawproto b/build/android-profile/profile-2019-09-26-16-39-08-362.rawproto new file mode 100644 index 000000000..7e917bee9 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-39-08-362.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-41-08-270.rawproto b/build/android-profile/profile-2019-09-26-16-41-08-270.rawproto new file mode 100644 index 000000000..482e6a8a7 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-41-08-270.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-42-30-949.rawproto b/build/android-profile/profile-2019-09-26-16-42-30-949.rawproto new file mode 100644 index 000000000..46f6fb361 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-42-30-949.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-45-52-319.rawproto b/build/android-profile/profile-2019-09-26-16-45-52-319.rawproto new file mode 100644 index 000000000..d2a076a9e Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-45-52-319.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-47-30-695.rawproto b/build/android-profile/profile-2019-09-26-16-47-30-695.rawproto new file mode 100644 index 000000000..55fe1f8cf Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-47-30-695.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-48-32-095.rawproto b/build/android-profile/profile-2019-09-26-16-48-32-095.rawproto new file mode 100644 index 000000000..c391f995a Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-48-32-095.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-50-23-150.rawproto b/build/android-profile/profile-2019-09-26-16-50-23-150.rawproto new file mode 100644 index 000000000..27680b5a2 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-50-23-150.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-55-55-864.rawproto b/build/android-profile/profile-2019-09-26-16-55-55-864.rawproto new file mode 100644 index 000000000..7fb32b187 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-55-55-864.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-57-20-750.rawproto b/build/android-profile/profile-2019-09-26-16-57-20-750.rawproto new file mode 100644 index 000000000..2e4dc5ab9 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-57-20-750.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-16-58-54-208.rawproto b/build/android-profile/profile-2019-09-26-16-58-54-208.rawproto new file mode 100644 index 000000000..0046a2b61 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-16-58-54-208.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-17-04-49-357.rawproto b/build/android-profile/profile-2019-09-26-17-04-49-357.rawproto new file mode 100644 index 000000000..077e1016e Binary files /dev/null and b/build/android-profile/profile-2019-09-26-17-04-49-357.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-17-12-10-021.rawproto b/build/android-profile/profile-2019-09-26-17-12-10-021.rawproto new file mode 100644 index 000000000..ce06b2426 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-17-12-10-021.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-17-45-43-248.rawproto b/build/android-profile/profile-2019-09-26-17-45-43-248.rawproto new file mode 100644 index 000000000..60f756726 Binary files /dev/null and b/build/android-profile/profile-2019-09-26-17-45-43-248.rawproto differ diff --git a/build/android-profile/profile-2019-09-26-17-50-44-089.rawproto b/build/android-profile/profile-2019-09-26-17-50-44-089.rawproto new file mode 100644 index 000000000..40ffaaa9f Binary files /dev/null and b/build/android-profile/profile-2019-09-26-17-50-44-089.rawproto differ diff --git a/build/intermediates/jack-cache/cache.xml b/build/intermediates/jack-cache/cache.xml index 8bb1dd904..4af396699 100644 --- a/build/intermediates/jack-cache/cache.xml +++ b/build/intermediates/jack-cache/cache.xml @@ -151,6 +151,12 @@ sha1="dace4ae4c64a1c4637b8d48dd7f266fb80e98475"> + + + + + + 100) { + if (e.getY() == 499) { + tvContent.setText("正常"); + } else if (e.getY() == 0) { + tvContent.setText("无水"); + } else if (e.getY() > 100) { tvContent.setText(format.format(e.getY())); } else { tvContent.setText(e.getY() + ""); @@ -836,7 +846,7 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR leftYAxis.setGranularity(1f); leftYAxis.setAxisMaximum(35); leftYAxis.setAxisMinimum(25); - rightYaxis.setLabelCount(3, true); + rightYaxis.setLabelCount(6, true); rightYaxis.setGranularity(1f); // int miny = 999999999; // int maxy = 0; @@ -854,12 +864,12 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR // miny = miny - 50; // maxy = maxy + 50; rightYaxis.setAxisMinimum(0); - rightYaxis.setAxisMaximum(2495); + rightYaxis.setAxisMaximum(2500); rightYaxis.setValueFormatter(new IAxisValueFormatter() { @Override public String getFormattedValue(float v, AxisBase axisBase) { int IValue = (int) v; - if (IValue == 499) { + if (IValue == 500) { return "正常"; } else if (IValue == 0) { return "无水"; @@ -945,15 +955,10 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR * @param color 曲线颜色 */ public void showLineChart2(List dataList, String name, int color) { -// for (ChangeHot.Phs phs : dataList) { -// if (Integer.parseInt(phs.getHeaterGatheringTime()) > maxsize) { -// maxsize = Integer.parseInt(phs.getHeaterGatheringTime()); -// } -// } Calendar calendars = Calendar.getInstance(); int hour = calendars.get(Calendar.HOUR_OF_DAY); List entries = new ArrayList<>(); - for (int i = hour; i >= 0; i--) { + for (int i = 0; i <= hour; i++) { Entry entry = new Entry(i, 0); entries.add(entry); } @@ -964,10 +969,23 @@ public class MainHot_3A_ControlActivity extends BaseGradeActivity implements OnR * 也可传入Drawable， Entry(float x, float y, Drawable icon) 可在XY轴交点 设置Drawable图像展示 */ if (entries.get(i).getX() == Integer.parseInt(phs.getHeaterGatheringTime())) { - entries.get(i).setY(Float.parseFloat(phs.getHeaterPh())); + entries.get(i).setY((Float.parseFloat(phs.getHeaterPh()))); } } } + +// List entries = new ArrayList<>(); +// for (ChangeHot.Phs phs : dataList) { +// /** +// * 在此可查看 Entry构造方法，可发现 可传入数值 Entry(float x, float y) +// * 也可传入Drawable， Entry(float x, float y, Drawable icon) 可在XY轴交点 设置Drawable图像展示 +// */ +// Entry entry = new Entry(Float.parseFloat(phs.getHeaterGatheringTime()), (Float.parseFloat(phs.getHeaterPh()))); +// entries.add(entry); +// } + for (Entry entry : entries) { + Log.i("SSSSR", entry.getX() + "----" + entry.getY()); + } // 每一个LineDataSet代表一条线 LineDataSet lineDataSet = new LineDataSet(entries, name); lineDataSet.setDrawValues(false); diff --git a/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java b/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java index 2c7ac7a33..f793d62bc 100644 --- a/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/WaitCameraActivity.java @@ -39,6 +39,7 @@ import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDK; import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDKListener; import com.mediatek.elian.ElianNative; import com.p2p.core.P2PHandler; +import com.p2p.core.global.P2PConstants; import java.text.SimpleDateFormat; import java.util.Date; @@ -347,6 +348,11 @@ public class WaitCameraActivity extends BaseActivity { Commons.CameraPosition = Commons.CAMERA.size() - 1; sp.putInt(LoginSPKey.Camera_Position, Commons.CAMERA.size() - 1); } + String[] cameras = new String[Commons.CAMERA.size()]; + for (int i = 0; i < Commons.CAMERA.size(); i++) { + cameras[i] = Commons.CAMERA.get(i).cameraId; + } + P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P); Commons.HAVE_CAMERA = true; Commons.IS_CAMERA = true; EventBus.getDefault().post(new RefreshCamera()); diff --git a/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java b/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java index eb936b3b6..cbce5d2b0 100644 --- a/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/WaveCameraActivity.java @@ -43,6 +43,7 @@ import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDK; import com.lsemtmf.genersdk.tools.emtmf.EMTMFSDKListener; import com.mediatek.elian.ElianNative; import com.p2p.core.P2PHandler; +import com.p2p.core.global.P2PConstants; import java.text.SimpleDateFormat; import java.util.Date; @@ -240,6 +241,11 @@ public class WaveCameraActivity extends BaseActivity { } Commons.HAVE_CAMERA = true; Commons.IS_CAMERA = true; + String[] cameras = new String[Commons.CAMERA.size()]; + for (int i = 0; i < Commons.CAMERA.size(); i++) { + cameras[i] = Commons.CAMERA.get(i).cameraId; + } + P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P); EventBus.getDefault().post(new RefreshCamera()); sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); ToastUtil.show(WaveCameraActivity.this, "绑定摄像头成功"); diff --git a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json index c050cef1a..71e2d8c94 100644 --- a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json +++ b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-nodpi-v4.json @@ -215,14 +215,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f467.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_270c.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_270c.png" @@ -407,14 +407,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f630.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f630.png" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png" - }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png" + }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f627.png", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f627.png" diff --git a/umeng_community_library/build/intermediates/blame/res/debug/single/color.json b/umeng_community_library/build/intermediates/blame/res/debug/single/color.json index 407c7cc4f..bdafe5cc0 100644 --- a/umeng_community_library/build/intermediates/blame/res/debug/single/color.json +++ b/umeng_community_library/build/intermediates/blame/res/debug/single/color.json @@ -3,14 +3,14 @@ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_switch_textcolor.xml", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_switch_textcolor.xml" }, - { - "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_location_text.xml", - "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_location_text.xml" - }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_topic_toogle_color.xml", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_topic_toogle_color.xml" }, + { + "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_location_text.xml", + "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_location_text.xml" + }, { "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\color\\umeng_comm_toogle_color.xml", "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\color\\umeng_comm_toogle_color.xml" diff --git a/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index 7cb33e440..2582f8c09 100644 --- a/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/umeng_community_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:17 CST 2019 +#Thu Sep 26 17:50:57 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f61a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f61a.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_image_selected_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_image_selected_item.xml C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f420.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f420.png @@ -503,9 +503,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f418.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f418.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml +C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png -C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f629.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f629.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png diff --git a/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 99c4be818..9b7a58e9d 100644 --- a/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/umeng_community_library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:16 CST 2019 +#Thu Sep 26 17:50:56 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_camera.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_search_header_view.xml diff --git a/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index 213e9cec8..1d8cb3c7d 100644 --- a/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/umeng_community_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:17 CST 2019 +#Thu Sep 26 17:50:57 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_header_view.xml diff --git a/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index dd1bdf169..a10985af1 100644 --- a/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/umeng_community_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:08 CST 2019 +#Thu Sep 26 17:50:50 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_search_header_view.xml diff --git a/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar b/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar index 1c88c1110..0de6b849d 100644 Binary files a/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar and b/umeng_community_library/build/outputs/aar/umeng_community_library-debug.aar differ diff --git a/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar b/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar index fd0413134..99ba4ba14 100644 Binary files a/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar and b/umeng_community_library/build/outputs/aar/umeng_community_library-release.aar differ diff --git a/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index ef4136a07..fcdb6d8cb 100644 --- a/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/umeng_sharesdk_library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:18 CST 2019 +#Thu Sep 26 17:50:58 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_fetch_image.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_fetch_image.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_ynote.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_ynote.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png @@ -155,8 +155,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\wechat_fav.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\wechat_fav.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_twitter.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_twitter.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_socialize_full_alert_dialog_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_socialize_full_alert_dialog_item.xml -C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_wxcircle.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_wxcircle.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_socialize_post_share.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_socialize_post_share.xml +C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_wxcircle.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_wxcircle.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sidebar_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sidebar_selector.xml C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_oauth_check_on.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_oauth_check_on.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_selected.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_at_selected.png diff --git a/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties index b5a961eb9..0e58c1dab 100644 --- a/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/umeng_sharesdk_library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:18 CST 2019 +#Thu Sep 26 17:50:58 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_normal.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_white.9.png diff --git a/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index ce10dee36..03d618b79 100644 --- a/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/umeng_sharesdk_library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 25 20:05:08 CST 2019 +#Thu Sep 26 17:50:50 CST 2019 C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_at_normal.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_button_white.9.png diff --git a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar index dfd797b7a..dc18beb20 100644 Binary files a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar and b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-debug.aar differ diff --git a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar index beaf2659a..3216ac90f 100644 Binary files a/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar and b/umeng_sharesdk_library/build/outputs/aar/umeng_sharesdk_library-release.aar differ