diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index 96e6de3dd..e74498817 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 d49282d4c..080c821f5 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 1dda5271a..37bac82f4 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 c4ef85443..69f1df718 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 bfab13cc0..cef9723cb 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 f9ec3f5b2..39d3d12e6 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 fc123f436..76a2868b9 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 f0c423b65..97bc6aa4d 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 7b93007d4..473e710f3 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 f7266e668..7591bf238 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 66a4f47bf..e14a7aa90 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 023c13f1d..3889ffe2d 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 ac6a711d1..d05db1aaf 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 b92290be9..dd8fc6fd4 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.lock b/.gradle/3.3/tasks/_iFish7_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index aa2caa6f3..c2a1833df 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/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 8856cf647..14ce944b5 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index b6aa3e3e3..aa9316a48 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 4a73da925..b58671689 100644
Binary files a/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_iFish7_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index bc8d8bde6..8c120bc56 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index e848c8029..00b052ba4 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_p2PCore_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index e8c839069..36dda2b9d 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index ba3ffd23b..683d48f23 100644
Binary files a/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_p2PCore_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 9338c5dc0..0870d1226 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 2211a42e0..f6913b225 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_uikit_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 440b2a9c0..247c0d3ca 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 4396559c8..e063394c3 100644
Binary files a/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_uikit_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8d978c016..773328476 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,16 +10,11 @@
-
-
+
-
-
-
-
@@ -28,6 +23,8 @@
+
+
@@ -36,8 +33,12 @@
+
+
+
+
@@ -57,48 +58,47 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
@@ -139,7 +139,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6834,27 +6848,35 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6893,8 +6915,6 @@
-
-
@@ -6923,17 +6943,19 @@
-
+
+
+
-
+
@@ -7279,27 +7301,27 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
+
@@ -7308,34 +7330,34 @@
-
+
-
-
+
+
-
+
-
+
-
+
-
+
@@ -7367,399 +7389,457 @@
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java
+ 226
+
+
+
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/MainFour_2B_ControlActivity.java
+ 444
+
+
+
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/tcp/TcpSendThread.java
+ 131
+
+
+
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/fragment/Four_2B_Fragment.java
+ 80
+
+
+
+
+ file://$PROJECT_DIR$/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2B.java
+ 311
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
-
+
+
+
+
-
-
-
+
+
-
+
+
+
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index f5719c6dd..fd96ed595 100644
--- a/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 19 19:10:07 CST 2018
+#Tue Apr 24 16:44:46 CST 2018
diff --git a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 1738f8fd2..7433622a6 100644
--- a/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 19 19:10:06 CST 2018
+#Tue Apr 24 16:44:44 CST 2018
diff --git a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 24cda7acc..0c28a6219 100644
--- a/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 19 19:10:16 CST 2018
+#Tue Apr 24 16:45:02 CST 2018
diff --git a/BageView/build/outputs/aar/BageView-debug.aar b/BageView/build/outputs/aar/BageView-debug.aar
index 1b0a25a11..55d6c44c6 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 2587cfb3d..83ec4d254 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-mdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json
index 7f9264aa5..fa2d636e5 100644
--- a/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json
+++ b/JCVideo_Library/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json
@@ -11,26 +11,26 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_dark.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_dark.png"
},
- {
- "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png",
- "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png"
- },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_popup_background_mtrl_mult.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_popup_background_mtrl_mult.9.png"
},
+ {
+ "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png",
+ "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png"
+ },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png"
},
- {
- "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
- "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
- },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png"
},
+ {
+ "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
+ "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
+ },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_text_select_handle_middle_mtrl_light.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_text_select_handle_middle_mtrl_light.png"
@@ -103,14 +103,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_star_half_black_48dp.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_48dp.png"
},
- {
- "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png",
- "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
- },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
},
+ {
+ "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png",
+ "source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
+ },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_switch_track_mtrl_alpha.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_switch_track_mtrl_alpha.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 0b65c7973..424223567 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
@@ -59,14 +59,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_add_volume.png",
"source": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_add_volume.png"
},
- {
- "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_shrink.png",
- "source": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_shrink.png"
- },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notification_bg_normal.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\notification_bg_normal.9.png"
},
+ {
+ "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_shrink.png",
+ "source": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_shrink.png"
+ },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
diff --git a/JCVideo_Library/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json b/JCVideo_Library/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json
index 47fba05d6..f35564fbe 100644
--- a/JCVideo_Library/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json
+++ b/JCVideo_Library/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json
@@ -219,14 +219,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_back_pressed.png",
"source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_pressed.png"
},
- {
- "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_pause_normal.png",
- "source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_pause_normal.png"
- },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png"
},
+ {
+ "merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_pause_normal.png",
+ "source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_pause_normal.png"
+ },
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_volume_icon.png",
"source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_volume_icon.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 69e3a6911..970a2dc1a 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 @@
-#Thu Apr 19 19:10:15 CST 2018
+#Tue Apr 24 16:44:58 CST 2018
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_bottom_seek_progress.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
@@ -11,8 +11,8 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_error_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_error_pressed.png
-C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_16dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_half_black_16dp.png
+C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_black_36dp.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_bg.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_bottom_bg.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\notification_bg_normal.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_normal.9.png
@@ -100,8 +100,8 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_16dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_half_black_16dp.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v11\\abc_background_cache_hint_selector_material_light.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v11\\abc_background_cache_hint_selector_material_light.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png
-C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_item_background_holo_light.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_item_background_holo_light.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_list_focused_holo.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_focused_holo.9.png
+C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_item_background_holo_light.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_item_background_holo_light.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_backward_icon.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_backward_icon.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_btn_colored_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_btn_colored_material.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 1efd151b1..d6a16679c 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 @@
-#Thu Apr 19 19:10:10 CST 2018
+#Tue Apr 24 16:44:52 CST 2018
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
@@ -241,9 +241,9 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_light.png
+C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_search_view.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout\\abc_search_view.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_btn_check_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml
-C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout-v16\\notification_template_custom_big.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout-v16\\notification_template_custom_big.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_edit_text_material.xml
@@ -399,8 +399,8 @@ C\:\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_brightness.xml=C\
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout-v11\\notification_template_big_media_narrow.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout-v11\\notification_template_big_media_narrow.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_list_menu_item_checkbox.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout\\abc_list_menu_item_checkbox.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png
-C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_enlarge.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_enlarge.png
+C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.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 5d2cfd08a..c4a751dfa 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 @@
-#Thu Apr 19 19:10:11 CST 2018
+#Tue Apr 24 16:44:54 CST 2018
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_play_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_play_pressed.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 8a8da9883..5e2932ce2 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 @@
-#Thu Apr 19 19:10:17 CST 2018
+#Tue Apr 24 16:45:03 CST 2018
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_back_normal.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_play_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_play_pressed.png
diff --git a/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar b/JCVideo_Library/build/outputs/aar/JCVideo_Library-debug.aar
index 844229bf9..42f749a16 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 0f69dd1bd..75702c1f0 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-2018-04-20-09-43-42-029.rawproto b/build/android-profile/profile-2018-04-20-09-43-42-029.rawproto
new file mode 100644
index 000000000..bdf5fb8cc
Binary files /dev/null and b/build/android-profile/profile-2018-04-20-09-43-42-029.rawproto differ
diff --git a/build/android-profile/profile-2018-04-20-09-43-59-350.rawproto b/build/android-profile/profile-2018-04-20-09-43-59-350.rawproto
new file mode 100644
index 000000000..8dd460c18
Binary files /dev/null and b/build/android-profile/profile-2018-04-20-09-43-59-350.rawproto differ
diff --git a/build/android-profile/profile-2018-04-20-17-47-18-581.rawproto b/build/android-profile/profile-2018-04-20-17-47-18-581.rawproto
new file mode 100644
index 000000000..971aece0e
Binary files /dev/null and b/build/android-profile/profile-2018-04-20-17-47-18-581.rawproto differ
diff --git a/build/android-profile/profile-2018-04-20-17-47-31-946.rawproto b/build/android-profile/profile-2018-04-20-17-47-31-946.rawproto
new file mode 100644
index 000000000..6f8fcdd67
Binary files /dev/null and b/build/android-profile/profile-2018-04-20-17-47-31-946.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-16-38-36-206.rawproto b/build/android-profile/profile-2018-04-22-16-38-36-206.rawproto
new file mode 100644
index 000000000..4bca5fd1d
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-16-38-36-206.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-16-38-58-129.rawproto b/build/android-profile/profile-2018-04-22-16-38-58-129.rawproto
new file mode 100644
index 000000000..ec56775d7
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-16-38-58-129.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-24-13-989.rawproto b/build/android-profile/profile-2018-04-22-17-24-13-989.rawproto
new file mode 100644
index 000000000..c55a4aeb8
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-24-13-989.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-36-38-589.rawproto b/build/android-profile/profile-2018-04-22-17-36-38-589.rawproto
new file mode 100644
index 000000000..528520828
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-36-38-589.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-43-39-675.rawproto b/build/android-profile/profile-2018-04-22-17-43-39-675.rawproto
new file mode 100644
index 000000000..c727f1c5f
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-43-39-675.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-47-28-524.rawproto b/build/android-profile/profile-2018-04-22-17-47-28-524.rawproto
new file mode 100644
index 000000000..fe79bbd1a
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-47-28-524.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-52-49-784.rawproto b/build/android-profile/profile-2018-04-22-17-52-49-784.rawproto
new file mode 100644
index 000000000..e327e6aa6
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-52-49-784.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-56-40-849.rawproto b/build/android-profile/profile-2018-04-22-17-56-40-849.rawproto
new file mode 100644
index 000000000..6dd713bb9
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-56-40-849.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-57-59-707.rawproto b/build/android-profile/profile-2018-04-22-17-57-59-707.rawproto
new file mode 100644
index 000000000..54d20340c
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-57-59-707.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-17-59-01-979.rawproto b/build/android-profile/profile-2018-04-22-17-59-01-979.rawproto
new file mode 100644
index 000000000..4243a7439
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-17-59-01-979.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-01-50-488.rawproto b/build/android-profile/profile-2018-04-22-18-01-50-488.rawproto
new file mode 100644
index 000000000..20915408c
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-01-50-488.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-08-51-100.rawproto b/build/android-profile/profile-2018-04-22-18-08-51-100.rawproto
new file mode 100644
index 000000000..8bc036b36
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-08-51-100.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-11-47-785.rawproto b/build/android-profile/profile-2018-04-22-18-11-47-785.rawproto
new file mode 100644
index 000000000..9a2979862
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-11-47-785.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-12-51-278.rawproto b/build/android-profile/profile-2018-04-22-18-12-51-278.rawproto
new file mode 100644
index 000000000..f082e28df
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-12-51-278.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-28-24-812.rawproto b/build/android-profile/profile-2018-04-22-18-28-24-812.rawproto
new file mode 100644
index 000000000..6d90e76e9
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-28-24-812.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-30-06-225.rawproto b/build/android-profile/profile-2018-04-22-18-30-06-225.rawproto
new file mode 100644
index 000000000..87d149668
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-30-06-225.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-31-11-962.rawproto b/build/android-profile/profile-2018-04-22-18-31-11-962.rawproto
new file mode 100644
index 000000000..123c4b5bc
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-31-11-962.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-34-59-146.rawproto b/build/android-profile/profile-2018-04-22-18-34-59-146.rawproto
new file mode 100644
index 000000000..e6cc29416
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-34-59-146.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-36-39-545.rawproto b/build/android-profile/profile-2018-04-22-18-36-39-545.rawproto
new file mode 100644
index 000000000..1cb54bed2
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-36-39-545.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-42-02-641.rawproto b/build/android-profile/profile-2018-04-22-18-42-02-641.rawproto
new file mode 100644
index 000000000..466517e79
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-42-02-641.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-43-06-230.rawproto b/build/android-profile/profile-2018-04-22-18-43-06-230.rawproto
new file mode 100644
index 000000000..28018847e
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-43-06-230.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-49-23-885.rawproto b/build/android-profile/profile-2018-04-22-18-49-23-885.rawproto
new file mode 100644
index 000000000..e977c9118
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-49-23-885.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-50-29-779.rawproto b/build/android-profile/profile-2018-04-22-18-50-29-779.rawproto
new file mode 100644
index 000000000..a1b9aea15
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-50-29-779.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-18-58-41-289.rawproto b/build/android-profile/profile-2018-04-22-18-58-41-289.rawproto
new file mode 100644
index 000000000..087378aee
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-18-58-41-289.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-19-00-14-310.rawproto b/build/android-profile/profile-2018-04-22-19-00-14-310.rawproto
new file mode 100644
index 000000000..5468cb375
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-19-00-14-310.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-19-06-07-976.rawproto b/build/android-profile/profile-2018-04-22-19-06-07-976.rawproto
new file mode 100644
index 000000000..6bf660bd2
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-19-06-07-976.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-19-07-10-683.rawproto b/build/android-profile/profile-2018-04-22-19-07-10-683.rawproto
new file mode 100644
index 000000000..d50c2cb15
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-19-07-10-683.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-19-30-55-103.rawproto b/build/android-profile/profile-2018-04-22-19-30-55-103.rawproto
new file mode 100644
index 000000000..4047d5d72
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-19-30-55-103.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-20-38-35-989.rawproto b/build/android-profile/profile-2018-04-22-20-38-35-989.rawproto
new file mode 100644
index 000000000..d74a03cc1
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-20-38-35-989.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-20-49-05-284.rawproto b/build/android-profile/profile-2018-04-22-20-49-05-284.rawproto
new file mode 100644
index 000000000..f30adee18
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-20-49-05-284.rawproto differ
diff --git a/build/android-profile/profile-2018-04-22-20-50-11-445.rawproto b/build/android-profile/profile-2018-04-22-20-50-11-445.rawproto
new file mode 100644
index 000000000..8d0f33245
Binary files /dev/null and b/build/android-profile/profile-2018-04-22-20-50-11-445.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-10-04-03-935.rawproto b/build/android-profile/profile-2018-04-23-10-04-03-935.rawproto
new file mode 100644
index 000000000..6bc13dd0f
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-10-04-03-935.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-10-04-25-360.rawproto b/build/android-profile/profile-2018-04-23-10-04-25-360.rawproto
new file mode 100644
index 000000000..f864fb243
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-10-04-25-360.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-01-22-515.rawproto b/build/android-profile/profile-2018-04-23-19-01-22-515.rawproto
new file mode 100644
index 000000000..0ad5e9be3
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-01-22-515.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-01-45-582.rawproto b/build/android-profile/profile-2018-04-23-19-01-45-582.rawproto
new file mode 100644
index 000000000..40aac59d3
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-01-45-582.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-02-44-042.rawproto b/build/android-profile/profile-2018-04-23-19-02-44-042.rawproto
new file mode 100644
index 000000000..a502ac608
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-02-44-042.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-07-27-615.rawproto b/build/android-profile/profile-2018-04-23-19-07-27-615.rawproto
new file mode 100644
index 000000000..8723877f7
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-07-27-615.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-16-33-107.rawproto b/build/android-profile/profile-2018-04-23-19-16-33-107.rawproto
new file mode 100644
index 000000000..3345d08e3
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-16-33-107.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-20-45-369.rawproto b/build/android-profile/profile-2018-04-23-19-20-45-369.rawproto
new file mode 100644
index 000000000..8535896ef
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-20-45-369.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-30-34-155.rawproto b/build/android-profile/profile-2018-04-23-19-30-34-155.rawproto
new file mode 100644
index 000000000..fb2ffe47d
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-30-34-155.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-33-46-777.rawproto b/build/android-profile/profile-2018-04-23-19-33-46-777.rawproto
new file mode 100644
index 000000000..3c9c2bf8a
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-33-46-777.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-36-12-345.rawproto b/build/android-profile/profile-2018-04-23-19-36-12-345.rawproto
new file mode 100644
index 000000000..de857e38c
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-36-12-345.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-38-04-913.rawproto b/build/android-profile/profile-2018-04-23-19-38-04-913.rawproto
new file mode 100644
index 000000000..5efb33a0d
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-38-04-913.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-44-46-405.rawproto b/build/android-profile/profile-2018-04-23-19-44-46-405.rawproto
new file mode 100644
index 000000000..b2b586437
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-44-46-405.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-19-53-00-908.rawproto b/build/android-profile/profile-2018-04-23-19-53-00-908.rawproto
new file mode 100644
index 000000000..a41029dd7
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-19-53-00-908.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-00-43-319.rawproto b/build/android-profile/profile-2018-04-23-20-00-43-319.rawproto
new file mode 100644
index 000000000..8a1816147
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-00-43-319.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-01-56-211.rawproto b/build/android-profile/profile-2018-04-23-20-01-56-211.rawproto
new file mode 100644
index 000000000..be8ba269b
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-01-56-211.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-05-22-863.rawproto b/build/android-profile/profile-2018-04-23-20-05-22-863.rawproto
new file mode 100644
index 000000000..234e5933f
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-05-22-863.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-10-17-522.rawproto b/build/android-profile/profile-2018-04-23-20-10-17-522.rawproto
new file mode 100644
index 000000000..eb47ea547
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-10-17-522.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-14-49-865.rawproto b/build/android-profile/profile-2018-04-23-20-14-49-865.rawproto
new file mode 100644
index 000000000..bfeb53099
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-14-49-865.rawproto differ
diff --git a/build/android-profile/profile-2018-04-23-20-23-49-647.rawproto b/build/android-profile/profile-2018-04-23-20-23-49-647.rawproto
new file mode 100644
index 000000000..1104e2919
Binary files /dev/null and b/build/android-profile/profile-2018-04-23-20-23-49-647.rawproto differ
diff --git a/build/android-profile/profile-2018-04-24-09-47-28-559.rawproto b/build/android-profile/profile-2018-04-24-09-47-28-559.rawproto
new file mode 100644
index 000000000..689335ade
Binary files /dev/null and b/build/android-profile/profile-2018-04-24-09-47-28-559.rawproto differ
diff --git a/build/android-profile/profile-2018-04-24-09-47-51-803.rawproto b/build/android-profile/profile-2018-04-24-09-47-51-803.rawproto
new file mode 100644
index 000000000..f9e0e46cd
Binary files /dev/null and b/build/android-profile/profile-2018-04-24-09-47-51-803.rawproto differ
diff --git a/build/android-profile/profile-2018-04-24-16-42-20-205.rawproto b/build/android-profile/profile-2018-04-24-16-42-20-205.rawproto
new file mode 100644
index 000000000..e612ff7e7
Binary files /dev/null and b/build/android-profile/profile-2018-04-24-16-42-20-205.rawproto differ
diff --git a/build/android-profile/profile-2018-04-24-16-42-34-087.rawproto b/build/android-profile/profile-2018-04-24-16-42-34-087.rawproto
new file mode 100644
index 000000000..98a0cf0e4
Binary files /dev/null and b/build/android-profile/profile-2018-04-24-16-42-34-087.rawproto differ
diff --git a/build/android-profile/profile-2018-04-24-16-43-10-020.rawproto b/build/android-profile/profile-2018-04-24-16-43-10-020.rawproto
new file mode 100644
index 000000000..17b99d64b
Binary files /dev/null and b/build/android-profile/profile-2018-04-24-16-43-10-020.rawproto differ
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
index 4772c0705..9a199d69c 100644
--- a/build/intermediates/dex-cache/cache.xml
+++ b/build/intermediates/dex-cache/cache.xml
@@ -1096,7 +1096,7 @@
jumboMode="true"
optimize="true"
revision="25.0.2"
- sha1="bed6336f45c6f484aa54cc8932fc4f8df8b3be45">
+ sha1="60a78d24161f26144cf0604b89cd4e9088516b8a">
-
+
+
+
+
+
<!– 发送feedActivity –>
<!– 转发页面 –>
<!– 用户信息页面 –>
<!– 话题详情页面 –>
+ android:windowSoftInputMode="stateHidden|adjustResize" />
<!– feed详情页面 –>
<!– 设置页面activity –>
@@ -1017,8 +1033,8 @@ android:name="com.umeng.comm.ui.activities.FeedDetailActivity"
<!– 显示某个位置Feed的Activity –>
<!–相册Activity–>
-
<!–已关注的话题Activity–>
@@ -1036,7 +1052,7 @@ android:name="com.umeng.comm.ui.activities.FeedDetailActivity"
<!– 点击链接时跳转的Activity –>
-->
diff --git a/iFish7/build/intermediates/res/merged/debug/layout/bindtwodevice_activity.xml b/iFish7/build/intermediates/res/merged/debug/layout/bindtwodevice_activity.xml
index 2d5419326..4c136a282 100644
--- a/iFish7/build/intermediates/res/merged/debug/layout/bindtwodevice_activity.xml
+++ b/iFish7/build/intermediates/res/merged/debug/layout/bindtwodevice_activity.xml
@@ -18,12 +18,13 @@
android:layout_height="match_parent"
android:orientation="vertical"
>
+
+ android:scaleType="fitXY" />
+
-
@@ -74,8 +74,8 @@
android:textColor="@color/FCBB3E"
android:textSize="18sp" />
-
diff --git a/iFish7/build/intermediates/res/merged/debug/layout/setwatertemp_dialog.xml b/iFish7/build/intermediates/res/merged/debug/layout/setwatertemp_dialog.xml
index 7c83cc884..616fd420d 100644
--- a/iFish7/build/intermediates/res/merged/debug/layout/setwatertemp_dialog.xml
+++ b/iFish7/build/intermediates/res/merged/debug/layout/setwatertemp_dialog.xml
@@ -22,12 +22,13 @@
android:id="@+id/iv_hot"
android:layout_width="68dp"
android:layout_height="28dp"
- android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
- android:layout_alignParentRight="true"
android:src="@drawable/watertemp_hot"
app:selector_src="@drawable/watertemp_cold"
- />
+ android:layout_above="@+id/rl_frame"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="10dp" />
-
+
-
+
@@ -53,7 +53,7 @@
-
+
@@ -72,10 +72,10 @@
-
+
-
+
@@ -83,12 +83,12 @@
-
-
+
+
-
+
@@ -102,7 +102,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
-
+
-
+
-
+
@@ -316,7 +316,9 @@
android:theme="@style/MyAppTheme"
tools:replace="android:icon,android:theme,android:allowBackup"
>
-
+
+
+
+
@@ -533,8 +538,8 @@
android:value="com.netease.nimlib.service.NimReceiver"/>
-
-
+
+
-
+
-->
-
-
-
-
+
+
+
+
-
+
-
-
+
+
@@ -597,45 +602,45 @@
<!– 发送feedActivity –>
<!– 转发页面 –>
<!– 用户信息页面 –>
<!– 话题详情页面 –>
+ android:windowSoftInputMode="stateHidden|adjustResize" />
<!– feed详情页面 –>
<!– 设置页面activity –>
@@ -652,8 +657,8 @@ android:name="com.umeng.comm.ui.activities.FeedDetailActivity"
<!– 显示某个位置Feed的Activity –>
<!–相册Activity–>
-
<!–已关注的话题Activity–>
@@ -671,13 +676,13 @@ android:name="com.umeng.comm.ui.activities.FeedDetailActivity"
<!– 点击链接时跳转的Activity –>
-->
@@ -685,7 +690,7 @@ android:name="com.umeng.comm.ui.activities.FeedDetailActivity"
-
+
-
+
\ No newline at end of file
diff --git a/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java b/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java
index 3fb76ab4e..fb1f23048 100644
--- a/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java
@@ -279,6 +279,8 @@ public class BindTankActivity extends BaseActivity {
i.setClass(BindTankActivity.this, MainFiveBDControlActivity.class);
}else if(Device.TYPE_2A.equals(type)){
i.setClass(BindTankActivity.this, MainSix_2A_ControlActivity.class);
+ }else if(Device.TYPE_2B.equals(type)){
+ i.setClass(BindTankActivity.this, MainFour_2B_ControlActivity.class);
}else{
if (controlAmount==null) {//如果控制器返回空 则默认给三控的页面
i.setClass(BindTankActivity.this, MainThreeControlActivity.class);
@@ -649,6 +651,8 @@ public class BindTankActivity extends BaseActivity {
i.setClass(BindTankActivity.this, MainFiveBDControlActivity.class);
}else if(Device.TYPE_2A.equals(type)){
i.setClass(BindTankActivity.this, MainSix_2A_ControlActivity.class);
+ }else if(Device.TYPE_2B.equals(type)){
+ i.setClass(BindTankActivity.this, MainFour_2B_ControlActivity.class);
}else{
if (controlAmount==null) {//如果控制器返回空 则默认给三控的页面
i.setClass(BindTankActivity.this, MainThreeControlActivity.class);
diff --git a/iFish7/src/main/java/com/ifish/activity/CaptureActivity.java b/iFish7/src/main/java/com/ifish/activity/CaptureActivity.java
index 5cd8c98f7..89e3aba29 100644
--- a/iFish7/src/main/java/com/ifish/activity/CaptureActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/CaptureActivity.java
@@ -398,6 +398,8 @@ public final class CaptureActivity extends BaseActivity implements SurfaceHolder
i.setClass(CaptureActivity.this, MainFiveBDControlActivity.class);
}else if(Device.TYPE_2A.equals(type)){
i.setClass(CaptureActivity.this, MainSix_2A_ControlActivity.class);
+ }else if(Device.TYPE_2B.equals(type)){
+ i.setClass(CaptureActivity.this, MainFour_2B_ControlActivity.class);
}else{
if (controlAmount==null) {//如果控制器返回空 则默认给三控的页面
i.setClass(CaptureActivity.this, MainThreeControlActivity.class);
diff --git a/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2B_Activity.java b/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2B_Activity.java
index 2c15282c9..443be977c 100644
--- a/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2B_Activity.java
+++ b/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2B_Activity.java
@@ -35,9 +35,7 @@ import java.util.List;
/**
* @ClassName: changeDeviceNameActivity
- * @Description: 修改设备昵称(睿鑫独立六控)
- * @author Jacky dada
- * @date 2017年6月6日 16:55:02
+ * @Description: 修改设备昵称(睿美四控)
*/
public class ChangeDeviceName_2B_Activity extends BaseActivity {
private ProgressBar mypro;
diff --git a/iFish7/src/main/java/com/ifish/activity/DeviceCameraListActivity.java b/iFish7/src/main/java/com/ifish/activity/DeviceCameraListActivity.java
index 9f9aeeeab..6cf995157 100644
--- a/iFish7/src/main/java/com/ifish/activity/DeviceCameraListActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/DeviceCameraListActivity.java
@@ -148,6 +148,8 @@ public class DeviceCameraListActivity extends BaseActivity {
i.setClass(DeviceCameraListActivity.this, MainFiveBDControlActivity.class);
}else if(Device.TYPE_2A.equals(type)){
i.setClass(DeviceCameraListActivity.this, MainSix_2A_ControlActivity.class);
+ }else if(Device.TYPE_2B.equals(type)){
+ i.setClass(DeviceCameraListActivity.this, MainFour_2B_ControlActivity.class);
}else{
if (controlAmount==null) {//如果控制器返回空 则默认给三控的页面
i.setClass(DeviceCameraListActivity.this, MainThreeControlActivity.class);
diff --git a/iFish7/src/main/java/com/ifish/activity/MainFour_2B_ControlActivity.java b/iFish7/src/main/java/com/ifish/activity/MainFour_2B_ControlActivity.java
index b8fd41f0f..8adae1cb3 100644
--- a/iFish7/src/main/java/com/ifish/activity/MainFour_2B_ControlActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/MainFour_2B_ControlActivity.java
@@ -287,7 +287,7 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
AnimationUtil.startAnimation(this);
}
public void onEventMainThread(RenameDevice event) {//修改鱼缸名字
- Intent i=new Intent(this,ChangeDeviceName_2A_Activity.class);
+ Intent i=new Intent(this,ChangeDeviceName_2B_Activity.class);
i.putExtra("device", Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)));
i.putExtra("position", sp.getInt(Commons.LoginSPKey.Position, 0));
startActivity(i);
@@ -547,7 +547,7 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
rl_watertemp.setVisibility(View.VISIBLE);
rl_offline.setVisibility(View.GONE);
L.i("温度："+wendu);
- tv_watertemp.setText((float) event.getRoomTemperature()/10+"");
+ tv_watertemp.setText((float) event.getWendu()/10+"");
tv_heatWendu.setText(backQueryObjFour_2B.getRoomTemperature()/10+wendu_text);
// if (Byte.toString(event.getOnoff5()).equals(Commons.FishKey.On)) {
//制冷
@@ -569,19 +569,18 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
byte string2 = event.getOnoff2();
byte string3 = event.getOnoff3();
byte string4 = event.getOnoff4();
-// byte string5 = event.getSarkLamp();//柜灯
- byte string6 = event.getHeatStatus();//加热棒
- if (waterTempDialog != null) {
- if(waterTempDialog.isShowing()){
- if(iv_hot!=null){
- if (Byte.toString(event.getOnoff5()).equals(Commons.FishKey.On)) {
- iv_hot.toggle(true);
- } else {
- iv_hot.toggle(false);
- }
- }
- }
- }
+ byte string5 = event.getHeatStatus();//加热棒
+// if (waterTempDialog != null) {
+// if(waterTempDialog.isShowing()){
+// if(iv_hot!=null){
+// if (Byte.toString(event.getOnoff5()).equals(Commons.FishKey.On)) {
+// iv_hot.toggle(true);
+// } else {
+// iv_hot.toggle(false);
+// }
+// }
+// }
+// }
if (Byte.toString(string1).equals(Commons.FishKey.On)) {
iv_control_1.toggle(true);
} else {
@@ -602,15 +601,10 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
} else {
iv_control_4.toggle(false);
}
-// if (Byte.toString(string5).equals(Commons.FishKey.On)) {//柜灯
-// iv_control_5.toggle(true);
-// } else {
-// iv_control_5.toggle(false);
-// }
- if (Byte.toString(string6).equals(Commons.FishKey.On)) {//加热棒
- iv_control_6.toggle(true);
+ if (Byte.toString(string5).equals(Commons.FishKey.On)) {//加热棒
+ iv_control_5.toggle(true);
} else {
- iv_control_6.toggle(false);
+ iv_control_5.toggle(false);
}
}
//接收到发送方出错的指令
@@ -913,23 +907,6 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
break;
}
case R.id.iv_control_5:{
- if (rl_setting_clickble) {
- rl_setting_clickble=false;
- tv_control_5.setVisibility(View.VISIBLE);
- startTimer();
- if (!DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (iv_control_5.isChecked()) {//柜灯的开关
- SarkLampOff();
- }else{
- SarkLampOn();
- }
- }
- }
- break;
- }
- case R.id.iv_control_6:{
if (rl_setting_clickble) {
rl_setting_clickble=false;
if (!DeviceOnLine) {//离线就发登录指令 否则开关灯
@@ -943,8 +920,6 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
}
break;
}
-
-
}
}
private void showHeatWenduDialog() {
@@ -963,14 +938,15 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
wv_water = (WheelView)window. findViewById(R.id.wv_water);
bt_submit = (Button)window. findViewById(R.id.bt_submit);
iv_hot = (SelectorImageView)window. findViewById(R.id.iv_hot);
+ iv_hot.setVisibility(View.GONE);
wv_water.setViewAdapter(new ArrayWheelAdapter(MainFour_2B_ControlActivity.this, temps));
waterTempDialog.show();
if (backQueryObjFour_2B!=null) {
- if (Byte.toString(backQueryObjFour_2B.getOnoff5()).equals(Commons.FishKey.On)) {
- iv_hot.toggle(true);
- } else {
- iv_hot.toggle(false);
- }
+// if (Byte.toString(backQueryObjFour_2B.getOnoff5()).equals(Commons.FishKey.On)) {
+// iv_hot.toggle(true);
+// } else {
+// iv_hot.toggle(false);
+// }
String temp=backQueryObjFour_2B.getHeatWendu()/10+"";
for (int i = 0; i < temps.length; i++) {
if (temp.equals(temps[i])) {
@@ -990,17 +966,17 @@ public class MainFour_2B_ControlActivity extends BaseGradeActivity implements On
}else{
wv_water.setCurrentItem(15);
}
- iv_hot.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- showProgressDialogCancelble();
- if(iv_hot.isChecked()){
- OFFDevice(5);
- }else{
- OnDevice(5);
- }
- }
- });
+// iv_hot.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View view) {
+// showProgressDialogCancelble();
+// if(iv_hot.isChecked()){
+// OFFDevice(5);
+// }else{
+// OnDevice(5);
+// }
+// }
+// });
bt_submit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2B.java b/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2B.java
index c1fb02cea..d9af1c0f9 100644
--- a/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2B.java
+++ b/iFish7/src/main/java/com/ifish/activity/TimeSettingFour_2B.java
@@ -19,6 +19,7 @@ import android.view.View.OnClickListener;
import android.view.Window;
import android.widget.Button;
import android.widget.TextView;
+import android.widget.Toast;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -51,11 +52,8 @@ import java.util.List;
import de.greenrobot.event.EventBus;
/**
- *
- * @ClassName: TimeSettingFour
- * @Description: 睿鑫独立六控
- * @author Jacky dada
- * @date 2017年6月6日 16:48:26
+ * @Description: 睿美四控
+ * @date 2018年4月22日 16:48:26
*/
public class TimeSettingFour_2B extends BaseActivity {
public static final String BYTEOBJECT = "BYTEOBJECT";
@@ -507,7 +505,7 @@ public class TimeSettingFour_2B extends BaseActivity {
@Override
public void run() {
super.run();
- spmap.put(FishKey.timer_number, timer_number);
+ spmap.put(timer_number, timer_number);
map.put(FishKey.Key, FishKey.ChangeTime);//修改时间
map.put(FishKey.Mac, mac);
map.put(FishKey.Time, time);
@@ -564,15 +562,17 @@ public class TimeSettingFour_2B extends BaseActivity {
}
}.start();
}
+
//设置自定义模式开
private void setCustomModeOn() {
new Thread() {
@Override
public void run() {
super.run();
- map.put(FishKey.Key, FishKey.CustomModeOn);
- map.put(FishKey.Mac, mac);
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ MainTabActivity.spmap.put(Commons.FishKey.timer_number, 5);
+ map.put(Commons.FishKey.Key, Commons.FishKey.On);//开灯
+ map.put(Commons.FishKey.Mac, mac);
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map, MainTabActivity.spmap);
Thread thread3 = new Thread(ts3);
thread3.start();
}
@@ -585,9 +585,10 @@ public class TimeSettingFour_2B extends BaseActivity {
@Override
public void run() {
super.run();
- map.put(FishKey.Key, FishKey.WarnWenduOff);
- map.put(FishKey.Mac, mac);
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ MainTabActivity.spmap.put(Commons.FishKey.timer_number, 5);
+ map.put(Commons.FishKey.Key, Commons.FishKey.Off);//开灯
+ map.put(Commons.FishKey.Mac, mac);
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map, MainTabActivity.spmap);
Thread thread3 = new Thread(ts3);
thread3.start();
}
@@ -951,6 +952,10 @@ public class TimeSettingFour_2B extends BaseActivity {
public void setTimeOff(int num) {
+ if (iv_custom_mode.isChecked()) {
+ Toast.makeText(TimeSettingFour_2B.this, "自定义模式已开启，定时模式不可用", Toast.LENGTH_LONG).show();
+ return;
+ }
showProgressDialog();
startTimer();
isDialog = true;
@@ -958,6 +963,10 @@ public class TimeSettingFour_2B extends BaseActivity {
}
public void setTimeOn(int num) {
+ if (iv_custom_mode.isChecked()) {
+ Toast.makeText(TimeSettingFour_2B.this, "自定义模式已开启，定时模式不可用", Toast.LENGTH_LONG).show();
+ return;
+ }
showProgressDialog();
startTimer();
isDialog = true;
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index 38f4b9035..adf81839a 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -41,6 +41,7 @@ import com.ifish.activity.MainEightControlActivity;
import com.ifish.activity.MainFiveBDControlActivity;
import com.ifish.activity.MainFiveControlActivity;
import com.ifish.activity.MainFourControlActivity;
+import com.ifish.activity.MainFour_2B_ControlActivity;
import com.ifish.activity.MainSixControlActivity;
import com.ifish.activity.MainSix_2A_ControlActivity;
import com.ifish.activity.MainThree1CControlActivity;
@@ -862,7 +863,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
}else if(Device.TYPE_2A.equals(type)) {
i.setClass(getActivity(), MainSix_2A_ControlActivity.class);
}else if(Device.TYPE_2B.equals(type)){
- i.setClass(getActivity(), MainSix_2A_ControlActivity.class);
+ i.setClass(getActivity(), MainFour_2B_ControlActivity.class);
}else{
if (controlAmount==null) {//如果控制器返回空 则默认给三控的页面
i.setClass(getActivity(), MainThreeControlActivity.class);
diff --git a/iFish7/src/main/java/com/ifish/fragment/Four_2B_Fragment.java b/iFish7/src/main/java/com/ifish/fragment/Four_2B_Fragment.java
index 1dcb94d61..3c90dc245 100644
--- a/iFish7/src/main/java/com/ifish/fragment/Four_2B_Fragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/Four_2B_Fragment.java
@@ -1,9 +1,9 @@
-/**
-* @Title: SixFragment.java
-* @Package com.ifish.fragment
-* @Description: TODO
-* @author Jacky dada
-* @date 2016-7-18 下午3:18:27
+/**
+ * @Title: SixFragment.java
+ * @Package com.ifish.fragment
+ * @Description: TODO
+ * @author Jacky dada
+ * @date 2016-7-18 下午3:18:27
*/
package com.ifish.fragment;
@@ -27,7 +27,7 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ifish.activity.MainTabActivity;
import com.ifish.activity.R;
-import com.ifish.activity.TimeSettingFour_2A;
+import com.ifish.activity.TimeSettingFour_2B;
import com.ifish.activity.WebViewBrandActivity;
import com.ifish.basebean.WifiChangeObj;
import com.ifish.baseclass.BaseFragment;
@@ -52,540 +52,559 @@ import java.util.List;
import static com.ifish.utils.Commons.FishKey.SarkLampOn;
-/**
+/**
* @ClassName: Four_2B_Fragment
* @Description: 睿美4控
*/
public class Four_2B_Fragment extends BaseFragment {
- private View v;
- private SelectorImageView iv_1,iv_2,iv_3,iv_4,iv_5,iv_6;
- private ProgressBar mypro;
- private SparseArray map=new SparseArray();
- private SparseArray spmap=new SparseArray();
- private boolean clickble=true;
- private CountDownTimer TcpTimer;
- private TextView tv_water,tv_room_temperature;
- private ImageView iv_logo,iv_setting;
- private BackInfoModelFour_2B backQueryObj;
- private Dialog waterTempDialog;
- private Boolean isWaterDialog=false;
- private boolean isSetting=false;
- private TextView tv_1,tv_2,tv_3,tv_4,tv_5,tv_6;
- private SPUtil sp;
- private SelectorImageView iv_hot;
+ private View v;
+ private SelectorImageView iv_1, iv_2, iv_3, iv_4, iv_5, iv_6;
+ private ProgressBar mypro;
+ private SparseArray map = new SparseArray();
+ private SparseArray spmap = new SparseArray();
+ private boolean clickble = true;
+ private CountDownTimer TcpTimer;
+ private TextView tv_water, tv_room_temperature;
+ private ImageView iv_logo, iv_setting;
+ private BackInfoModelFour_2B backQueryObj;
+ private Dialog waterTempDialog;
+ private Boolean isWaterDialog = false;
+ private boolean isSetting = false;
+ private TextView tv_1, tv_2, tv_3, tv_4, tv_5, tv_6;
+ private SPUtil sp;
+ private SelectorImageView iv_hot;
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- L.i(this.getClass().getName()+"----------------onCreateView");
- v=inflater.inflate(R.layout.four_2b_fragment, null);
- initView();
- initListener();
- startTimer();
- LoginDevice();
- getLocalIconName();
- return v;
- }
- @Override
- public void onDestroyView() {
- super.onDestroyView();
- if (!isSetting) {
- if (MainTabActivity.socket!=null) {
- try {
- MainTabActivity.socket.close();
- } catch (Exception e) {
- }
- MainTabActivity.socket=null;
- }
- }
- }
- /**
- * 获取本地图标名字
- */
- public void getLocalIconName(){
- String locatText=sp.getString(Commons.Device.getMacAddress()+Commons.LoginSPKey.ICONNAME);
- //本地集合json字符串不为空才能进行转化
- if(!TextUtils.isEmpty(locatText)){
- List locatTextList=null;
- try {
- locatTextList = new Gson().fromJson(locatText, new TypeToken>(){}.getType());
- if (locatTextList != null&&locatTextList.size()==6) {
- if(!TextUtils.isEmpty(locatTextList.get(0))){
- tv_1.setText(locatTextList.get(0));
- }
- if(!TextUtils.isEmpty(locatTextList.get(1))){
- tv_2.setText(locatTextList.get(1));
- }
- if(!TextUtils.isEmpty(locatTextList.get(2))){
- tv_3.setText(locatTextList.get(2));
- }
- if(!TextUtils.isEmpty(locatTextList.get(3))){
- tv_4.setText(locatTextList.get(3));
- }
- if(!TextUtils.isEmpty(locatTextList.get(4))){
- tv_5.setText(locatTextList.get(4));
- }
- if(!TextUtils.isEmpty(locatTextList.get(5))){
- tv_6.setText(locatTextList.get(5));
- }
- }
- } catch (Exception e) {
- }
- }
- }
- //发送登录设备的指令
- private void LoginDevice() {
- new Thread() {
- @Override
- public void run() {
- super.run();
- try {
- if (MainTabActivity.socket==null) {
- MainTabActivity.socket = new Socket(HttpManager.FISH_URL, HttpManager.FISH_URL_PORT);
- }
- map.put(FishKey.Key,FishKey.Login);//登录
- map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ L.i(this.getClass().getName() + "----------------onCreateView");
+ v = inflater.inflate(R.layout.four_2b_fragment, null);
+ initView();
+ initListener();
+ startTimer();
+ LoginDevice();
+ getLocalIconName();
+ return v;
+ }
- TcpReceiveThread tr = new TcpReceiveThread( MainTabActivity.socket);
- Thread thread1 = new Thread(tr);
- thread1.start();
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ if (!isSetting) {
+ if (MainTabActivity.socket != null) {
+ try {
+ MainTabActivity.socket.close();
+ } catch (Exception e) {
+ }
+ MainTabActivity.socket = null;
+ }
+ }
+ }
- TcpSendThread ts = new TcpSendThread( MainTabActivity.socket, map);
- Thread thread2 = new Thread(ts);
- thread2.start();
- } catch (Exception e) {
- }
- }
- }.start();
- }
- //发送查询设备温度 定时器的指令
- private void checkDevice(){
- new Thread() {
- @Override
- public void run() {
- super.run();
- map.put(FishKey.Key,FishKey.Query);//查询
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //发送控制设备开灯的指令
- private void OnDevice(final int timer_number){
- new Thread() {
- @Override
- public void run() {
- super.run();
- spmap.put(FishKey.timer_number, timer_number);
- map.put(FishKey.Key,FishKey.On);//开灯
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map,spmap);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //发送控制设备关灯的指令
- private void OFFDevice(final int timer_number){
- new Thread() {
- @Override
- public void run() {
- super.run();
- spmap.put(FishKey.timer_number, timer_number);
- map.put(FishKey.Key,FishKey.Off);//开灯
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map,spmap);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //柜灯开
- private void SarkLampOn(){
- new Thread() {
- @Override
- public void run() {
- super.run();
- map.put(FishKey.Key, SarkLampOn);//柜灯开
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //柜灯关
- private void SarkLampOff(){
- new Thread() {
- @Override
- public void run() {
- super.run();
- map.put(FishKey.Key, FishKey.SarkLampOff);//柜灯关
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //设置加热棒温度
- private void setHotWater(final String hot_water_temp){
- new Thread() {
- @Override
- public void run() {
- super.run();
- map.put(FishKey.Key,FishKey.HotWaterTemp);
- map.put(FishKey.hot_water_temp,hot_water_temp);
- map.put(FishKey.Mac,Commons.Device.getMacAddress());
- TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket,map);
- Thread thread3 = new Thread(ts3);
- thread3.start();
- }
- }.start();
- }
- //接收到网络环境改变的指令 发送登录指令
- public void onEventMainThread(WifiChangeObj event) {
- startTimer();
- LoginDevice();
- }
- //接收登录返回的指令
- public void onEventMainThread(Boolean event) {
- stopTimer();
- resetView();
- if (event) {
- startTimer();
- checkDevice();
- }else{
- ToastUtil.show(getActivity(), Text.OFFDevice);
- }
- }
- //接受查询返回的指令
- public void onEventMainThread(BackInfoModelFour_2B event) {
- dismissProgressDialog();
- backQueryObj=event;
- resetView();
- stopTimer();
- byte string1 = event.getOnoff1();
- byte string2 = event.getOnoff2();
- byte string3 = event.getOnoff3();
- byte string4 = event.getOnoff4();
-// byte string5 = event.getSarkLamp();//柜灯
- byte string6 = event.getHeatStatus();//加热棒
- if (Byte.toString(string1).equals(FishKey.On)) {
- iv_1.toggle(true);
- } else {
- iv_1.toggle(false);
- }
- if (Byte.toString(string2).equals(FishKey.On)) {
- iv_2.toggle(true);
- } else {
- iv_2.toggle(false);
- }
- if (Byte.toString(string3).equals(FishKey.On)) {
- iv_3.toggle(true);
- } else {
- iv_3.toggle(false);
- }
- if (Byte.toString(string4).equals(FishKey.On)) {
- iv_4.toggle(true);
- } else {
- iv_4.toggle(false);
- }
-// if (Byte.toString(string5).equals(FishKey.On)) {
-// iv_5.toggle(true);
+ /**
+ * 获取本地图标名字
+ */
+ public void getLocalIconName() {
+ String locatText = sp.getString(Commons.Device.getMacAddress() + Commons.LoginSPKey.ICONNAME);
+ //本地集合json字符串不为空才能进行转化
+ if (!TextUtils.isEmpty(locatText)) {
+ List locatTextList = null;
+ try {
+ locatTextList = new Gson().fromJson(locatText, new TypeToken>() {
+ }.getType());
+ if (locatTextList != null && locatTextList.size() == 6) {
+ if (!TextUtils.isEmpty(locatTextList.get(0))) {
+ tv_1.setText(locatTextList.get(0));
+ }
+ if (!TextUtils.isEmpty(locatTextList.get(1))) {
+ tv_2.setText(locatTextList.get(1));
+ }
+ if (!TextUtils.isEmpty(locatTextList.get(2))) {
+ tv_3.setText(locatTextList.get(2));
+ }
+ if (!TextUtils.isEmpty(locatTextList.get(3))) {
+ tv_4.setText(locatTextList.get(3));
+ }
+ if (!TextUtils.isEmpty(locatTextList.get(4))) {
+ tv_5.setText(locatTextList.get(4));
+ }
+ if (!TextUtils.isEmpty(locatTextList.get(5))) {
+ tv_6.setText(locatTextList.get(5));
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ //发送登录设备的指令
+ private void LoginDevice() {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ try {
+ if (MainTabActivity.socket == null) {
+ MainTabActivity.socket = new Socket(HttpManager.FISH_URL, HttpManager.FISH_URL_PORT);
+ }
+ map.put(FishKey.Key, FishKey.Login);//登录
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+
+ TcpReceiveThread tr = new TcpReceiveThread(MainTabActivity.socket);
+ Thread thread1 = new Thread(tr);
+ thread1.start();
+
+ TcpSendThread ts = new TcpSendThread(MainTabActivity.socket, map);
+ Thread thread2 = new Thread(ts);
+ thread2.start();
+ } catch (Exception e) {
+ }
+ }
+ }.start();
+ }
+
+ //发送查询设备温度 定时器的指令
+ private void checkDevice() {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ map.put(FishKey.Key, FishKey.Query);//查询
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //发送控制设备开灯的指令
+ private void OnDevice(final int timer_number) {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ spmap.put(FishKey.timer_number, timer_number);
+ map.put(FishKey.Key, FishKey.On);//开灯
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map, spmap);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //发送控制设备关灯的指令
+ private void OFFDevice(final int timer_number) {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ spmap.put(FishKey.timer_number, timer_number);
+ map.put(FishKey.Key, FishKey.Off);//开灯
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map, spmap);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //柜灯开
+ private void SarkLampOn() {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ map.put(FishKey.Key, SarkLampOn);//柜灯开
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //柜灯关
+ private void SarkLampOff() {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ map.put(FishKey.Key, FishKey.SarkLampOff);//柜灯关
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //设置加热棒温度
+ private void setHotWater(final String hot_water_temp) {
+ new Thread() {
+ @Override
+ public void run() {
+ super.run();
+ map.put(FishKey.Key, FishKey.HotWaterTemp);
+ map.put(FishKey.hot_water_temp, hot_water_temp);
+ map.put(FishKey.Mac, Commons.Device.getMacAddress());
+ TcpSendThread ts3 = new TcpSendThread(MainTabActivity.socket, map);
+ Thread thread3 = new Thread(ts3);
+ thread3.start();
+ }
+ }.start();
+ }
+
+ //接收到网络环境改变的指令 发送登录指令
+ public void onEventMainThread(WifiChangeObj event) {
+ startTimer();
+ LoginDevice();
+ }
+
+ //接收登录返回的指令
+ public void onEventMainThread(Boolean event) {
+ stopTimer();
+ resetView();
+ if (event) {
+ startTimer();
+ checkDevice();
+ } else {
+ ToastUtil.show(getActivity(), Text.OFFDevice);
+ }
+ }
+
+ //接受查询返回的指令
+ public void onEventMainThread(BackInfoModelFour_2B event) {
+ dismissProgressDialog();
+ backQueryObj = event;
+ resetView();
+ stopTimer();
+ byte string1 = event.getOnoff1();
+ byte string2 = event.getOnoff2();
+ byte string3 = event.getOnoff3();
+ byte string4 = event.getOnoff4();
+ byte string5 = event.getHeatStatus();//柜灯
+// byte string6 = event.getHeatStatus();//加热棒
+ if (Byte.toString(string1).equals(FishKey.On)) {
+ iv_1.toggle(true);
+ } else {
+ iv_1.toggle(false);
+ }
+ if (Byte.toString(string2).equals(FishKey.On)) {
+ iv_2.toggle(true);
+ } else {
+ iv_2.toggle(false);
+ }
+ if (Byte.toString(string3).equals(FishKey.On)) {
+ iv_3.toggle(true);
+ } else {
+ iv_3.toggle(false);
+ }
+ if (Byte.toString(string4).equals(FishKey.On)) {
+ iv_4.toggle(true);
+ } else {
+ iv_4.toggle(false);
+ }
+ if (Byte.toString(string5).equals(FishKey.On)) {
+ iv_5.toggle(true);
+ } else {
+ iv_5.toggle(false);
+ }
+// if (Byte.toString(string6).equals(FishKey.On)) {
+// iv_6.toggle(true);
// } else {
-// iv_5.toggle(false);
+// iv_6.toggle(false);
// }
- if (Byte.toString(string6).equals(FishKey.On)) {
- iv_6.toggle(true);
- } else {
- iv_6.toggle(false);
- }
- tv_water.setText((float)event.getWendu()/10+"℃");
- tv_room_temperature.setText((float)event.getRoomTemperature()/10+"℃");
- if (isWaterDialog) {
- if (waterTempDialog!=null) {
- waterTempDialog.dismiss();
- }
- isWaterDialog=false;
- }
- if (waterTempDialog != null) {
- if(waterTempDialog.isShowing()){
- if(iv_hot!=null){
- if (Byte.toString(event.getOnoff5()).equals(FishKey.On)) {
- iv_hot.toggle(true);
- } else {
- iv_hot.toggle(false);
- }
- }
- }
- }
- }
- private void startTimer(){
- clickble=false;
- mypro.setVisibility(View.VISIBLE);
- if (TcpTimer==null) {
- TcpTimer=new CountDownTimer(4000, 4000) {
- public void onTick(long millisUntilFinished) {}
- public void onFinish() {
- resetView();
- isWaterDialog=false;
- ToastUtil.showSpecial(getActivity(), Text.Repost);
- }
- };
- }
- TcpTimer.start();
- }
- private void stopTimer(){
- if (TcpTimer!=null) {
- TcpTimer.cancel();
- }
- }
- private void showHeatWenduDialog() {
- final String[] temps=new String[46];
- for (int i = 0; i < 46; i++) {
- temps[i]=i+5+"";
- }
- int currentItem=0;
- final WheelView wv_water;
- Button bt_submit;
- waterTempDialog=new Dialog(getActivity(),R.style.HOLOMyDialogs);
- waterTempDialog.setCancelable(true);
- Window window=waterTempDialog.getWindow();
- window.setContentView(R.layout.setwatertemp_dialog);
- wv_water = (WheelView)window. findViewById(R.id.wv_water);
- bt_submit = (Button)window. findViewById(R.id.bt_submit);
- iv_hot = (SelectorImageView)window. findViewById(R.id.iv_hot);
- wv_water.setViewAdapter(new ArrayWheelAdapter(getActivity(), temps));
- waterTempDialog.show();
- if (backQueryObj!=null) {
- String temp=backQueryObj.getHeatWendu()/10+"";
- for (int i = 0; i < temps.length; i++) {
- if (temp.equals(temps[i])) {
- currentItem=i;
- break;
- }
- }
- if (Byte.toString(backQueryObj.getOnoff5()).equals(FishKey.On)) {
- iv_hot.toggle(true);
- } else {
- iv_hot.toggle(false);
- }
- if (currentItem==0) {//如果默认设置第一个 就显示第一个温度 但是获取到的温度为空的话就显示20摄氏度
- if ("5".equals(temp)) {
- wv_water.setCurrentItem(currentItem);
- }else{
- wv_water.setCurrentItem(15);
- }
- }else{
- wv_water.setCurrentItem(currentItem);
- }
- }else{
- wv_water.setCurrentItem(15);
- }
- iv_hot.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- showProgressDialogCancelble();
- if(iv_hot.isChecked()){
- OFFDevice(5);
- }else{
- OnDevice(5);
- }
- }
- });
- bt_submit.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- isWaterDialog=true;
- showProgressDialog();
- startTimer();
- setHotWater(temps[wv_water.getCurrentItem()]);
- }
- });
- }
+ tv_water.setText((float) event.getWendu() / 10 + "℃");
+ tv_room_temperature.setText((float) event.getRoomTemperature() / 10 + "℃");
+ if (isWaterDialog) {
+ if (waterTempDialog != null) {
+ waterTempDialog.dismiss();
+ }
+ isWaterDialog = false;
+ }
+ if (waterTempDialog != null) {
+ if (waterTempDialog.isShowing()) {
+ if (iv_hot != null) {
+ if (Byte.toString(event.getOnoff5()).equals(FishKey.On)) {
+ iv_hot.toggle(true);
+ } else {
+ iv_hot.toggle(false);
+ }
+ }
+ }
+ }
+ }
- private void initView() {
- mypro = (ProgressBar) v.findViewById(R.id.mypro);
- tv_water = (TextView) v.findViewById(R.id.tv_water);
- tv_room_temperature = (TextView) v.findViewById(R.id.tv_room_temperature);
- iv_logo = (ImageView) v.findViewById(R.id.iv_logo);
- iv_setting = (ImageView) v.findViewById(R.id.iv_setting);
- iv_1 = (SelectorImageView) v.findViewById(R.id.iv_1);
- iv_2 = (SelectorImageView) v.findViewById(R.id.iv_2);
- iv_3 = (SelectorImageView) v.findViewById(R.id.iv_3);
- iv_4 = (SelectorImageView) v.findViewById(R.id.iv_4);
- iv_5 = (SelectorImageView) v.findViewById(R.id.iv_5);
- iv_6 = (SelectorImageView) v.findViewById(R.id.iv_6);
- tv_1 = (TextView) v.findViewById(R.id.tv_1);
- tv_2 = (TextView) v.findViewById(R.id.tv_2);
- tv_3 = (TextView) v.findViewById(R.id.tv_3);
- tv_4 = (TextView) v.findViewById(R.id.tv_4);
- tv_5 = (TextView) v.findViewById(R.id.tv_5);
- tv_6 = (TextView) v.findViewById(R.id.tv_6);
- Picasso.with(getActivity()).load(HttpManager.Store_URL+Commons.Device.getVenderList().getLogo()).error(R.drawable.ifish_logo_default).into(iv_logo);
- map.clear();
- spmap.clear();
- sp=SPUtil.getInstance(getActivity());
- }
- //重置三个按钮所有状态
- private void resetView(){
- clickble=true;
- dismissProgressDialog();
- mypro.setVisibility(View.GONE);
- }
+ private void startTimer() {
+ clickble = false;
+ mypro.setVisibility(View.VISIBLE);
+ if (TcpTimer == null) {
+ TcpTimer = new CountDownTimer(4000, 4000) {
+ public void onTick(long millisUntilFinished) {
+ }
- private void initListener() {
- iv_1.setOnClickListener(this);
- iv_2.setOnClickListener(this);
- iv_3.setOnClickListener(this);
- iv_4.setOnClickListener(this);
- iv_5.setOnClickListener(this);
- iv_6.setOnClickListener(this);
- iv_setting.setOnClickListener(this);
- iv_logo.setOnClickListener(this);
- v.findViewById(R.id.tv_1).setOnClickListener(this);
- v.findViewById(R.id.tv_2).setOnClickListener(this);
- v.findViewById(R.id.tv_3).setOnClickListener(this);
- v.findViewById(R.id.tv_4).setOnClickListener(this);
- v.findViewById(R.id.tv_5).setOnClickListener(this);
- v.findViewById(R.id.tv_6).setOnClickListener(this);
- }
- @Override
- public void onDetach() {
- super.onDetach();
- stopTimer();
- }
- @Override
- public void onClick(View v) {//点击事件
- Intent i=new Intent();
- super.onClick(v);
- switch (v.getId()) {
- case R.id.iv_1:
- case R.id.tv_1:
- if (clickble) {
- startTimer();
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (!iv_1.isChecked()) {
- OnDevice(1);
- }else{
- OFFDevice(1);
- }
- }
- }
- break;
- case R.id.iv_2:
- case R.id.tv_2:
- if (clickble) {
- startTimer();
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (!iv_2.isChecked()) {
- OnDevice(2);
- }else{
- OFFDevice(2);
- }
- }
- }
- break;
- case R.id.iv_3:
- case R.id.tv_3:
- if (clickble) {
- startTimer();
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (!iv_3.isChecked()) {
- OnDevice(3);
- }else{
- OFFDevice(3);
- }
- }
- }
- break;
- case R.id.iv_4:
- case R.id.tv_4:
- if (clickble) {
- startTimer();
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (!iv_4.isChecked()) {
- OnDevice(4);
- }else{
- OFFDevice(4);
- }
- }
- }
- break;
- case R.id.iv_5:
- case R.id.tv_5:
- if (clickble) {
- startTimer();
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- LoginDevice();
- }else{
- if (!iv_5.isChecked()) {
- SarkLampOn();
- }else{
- SarkLampOff();
- }
- }
- }
- break;
- case R.id.iv_6:
- case R.id.tv_6:
- if (clickble) {
- if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
- startTimer();
- LoginDevice();
- }else{
- //设置加热棒温度对话框
- showHeatWenduDialog();
- }
- }
- break;
- case R.id.iv_setting:
- if (clickble) {
- if (!MainTabActivity.DeviceOnLine) {
- ToastUtil.show(getActivity(), Text.OFFDevice);
- return;
- }
- isSetting=true;
- i.setClass(getActivity(), TimeSettingFour_2A.class);
- i.putExtra(TimeSettingFour_2A.BYTEOBJECT, backQueryObj);
- i.putExtra(TimeSettingFour_2A.MAC, Commons.Device.getMacAddress());
- i.putExtra("mMonitorActivity", true);
- startActivity(i);
- AnimationUtil.startAnimation(getActivity());
- }
- break;
- case R.id.iv_logo:
- String brandIntroduce="";
- String brandName="";
- try {
- brandIntroduce= Commons.Device.getVenderList().getBrandIntroduce();
- brandName= Commons.Device.getVenderList().getBrandName();
- } catch (Exception e) {
- brandIntroduce=HttpManager.Vender_URL;
- brandName="鱼影科技";
- }
- if (!brandIntroduce.contains("http")) {
- brandIntroduce=HttpManager.Vender_URL;
- }
- i.putExtra(WebViewBrandActivity.URL, brandIntroduce);
- i.putExtra(WebViewBrandActivity.WEBVIEWTITLE, brandName);
- i.putExtra("mMonitorActivity", true);
- i.setClass(getActivity(), WebViewBrandActivity.class);
- startActivity(i);
- AnimationUtil.startAnimation(getActivity());
- break;
+ public void onFinish() {
+ resetView();
+ isWaterDialog = false;
+ ToastUtil.showSpecial(getActivity(), Text.Repost);
+ }
+ };
+ }
+ TcpTimer.start();
+ }
- }
- }
+ private void stopTimer() {
+ if (TcpTimer != null) {
+ TcpTimer.cancel();
+ }
+ }
+
+ private void showHeatWenduDialog() {
+ final String[] temps = new String[46];
+ for (int i = 0; i < 46; i++) {
+ temps[i] = i + 5 + "";
+ }
+ int currentItem = 0;
+ final WheelView wv_water;
+ Button bt_submit;
+ waterTempDialog = new Dialog(getActivity(), R.style.HOLOMyDialogs);
+ waterTempDialog.setCancelable(true);
+ Window window = waterTempDialog.getWindow();
+ window.setContentView(R.layout.setwatertemp_dialog);
+ wv_water = (WheelView) window.findViewById(R.id.wv_water);
+ bt_submit = (Button) window.findViewById(R.id.bt_submit);
+ iv_hot = (SelectorImageView) window.findViewById(R.id.iv_hot);
+ iv_hot.setVisibility(View.GONE);
+ wv_water.setViewAdapter(new ArrayWheelAdapter(getActivity(), temps));
+ waterTempDialog.show();
+ if (backQueryObj != null) {
+ String temp = backQueryObj.getHeatWendu() / 10 + "";
+ for (int i = 0; i < temps.length; i++) {
+ if (temp.equals(temps[i])) {
+ currentItem = i;
+ break;
+ }
+ }
+// if (Byte.toString(backQueryObj.getOnoff5()).equals(FishKey.On)) {
+// iv_hot.toggle(true);
+// } else {
+// iv_hot.toggle(false);
+// }
+ if (currentItem == 0) {//如果默认设置第一个 就显示第一个温度 但是获取到的温度为空的话就显示20摄氏度
+ if ("5".equals(temp)) {
+ wv_water.setCurrentItem(currentItem);
+ } else {
+ wv_water.setCurrentItem(15);
+ }
+ } else {
+ wv_water.setCurrentItem(currentItem);
+ }
+ } else {
+ wv_water.setCurrentItem(15);
+ }
+// iv_hot.setOnClickListener(new OnClickListener() {
+// @Override
+// public void onClick(View view) {
+// showProgressDialogCancelble();
+// if (iv_hot.isChecked()) {
+// OFFDevice(5);
+// } else {
+// OnDevice(5);
+// }
+// }
+// });
+ bt_submit.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ isWaterDialog = true;
+ showProgressDialog();
+ startTimer();
+ setHotWater(temps[wv_water.getCurrentItem()]);
+ }
+ });
+ }
+
+ private void initView() {
+ mypro = (ProgressBar) v.findViewById(R.id.mypro);
+ tv_water = (TextView) v.findViewById(R.id.tv_water);
+ tv_room_temperature = (TextView) v.findViewById(R.id.tv_room_temperature);
+ iv_logo = (ImageView) v.findViewById(R.id.iv_logo);
+ iv_setting = (ImageView) v.findViewById(R.id.iv_setting);
+ iv_1 = (SelectorImageView) v.findViewById(R.id.iv_1);
+ iv_2 = (SelectorImageView) v.findViewById(R.id.iv_2);
+ iv_3 = (SelectorImageView) v.findViewById(R.id.iv_3);
+ iv_4 = (SelectorImageView) v.findViewById(R.id.iv_4);
+ iv_5 = (SelectorImageView) v.findViewById(R.id.iv_5);
+ iv_6 = (SelectorImageView) v.findViewById(R.id.iv_6);
+ tv_1 = (TextView) v.findViewById(R.id.tv_1);
+ tv_2 = (TextView) v.findViewById(R.id.tv_2);
+ tv_3 = (TextView) v.findViewById(R.id.tv_3);
+ tv_4 = (TextView) v.findViewById(R.id.tv_4);
+ tv_5 = (TextView) v.findViewById(R.id.tv_5);
+ tv_6 = (TextView) v.findViewById(R.id.tv_6);
+ Picasso.with(getActivity()).load(HttpManager.Store_URL + Commons.Device.getVenderList().getLogo()).error(R.drawable.ifish_logo_default).into(iv_logo);
+ map.clear();
+ spmap.clear();
+ sp = SPUtil.getInstance(getActivity());
+ }
+
+ //重置三个按钮所有状态
+ private void resetView() {
+ clickble = true;
+ dismissProgressDialog();
+ mypro.setVisibility(View.GONE);
+ }
+
+ private void initListener() {
+ iv_1.setOnClickListener(this);
+ iv_2.setOnClickListener(this);
+ iv_3.setOnClickListener(this);
+ iv_4.setOnClickListener(this);
+ iv_5.setOnClickListener(this);
+ iv_6.setOnClickListener(this);
+ iv_setting.setOnClickListener(this);
+ iv_logo.setOnClickListener(this);
+ v.findViewById(R.id.tv_1).setOnClickListener(this);
+ v.findViewById(R.id.tv_2).setOnClickListener(this);
+ v.findViewById(R.id.tv_3).setOnClickListener(this);
+ v.findViewById(R.id.tv_4).setOnClickListener(this);
+ v.findViewById(R.id.tv_5).setOnClickListener(this);
+ v.findViewById(R.id.tv_6).setOnClickListener(this);
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ stopTimer();
+ }
+
+ @Override
+ public void onClick(View v) {//点击事件
+ Intent i = new Intent();
+ super.onClick(v);
+ switch (v.getId()) {
+ case R.id.iv_1:
+ case R.id.tv_1:
+ if (clickble) {
+ startTimer();
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ LoginDevice();
+ } else {
+ if (!iv_1.isChecked()) {
+ OnDevice(1);
+ } else {
+ OFFDevice(1);
+ }
+ }
+ }
+ break;
+ case R.id.iv_2:
+ case R.id.tv_2:
+ if (clickble) {
+ startTimer();
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ LoginDevice();
+ } else {
+ if (!iv_2.isChecked()) {
+ OnDevice(2);
+ } else {
+ OFFDevice(2);
+ }
+ }
+ }
+ break;
+ case R.id.iv_3:
+ case R.id.tv_3:
+ if (clickble) {
+ startTimer();
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ LoginDevice();
+ } else {
+ if (!iv_3.isChecked()) {
+ OnDevice(3);
+ } else {
+ OFFDevice(3);
+ }
+ }
+ }
+ break;
+ case R.id.iv_4:
+ case R.id.tv_4:
+ if (clickble) {
+ startTimer();
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ LoginDevice();
+ } else {
+ if (!iv_4.isChecked()) {
+ OnDevice(4);
+ } else {
+ OFFDevice(4);
+ }
+ }
+ }
+ break;
+ case R.id.iv_5:
+ case R.id.tv_5:
+ if (clickble) {
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ startTimer();
+ LoginDevice();
+ } else {
+ //设置加热棒温度对话框
+ showHeatWenduDialog();
+ }
+ }
+ break;
+ case R.id.iv_6:
+ case R.id.tv_6:
+ if (clickble) {
+ if (!MainTabActivity.DeviceOnLine) {//离线就发登录指令 否则开关灯
+ startTimer();
+ LoginDevice();
+ } else {
+ //设置加热棒温度对话框
+ showHeatWenduDialog();
+ }
+ }
+ break;
+ case R.id.iv_setting:
+ if (clickble) {
+ if (!MainTabActivity.DeviceOnLine) {
+ ToastUtil.show(getActivity(), Text.OFFDevice);
+ return;
+ }
+ isSetting = true;
+ i.setClass(getActivity(), TimeSettingFour_2B.class);
+ i.putExtra(TimeSettingFour_2B.BYTEOBJECT, backQueryObj);
+ i.putExtra(TimeSettingFour_2B.MAC, Commons.Device.getMacAddress());
+ i.putExtra("mMonitorActivity", true);
+ startActivity(i);
+ AnimationUtil.startAnimation(getActivity());
+ }
+ break;
+ case R.id.iv_logo:
+ String brandIntroduce = "";
+ String brandName = "";
+ try {
+ brandIntroduce = Commons.Device.getVenderList().getBrandIntroduce();
+ brandName = Commons.Device.getVenderList().getBrandName();
+ } catch (Exception e) {
+ brandIntroduce = HttpManager.Vender_URL;
+ brandName = "鱼影科技";
+ }
+ if (!brandIntroduce.contains("http")) {
+ brandIntroduce = HttpManager.Vender_URL;
+ }
+ i.putExtra(WebViewBrandActivity.URL, brandIntroduce);
+ i.putExtra(WebViewBrandActivity.WEBVIEWTITLE, brandName);
+ i.putExtra("mMonitorActivity", true);
+ i.setClass(getActivity(), WebViewBrandActivity.class);
+ startActivity(i);
+ AnimationUtil.startAnimation(getActivity());
+ break;
+
+ }
+ }
}
diff --git a/iFish7/src/main/java/com/ifish/tcp/ModelCodec.java b/iFish7/src/main/java/com/ifish/tcp/ModelCodec.java
index 4ec77fd09..a7150e970 100644
--- a/iFish7/src/main/java/com/ifish/tcp/ModelCodec.java
+++ b/iFish7/src/main/java/com/ifish/tcp/ModelCodec.java
@@ -12,13 +12,14 @@ import static com.ifish.utils.Commons.Device;
public class ModelCodec {
/**
* 把对象转成字节数
+ *
* @param obj
* @return
*/
- public static byte[] enCode(Object obj){
+ public static byte[] enCode(Object obj) {
IoBuffer buffer = IoBuffer.allocate(100).setAutoExpand(true);
//查询设备状信息
- if(obj instanceof OrderQueryModel){
+ if (obj instanceof OrderQueryModel) {
OrderQueryModel model = (OrderQueryModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -30,7 +31,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//切换工作模式
- else if(obj instanceof OrderWorkModel){
+ else if (obj instanceof OrderWorkModel) {
OrderWorkModel model = (OrderWorkModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -44,7 +45,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//开关灯
- else if(obj instanceof OrderOnOffModel){
+ else if (obj instanceof OrderOnOffModel) {
OrderOnOffModel model = (OrderOnOffModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -60,7 +61,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//设置定时器时间
- else if(obj instanceof OrderTimerModel){
+ else if (obj instanceof OrderTimerModel) {
OrderTimerModel model = (OrderTimerModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -76,7 +77,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//设置报警温度
- else if(obj instanceof OrderWarnModel){
+ else if (obj instanceof OrderWarnModel) {
OrderWarnModel model = (OrderWarnModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -94,7 +95,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//APP登陆服务器
- else if(obj instanceof OrderAppLoginModel){
+ else if (obj instanceof OrderAppLoginModel) {
OrderAppLoginModel model = (OrderAppLoginModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -108,7 +109,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//绑定wifi
- else if(obj instanceof OrderBindWifiModel){
+ else if (obj instanceof OrderBindWifiModel) {
OrderBindWifiModel model = (OrderBindWifiModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -126,7 +127,7 @@ public class ModelCodec {
// buffer.put(model.getRealm_name());
}
//设置加热棒温度
- else if(obj instanceof OrderHotWaterModel){
+ else if (obj instanceof OrderHotWaterModel) {
OrderHotWaterModel model = (OrderHotWaterModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -140,7 +141,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//查询设备状信息
- else if(obj instanceof OrderUpdateModel){
+ else if (obj instanceof OrderUpdateModel) {
OrderUpdateModel model = (OrderUpdateModel) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -154,7 +155,7 @@ public class ModelCodec {
buffer.put(model.getCrc16_code());
}
//设置tcp域名
- else if(obj instanceof OrderFunctionCode7){
+ else if (obj instanceof OrderFunctionCode7) {
OrderFunctionCode7 model = (OrderFunctionCode7) obj;
//15字节数据包头
buffer.put(model.getType());
@@ -178,7 +179,7 @@ public class ModelCodec {
*/
public static Object deCode(byte[] bys) {
int length = bys.length;
- IoBuffer buf = ByteUtil.byteToIoBuffer(bys,length);
+ IoBuffer buf = ByteUtil.byteToIoBuffer(bys, length);
//switch语句
switch (length) {
//长度为20,绑定wifi的反馈
@@ -192,43 +193,48 @@ public class ModelCodec {
case 28: {//长度为28,设备反馈信息
return decode28(buf);
}
- case 57: { //长度为57,设备反馈信息
+ case 57: { //长度为57,设备反馈信息
return decode57(buf);
}
- case 71: { //长度为71,设备反馈信息
+ case 71: { //长度为71,设备反馈信息
return decode71(buf);
}
- case 72: { //长度为72,设备反馈信息
+ case 72: { //长度为72,设备反馈信息
return decode72(buf);
}
case 74: {
return decode74(buf);
}
- case 73: { //长度为73,设备反馈信息六控询多
+ case 73: { //长度为73,设备反馈信息六控询多
return decode73(buf);
}
- case 85: { //长度为85,设备反馈信息
+ case 85: { //长度为85,设备反馈信息
return decode85(buf);
}
case 86: {
- return decode86(buf,bys);
+ return decode86(buf, bys);
+ }
+ case 87: {
+ return decode87(buf, bys);
}
case 99: {//长度为99,设备反馈信息
return decode99(buf);
}
case 128: {//长度为128,设备反馈信息
- return decode128(buf,bys);
+ return decode128(buf, bys);
}
default:
return null;
}
}
+
/**
* 设置tcp域名
+ *
* @param buf
* @return
*/
- private static Object decode20(IoBuffer buf){
+ private static Object decode20(IoBuffer buf) {
BackFunctionCode7_11 model = new BackFunctionCode7_11();
//15字节头
model.setType(buf.get());
@@ -257,12 +263,14 @@ public class ModelCodec {
return model;
}
+
/**
* 服务器回复APP登录请求
+ *
* @param buf
* @return
*/
- private static Object decode26(IoBuffer buf){
+ private static Object decode26(IoBuffer buf) {
BackAppLoginModel model = new BackAppLoginModel();
//15字节头
model.setType(buf.get());
@@ -288,12 +296,14 @@ public class ModelCodec {
}
return model;
}
+
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode99(IoBuffer buf){
+ private static Object decode99(IoBuffer buf) {
BackInfoModel model = new BackInfoModel();
//15字节头
model.setType(buf.get());
@@ -363,9 +373,9 @@ public class ModelCodec {
byte[] timer_time9 = model.getTimer_time9();
byte[] timer_time10 = model.getTimer_time10();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8,timer_number9,timer_number10};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8,timer_onoff9,timer_onoff10};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8,timer_time9,timer_time10};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8, timer_number9, timer_number10};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8, timer_onoff9, timer_onoff10};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8, timer_time9, timer_time10};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -428,12 +438,14 @@ public class ModelCodec {
}
return model;
}
+
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode71(IoBuffer buf){
+ private static Object decode71(IoBuffer buf) {
BackInfoModelThree model = new BackInfoModelThree();
//15字节头
model.setType(buf.get());
@@ -485,9 +497,9 @@ public class ModelCodec {
byte[] timer_time5 = model.getTimer_time5();
byte[] timer_time6 = model.getTimer_time6();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -540,6 +552,7 @@ public class ModelCodec {
}
return model;
}
+
/**
* 六控询多协议
*/
@@ -599,9 +612,9 @@ public class ModelCodec {
byte[] timer_time5 = model.getTimer_time5();
byte[] timer_time6 = model.getTimer_time6();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -716,9 +729,9 @@ public class ModelCodec {
byte[] timer_time7 = model.getTimer_time7();
byte[] timer_time8 = model.getTimer_time8();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -831,9 +844,9 @@ public class ModelCodec {
byte[] timer_time5 = model.getTimer_time5();
byte[] timer_time6 = model.getTimer_time6();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -890,6 +903,7 @@ public class ModelCodec {
}
return model;
}
+
/**
* 五控可丽爱协议&三控温控
*/
@@ -946,9 +960,9 @@ public class ModelCodec {
byte[] timer_time5 = model.getTimer_time5();
byte[] timer_time6 = model.getTimer_time6();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1002,10 +1016,11 @@ public class ModelCodec {
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode85(IoBuffer buf){
+ private static Object decode85(IoBuffer buf) {
BackInfoModelFour model = new BackInfoModelFour();
//15字节头
model.setType(buf.get());
@@ -1066,9 +1081,9 @@ public class ModelCodec {
byte[] timer_time7 = model.getTimer_time7();
byte[] timer_time8 = model.getTimer_time8();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1127,23 +1142,24 @@ public class ModelCodec {
}
return model;
}
- private static Object decode86(IoBuffer buf,byte[] bys){
+
+ private static Object decode86(IoBuffer buf, byte[] bys) {
//长度
int length = bys[14] & 0xff;
//mac地址
byte[] srcByte = new byte[6];
for (int i = 2; i < 8; i++) {
- srcByte[i-2] = bys[i];
+ srcByte[i - 2] = bys[i];
}
String strSrc = ByteUtil.bytesToHexString(srcByte);
/**
* 校验mac 匹配不同类型的设备 由于字节数相同 需要此判断
*/
- String type="";
+ String type = "";
if (Commons.DEVICE != null) {
- for (int i = 0; i < Commons.DEVICE.size() ; i++) {
- if(strSrc.equals(Commons.DEVICE.get(i).getMacAddress())){
- type=Commons.DEVICE.get(i).type;
+ for (int i = 0; i < Commons.DEVICE.size(); i++) {
+ if (strSrc.equals(Commons.DEVICE.get(i).getMacAddress())) {
+ type = Commons.DEVICE.get(i).type;
break;
}
@@ -1215,9 +1231,9 @@ public class ModelCodec {
byte[] timer_time7 = model.getTimer_time7();
byte[] timer_time8 = model.getTimer_time8();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1275,7 +1291,7 @@ public class ModelCodec {
}
return model;
- }else{
+ } else {
/**
* 睿鑫独立六控
*/
@@ -1340,9 +1356,9 @@ public class ModelCodec {
byte[] timer_time7 = model.getTimer_time7();
byte[] timer_time8 = model.getTimer_time8();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1401,7 +1417,7 @@ public class ModelCodec {
}
return model;
}
- }else{
+ } else {
/**
* 获取不到type 默认五控松诺
*/
@@ -1466,9 +1482,9 @@ public class ModelCodec {
byte[] timer_time7 = model.getTimer_time7();
byte[] timer_time8 = model.getTimer_time8();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1529,12 +1545,167 @@ public class ModelCodec {
}
}
+
+ private static Object decode87(IoBuffer buf, byte[] bys) {
+ //长度
+ int length = bys[14] & 0xff;
+ //mac地址
+ byte[] srcByte = new byte[6];
+ for (int i = 2; i < 8; i++) {
+ srcByte[i - 2] = bys[i];
+ }
+ String strSrc = ByteUtil.bytesToHexString(srcByte);
+ /**
+ * 校验mac 匹配不同类型的设备 由于字节数相同 需要此判断
+ */
+ String type = "";
+ if (Commons.DEVICE != null) {
+ for (int i = 0; i < Commons.DEVICE.size(); i++) {
+ if (strSrc.equals(Commons.DEVICE.get(i).getMacAddress())) {
+ type = Commons.DEVICE.get(i).type;
+ break;
+ }
+
+ }
+ }
+ if (!TextUtils.isEmpty(type)) {
+ if (Device.TYPE_2B.equals(type)) {
+ /**
+ * 睿美四控
+ */
+ BackInfoModelFour_2B model = new BackInfoModelFour_2B();
+ //15字节头
+ model.setType(buf.get());
+ model.setCheck_code(buf.get());
+ byte[] src = model.getSrc();
+ for (int i = 0; i < src.length; i++) {
+ src[i] = buf.get();
+ }
+ model.setSrc(src);
+ byte[] dest = model.getDest();
+ for (int i = 0; i < dest.length; i++) {
+ dest[i] = buf.get();
+ }
+ model.setDest(dest);
+ model.setRemote_len(buf.get());
+ //灯1编号和开关
+ model.setNumber1(buf.get());
+ model.setOnoff1(buf.get());
+ //灯2编号和开关
+ model.setNumber2(buf.get());
+ model.setOnoff2(buf.get());
+ //灯3编号和开关
+ model.setNumber3(buf.get());
+ model.setOnoff3(buf.get());
+ //灯4编号和开关
+ model.setNumber4(buf.get());
+ model.setOnoff4(buf.get());
+ //制冷编号和开关
+ model.setNumber5(buf.get());
+ model.setOnoff5(buf.get());
+
+ //定时器编号
+ byte timer_number1 = model.getTimer_number1();
+ byte timer_number2 = model.getTimer_number2();
+ byte timer_number3 = model.getTimer_number3();
+ byte timer_number4 = model.getTimer_number4();
+ byte timer_number5 = model.getTimer_number5();
+ byte timer_number6 = model.getTimer_number6();
+ byte timer_number7 = model.getTimer_number7();
+ byte timer_number8 = model.getTimer_number8();
+
+ //定时器开关
+ byte timer_onoff1 = model.getTimer_onoff1();
+ byte timer_onoff2 = model.getTimer_onoff2();
+ byte timer_onoff3 = model.getTimer_onoff3();
+ byte timer_onoff4 = model.getTimer_onoff4();
+ byte timer_onoff5 = model.getTimer_onoff5();
+ byte timer_onoff6 = model.getTimer_onoff6();
+ byte timer_onoff7 = model.getTimer_onoff7();
+ byte timer_onoff8 = model.getTimer_onoff8();
+
+ //定时器时间
+ byte[] timer_time1 = model.getTimer_time1();
+ byte[] timer_time2 = model.getTimer_time2();
+ byte[] timer_time3 = model.getTimer_time3();
+ byte[] timer_time4 = model.getTimer_time4();
+ byte[] timer_time5 = model.getTimer_time5();
+ byte[] timer_time6 = model.getTimer_time6();
+ byte[] timer_time7 = model.getTimer_time7();
+ byte[] timer_time8 = model.getTimer_time8();
+
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8};
+
+ for (int i = 0; i < timers.length; i++) {
+ //定时器编号
+ timer_numbers[i] = buf.get();
+ //定时器开关
+ timer_onoffs[i] = buf.get();
+ for (int j = 0; j < timers[i].length; j++) {
+ timers[i][j] = buf.get();
+ }
+ }
+ //定时器编号
+ model.setTimer_number1(timer_numbers[0]);
+ model.setTimer_number2(timer_numbers[1]);
+ model.setTimer_number3(timer_numbers[2]);
+ model.setTimer_number4(timer_numbers[3]);
+ model.setTimer_number5(timer_numbers[4]);
+ model.setTimer_number6(timer_numbers[5]);
+ model.setTimer_number7(timer_numbers[6]);
+ model.setTimer_number8(timer_numbers[7]);
+ //定时器开关
+ model.setTimer_onoff1(timer_onoffs[0]);
+ model.setTimer_onoff2(timer_onoffs[1]);
+ model.setTimer_onoff3(timer_onoffs[2]);
+ model.setTimer_onoff4(timer_onoffs[3]);
+ model.setTimer_onoff5(timer_onoffs[4]);
+ model.setTimer_onoff6(timer_onoffs[5]);
+ model.setTimer_onoff7(timer_onoffs[6]);
+ model.setTimer_onoff8(timer_onoffs[7]);
+ //定时器时间
+ model.setTimer_time1(timers[0]);
+ model.setTimer_time2(timers[1]);
+ model.setTimer_time3(timers[2]);
+ model.setTimer_time4(timers[3]);
+ model.setTimer_time5(timers[4]);
+ model.setTimer_time6(timers[5]);
+ model.setTimer_time7(timers[6]);
+ model.setTimer_time8(timers[7]);
+
+ //加热状态
+ model.setHeatStatus(buf.get());
+ //温度
+ model.setWendu(buf.getShort());
+ //加热温度
+ model.setHeatWendu(buf.getShort());
+ //室温
+ model.setRoomTemperature(buf.getShort());
+ //报警开关
+ model.setWarn_onoff(buf.get());
+ //最低报警温度
+ model.setLow_wendu(buf.getShort());
+ //最高报警温度
+ model.setHigh_wendu(buf.getShort());
+ byte[] crc16_code = model.getCrc16_code();
+ for (int i = 0; i < crc16_code.length; i++) {
+ crc16_code[i] = buf.get();
+ }
+ return model;
+ }
+ }
+ return null;
+ }
+
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode57(IoBuffer buf){
+ private static Object decode57(IoBuffer buf) {
BackInfoModelTwo model = new BackInfoModelTwo();
//15字节头
model.setType(buf.get());
@@ -1577,9 +1748,9 @@ public class ModelCodec {
byte[] timer_time3 = model.getTimer_time3();
byte[] timer_time4 = model.getTimer_time4();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1626,12 +1797,14 @@ public class ModelCodec {
}
return model;
}
+
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode28(IoBuffer buf){
+ private static Object decode28(IoBuffer buf) {
BackInfoModelZero model = new BackInfoModelZero();
//15字节头
model.setType(buf.get());
@@ -1667,28 +1840,30 @@ public class ModelCodec {
}
return model;
}
+
/**
* 设备反馈信息
+ *
* @param buf
* @return
*/
- private static Object decode128(IoBuffer buf,byte[] bys) {
+ private static Object decode128(IoBuffer buf, byte[] bys) {
//长度
int length = bys[14] & 0xff;
//mac地址
byte[] srcByte = new byte[6];
for (int i = 2; i < 8; i++) {
- srcByte[i-2] = bys[i];
+ srcByte[i - 2] = bys[i];
}
String strSrc = ByteUtil.bytesToHexString(srcByte);
/**
* 校验mac 匹配不同类型的设备 由于字节数相同 需要此判断
*/
- String type="";
+ String type = "";
if (Commons.DEVICE != null) {
- for (int i = 0; i < Commons.DEVICE.size() ; i++) {
- if(strSrc.equals(Commons.DEVICE.get(i).getMacAddress())){
- type=Commons.DEVICE.get(i).type;
+ for (int i = 0; i < Commons.DEVICE.size(); i++) {
+ if (strSrc.equals(Commons.DEVICE.get(i).getMacAddress())) {
+ type = Commons.DEVICE.get(i).type;
break;
}
@@ -1784,9 +1959,9 @@ public class ModelCodec {
byte[] timer_time13 = model.getTimer_time13();
byte[] timer_time14 = model.getTimer_time14();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8,timer_number9,timer_number10,timer_number11,timer_number12,timer_number13,timer_number14};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8,timer_onoff9,timer_onoff10,timer_onoff11,timer_onoff12,timer_onoff13,timer_onoff14};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8,timer_time9,timer_time10,timer_time11,timer_time12,timer_time13,timer_time14};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8, timer_number9, timer_number10, timer_number11, timer_number12, timer_number13, timer_number14};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8, timer_onoff9, timer_onoff10, timer_onoff11, timer_onoff12, timer_onoff13, timer_onoff14};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8, timer_time9, timer_time10, timer_time11, timer_time12, timer_time13, timer_time14};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -1862,7 +2037,7 @@ public class ModelCodec {
crc16_code[i] = buf.get();
}
return model;
- }else{
+ } else {
BackInfoModelFiveCC model = new BackInfoModelFiveCC();
//15字节头
model.setType(buf.get());
@@ -1947,9 +2122,9 @@ public class ModelCodec {
byte[] timer_time14 = model.getTimer_time14();
byte[] timer_time15 = model.getTimer_time15();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8,timer_number9,timer_number10,timer_number11,timer_number12,timer_number13,timer_number14,timer_number15};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8,timer_onoff9,timer_onoff10,timer_onoff11,timer_onoff12,timer_onoff13,timer_onoff14,timer_onoff15};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8,timer_time9,timer_time10,timer_time11,timer_time12,timer_time13,timer_time14,timer_time15};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8, timer_number9, timer_number10, timer_number11, timer_number12, timer_number13, timer_number14, timer_number15};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8, timer_onoff9, timer_onoff10, timer_onoff11, timer_onoff12, timer_onoff13, timer_onoff14, timer_onoff15};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8, timer_time9, timer_time10, timer_time11, timer_time12, timer_time13, timer_time14, timer_time15};
for (int i = 0; i < timers.length; i++) {
//定时器编号
@@ -2029,7 +2204,7 @@ public class ModelCodec {
}
- }else{
+ } else {
/**
* 未知type 默认返回128长度松诺
*/
@@ -2121,9 +2296,9 @@ public class ModelCodec {
byte[] timer_time13 = model.getTimer_time13();
byte[] timer_time14 = model.getTimer_time14();
- byte[] timer_numbers = {timer_number1,timer_number2,timer_number3,timer_number4,timer_number5,timer_number6,timer_number7,timer_number8,timer_number9,timer_number10,timer_number11,timer_number12,timer_number13,timer_number14};
- byte[] timer_onoffs = {timer_onoff1,timer_onoff2,timer_onoff3,timer_onoff4,timer_onoff5,timer_onoff6,timer_onoff7,timer_onoff8,timer_onoff9,timer_onoff10,timer_onoff11,timer_onoff12,timer_onoff13,timer_onoff14};
- byte[][] timers = {timer_time1,timer_time2,timer_time3,timer_time4,timer_time5,timer_time6,timer_time7,timer_time8,timer_time9,timer_time10,timer_time11,timer_time12,timer_time13,timer_time14};
+ byte[] timer_numbers = {timer_number1, timer_number2, timer_number3, timer_number4, timer_number5, timer_number6, timer_number7, timer_number8, timer_number9, timer_number10, timer_number11, timer_number12, timer_number13, timer_number14};
+ byte[] timer_onoffs = {timer_onoff1, timer_onoff2, timer_onoff3, timer_onoff4, timer_onoff5, timer_onoff6, timer_onoff7, timer_onoff8, timer_onoff9, timer_onoff10, timer_onoff11, timer_onoff12, timer_onoff13, timer_onoff14};
+ byte[][] timers = {timer_time1, timer_time2, timer_time3, timer_time4, timer_time5, timer_time6, timer_time7, timer_time8, timer_time9, timer_time10, timer_time11, timer_time12, timer_time13, timer_time14};
for (int i = 0; i < timers.length; i++) {
//定时器编号
diff --git a/iFish7/src/main/java/com/ifish/tcp/TcpReceiveThread.java b/iFish7/src/main/java/com/ifish/tcp/TcpReceiveThread.java
index 7f0397aa8..624b24c8e 100644
--- a/iFish7/src/main/java/com/ifish/tcp/TcpReceiveThread.java
+++ b/iFish7/src/main/java/com/ifish/tcp/TcpReceiveThread.java
@@ -195,6 +195,17 @@ public class TcpReceiveThread implements Runnable {
}
L.i("睿鑫独立六控查询返回结果码="+ByteUtil.bytesToHexString(a));
L.i("===========收到睿鑫独立六控查询指令"+socket.getLocalPort()+"=================");
+ }else if (obj instanceof BackInfoModelFour_2B) {//收到睿美4控查询指令
+ BackInfoModelFour_2B backOBJ=(BackInfoModelFour_2B) obj;
+ if (Commons.IS_EventBus) {//判断tcp连接返回的mac地址是否与自己本地相同 不同则不做处理
+ if (ByteUtil.bytesToHexString(backOBJ.getSrc()).equals(Commons.DEVICE.get(MainTabActivity.sp.getInt(LoginSPKey.Position, 0)).getMacAddress())) {
+ EventBus.getDefault().post(backOBJ);
+ }else{
+ L.i("返回的MAC："+ByteUtil.bytesToHexString(backOBJ.getSrc())+"服务器的MAC："+Commons.DEVICE.get(MainTabActivity.sp.getInt(LoginSPKey.Position, 0)).getMacAddress());
+ }
+ }
+ L.i("睿美4控查询返回结果码="+ByteUtil.bytesToHexString(a));
+ L.i("===========收到睿美4控查询指令"+socket.getLocalPort()+"=================");
}else{
L.i("=========不知几控=========");
}
diff --git a/iFish7/src/main/java/com/ifish/utils/HttpManager.java b/iFish7/src/main/java/com/ifish/utils/HttpManager.java
index 5301c0ebd..16b9f4c54 100644
--- a/iFish7/src/main/java/com/ifish/utils/HttpManager.java
+++ b/iFish7/src/main/java/com/ifish/utils/HttpManager.java
@@ -95,6 +95,7 @@ public class HttpManager {
* 正式环境
*/
public final static String BASE = "http://app.ifish7.com/";//接口访问地址
+// public final static String FISH_URL="192.168.31.83";//soket地址
public final static String FISH_URL="www.ifish7.com";//soket地址
diff --git a/iFish7/src/main/res/layout/bindtwodevice_activity.xml b/iFish7/src/main/res/layout/bindtwodevice_activity.xml
index 2d5419326..4c136a282 100644
--- a/iFish7/src/main/res/layout/bindtwodevice_activity.xml
+++ b/iFish7/src/main/res/layout/bindtwodevice_activity.xml
@@ -18,12 +18,13 @@
android:layout_height="match_parent"
android:orientation="vertical"
>
+
+ android:scaleType="fitXY" />
+
-
@@ -74,8 +74,8 @@
android:textColor="@color/FCBB3E"
android:textSize="18sp" />
-
diff --git a/iFish7/src/main/res/layout/setwatertemp_dialog.xml b/iFish7/src/main/res/layout/setwatertemp_dialog.xml
index 7c83cc884..616fd420d 100644
--- a/iFish7/src/main/res/layout/setwatertemp_dialog.xml
+++ b/iFish7/src/main/res/layout/setwatertemp_dialog.xml
@@ -22,12 +22,13 @@
android:id="@+id/iv_hot"
android:layout_width="68dp"
android:layout_height="28dp"
- android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
- android:layout_alignParentRight="true"
android:src="@drawable/watertemp_hot"
app:selector_src="@drawable/watertemp_cold"
- />
+ android:layout_above="@+id/rl_frame"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="10dp" />