diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index eb6a142b6..137614836 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 e93e6c28d..0c8bdb7ba 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 13a2fb9f4..f98dd6a7e 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 f51c0e988..8cf5b1bf1 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 bf7e202a9..31d8b3eeb 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 dc9db50db..e046388a6 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 20f2dddbe..1c6ce7167 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 81218adb5..bfb0de544 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/libraries/alicloud_android_beacon_1_0_2.xml b/.idea/libraries/alicloud_android_beacon_1_0_2.xml
deleted file mode 100644
index a147e2a2a..000000000
--- a/.idea/libraries/alicloud_android_beacon_1_0_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/alicloud_android_beacon_1_0_3.xml b/.idea/libraries/alicloud_android_beacon_1_0_3.xml
new file mode 100644
index 000000000..c89639e4e
--- /dev/null
+++ b/.idea/libraries/alicloud_android_beacon_1_0_3.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/alicloud_android_utdid_1_1_5_3.xml b/.idea/libraries/alicloud_android_utdid_1_1_5_3.xml
deleted file mode 100644
index 01e650175..000000000
--- a/.idea/libraries/alicloud_android_utdid_1_1_5_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/alicloud_android_utdid_1_1_5_4.xml b/.idea/libraries/alicloud_android_utdid_1_1_5_4.xml
new file mode 100644
index 000000000..9a72c4a0c
--- /dev/null
+++ b/.idea/libraries/alicloud_android_utdid_1_1_5_4.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9d62365af..021c25f16 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,6 +11,7 @@
+
@@ -20,222 +21,32 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
@@ -268,12 +79,12 @@
-
-
+
+
-
-
+
+
@@ -282,8 +93,58 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4726,7 +4587,7 @@
@@ -5696,14 +5557,14 @@
-
-
-
+
+
+
@@ -5757,6 +5618,10 @@
+
+
+
+
@@ -5776,12 +5641,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -5790,7 +5665,7 @@
-
+
@@ -6155,16 +6030,16 @@
-
-
+
+
-
+
-
+
@@ -6172,7 +6047,7 @@
-
+
@@ -6223,85 +6098,85 @@
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 22
+ 23
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 28
+ 29
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 34
+ 35
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 40
+ 41
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 46
+ 47
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 52
+ 53
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 58
+ 59
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 77
+ 78
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 86
+ 87
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 95
+ 96
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 192
+ 193
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 202
+ 203
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 210
+ 211
file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
- 218
+ 219
@@ -6309,7 +6184,7 @@
-
+
@@ -6389,14 +6264,14 @@
-
-
-
+
+
+
@@ -6516,13 +6391,6 @@
-
-
-
-
-
-
-
@@ -6558,14 +6426,6 @@
-
-
-
-
-
-
-
-
@@ -6647,23 +6507,15 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -6674,48 +6526,34 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
@@ -6733,28 +6571,68 @@
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 7d5d15f42..1a09c67e6 100644
--- a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Sep 24 20:44:20 CST 2019
+#Wed Sep 25 20:05:04 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 627da72fc..1a09c67e6 100644
--- a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Sep 24 20:44:19 CST 2019
+#Wed Sep 25 20:05:04 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 2d29f1364..4ebb77f8b 100644
--- a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Sep 24 20:44:26 CST 2019
+#Wed Sep 25 20:05:07 CST 2019
diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar
index cbd2e3773..c87d5e8e7 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 8ea37f964..0926fbba8 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/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 672189cf9..5144ab138 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 @@
-#Tue Sep 24 20:44:25 CST 2019
+#Wed Sep 25 20:05:06 CST 2019
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
@@ -162,8 +162,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_dialog_material_background.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_dialog_material_background.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_48dp.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_tint_spinner.xml
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color\\abc_hint_foreground_material_dark.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_hint_foreground_material_dark.xml
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 37202764e..d4822ea16 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 @@
-#Tue Sep 24 20:44:22 CST 2019
+#Wed Sep 25 20:05:05 CST 2019
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png
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 6dcf69957..5e94b44b3 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 @@
-#Tue Sep 24 20:44:23 CST 2019
+#Wed Sep 25 20:05:06 CST 2019
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_play_selector.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml
@@ -15,8 +15,8 @@ C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\quit_fullscree
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_tiny_pressed.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_volume.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_dialog_volume.xml
-C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\start_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\start_fullscreen.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_normal.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_normal.xml
+C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\anim\\start_fullscreen.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\start_fullscreen.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_back_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_back_selector.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_forward_icon.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_forward_icon.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_brightness_video.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_brightness_video.png
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 48f9da97f..f35eca353 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 @@
-#Tue Sep 24 20:44:26 CST 2019
+#Wed Sep 25 20:05:07 CST 2019
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml
diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar
index 75e8d7951..83f65e8ef 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 eb9fec434..84306e08c 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-25-19-10-48-721.rawproto b/build/android-profile/profile-2019-09-25-19-10-48-721.rawproto
new file mode 100644
index 000000000..c5589949a
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-10-48-721.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-10-54-478.rawproto b/build/android-profile/profile-2019-09-25-19-10-54-478.rawproto
new file mode 100644
index 000000000..98a3d8671
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-10-54-478.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-26-37-205.rawproto b/build/android-profile/profile-2019-09-25-19-26-37-205.rawproto
new file mode 100644
index 000000000..793a809aa
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-26-37-205.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-30-40-297.rawproto b/build/android-profile/profile-2019-09-25-19-30-40-297.rawproto
new file mode 100644
index 000000000..528e4f0e2
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-30-40-297.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-31-11-030.rawproto b/build/android-profile/profile-2019-09-25-19-31-11-030.rawproto
new file mode 100644
index 000000000..a93be4e8e
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-31-11-030.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-37-06-695.rawproto b/build/android-profile/profile-2019-09-25-19-37-06-695.rawproto
new file mode 100644
index 000000000..69956d98d
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-37-06-695.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-41-32-079.rawproto b/build/android-profile/profile-2019-09-25-19-41-32-079.rawproto
new file mode 100644
index 000000000..c72c397ca
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-41-32-079.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-44-19-557.rawproto b/build/android-profile/profile-2019-09-25-19-44-19-557.rawproto
new file mode 100644
index 000000000..35878e4bd
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-44-19-557.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-46-53-638.rawproto b/build/android-profile/profile-2019-09-25-19-46-53-638.rawproto
new file mode 100644
index 000000000..62585c20d
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-46-53-638.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-46-55-783.rawproto b/build/android-profile/profile-2019-09-25-19-46-55-783.rawproto
new file mode 100644
index 000000000..4a56e9526
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-46-55-783.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-47-33-799.rawproto b/build/android-profile/profile-2019-09-25-19-47-33-799.rawproto
new file mode 100644
index 000000000..668c1502f
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-47-33-799.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-52-55-067.rawproto b/build/android-profile/profile-2019-09-25-19-52-55-067.rawproto
new file mode 100644
index 000000000..c8a2890d7
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-52-55-067.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-59-32-734.rawproto b/build/android-profile/profile-2019-09-25-19-59-32-734.rawproto
new file mode 100644
index 000000000..93914c3f7
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-59-32-734.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-19-59-51-970.rawproto b/build/android-profile/profile-2019-09-25-19-59-51-970.rawproto
new file mode 100644
index 000000000..113a5d2ec
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-19-59-51-970.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-20-00-31-692.rawproto b/build/android-profile/profile-2019-09-25-20-00-31-692.rawproto
new file mode 100644
index 000000000..a8c92f448
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-20-00-31-692.rawproto differ
diff --git a/build/android-profile/profile-2019-09-25-20-04-55-481.rawproto b/build/android-profile/profile-2019-09-25-20-04-55-481.rawproto
new file mode 100644
index 000000000..bf3723498
Binary files /dev/null and b/build/android-profile/profile-2019-09-25-20-04-55-481.rawproto differ
diff --git a/build/intermediates/jack-cache/cache.xml b/build/intermediates/jack-cache/cache.xml
index 410f97b18..8bb1dd904 100644
--- a/build/intermediates/jack-cache/cache.xml
+++ b/build/intermediates/jack-cache/cache.xml
@@ -1,539 +1,539 @@
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
+
-
-
+
-
-
+ sha1="30609175e61f293b438213c82956e731cd9a1489">
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
+
-
-
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
-
-
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
diff --git a/iFish7/build.gradle b/iFish7/build.gradle
index d515f5af3..dea95e530 100644
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@@ -21,8 +21,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
applicationId "com.ifish.activity"
- versionCode 30
- versionName "4.7.4"
+ versionCode 31
+ versionName "4.7.5"
multiDexEnabled true
ndk { abiFilters "armeabi" }
jackOptions
@@ -45,7 +45,6 @@ android {
}
}
dexOptions {
- incremental true
javaMaxHeapSize '4g'
}
diff --git a/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java b/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java
index 0f10cad08..a0a62ef7c 100644
--- a/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java
+++ b/iFish7/build/generated/source/buildConfig/androidTest/debug/com/ifish/activity/test/BuildConfig.java
@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "com.ifish.activity.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
- public static final int VERSION_CODE = 30;
- public static final String VERSION_NAME = "4.7.4";
+ public static final int VERSION_CODE = 31;
+ public static final String VERSION_NAME = "4.7.5";
}
diff --git a/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java b/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java
index 3ddd220b4..5b05d62af 100644
--- a/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java
+++ b/iFish7/build/generated/source/buildConfig/debug/com/ifish/activity/BuildConfig.java
@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "com.ifish.activity";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
- public static final int VERSION_CODE = 30;
- public static final String VERSION_NAME = "4.7.4";
+ public static final int VERSION_CODE = 31;
+ public static final String VERSION_NAME = "4.7.5";
}
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 6114e0a21..e1f041438 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_button_icon.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_button_icon.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_close.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_close.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_button_icon.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_button_icon.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_015.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_015.png"
@@ -339,12 +339,12 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_light.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_light.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_xout.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_xout.png"
+ },
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png"
}
]
\ 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 69a0315f7..5a71d5b26 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\\ic_blue_4.png",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\goldcoupon_bg.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\goldcoupon_bg.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_4.png",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_4.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_lookat_shopcar.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lookat_shopcar.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-nodpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-nodpi-v4.json
index 59a5c9dad..a8ab28480 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable-nodpi-v4.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-nodpi-v4.json
@@ -447,14 +447,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44e.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44e.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61d.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61d.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f633.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f633.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f61d.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f61d.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f433.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f433.png"
@@ -783,14 +783,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f44f.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f44f.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63b.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63b.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f618.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f618.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f351.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f351.png"
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 a63bdf2ed..eab6e2566 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\\abc_ic_menu_share_mtrl_alpha.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\shareifishapp.jpg",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-xxhdpi\\shareifishapp.jpg"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable.json b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
index d0e9823c7..55b5bb288 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
@@ -135,14 +135,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_renren_on.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_renren_on.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\nonet_bt_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\nonet_bt_select.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_gray.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_gray.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_bind_bg.9.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_bind_bg.9.png"
@@ -399,14 +399,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_laiwang_dynamic_gray.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_laiwang_dynamic_gray.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_segment_shape_middle.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_segment_shape_middle.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_comment_input_send_selector.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_comment_input_send_selector.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_wxcircle_gray.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_wxcircle_gray.png"
@@ -423,14 +423,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_instagram_off.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_instagram_off.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_alibaba_bc_auth_ll_bg.xml",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable\\com_alibaba_bc_auth_ll_bg.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sidebar_normal.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_sidebar_normal.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\com_alibaba_bc_auth_ll_bg.xml",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\5dedc35929e38b74b799f2483ee90c0c6c8fb56b\\output\\res\\drawable\\com_alibaba_bc_auth_ll_bg.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_back_tiny_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_back_tiny_selector.xml"
@@ -459,14 +459,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_select_location_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_select_location_selector.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_hot_btn_shape_round.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_hot_btn_shape_round.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\device_fragment_nobottom_shape.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\device_fragment_nobottom_shape.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_share_music.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_share_music.png"
@@ -575,14 +575,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\messenger_button_white_bg_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\messenger_button_white_bg_selector.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\lookfishdialog_bt_press_shape.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\lookfishdialog_bt_press_shape.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_evernote_gray.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_evernote_gray.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_cancel_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_cancel_select.xml"
@@ -663,14 +663,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_foursquare.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_foursquare.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_login.xml",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_login.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white_blue.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white_blue.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_login.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_login.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shop_item_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\shop_item_select.xml"
@@ -859,14 +859,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_switch_centerbutton_bg.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_switch_centerbutton_bg.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_material.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_ratingbar_material.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_location_off.png",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_location_off.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_tab_indicator_material.xml"
@@ -1067,14 +1067,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_ynote_gray.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_ynote_gray.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_at_normal.png",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_bottomnocircle_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_bottomnocircle_select.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_at_normal.png",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_send_bt.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_send_bt.xml"
@@ -1363,14 +1363,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_more_radius_none.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_more_radius_none.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\look_buy_bt_shape.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\look_buy_bt_shape.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_white.9.png",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_xiaolian.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_xiaolian.png"
@@ -1567,14 +1567,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_color_ff_bg.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_color_ff_bg.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fragment_bg_select.xml",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fragment_bg_select.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_error_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_error_selector.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\fragment_bg_select.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\fragment_bg_select.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_facebook.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_facebook.png"
@@ -1587,14 +1587,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_on.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_on.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_edtext_noright_shape_f2.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_edtext_noright_shape_f2.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_sms_on.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_sms_on.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_tab_left_normal.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_normal.png"
@@ -1659,14 +1659,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_pause_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_pause_selector.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_grey_blue.xml",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_grey_blue.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\login_button_square_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\login_button_square_select.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_grey_blue.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_grey_blue.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_comm_cancel_bt.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_comm_cancel_bt.xml"
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 531938df5..cdc1d337a 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_loading12.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading12.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading03.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading03.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading12.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading12.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi-v4\\bga_refresh_loading09.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\ac346b54ec4ba05f11e2c87cf38276d3b0e64b96\\output\\res\\mipmap-hdpi-v4\\bga_refresh_loading09.png"
diff --git a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 396444c70..65595fbb8 100644
--- a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Sep 24 20:44:39 CST 2019
+#Wed Sep 25 20:05:16 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 2b4a923c5..7da5db699 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 @@
-#Tue Sep 24 20:44:35 CST 2019
+#Wed Sep 25 20:05:13 CST 2019
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\layout\\pop_camera.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\pop_camera.xml
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_1_on.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_1_on.png
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_jpush_wendu.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_jpush_wendu.png
@@ -452,8 +452,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_back_white.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_back_white.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
C\:\\Users\\Administrator\\.android\\build-cache\\b5c89dc17e66e83a88a375a2104b83d004c47000\\output\\res\\color-v23\\design_tint_password_toggle.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\color-v23\\design_tint_password_toggle.xml
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_topic_recommend.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_topic_recommend.xml
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\com_facebook_tooltip_black_background.9.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f428.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f428.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\jc_click_play_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_image_delete.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_image_delete.png
@@ -889,8 +889,8 @@ C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_lock.png=C\
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f605.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f605.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png
-C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_x_button.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_x_button.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png
+C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_x_button.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_x_button.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_img_browser_layout.xml=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_img_browser_layout.xml
C\:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\icon_lookfish.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_lookfish.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\xietiezi.png=C\:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\xietiezi.png
diff --git a/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.xml b/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.xml
index 8415b7531..17e816791 100644
--- a/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/iFish7/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ android:versionCode="31"
+ android:versionName="4.7.5" >
-
-
@@ -92,7 +90,6 @@
-
@@ -104,7 +101,7 @@
-
+
@@ -129,7 +126,6 @@
-
@@ -163,6 +159,7 @@
+
diff --git a/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java b/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java
index af687b854..b241d26ff 100644
--- a/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/MonitorActivity.java
@@ -181,7 +181,6 @@ public class MonitorActivity extends BaseGradeMonitorActivity implements OnClick
if (!Commons.FishKey.On.equals(mCamera.isActive)) {//摄像头未激活
} else {
mypro.setVisibility(View.VISIBLE);
- MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
String pwd = P2PHandler.getInstance().EntryPassword(HttpManager.Camera_psw);//经过转换后的设备密码
String contactId = sp.getString(LoginSPKey.GeeWeUserId, "");//登陆的用户账号
P2PHandler.getInstance().call(contactId, pwd, true, 1, cameraId, "", "", 2, cameraId, 0);//呼叫监控
@@ -363,7 +362,6 @@ public class MonitorActivity extends BaseGradeMonitorActivity implements OnClick
mypro.setVisibility(View.VISIBLE);
String pwd = P2PHandler.getInstance().EntryPassword(HttpManager.Camera_psw);//经过转换后的设备密码
String contactId = sp.getString(LoginSPKey.GeeWeUserId, "");//登陆的用户账号
- MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
P2PHandler.getInstance().call(contactId, pwd, true, 1, cameraId, "", "", 2, cameraId, 0);//呼叫监控
}
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index 7b4d7f6f4..0df24259e 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -116,6 +116,7 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
import com.p2p.core.MediaPlayer;
import com.p2p.core.P2PHandler;
import com.p2p.core.P2PSpecial.HttpSend;
+import com.p2p.core.global.P2PConstants;
import com.squareup.picasso.Picasso;
import java.io.File;
@@ -318,7 +319,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
String geeWeUserId = sp.getString(LoginSPKey.GeeWeUserId, "");
if (p2PVerifyCode1.length() > 2 && p2PVerifyCode2.length() > 2 && geeWeUserId.length() > 2) {//"1005746664", 验证码格式长度必须都大于2 否则重新请求 满足条件p2pconect
P2PHandler.getInstance().p2pInit(getActivity(), new P2PListener(), new SettingListener());//初始化技威
- MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
int parseInt = Integer.parseInt(p2PVerifyCode1);
int parseInt2 = Integer.parseInt(p2PVerifyCode2);
int s1 = Integer.parseInt(sessionId);
@@ -327,6 +327,12 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
s2 = Integer.parseInt(sessionId2);
}
boolean p2pConnect = P2PHandler.getInstance().p2pConnect(geeWeUserId, s1, s2, parseInt, parseInt2, 0);//p2p连接
+ String[] cameras = new String[Commons.CAMERA.size()];
+ for (int i = 0; i < Commons.CAMERA.size(); i++) {
+ cameras[i] = Commons.CAMERA.get(i).cameraId;
+ }
+ P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
+ Log.i("ifishcamaer", "deveicever---" + cameras.toString());
Log.i("devicetype", p2pConnect + "---");
} else {
hm.loginGeeWeUser(new HttpListener() {
@@ -337,8 +343,13 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
sp.putString(LoginSPKey.P2PVerifyCode1, baseBean.P2PVerifyCode1);
sp.putString(LoginSPKey.P2PVerifyCode2, baseBean.P2PVerifyCode2);
P2PHandler.getInstance().p2pInit(getActivity(), new P2PListener(), new SettingListener());//初始化技威
- MediaPlayer.setP2PLibVersion(new int[]{9082821}, new short[]{1284}, 1);
boolean p2pConnect = P2PHandler.getInstance().p2pConnect(baseBean.UserID, Integer.parseInt(baseBean.sessionId), Integer.parseInt(baseBean.sessionId2), Integer.parseInt(baseBean.P2PVerifyCode1), Integer.parseInt(baseBean.P2PVerifyCode2), 0);//p2p连接
+ String[] cameras = new String[Commons.CAMERA.size()];
+ for (int i = 0; i < Commons.CAMERA.size(); i++) {
+ cameras[i] = Commons.CAMERA.get(i).cameraId;
+ }
+ P2PHandler.getInstance().getFriendStatus(cameras, P2PConstants.P2P_Server.SERVER_NEW_P2P);
+ Log.i("ifishcamaer", "deveicever---" + cameras.toString());
L.i("geeWeUserId=" + baseBean.UserID + "parseInt=" + Integer.parseInt(baseBean.P2PVerifyCode1) + "parseIn2=" + Integer.parseInt(baseBean.P2PVerifyCode2));
L.i("p2pConnect=" + p2pConnect);
}
diff --git a/iFish7/src/main/java/com/ifish/geewe/SettingListener.java b/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
index 3dafabcce..c8a87cc0a 100644
--- a/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
+++ b/iFish7/src/main/java/com/ifish/geewe/SettingListener.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.util.Log;
import com.ifish.baseclass.BaseApplication;
+import com.p2p.core.MediaPlayer;
import com.p2p.core.P2PInterface.ISetting;
import java.util.ArrayList;
@@ -1105,8 +1106,16 @@ public class SettingListener implements ISetting {
}
@Override
- public void vRetGetIndexFriendStatus(int i, String[] strings, int[] ints, int[] ints1, int[] ints2, int[] ints3, int[] ints4, byte b, long[] longs, int[][] ints5, int[][] ints6, int[] ints7, short[] shorts) {
-
+ public void vRetGetIndexFriendStatus(int count, String[] contactIds, int[] IdProtery,
+ int[] status, int[] DevTypes, int[] SubType, int[] DefenceState, byte bRequestResult,
+ long[] defenceFlag, int[][] configs, int[][] infos, int[] startAuthManage, short[] p2pLibVersion) {
+ if (contactIds != null) {
+ int[] deviceid = new int[contactIds.length];
+ for (int i = 0; i < contactIds.length; i++) {
+ deviceid[i] = Integer.parseInt(contactIds[i]);
+ }
+ MediaPlayer.setP2PLibVersion(deviceid, p2pLibVersion, count);
+ }
}
@Override
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 71e2d8c94..c050cef1a 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_1f467.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f683.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f683.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f467.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f467.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_270c.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_270c.png"
@@ -407,14 +407,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f630.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f630.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f430.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f430.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f475.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f475.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f627.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f627.png"
diff --git a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
index 94f2d29cb..e25602f0c 100644
--- a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
+++ b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxxhdpi-v4.json
@@ -63,14 +63,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_more.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_lock.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_lock.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write_click.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_backward_white.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_backward_white.png"
diff --git a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
index 6a8850da0..3564e078a 100644
--- a/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
+++ b/umeng_community_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
@@ -307,14 +307,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_delete.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_delete.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_backward.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_backward.png"
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 c5b507929..7cb33e440 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 @@
-#Tue Sep 24 20:44:43 CST 2019
+#Wed Sep 25 20:05:17 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f61a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f61a.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_image_selected_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_image_selected_item.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f420.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f420.png
@@ -14,9 +14,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_ic_loading_white.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_ic_loading_white.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_user_info_male.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_user_info_male.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_account_setting.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_account_setting.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_feed_item_like_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_feed_item_like_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_share.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_share.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_comment_reply_stub.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_comment_reply_stub.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_feed_item_like_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_feed_item_like_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_title.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_title.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_rounded_corner_backgroud.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_rounded_corner_backgroud.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f487.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f487.png
@@ -81,8 +81,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_more_dialog_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_more_dialog_layout.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_album.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_album.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44e.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44e.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_retangle.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_retangle.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f419.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f419.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_user_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_user_n.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\xiangji.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\xiangji.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_feeds_activity.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_feeds_activity.xml
@@ -161,9 +161,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f693.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f693.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_topic_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_topic_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f63d.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f63d.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f608.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f608.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f443.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f443.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_simplify_fragment_title.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_simplify_fragment_title.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f443.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f443.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f608.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f608.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\xianghu.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\xianghu.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_photo_pick_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_photo_pick_bt.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_comment_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_comment_p.png
@@ -257,8 +257,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_recommend.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_recommend.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_topic_detail_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_topic_detail_layout.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_item_bg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_item_bg.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_item.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_login_btnbg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_login_btnbg.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_category_item.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_category_item.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44c.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44c.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f417.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f417.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_at_friend_pressed.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_at_friend_pressed.png
@@ -307,8 +307,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_base_loading_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_base_loading_view.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_color_ff_bg.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_color_ff_bg.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_activity.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_search_activity.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44f.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44f.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_setting.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_setting.xml
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f44f.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f44f.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f49b.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f49b.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_at_friend_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_at_friend_bt.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f466.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f466.png
@@ -503,9 +503,9 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f418.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f418.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_comm_simplify_top.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_detail_like_count_selector.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_feed_item_tv_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_feed_item_tv_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_wodedongtai.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_wodedongtai.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f4aa.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f4aa.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_detail_reply_comment.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f629.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f629.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_item_like_n.png
@@ -518,10 +518,10 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_report_reply_comment_dialog.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_report_reply_comment_dialog.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_chat_input_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_chat_input_view.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\kuangh.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\kuangh.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_emoji_btn_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_emoji_btn_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_comment_main_layout.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\umeng_comm_comment_main_layout.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f636.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f636.png
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_emoji_btn_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_emoji_btn_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f471.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f471.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_n.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_favorite_n.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f682.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f682.png
@@ -604,8 +604,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundle
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_xiaolian.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_xiaolian.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f614.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f614.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_simplify_received_comment_triangle.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_simplify_received_comment_triangle.xml
-C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_comment_item_reply.png
+C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_feed_detail_like_icon_p.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_topic_bt.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_topic_bt.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_select_location_selector.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_select_location_selector.xml
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f60a.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f60a.png
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 e6acc0be5..99c4be818 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 @@
-#Tue Sep 24 20:44:40 CST 2019
+#Wed Sep 25 20:05:16 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_camera.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_search_header_view.xml
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 47c630649..213e9cec8 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 @@
-#Tue Sep 24 20:44:41 CST 2019
+#Wed Sep 25 20:05:17 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\layout\\umeng_comm_search_header_view.xml
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 50e5b2a95..dd1bdf169 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 @@
-#Tue Sep 24 20:44:27 CST 2019
+#Wed Sep 25 20:05:08 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_camera.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_camera.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_msg_notice.png=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_msg_notice.png
C\:\\beifen\\ifish\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_search_header_view.xml=C\:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_search_header_view.xml
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 4c918cf17..1c88c1110 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 5a9c48b06..fd0413134 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/blame/res/androidTest/debug/single/drawable.json b/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
index bb412207d..59f4d6280 100644
--- a/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
+++ b/umeng_sharesdk_library/build/intermediates/blame/res/androidTest/debug/single/drawable.json
@@ -211,14 +211,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_title_tab_right_pressed.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_title_tab_right_pressed.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_light_bar_bg.9.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_light_bar_bg.9.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sidebar_selector.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sidebar_selector.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_light_bar_bg.9.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_light_bar_bg.9.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_button_red_blue.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_red_blue.xml"
@@ -243,14 +243,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_send_background.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_send_background.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_window_shadow_pad.xml",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_window_shadow_pad.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_evernote_gray.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_evernote_gray.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_window_shadow_pad.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_window_shadow_pad.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_pocket_gray.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_pocket_gray.png"
@@ -411,6 +411,10 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_follow_check.xml",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_follow_check.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_douban_on.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_douban_on.png"
@@ -419,10 +423,6 @@
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_location_off.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_location_off.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\com_facebook_button_login_silver_background.xml",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\com_facebook_button_login_silver_background.xml"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_google.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_google.png"
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 9cc5bfea8..ef4136a07 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 @@
-#Tue Sep 24 20:44:44 CST 2019
+#Wed Sep 25 20:05:18 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_fetch_image.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_fetch_image.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_ynote.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_ynote.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\com_facebook_tooltip_black_bottomnub.png
@@ -148,8 +148,8 @@ C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xxhdpi-v4\\messenger_bubble_large_white.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\messenger_bubble_large_white.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_line.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_line.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_qzone_on.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_qzone_on.png
-C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\messenger_button_send_blue_large.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\messenger_button_send_blue_large.xml
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_laiwang.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_laiwang.png
+C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\layout\\messenger_button_send_blue_large.xml=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\messenger_button_send_blue_large.xml
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_sina_off.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_sina_off.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_linkedin.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_socialize_linkedin.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\wechat_fav.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\wechat_fav.png
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 6b255c405..b5a961eb9 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 @@
-#Tue Sep 24 20:44:43 CST 2019
+#Wed Sep 25 20:05:18 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_at_normal.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_socialize_button_white.9.png
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 192c99704..ce10dee36 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 @@
-#Tue Sep 24 20:44:28 CST 2019
+#Wed Sep 25 20:05:08 CST 2019
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_at_normal.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_at_normal.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable-xhdpi\\messenger_bubble_small_blue.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\messenger_bubble_small_blue.png
C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\src\\main\\res\\drawable\\umeng_socialize_button_white.9.png=C\:\\beifen\\ifish\\ifish\\umeng_sharesdk_library\\build\\intermediates\\bundles\\default\\res\\drawable\\umeng_socialize_button_white.9.png
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 0bcdc7fa4..dfd797b7a 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 7efd8b4df..beaf2659a 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