diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index 2269af3a0..ce2680b49 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 283afd2eb..0541475ef 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 9b876a34d..b52b385e4 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 da3c9f089..a35236d7b 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index cb852767f..a4c413f1c 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 400ee8501..759959b45 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 24e5a706a..6f763fdfc 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 a578f0d68..a7b805f86 100644
Binary files a/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_BageView_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index b5afd6342..6213a2902 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 031d2be80..13d54089d 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index da1e90a00..ac5b582f5 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 7cdabe5c8..55c83084e 100644
Binary files a/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_JCVideo_Library_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 4398d2705..e09bade8d 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index d7e7e8e3d..38c7158ac 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index a2a337579..41e078396 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index b75d411f7..ec32837ad 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/libraries/alicloud_android_beacon_1_0_1.xml b/.idea/libraries/alicloud_android_beacon_1_0_1.xml
deleted file mode 100644
index 698390bec..000000000
--- a/.idea/libraries/alicloud_android_beacon_1_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/alicloud_android_beacon_1_0_2.xml b/.idea/libraries/alicloud_android_beacon_1_0_2.xml
new file mode 100644
index 000000000..a147e2a2a
--- /dev/null
+++ b/.idea/libraries/alicloud_android_beacon_1_0_2.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/firebase_common_9_0_0.xml b/.idea/libraries/firebase_common_9_0_0.xml
new file mode 100644
index 000000000..6e48a5af2
--- /dev/null
+++ b/.idea/libraries/firebase_common_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/javabase64.xml b/.idea/libraries/javabase64.xml
new file mode 100644
index 000000000..f7aa37aff
--- /dev/null
+++ b/.idea/libraries/javabase64.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/libhttp_0_4_6_3.xml b/.idea/libraries/libhttp_0_4_6_3.xml
deleted file mode 100644
index d1cc3e658..000000000
--- a/.idea/libraries/libhttp_0_4_6_3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/libhttp_v0_5_5.xml b/.idea/libraries/libhttp_v0_5_5.xml
new file mode 100644
index 000000000..084f66ae6
--- /dev/null
+++ b/.idea/libraries/libhttp_v0_5_5.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/logging_interceptor_3_8_1.xml b/.idea/libraries/logging_interceptor_3_8_1.xml
new file mode 100644
index 000000000..ff3e22095
--- /dev/null
+++ b/.idea/libraries/logging_interceptor_3_8_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_3_3_0.xml b/.idea/libraries/okhttp_3_3_0.xml
deleted file mode 100644
index bce0736ce..000000000
--- a/.idea/libraries/okhttp_3_3_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_3_8_1.xml b/.idea/libraries/okhttp_3_8_1.xml
new file mode 100644
index 000000000..1c52fa2da
--- /dev/null
+++ b/.idea/libraries/okhttp_3_8_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okio_1_13_0.xml b/.idea/libraries/okio_1_13_0.xml
new file mode 100644
index 000000000..a855abb67
--- /dev/null
+++ b/.idea/libraries/okio_1_13_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okio_1_8_0.xml b/.idea/libraries/okio_1_8_0.xml
deleted file mode 100644
index 3422c1a90..000000000
--- a/.idea/libraries/okio_1_8_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/p2p_core_0_4_4.xml b/.idea/libraries/p2p_core_0_4_4.xml
deleted file mode 100644
index 59b128885..000000000
--- a/.idea/libraries/p2p_core_0_4_4.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/p2p_core_0_4_4_9.xml b/.idea/libraries/p2p_core_0_4_4_9.xml
new file mode 100644
index 000000000..406937a31
--- /dev/null
+++ b/.idea/libraries/p2p_core_0_4_4_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/p2p_core_release_.xml b/.idea/libraries/p2p_core_release_.xml
new file mode 100644
index 000000000..2d1a5f94d
--- /dev/null
+++ b/.idea/libraries/p2p_core_release_.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_analytics_9_0_0.xml b/.idea/libraries/play_services_analytics_9_0_0.xml
new file mode 100644
index 000000000..53ed629ef
--- /dev/null
+++ b/.idea/libraries/play_services_analytics_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_analytics_impl_9_0_0.xml b/.idea/libraries/play_services_analytics_impl_9_0_0.xml
new file mode 100644
index 000000000..f16adf22f
--- /dev/null
+++ b/.idea/libraries/play_services_analytics_impl_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_base_9_0_0.xml b/.idea/libraries/play_services_base_9_0_0.xml
new file mode 100644
index 000000000..8c50a0286
--- /dev/null
+++ b/.idea/libraries/play_services_base_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_basement_9_0_0.xml b/.idea/libraries/play_services_basement_9_0_0.xml
new file mode 100644
index 000000000..218d18a86
--- /dev/null
+++ b/.idea/libraries/play_services_basement_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_tasks_9_0_0.xml b/.idea/libraries/play_services_tasks_9_0_0.xml
new file mode 100644
index 000000000..aae61ea16
--- /dev/null
+++ b/.idea/libraries/play_services_tasks_9_0_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b8cb872b6..78d4765df 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,8 +11,9 @@
-
-
+
+
+
@@ -20,12 +21,27 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,13 +58,15 @@
-
+
+
+
@@ -57,44 +75,28 @@
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -139,31 +141,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -175,115 +167,74 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -580,6 +531,11 @@
+
+
+
+
+
@@ -756,11 +712,6 @@
-
-
-
-
-
@@ -810,11 +761,6 @@
-
-
-
-
-
@@ -965,6 +911,11 @@
+
+
+
+
+
@@ -2767,6 +2718,11 @@
+
+
+
+
+
@@ -2921,6 +2877,11 @@
+
+
+
+
+
@@ -3191,11 +3152,6 @@
-
-
-
-
-
@@ -3282,11 +3238,6 @@
-
-
-
-
-
@@ -4716,7 +4667,7 @@
@@ -5660,19 +5611,11 @@
-
-
-
-
-
-
-
-
@@ -5681,7 +5624,6 @@
-
@@ -5690,10 +5632,19 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -5747,7 +5698,8 @@
-
+
+
@@ -5755,6 +5707,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5780,21 +5828,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
+
@@ -5811,8 +6000,8 @@
-
+
@@ -6163,14 +6352,14 @@
-
+
-
-
+
+
@@ -6181,8 +6370,8 @@
-
+
@@ -6212,10 +6401,18 @@
+
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/geewe/P2PListener.java
+ 25
+
+
+
+
-
+
@@ -6267,229 +6464,31 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
@@ -6499,14 +6498,14 @@
+
+
+
-
-
-
@@ -6516,44 +6515,44 @@
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
@@ -6566,7 +6565,6 @@
-
@@ -6574,105 +6572,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -6680,22 +6596,223 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -6705,40 +6822,86 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index cf2443c8b..e49110dd1 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 10 23:58:18 CST 2019
+#Sat Sep 21 15:03:09 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 2685af162..e49110dd1 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 10 23:58:17 CST 2019
+#Sat Sep 21 15:03:09 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 7422528f6..537497356 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 10 23:58:20 CST 2019
+#Sat Sep 21 15:03:11 CST 2019
diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar
index 939a0d766..d01cccfb7 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 72506c165..98b7ac97c 100644
Binary files a/BageView/build/outputs/aar/BageView-release.aar and b/BageView/build/outputs/aar/BageView-release.aar differ
diff --git a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
index 678bfee93..806a9ef62 100644
--- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
+++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-hdpi-v4.json
@@ -139,14 +139,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png"
diff --git a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json
index 23d900e31..897d2f33b 100644
--- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json
+++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xhdpi-v4.json
@@ -219,14 +219,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png",
"source": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_tiny_pressed.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png"
diff --git a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json
index fac38c32a..5738e7cec 100644
--- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json
+++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-xxhdpi-v4.json
@@ -75,14 +75,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png",
- "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_half_black_16dp.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_16dp.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png",
+ "source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 613bc9854..f4c995382 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 10 23:58:19 CST 2019
+#Sat Sep 21 15:03:11 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
@@ -10,8 +10,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_ic_star_black_36dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_black_36dp.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-mdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-mdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_pressed.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_pressed.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_play_normal.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_play_normal.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\anim\\abc_fade_in.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\anim\\abc_fade_in.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable\\abc_list_selector_holo_light.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_list_selector_holo_light.xml
@@ -167,8 +167,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b
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
-C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_default_mtrl_alpha.9.png
+C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\anim\\abc_slide_in_top.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\anim\\abc_slide_in_top.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
diff --git a/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/JCVideo_Library/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 4dbf36948..4a9799d18 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 10 23:58:18 CST 2019
+#Sat Sep 21 15:03:10 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 35a0b0c30..28760475d 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 10 23:58:19 CST 2019
+#Sat Sep 21 15:03:10 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
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 97d20ad3c..9edf095fd 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 10 23:58:20 CST 2019
+#Sat Sep 21 15:03:11 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 1cfe2040d..36757804a 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 cf878a957..08a331584 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-14-23-32-50-410.rawproto b/build/android-profile/profile-2019-09-14-23-32-50-410.rawproto
new file mode 100644
index 000000000..0bc9235e0
Binary files /dev/null and b/build/android-profile/profile-2019-09-14-23-32-50-410.rawproto differ
diff --git a/build/android-profile/profile-2019-09-14-23-33-10-398.rawproto b/build/android-profile/profile-2019-09-14-23-33-10-398.rawproto
new file mode 100644
index 000000000..0f2840e6a
Binary files /dev/null and b/build/android-profile/profile-2019-09-14-23-33-10-398.rawproto differ
diff --git a/build/android-profile/profile-2019-09-14-23-41-56-840.rawproto b/build/android-profile/profile-2019-09-14-23-41-56-840.rawproto
new file mode 100644
index 000000000..991d0f0cb
Binary files /dev/null and b/build/android-profile/profile-2019-09-14-23-41-56-840.rawproto differ
diff --git a/build/android-profile/profile-2019-09-14-23-48-28-278.rawproto b/build/android-profile/profile-2019-09-14-23-48-28-278.rawproto
new file mode 100644
index 000000000..1e00aa987
Binary files /dev/null and b/build/android-profile/profile-2019-09-14-23-48-28-278.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-12-43-178.rawproto b/build/android-profile/profile-2019-09-15-00-12-43-178.rawproto
new file mode 100644
index 000000000..07f9eaef9
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-12-43-178.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-13-35-702.rawproto b/build/android-profile/profile-2019-09-15-00-13-35-702.rawproto
new file mode 100644
index 000000000..6525ade39
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-13-35-702.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-13-56-720.rawproto b/build/android-profile/profile-2019-09-15-00-13-56-720.rawproto
new file mode 100644
index 000000000..27a894643
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-13-56-720.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-19-16-154.rawproto b/build/android-profile/profile-2019-09-15-00-19-16-154.rawproto
new file mode 100644
index 000000000..f0fe52e15
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-19-16-154.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-56-19-468.rawproto b/build/android-profile/profile-2019-09-15-00-56-19-468.rawproto
new file mode 100644
index 000000000..6adf3969a
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-56-19-468.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-56-30-518.rawproto b/build/android-profile/profile-2019-09-15-00-56-30-518.rawproto
new file mode 100644
index 000000000..ae29f19a1
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-56-30-518.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-57-46-431.rawproto b/build/android-profile/profile-2019-09-15-00-57-46-431.rawproto
new file mode 100644
index 000000000..1ef20493e
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-57-46-431.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-57-48-226.rawproto b/build/android-profile/profile-2019-09-15-00-57-48-226.rawproto
new file mode 100644
index 000000000..df46f4fc6
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-57-48-226.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-00-57-56-562.rawproto b/build/android-profile/profile-2019-09-15-00-57-56-562.rawproto
new file mode 100644
index 000000000..f2ae9be9b
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-00-57-56-562.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-02-11-865.rawproto b/build/android-profile/profile-2019-09-15-01-02-11-865.rawproto
new file mode 100644
index 000000000..e1f3e4a52
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-02-11-865.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-03-25-611.rawproto b/build/android-profile/profile-2019-09-15-01-03-25-611.rawproto
new file mode 100644
index 000000000..5e08332cd
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-03-25-611.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-17-52-980.rawproto b/build/android-profile/profile-2019-09-15-01-17-52-980.rawproto
new file mode 100644
index 000000000..5d2846419
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-17-52-980.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-19-09-631.rawproto b/build/android-profile/profile-2019-09-15-01-19-09-631.rawproto
new file mode 100644
index 000000000..b869b6c65
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-19-09-631.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-20-35-696.rawproto b/build/android-profile/profile-2019-09-15-01-20-35-696.rawproto
new file mode 100644
index 000000000..b40e0503b
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-20-35-696.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-23-53-470.rawproto b/build/android-profile/profile-2019-09-15-01-23-53-470.rawproto
new file mode 100644
index 000000000..e97d41434
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-23-53-470.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-25-07-867.rawproto b/build/android-profile/profile-2019-09-15-01-25-07-867.rawproto
new file mode 100644
index 000000000..01668ab3e
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-25-07-867.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-26-46-872.rawproto b/build/android-profile/profile-2019-09-15-01-26-46-872.rawproto
new file mode 100644
index 000000000..feadaac47
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-26-46-872.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-27-25-454.rawproto b/build/android-profile/profile-2019-09-15-01-27-25-454.rawproto
new file mode 100644
index 000000000..c5fabe172
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-27-25-454.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-35-01-242.rawproto b/build/android-profile/profile-2019-09-15-01-35-01-242.rawproto
new file mode 100644
index 000000000..ee7666dd0
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-35-01-242.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-35-07-289.rawproto b/build/android-profile/profile-2019-09-15-01-35-07-289.rawproto
new file mode 100644
index 000000000..0d86480bc
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-35-07-289.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-37-45-099.rawproto b/build/android-profile/profile-2019-09-15-01-37-45-099.rawproto
new file mode 100644
index 000000000..47b5a9b68
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-37-45-099.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-37-58-732.rawproto b/build/android-profile/profile-2019-09-15-01-37-58-732.rawproto
new file mode 100644
index 000000000..28026c42c
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-37-58-732.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-39-25-936.rawproto b/build/android-profile/profile-2019-09-15-01-39-25-936.rawproto
new file mode 100644
index 000000000..a17abc1d5
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-39-25-936.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-39-42-989.rawproto b/build/android-profile/profile-2019-09-15-01-39-42-989.rawproto
new file mode 100644
index 000000000..5566fa084
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-39-42-989.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-42-13-259.rawproto b/build/android-profile/profile-2019-09-15-01-42-13-259.rawproto
new file mode 100644
index 000000000..c26946b1b
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-42-13-259.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-44-55-609.rawproto b/build/android-profile/profile-2019-09-15-01-44-55-609.rawproto
new file mode 100644
index 000000000..02cc484bb
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-44-55-609.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-45-05-381.rawproto b/build/android-profile/profile-2019-09-15-01-45-05-381.rawproto
new file mode 100644
index 000000000..b359d0543
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-45-05-381.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-45-32-653.rawproto b/build/android-profile/profile-2019-09-15-01-45-32-653.rawproto
new file mode 100644
index 000000000..a9cb41ab7
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-45-32-653.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-49-41-209.rawproto b/build/android-profile/profile-2019-09-15-01-49-41-209.rawproto
new file mode 100644
index 000000000..11e6400c2
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-49-41-209.rawproto differ
diff --git a/build/android-profile/profile-2019-09-15-01-53-34-857.rawproto b/build/android-profile/profile-2019-09-15-01-53-34-857.rawproto
new file mode 100644
index 000000000..089fd85c8
Binary files /dev/null and b/build/android-profile/profile-2019-09-15-01-53-34-857.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-20-24-16-975.rawproto b/build/android-profile/profile-2019-09-17-20-24-16-975.rawproto
new file mode 100644
index 000000000..69951a17c
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-20-24-16-975.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-20-24-34-064.rawproto b/build/android-profile/profile-2019-09-17-20-24-34-064.rawproto
new file mode 100644
index 000000000..71c2526c1
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-20-24-34-064.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-17-56-940.rawproto b/build/android-profile/profile-2019-09-17-21-17-56-940.rawproto
new file mode 100644
index 000000000..f09d6e8b0
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-17-56-940.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-22-14-859.rawproto b/build/android-profile/profile-2019-09-17-21-22-14-859.rawproto
new file mode 100644
index 000000000..48d76548d
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-22-14-859.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-40-42-517.rawproto b/build/android-profile/profile-2019-09-17-21-40-42-517.rawproto
new file mode 100644
index 000000000..b30f49355
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-40-42-517.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-41-29-788.rawproto b/build/android-profile/profile-2019-09-17-21-41-29-788.rawproto
new file mode 100644
index 000000000..77ac2ef8c
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-41-29-788.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-42-23-713.rawproto b/build/android-profile/profile-2019-09-17-21-42-23-713.rawproto
new file mode 100644
index 000000000..3195e2c3e
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-42-23-713.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-47-27-663.rawproto b/build/android-profile/profile-2019-09-17-21-47-27-663.rawproto
new file mode 100644
index 000000000..eddc4d04a
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-47-27-663.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-53-39-289.rawproto b/build/android-profile/profile-2019-09-17-21-53-39-289.rawproto
new file mode 100644
index 000000000..56b7f7577
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-53-39-289.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-55-44-366.rawproto b/build/android-profile/profile-2019-09-17-21-55-44-366.rawproto
new file mode 100644
index 000000000..2d005312b
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-55-44-366.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-21-57-57-682.rawproto b/build/android-profile/profile-2019-09-17-21-57-57-682.rawproto
new file mode 100644
index 000000000..8bb4ae45c
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-21-57-57-682.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-22-04-28-708.rawproto b/build/android-profile/profile-2019-09-17-22-04-28-708.rawproto
new file mode 100644
index 000000000..1c24ed308
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-22-04-28-708.rawproto differ
diff --git a/build/android-profile/profile-2019-09-17-22-05-56-208.rawproto b/build/android-profile/profile-2019-09-17-22-05-56-208.rawproto
new file mode 100644
index 000000000..c072d47d5
Binary files /dev/null and b/build/android-profile/profile-2019-09-17-22-05-56-208.rawproto differ
diff --git a/build/android-profile/profile-2019-09-20-18-42-26-048.rawproto b/build/android-profile/profile-2019-09-20-18-42-26-048.rawproto
new file mode 100644
index 000000000..ac35be630
Binary files /dev/null and b/build/android-profile/profile-2019-09-20-18-42-26-048.rawproto differ
diff --git a/build/android-profile/profile-2019-09-20-18-44-21-806.rawproto b/build/android-profile/profile-2019-09-20-18-44-21-806.rawproto
new file mode 100644
index 000000000..9dd5f9dab
Binary files /dev/null and b/build/android-profile/profile-2019-09-20-18-44-21-806.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-03-46-26-907.rawproto b/build/android-profile/profile-2019-09-21-03-46-26-907.rawproto
new file mode 100644
index 000000000..1e8e8019d
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-03-46-26-907.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-03-46-37-237.rawproto b/build/android-profile/profile-2019-09-21-03-46-37-237.rawproto
new file mode 100644
index 000000000..0c4830984
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-03-46-37-237.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-03-49-54-312.rawproto b/build/android-profile/profile-2019-09-21-03-49-54-312.rawproto
new file mode 100644
index 000000000..62367390d
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-03-49-54-312.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-03-54-03-495.rawproto b/build/android-profile/profile-2019-09-21-03-54-03-495.rawproto
new file mode 100644
index 000000000..023edd2c7
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-03-54-03-495.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-03-54-45-728.rawproto b/build/android-profile/profile-2019-09-21-03-54-45-728.rawproto
new file mode 100644
index 000000000..3e5f429d2
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-03-54-45-728.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-09-58-427.rawproto b/build/android-profile/profile-2019-09-21-04-09-58-427.rawproto
new file mode 100644
index 000000000..16e5d7ed3
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-09-58-427.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-22-36-967.rawproto b/build/android-profile/profile-2019-09-21-04-22-36-967.rawproto
new file mode 100644
index 000000000..596a8e308
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-22-36-967.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-23-48-996.rawproto b/build/android-profile/profile-2019-09-21-04-23-48-996.rawproto
new file mode 100644
index 000000000..9a503817e
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-23-48-996.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-24-56-331.rawproto b/build/android-profile/profile-2019-09-21-04-24-56-331.rawproto
new file mode 100644
index 000000000..113103949
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-24-56-331.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-32-21-765.rawproto b/build/android-profile/profile-2019-09-21-04-32-21-765.rawproto
new file mode 100644
index 000000000..aa9eba02d
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-32-21-765.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-33-54-453.rawproto b/build/android-profile/profile-2019-09-21-04-33-54-453.rawproto
new file mode 100644
index 000000000..a21029ddd
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-33-54-453.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-41-43-987.rawproto b/build/android-profile/profile-2019-09-21-04-41-43-987.rawproto
new file mode 100644
index 000000000..4486bc692
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-41-43-987.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-04-56-53-295.rawproto b/build/android-profile/profile-2019-09-21-04-56-53-295.rawproto
new file mode 100644
index 000000000..42fd23716
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-04-56-53-295.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-20-52-708.rawproto b/build/android-profile/profile-2019-09-21-13-20-52-708.rawproto
new file mode 100644
index 000000000..06b78581b
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-20-52-708.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-21-01-083.rawproto b/build/android-profile/profile-2019-09-21-13-21-01-083.rawproto
new file mode 100644
index 000000000..71e1f8037
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-21-01-083.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-28-33-185.rawproto b/build/android-profile/profile-2019-09-21-13-28-33-185.rawproto
new file mode 100644
index 000000000..79676a6ff
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-28-33-185.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-51-46-280.rawproto b/build/android-profile/profile-2019-09-21-13-51-46-280.rawproto
new file mode 100644
index 000000000..c992bf97a
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-51-46-280.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-52-47-589.rawproto b/build/android-profile/profile-2019-09-21-13-52-47-589.rawproto
new file mode 100644
index 000000000..cf67251df
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-52-47-589.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-55-06-245.rawproto b/build/android-profile/profile-2019-09-21-13-55-06-245.rawproto
new file mode 100644
index 000000000..c4cdcba75
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-55-06-245.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-13-57-30-430.rawproto b/build/android-profile/profile-2019-09-21-13-57-30-430.rawproto
new file mode 100644
index 000000000..ac3b1f3a5
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-13-57-30-430.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-00-37-331.rawproto b/build/android-profile/profile-2019-09-21-14-00-37-331.rawproto
new file mode 100644
index 000000000..6683aeb09
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-00-37-331.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-02-29-801.rawproto b/build/android-profile/profile-2019-09-21-14-02-29-801.rawproto
new file mode 100644
index 000000000..1ccd08569
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-02-29-801.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-03-15-569.rawproto b/build/android-profile/profile-2019-09-21-14-03-15-569.rawproto
new file mode 100644
index 000000000..965e7ff01
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-03-15-569.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-08-25-788.rawproto b/build/android-profile/profile-2019-09-21-14-08-25-788.rawproto
new file mode 100644
index 000000000..255b868eb
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-08-25-788.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-12-13-353.rawproto b/build/android-profile/profile-2019-09-21-14-12-13-353.rawproto
new file mode 100644
index 000000000..7a244718f
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-12-13-353.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-12-40-073.rawproto b/build/android-profile/profile-2019-09-21-14-12-40-073.rawproto
new file mode 100644
index 000000000..d7a590fb8
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-12-40-073.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-15-13-809.rawproto b/build/android-profile/profile-2019-09-21-14-15-13-809.rawproto
new file mode 100644
index 000000000..608c2b968
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-15-13-809.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-22-39-436.rawproto b/build/android-profile/profile-2019-09-21-14-22-39-436.rawproto
new file mode 100644
index 000000000..9ee3a4c81
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-22-39-436.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-34-07-998.rawproto b/build/android-profile/profile-2019-09-21-14-34-07-998.rawproto
new file mode 100644
index 000000000..0ab1e28bd
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-34-07-998.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-34-51-669.rawproto b/build/android-profile/profile-2019-09-21-14-34-51-669.rawproto
new file mode 100644
index 000000000..1fb73f323
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-34-51-669.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-38-20-937.rawproto b/build/android-profile/profile-2019-09-21-14-38-20-937.rawproto
new file mode 100644
index 000000000..030dba413
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-38-20-937.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-43-04-768.rawproto b/build/android-profile/profile-2019-09-21-14-43-04-768.rawproto
new file mode 100644
index 000000000..2396d37ec
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-43-04-768.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-14-51-11-221.rawproto b/build/android-profile/profile-2019-09-21-14-51-11-221.rawproto
new file mode 100644
index 000000000..01ee4e32f
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-14-51-11-221.rawproto differ
diff --git a/build/android-profile/profile-2019-09-21-15-02-59-163.rawproto b/build/android-profile/profile-2019-09-21-15-02-59-163.rawproto
new file mode 100644
index 000000000..457eece69
Binary files /dev/null and b/build/android-profile/profile-2019-09-21-15-02-59-163.rawproto differ
diff --git a/build/intermediates/jack-cache/cache.xml b/build/intermediates/jack-cache/cache.xml
index dc5f5ff92..c5c33bd8d 100644
--- a/build/intermediates/jack-cache/cache.xml
+++ b/build/intermediates/jack-cache/cache.xml
@@ -1,480 +1,12 @@
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
+ sha1="30609175e61f293b438213c82956e731cd9a1489">
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
-
-
+ sha1="405525e8268d6748fe908ff792217b7620258042">
+
-
-
+ sha1="c6ef713202a62a4f84847ad9fd339c75f330c7c9">
+
+
+ -
+
-
-
+ sha1="989c3bb13060da1e3154bfe00236f76453a2725f">
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
-
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
-
-
+ sha1="751f548c85fa49f330cecbb1875893f971b33c4e">
+
-
-
+ sha1="d7c42c80f6509b9ea4db28ca7859ffae08ec5741">
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
diff --git a/iFish7/build.gradle b/iFish7/build.gradle
index da47bd177..560e76744 100644
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@@ -104,7 +104,7 @@ dependencies {
//Glide
compile 'cn.bingoogolapple:bga-refreshlayout:1.1.7@aar'
//下拉刷新
- /** 阿里百川 */
+ /** 阿里百川 */
//安全基础
compile name: 'securityguardaar3-5.1.81', ext: 'aar'
// compile 'com.taobao.android:securityguardaar3:5.1.81@aar'
@@ -123,17 +123,21 @@ dependencies {
compile 'com.taobao.android:alibc_applink:2.0.0.9@jar'
//支付宝
compile 'com.alibaba.alipay:alipaySingle:20160825@jar'
- /** 阿里百川 */
+ /** 阿里百川 */
compile project(':JCVideo_Library')
compile 'com.github.PhilJay:MPAndroidChart:v3.0.3'
compile files('libs/mina-core-2.0.17.jar')
compile files('libs/fastjson-1.1.34.android.jar')
compile 'com.aliyun.ams:alicloud-android-push:3.1.4'
compile(name: 'alicloud-android-third-push-3.0.6', ext: 'aar')
- compile 'com.p2p.core:p2p-core:0.4.4'
+// compile 'com.p2p.core:p2p-core:0.4.4.9'
+ compile(name: 'p2p-core-release', ext: 'aar')
+// compile(name: 'pano-release', ext: 'aar')
+ compile 'com.libhttp:libhttp:v0.5.5'
//声波配网库
compile 'com.github.jwkj:SoundWaveSender:v2.0.2'
//声波配网库所依赖的udp通讯库,不可删除
compile 'com.jwkj:udpsender:v2.0.1'
+ compile files('libs/javabase64.jar')
}
//apply plugin: 'com.getkeepsafe.dexcount'
\ No newline at end of file
diff --git a/iFish7/build/generated/source/r/debug/com/example/p2p_core/R.java b/iFish7/build/generated/source/r/debug/com/example/p2p_core/R.java
index 9a50ebbc0..b0f69eda9 100644
--- a/iFish7/build/generated/source/r/debug/com/example/p2p_core/R.java
+++ b/iFish7/build/generated/source/r/debug/com/example/p2p_core/R.java
@@ -280,7 +280,6 @@ public final class R {
public static final int abc_tint_edittext = 0x7f0e0277;
public static final int abc_tint_seek_thumb = 0x7f0e0278;
public static final int abc_tint_spinner = 0x7f0e0279;
- public static final int abc_tint_switch_thumb = 0x7f0e027a;
public static final int abc_tint_switch_track = 0x7f0e027b;
public static final int accent_material_dark = 0x7f0e0021;
public static final int accent_material_light = 0x7f0e0022;
@@ -560,30 +559,22 @@ public final class R {
public static final int activity_chooser_view_content = 0x7f0f0066;
public static final int add = 0x7f0f0026;
public static final int alertTitle = 0x7f0f007a;
- public static final int always = 0x7f0f0048;
- public static final int beginning = 0x7f0f0043;
- public static final int bottom = 0x7f0f0031;
public static final int buttonPanel = 0x7f0f006d;
public static final int cancel_action = 0x7f0f0325;
public static final int checkbox = 0x7f0f007d;
public static final int chronometer = 0x7f0f032d;
- public static final int collapseActionView = 0x7f0f0049;
public static final int contentPanel = 0x7f0f0070;
public static final int custom = 0x7f0f0077;
public static final int customPanel = 0x7f0f0076;
public static final int decor_content_parent = 0x7f0f0084;
public static final int default_activity_button = 0x7f0f0069;
- public static final int disableHome = 0x7f0f001a;
public static final int edit_query = 0x7f0f0088;
- public static final int end = 0x7f0f0035;
public static final int end_padder = 0x7f0f0336;
public static final int expand_activities_button = 0x7f0f0067;
public static final int expanded_menu = 0x7f0f007c;
public static final int home = 0x7f0f0008;
- public static final int homeAsUp = 0x7f0f001b;
public static final int icon = 0x7f0f006b;
public static final int icon_group = 0x7f0f0332;
- public static final int ifRoom = 0x7f0f004a;
public static final int image = 0x7f0f0068;
public static final int info = 0x7f0f032e;
public static final int line1 = 0x7f0f0333;
@@ -591,9 +582,7 @@ public final class R {
public static final int listMode = 0x7f0f0017;
public static final int list_item = 0x7f0f006a;
public static final int media_actions = 0x7f0f0327;
- public static final int middle = 0x7f0f0044;
public static final int multiply = 0x7f0f0027;
- public static final int never = 0x7f0f004b;
public static final int none = 0x7f0f001c;
public static final int normal = 0x7f0f0018;
public static final int notification_background = 0x7f0f032f;
@@ -621,9 +610,6 @@ public final class R {
public static final int search_voice_btn = 0x7f0f0093;
public static final int select_dialog_listview = 0x7f0f0094;
public static final int shortcut = 0x7f0f007e;
- public static final int showCustom = 0x7f0f001d;
- public static final int showHome = 0x7f0f001e;
- public static final int showTitle = 0x7f0f001f;
public static final int spacer = 0x7f0f006e;
public static final int split_action_bar = 0x7f0f000f;
public static final int src_atop = 0x7f0f0029;
@@ -641,11 +627,8 @@ public final class R {
public static final int title = 0x7f0f006c;
public static final int titleDividerNoCustom = 0x7f0f007b;
public static final int title_template = 0x7f0f0079;
- public static final int top = 0x7f0f003a;
public static final int topPanel = 0x7f0f0078;
public static final int up = 0x7f0f0014;
- public static final int useLogo = 0x7f0f0020;
- public static final int withText = 0x7f0f004c;
public static final int wrap_content = 0x7f0f002c;
}
public static final class integer {
@@ -981,11 +964,6 @@ public final class R {
public static final int TextAppearance_AppCompat_Widget_PopupMenu_Small = 0x7f0b0124;
public static final int TextAppearance_AppCompat_Widget_Switch = 0x7f0b0125;
public static final int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 0x7f0b0126;
- public static final int TextAppearance_StatusBar_EventContent = 0x7f0b002e;
- public static final int TextAppearance_StatusBar_EventContent_Info = 0x7f0b002f;
- public static final int TextAppearance_StatusBar_EventContent_Line2 = 0x7f0b0030;
- public static final int TextAppearance_StatusBar_EventContent_Time = 0x7f0b0031;
- public static final int TextAppearance_StatusBar_EventContent_Title = 0x7f0b0032;
public static final int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 0x7f0b012f;
public static final int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 0x7f0b0130;
public static final int TextAppearance_Widget_AppCompat_Toolbar_Title = 0x7f0b0131;
@@ -1070,8 +1048,6 @@ public final class R {
public static final int Widget_AppCompat_ListView = 0x7f0b0186;
public static final int Widget_AppCompat_ListView_DropDown = 0x7f0b0187;
public static final int Widget_AppCompat_ListView_Menu = 0x7f0b0188;
- public static final int Widget_AppCompat_NotificationActionContainer = 0x7f0b0092;
- public static final int Widget_AppCompat_NotificationActionText = 0x7f0b0093;
public static final int Widget_AppCompat_PopupMenu = 0x7f0b0189;
public static final int Widget_AppCompat_PopupMenu_Overflow = 0x7f0b018a;
public static final int Widget_AppCompat_PopupWindow = 0x7f0b018b;
@@ -1127,7 +1103,6 @@ public final class R {
public static final int ActionBar_titleTextStyle = 5;
public static final int[] ActionMenuItemView = { 0x0101013f };
public static final int ActionMenuItemView_android_minWidth = 0;
- public static final int[] ActionMenuView = { };
public static final int[] ActionMode = { 0x7f010002, 0x7f01000b, 0x7f01000c, 0x7f010010, 0x7f010012, 0x7f010022 };
public static final int ActionMode_background = 3;
public static final int ActionMode_backgroundSplit = 4;
diff --git a/iFish7/build/generated/source/r/debug/com/libhttp/R.java b/iFish7/build/generated/source/r/debug/com/libhttp/R.java
index 49083224b..befa464e0 100644
--- a/iFish7/build/generated/source/r/debug/com/libhttp/R.java
+++ b/iFish7/build/generated/source/r/debug/com/libhttp/R.java
@@ -7,7 +7,100 @@
package com.libhttp;
public final class R {
+ public static final class bool {
+ public static final int abc_action_bar_embed_tabs = 0x7f0c0000;
+ }
+ public static final class color {
+ public static final int notification_action_color_filter = 0x7f0e0000;
+ public static final int notification_icon_bg_color = 0x7f0e015c;
+ public static final int notification_material_background_media_default_color = 0x7f0e015d;
+ public static final int primary_text_default_material_dark = 0x7f0e0179;
+ public static final int ripple_material_light = 0x7f0e0185;
+ public static final int secondary_text_default_material_dark = 0x7f0e018d;
+ public static final int secondary_text_default_material_light = 0x7f0e018e;
+ }
+ public static final class dimen {
+ public static final int notification_action_icon_size = 0x7f0a0107;
+ public static final int notification_action_text_size = 0x7f0a0108;
+ public static final int notification_big_circle_margin = 0x7f0a0109;
+ public static final int notification_content_margin_start = 0x7f0a001c;
+ public static final int notification_large_icon_height = 0x7f0a010a;
+ public static final int notification_large_icon_width = 0x7f0a010b;
+ public static final int notification_main_column_padding_top = 0x7f0a001d;
+ public static final int notification_media_narrow_margin = 0x7f0a001e;
+ public static final int notification_right_icon_size = 0x7f0a010c;
+ public static final int notification_right_side_padding_top = 0x7f0a001a;
+ public static final int notification_small_icon_background_padding = 0x7f0a010d;
+ public static final int notification_small_icon_size_as_large = 0x7f0a010e;
+ public static final int notification_subtext_size = 0x7f0a010f;
+ public static final int notification_top_pad = 0x7f0a0110;
+ public static final int notification_top_pad_large_text = 0x7f0a0111;
+ }
+ public static final class drawable {
+ public static final int notification_action_background = 0x7f020316;
+ public static final int notification_bg = 0x7f020317;
+ public static final int notification_bg_low = 0x7f020318;
+ public static final int notification_bg_low_normal = 0x7f020319;
+ public static final int notification_bg_low_pressed = 0x7f02031a;
+ public static final int notification_bg_normal = 0x7f02031b;
+ public static final int notification_bg_normal_pressed = 0x7f02031c;
+ public static final int notification_icon_background = 0x7f02031d;
+ public static final int notification_template_icon_bg = 0x7f0205cc;
+ public static final int notification_template_icon_low_bg = 0x7f0205cd;
+ public static final int notification_tile_bg = 0x7f02031e;
+ public static final int notify_panel_notification_icon_bg = 0x7f02031f;
+ }
+ public static final class id {
+ public static final int action0 = 0x7f0f0324;
+ public static final int action_container = 0x7f0f0321;
+ public static final int action_divider = 0x7f0f0328;
+ public static final int action_image = 0x7f0f0322;
+ public static final int action_text = 0x7f0f0323;
+ public static final int actions = 0x7f0f0331;
+ public static final int cancel_action = 0x7f0f0325;
+ public static final int chronometer = 0x7f0f032d;
+ public static final int end_padder = 0x7f0f0336;
+ public static final int icon = 0x7f0f006b;
+ public static final int icon_group = 0x7f0f0332;
+ public static final int info = 0x7f0f032e;
+ public static final int line1 = 0x7f0f0333;
+ public static final int line3 = 0x7f0f0335;
+ public static final int media_actions = 0x7f0f0327;
+ public static final int normal = 0x7f0f0018;
+ public static final int notification_background = 0x7f0f032f;
+ public static final int notification_main_column = 0x7f0f032a;
+ public static final int notification_main_column_container = 0x7f0f0329;
+ public static final int right_icon = 0x7f0f0330;
+ public static final int right_side = 0x7f0f032b;
+ public static final int status_bar_latest_event_content = 0x7f0f0326;
+ public static final int text = 0x7f0f0114;
+ public static final int text2 = 0x7f0f0334;
+ public static final int time = 0x7f0f032c;
+ public static final int title = 0x7f0f006c;
+ }
+ public static final class integer {
+ public static final int cancel_button_image_alpha = 0x7f0d0005;
+ public static final int status_bar_notification_info_maxnum = 0x7f0d000e;
+ }
+ public static final class layout {
+ public static final int notification_action = 0x7f0400d4;
+ public static final int notification_action_tombstone = 0x7f0400d5;
+ public static final int notification_media_action = 0x7f0400d6;
+ public static final int notification_media_cancel_action = 0x7f0400d7;
+ public static final int notification_template_big_media = 0x7f0400d8;
+ public static final int notification_template_big_media_custom = 0x7f0400d9;
+ public static final int notification_template_big_media_narrow = 0x7f0400da;
+ public static final int notification_template_big_media_narrow_custom = 0x7f0400db;
+ public static final int notification_template_custom_big = 0x7f0400dc;
+ public static final int notification_template_icon_group = 0x7f0400dd;
+ public static final int notification_template_lines_media = 0x7f0400de;
+ public static final int notification_template_media = 0x7f0400df;
+ public static final int notification_template_media_custom = 0x7f0400e0;
+ public static final int notification_template_part_chronometer = 0x7f0400e1;
+ public static final int notification_template_part_time = 0x7f0400e2;
+ }
public static final class string {
public static final int httpapp_name = 0x7f080120;
+ public static final int status_bar_notification_info_overflow = 0x7f080014;
}
}
diff --git a/iFish7/build/intermediates/blame/res/debug/multi/values.json b/iFish7/build/intermediates/blame/res/debug/multi/values.json
index faff44ab5..b71f497c9 100644
--- a/iFish7/build/intermediates/blame/res/debug/multi/values.json
+++ b/iFish7/build/intermediates/blame/res/debug/multi/values.json
@@ -23928,7 +23928,7 @@
"endOffset": 130256
},
"from": {
- "file": "C:\\Users\\Administrator\\.android\\build-cache\\81bb1e81ce531aeaac2645ff6c3818d15e86e716\\output\\res\\values\\values.xml",
+ "file": "C:\\Users\\Administrator\\.android\\build-cache\\c5d11b14689461e21662c257116265cbd6d14c4c\\output\\res\\values\\values.xml",
"position": {
"startLine": 2,
"startColumn": 4,
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json
index c665a22ef..07b7e57a3 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json
@@ -155,14 +155,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
- "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png",
"source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_find_comment.png"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png",
+ "source": "C:\\beifen\\ifish\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-xxxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png"
diff --git a/iFish7/build/intermediates/blame/res/debug/single/drawable.json b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
index 9a414b3e3..bafee0287 100644
--- a/iFish7/build/intermediates/blame/res/debug/single/drawable.json
+++ b/iFish7/build/intermediates/blame/res/debug/single/drawable.json
@@ -1251,14 +1251,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_action_back.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_action_back.xml"
},
- {
- "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_tab_left_pressed.png",
- "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_pressed.png"
- },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\monitor_radiobutton_select.xml",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\monitor_radiobutton_select.xml"
},
+ {
+ "merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_title_tab_left_pressed.png",
+ "source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_title_tab_left_pressed.png"
+ },
{
"merged": "C:\\beifen\\ifish\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\umeng_socialize_button_red.9.png",
"source": "C:\\beifen\\ifish\\ifish\\iFish7\\src\\main\\res\\drawable\\umeng_socialize_button_red.9.png"
diff --git a/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/iFish7/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 5ce965db7..749c31cf3 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 10 23:58:26 CST 2019
+#Sat Sep 21 15:03:18 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 b4308a515..55ba1dd4a 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 10 23:58:24 CST 2019
+#Sat Sep 21 15:03:16 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
diff --git a/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml b/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml
index 43591a7a2..2cbcafdfa 100644
--- a/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/iFish7/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-UDPSenderLibSoundWaveLibhttp"999+""TẮT""Gửi truy vấn""Xóa truy vấn""Chọn một ứng dụng""Tìm kiếm…""Chia sẻ với %s""Thêm tùy chọn""Xong""Tìm kiếm bằng giọng nói""%1$s, %2$s""Xem tất cả""BẬT""Tìm kiếm""%1$s, %2$s, %3$s""Tìm kiếm truy vấn""Chia sẻ với""Tìm kiếm""Điều hướng lên trên""Điều hướng về trang chủ""Thu gọn"- 50%
- 60%
- 70%
- 90%
- 45%
- 72%
"搜索""关闭""提交查询""转到上一层级""999+""更多选项""语音搜索""收起""转到主屏幕""%1$s:%2$s""分享方式""开启""搜索""选择应用""查看全部""%1$s - %2$s:%3$s""搜索查询""完成""清除查询""通过%s分享""搜索…""清除查詢""999 +""更多選項""提交查詢""收合""與「%s」分享""向上瀏覽""開啟""語音搜尋""顯示全部""搜尋…""選擇應用程式""搜尋""%1$s (%2$s):%3$s""完成""%1$s:%2$s""搜尋查詢""分享對象""搜尋""關閉""瀏覽主頁""提交查詢""%1$s - %2$s:%3$s""搜尋""選擇分享對象""%1$s:%2$s""查看全部""選擇應用程式""清除查詢""更多選項""與「%s」分享""搜尋""搜尋查詢""語音搜尋""向上瀏覽""關閉""瀏覽首頁""完成""開啟""999+""收合""搜尋…""Iyasesha...""%1$s, %2$s""Hambisa umbuzo""Yabelana no-%s""%1$s, %2$s, %3$s""Izinketho eziningi""Kwenziwe""Umbuzo wosesho""Sesha""Zulazulela phezulu""Sula inkinga""Sesha""VULIWE""Yabelana no-""Goqa""VALIWE""Ukusesha ngezwi""Khetha uhlelo lokusebenza""Zulazulela ekhaya""Buka konke""999+"P2P-Corehuawei-xiaomi-push-support-aarpush sdk"999+""TẮT""Gửi truy vấn""Xóa truy vấn""Chọn một ứng dụng""Tìm kiếm…""Chia sẻ với %s""Thêm tùy chọn""Xong""Tìm kiếm bằng giọng nói""%1$s, %2$s""Xem tất cả""BẬT""Tìm kiếm""%1$s, %2$s, %3$s""Tìm kiếm truy vấn""Chia sẻ với""Tìm kiếm""Điều hướng lên trên""Điều hướng về trang chủ""Thu gọn"- 50%
- 60%
- 70%
- 90%
- 45%
- 72%
"搜索""关闭""提交查询""转到上一层级""999+""更多选项""语音搜索""收起""转到主屏幕""%1$s:%2$s""分享方式""开启""搜索""选择应用""查看全部""%1$s - %2$s:%3$s""搜索查询""完成""清除查询""通过%s分享""搜索…""清除查詢""999 +""更多選項""提交查詢""收合""與「%s」分享""向上瀏覽""開啟""語音搜尋""顯示全部""搜尋…""選擇應用程式""搜尋""%1$s (%2$s):%3$s""完成""%1$s:%2$s""搜尋查詢""分享對象""搜尋""關閉""瀏覽主頁""提交查詢""%1$s - %2$s:%3$s""搜尋""選擇分享對象""%1$s:%2$s""查看全部""選擇應用程式""清除查詢""更多選項""與「%s」分享""搜尋""搜尋查詢""語音搜尋""向上瀏覽""關閉""瀏覽首頁""完成""開啟""999+""收合""搜尋…""Iyasesha...""%1$s, %2$s""Hambisa umbuzo""Yabelana no-%s""%1$s, %2$s, %3$s""Izinketho eziningi""Kwenziwe""Umbuzo wosesho""Sesha""Zulazulela phezulu""Sula inkinga""Sesha""VULIWE""Yabelana no-""Goqa""VALIWE""Ukusesha ngezwi""Khetha uhlelo lokusebenza""Zulazulela ekhaya""Buka konke""999+"Stop playResume