epptouch sdk更新，闪退修改强化

2021-06-26 22:37:40 +08:00 · 2021-06-26 22:37:40 +08:00 · 6d1d973610
parent 0ab7d833a0
commit 6d1d973610
19 changed files with 268 additions and 203 deletions
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@ -26,6 +26,39 @@
 		18C54F2A2350541500DF4E7D /* SGNoCaptcha.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18C54F162350541400DF4E7D /* SGNoCaptcha.framework */; };
 		18C54F2C2350541500DF4E7D /* SGSecurityBody.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18C54F182350541400DF4E7D /* SGSecurityBody.framework */; };
 		18C54F2D2350541500DF4E7D /* OpenMtopExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18C54F192350541400DF4E7D /* OpenMtopExt.framework */; };
+		2AC8750326874F7500B6161C /* ESPUDPSocketClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874DE26874F7500B6161C /* ESPUDPSocketClient.h */; };
+		2AC8750426874F7500B6161C /* ESPUDPSocketServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874DF26874F7500B6161C /* ESPUDPSocketServer.m */; };
+		2AC8750526874F7500B6161C /* ESPUDPSocketClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874E026874F7500B6161C /* ESPUDPSocketClient.m */; };
+		2AC8750626874F7500B6161C /* ESPUDPSocketServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874E126874F7500B6161C /* ESPUDPSocketServer.h */; };
+		2AC8750726874F7500B6161C /* ESPGuideCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874E326874F7500B6161C /* ESPGuideCode.m */; };
+		2AC8750826874F7500B6161C /* ESPTouchGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874E426874F7500B6161C /* ESPTouchGenerator.m */; };
+		2AC8750926874F7500B6161C /* ESPDataCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874E526874F7500B6161C /* ESPDataCode.h */; };
+		2AC8750A26874F7500B6161C /* ESPDatumCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874E626874F7500B6161C /* ESPDatumCode.h */; };
+		2AC8750B26874F7500B6161C /* ESPGuideCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874E726874F7500B6161C /* ESPGuideCode.h */; };
+		2AC8750C26874F7500B6161C /* ESPDataCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874E826874F7500B6161C /* ESPDataCode.m */; };
+		2AC8750D26874F7500B6161C /* ESPTouchGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874E926874F7500B6161C /* ESPTouchGenerator.h */; };
+		2AC8750E26874F7500B6161C /* ESPDatumCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874EA26874F7500B6161C /* ESPDatumCode.m */; };
+		2AC8750F26874F7500B6161C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 2AC874EB26874F7500B6161C /* README.md */; };
+		2AC8751026874F7500B6161C /* ESPTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874ED26874F7500B6161C /* ESPTools.m */; };
+		2AC8751126874F7500B6161C /* ESP_NetUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874EE26874F7500B6161C /* ESP_NetUtil.m */; };
+		2AC8751226874F7500B6161C /* ESP_ByteUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874EF26874F7500B6161C /* ESP_ByteUtil.m */; };
+		2AC8751326874F7500B6161C /* ESP_WifiUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874F026874F7500B6161C /* ESP_WifiUtil.m */; };
+		2AC8751426874F7500B6161C /* ESP_CRC8.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874F126874F7500B6161C /* ESP_CRC8.m */; };
+		2AC8751526874F7500B6161C /* ESPVersionMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F226874F7500B6161C /* ESPVersionMacro.h */; };
+		2AC8751626874F7500B6161C /* ESPAES.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F326874F7500B6161C /* ESPAES.h */; };
+		2AC8751726874F7500B6161C /* ESP_NetUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F426874F7500B6161C /* ESP_NetUtil.h */; };
+		2AC8751826874F7500B6161C /* ESP_ByteUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F526874F7500B6161C /* ESP_ByteUtil.h */; };
+		2AC8751926874F7500B6161C /* ESPTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F626874F7500B6161C /* ESPTools.h */; };
+		2AC8751A26874F7500B6161C /* ESP_CRC8.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F726874F7500B6161C /* ESP_CRC8.h */; };
+		2AC8751B26874F7500B6161C /* ESP_WifiUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874F826874F7500B6161C /* ESP_WifiUtil.h */; };
+		2AC8751C26874F7500B6161C /* ESPAES.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874F926874F7500B6161C /* ESPAES.m */; };
+		2AC8751D26874F7500B6161C /* ESPTouchResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874FB26874F7500B6161C /* ESPTouchResult.m */; };
+		2AC8751E26874F7500B6161C /* ESPTouchTaskParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC874FC26874F7500B6161C /* ESPTouchTaskParameter.h */; };
+		2AC8751F26874F7500B6161C /* ESPTouchTaskParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874FD26874F7500B6161C /* ESPTouchTaskParameter.m */; };
+		2AC8752026874F7500B6161C /* ESPTouchTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC874FE26874F7500B6161C /* ESPTouchTask.m */; };
+		2AC8752126874F7500B6161C /* ESPTouchTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC8750026874F7500B6161C /* ESPTouchTask.h */; };
+		2AC8752226874F7500B6161C /* ESPTouchResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC8750126874F7500B6161C /* ESPTouchResult.h */; };
+		2AC8752326874F7500B6161C /* ESPTouchDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC8750226874F7500B6161C /* ESPTouchDelegate.h */; };
 		3D13F835212FE2C200D725F7 /* IFishWaterChangeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */; };
 		3D13F83B212FE48000D725F7 /* UIView+GetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D13F839212FE47F00D725F7 /* UIView+GetView.m */; };
 		3D1C17452171BB0700A159A8 /* PNPieChartDataItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17222171BB0600A159A8 /* PNPieChartDataItem.m */; };
@ -2253,38 +2286,6 @@
 		C0721974253C054D0065CF17 /* PlayBackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0721971253C054D0065CF17 /* PlayBackViewController.xib */; };
 		C0837A57244FF5510034FEC5 /* EGOCache.m in Sources */ = {isa = PBXBuildFile; fileRef = C0837A55244FF5500034FEC5 /* EGOCache.m */; };
 		C0837A58244FF5510034FEC5 /* EGOCache.h in Headers */ = {isa = PBXBuildFile; fileRef = C0837A56244FF5500034FEC5 /* EGOCache.h */; };
-		C0873EE12491060000D47D34 /* ESPUDPSocketClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EBE249105FF00D47D34 /* ESPUDPSocketClient.h */; };
-		C0873EE22491060000D47D34 /* ESPUDPSocketServer.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EBF249105FF00D47D34 /* ESPUDPSocketServer.m */; };
-		C0873EE32491060000D47D34 /* ESPUDPSocketClient.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EC0249105FF00D47D34 /* ESPUDPSocketClient.m */; };
-		C0873EE42491060000D47D34 /* ESPUDPSocketServer.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EC1249105FF00D47D34 /* ESPUDPSocketServer.h */; };
-		C0873EE52491060000D47D34 /* ESPGuideCode.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EC3249105FF00D47D34 /* ESPGuideCode.m */; };
-		C0873EE62491060000D47D34 /* ESPTouchGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EC4249105FF00D47D34 /* ESPTouchGenerator.m */; };
-		C0873EE72491060000D47D34 /* ESPDataCode.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EC5249105FF00D47D34 /* ESPDataCode.h */; };
-		C0873EE82491060000D47D34 /* ESPDatumCode.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EC6249105FF00D47D34 /* ESPDatumCode.h */; };
-		C0873EE92491060000D47D34 /* ESPGuideCode.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EC7249105FF00D47D34 /* ESPGuideCode.h */; };
-		C0873EEA2491060000D47D34 /* ESPDataCode.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EC8249105FF00D47D34 /* ESPDataCode.m */; };
-		C0873EEB2491060000D47D34 /* ESPTouchGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EC9249105FF00D47D34 /* ESPTouchGenerator.h */; };
-		C0873EEC2491060000D47D34 /* ESPDatumCode.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ECA249105FF00D47D34 /* ESPDatumCode.m */; };
-		C0873EED2491060000D47D34 /* ESPTools.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ECC249105FF00D47D34 /* ESPTools.m */; };
-		C0873EEE2491060000D47D34 /* ESP_NetUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ECD249105FF00D47D34 /* ESP_NetUtil.m */; };
-		C0873EEF2491060000D47D34 /* ESP_ByteUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ECE249105FF00D47D34 /* ESP_ByteUtil.m */; };
-		C0873EF02491060000D47D34 /* ESP_WifiUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ECF249105FF00D47D34 /* ESP_WifiUtil.m */; };
-		C0873EF12491060000D47D34 /* ESP_CRC8.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ED0249105FF00D47D34 /* ESP_CRC8.m */; };
-		C0873EF22491060000D47D34 /* ESPVersionMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED1249105FF00D47D34 /* ESPVersionMacro.h */; };
-		C0873EF32491060000D47D34 /* ESPAES.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED2249105FF00D47D34 /* ESPAES.h */; };
-		C0873EF42491060000D47D34 /* ESP_NetUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED3249105FF00D47D34 /* ESP_NetUtil.h */; };
-		C0873EF52491060000D47D34 /* ESP_ByteUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED4249105FF00D47D34 /* ESP_ByteUtil.h */; };
-		C0873EF62491060000D47D34 /* ESPTools.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED5249105FF00D47D34 /* ESPTools.h */; };
-		C0873EF72491060000D47D34 /* ESP_CRC8.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED6249105FF00D47D34 /* ESP_CRC8.h */; };
-		C0873EF82491060000D47D34 /* ESP_WifiUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873ED7249105FF00D47D34 /* ESP_WifiUtil.h */; };
-		C0873EF92491060000D47D34 /* ESPAES.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873ED8249105FF00D47D34 /* ESPAES.m */; };
-		C0873EFA2491060000D47D34 /* ESPTouchResult.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EDA2491060000D47D34 /* ESPTouchResult.m */; };
-		C0873EFB2491060000D47D34 /* ESPTouchTaskParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EDB2491060000D47D34 /* ESPTouchTaskParameter.h */; };
-		C0873EFC2491060000D47D34 /* ESPTouchTask.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EDC2491060000D47D34 /* ESPTouchTask.h */; };
-		C0873EFD2491060000D47D34 /* ESPTouchResult.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EDD2491060000D47D34 /* ESPTouchResult.h */; };
-		C0873EFE2491060000D47D34 /* ESPTouchDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = C0873EDE2491060000D47D34 /* ESPTouchDelegate.h */; };
-		C0873EFF2491060000D47D34 /* ESPTouchTaskParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EDF2491060000D47D34 /* ESPTouchTaskParameter.m */; };
-		C0873F002491060000D47D34 /* ESPTouchTask.m in Sources */ = {isa = PBXBuildFile; fileRef = C0873EE02491060000D47D34 /* ESPTouchTask.m */; };
 		C0B2F541244C6FE3001079AA /* PetStoresViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B2F53E244C6FE3001079AA /* PetStoresViewController.h */; };
 		C0B2F542244C6FE3001079AA /* PetStoresViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0B2F53F244C6FE3001079AA /* PetStoresViewController.m */; };
 		C0B2F543244C6FE3001079AA /* PetStoresViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0B2F540244C6FE3001079AA /* PetStoresViewController.xib */; };
@ -2692,6 +2693,39 @@
 		18C54F162350541400DF4E7D /* SGNoCaptcha.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGNoCaptcha.framework; sourceTree = "<group>"; };
 		18C54F182350541400DF4E7D /* SGSecurityBody.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGSecurityBody.framework; sourceTree = "<group>"; };
 		18C54F192350541400DF4E7D /* OpenMtopExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenMtopExt.framework; sourceTree = "<group>"; };
+		2AC874DE26874F7500B6161C /* ESPUDPSocketClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPUDPSocketClient.h; sourceTree = "<group>"; };
+		2AC874DF26874F7500B6161C /* ESPUDPSocketServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPUDPSocketServer.m; sourceTree = "<group>"; };
+		2AC874E026874F7500B6161C /* ESPUDPSocketClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPUDPSocketClient.m; sourceTree = "<group>"; };
+		2AC874E126874F7500B6161C /* ESPUDPSocketServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPUDPSocketServer.h; sourceTree = "<group>"; };
+		2AC874E326874F7500B6161C /* ESPGuideCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPGuideCode.m; sourceTree = "<group>"; };
+		2AC874E426874F7500B6161C /* ESPTouchGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchGenerator.m; sourceTree = "<group>"; };
+		2AC874E526874F7500B6161C /* ESPDataCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPDataCode.h; sourceTree = "<group>"; };
+		2AC874E626874F7500B6161C /* ESPDatumCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPDatumCode.h; sourceTree = "<group>"; };
+		2AC874E726874F7500B6161C /* ESPGuideCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPGuideCode.h; sourceTree = "<group>"; };
+		2AC874E826874F7500B6161C /* ESPDataCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPDataCode.m; sourceTree = "<group>"; };
+		2AC874E926874F7500B6161C /* ESPTouchGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchGenerator.h; sourceTree = "<group>"; };
+		2AC874EA26874F7500B6161C /* ESPDatumCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPDatumCode.m; sourceTree = "<group>"; };
+		2AC874EB26874F7500B6161C /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		2AC874ED26874F7500B6161C /* ESPTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTools.m; sourceTree = "<group>"; };
+		2AC874EE26874F7500B6161C /* ESP_NetUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_NetUtil.m; sourceTree = "<group>"; };
+		2AC874EF26874F7500B6161C /* ESP_ByteUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_ByteUtil.m; sourceTree = "<group>"; };
+		2AC874F026874F7500B6161C /* ESP_WifiUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_WifiUtil.m; sourceTree = "<group>"; };
+		2AC874F126874F7500B6161C /* ESP_CRC8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_CRC8.m; sourceTree = "<group>"; };
+		2AC874F226874F7500B6161C /* ESPVersionMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPVersionMacro.h; sourceTree = "<group>"; };
+		2AC874F326874F7500B6161C /* ESPAES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPAES.h; sourceTree = "<group>"; };
+		2AC874F426874F7500B6161C /* ESP_NetUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_NetUtil.h; sourceTree = "<group>"; };
+		2AC874F526874F7500B6161C /* ESP_ByteUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_ByteUtil.h; sourceTree = "<group>"; };
+		2AC874F626874F7500B6161C /* ESPTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTools.h; sourceTree = "<group>"; };
+		2AC874F726874F7500B6161C /* ESP_CRC8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_CRC8.h; sourceTree = "<group>"; };
+		2AC874F826874F7500B6161C /* ESP_WifiUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_WifiUtil.h; sourceTree = "<group>"; };
+		2AC874F926874F7500B6161C /* ESPAES.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPAES.m; sourceTree = "<group>"; };
+		2AC874FB26874F7500B6161C /* ESPTouchResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchResult.m; sourceTree = "<group>"; };
+		2AC874FC26874F7500B6161C /* ESPTouchTaskParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchTaskParameter.h; sourceTree = "<group>"; };
+		2AC874FD26874F7500B6161C /* ESPTouchTaskParameter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchTaskParameter.m; sourceTree = "<group>"; };
+		2AC874FE26874F7500B6161C /* ESPTouchTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchTask.m; sourceTree = "<group>"; };
+		2AC8750026874F7500B6161C /* ESPTouchTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchTask.h; sourceTree = "<group>"; };
+		2AC8750126874F7500B6161C /* ESPTouchResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchResult.h; sourceTree = "<group>"; };
+		2AC8750226874F7500B6161C /* ESPTouchDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchDelegate.h; sourceTree = "<group>"; };
 		3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishWaterChangeView.h; sourceTree = "<group>"; };
 		3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishWaterChangeView.m; sourceTree = "<group>"; };
 		3D13F839212FE47F00D725F7 /* UIView+GetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+GetView.m"; sourceTree = "<group>"; };
@ -5723,38 +5757,6 @@
 		C0721971253C054D0065CF17 /* PlayBackViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PlayBackViewController.xib; sourceTree = "<group>"; };
 		C0837A55244FF5500034FEC5 /* EGOCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EGOCache.m; sourceTree = "<group>"; };
 		C0837A56244FF5500034FEC5 /* EGOCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EGOCache.h; sourceTree = "<group>"; };
-		C0873EBE249105FF00D47D34 /* ESPUDPSocketClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPUDPSocketClient.h; sourceTree = "<group>"; };
-		C0873EBF249105FF00D47D34 /* ESPUDPSocketServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPUDPSocketServer.m; sourceTree = "<group>"; };
-		C0873EC0249105FF00D47D34 /* ESPUDPSocketClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPUDPSocketClient.m; sourceTree = "<group>"; };
-		C0873EC1249105FF00D47D34 /* ESPUDPSocketServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPUDPSocketServer.h; sourceTree = "<group>"; };
-		C0873EC3249105FF00D47D34 /* ESPGuideCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPGuideCode.m; sourceTree = "<group>"; };
-		C0873EC4249105FF00D47D34 /* ESPTouchGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchGenerator.m; sourceTree = "<group>"; };
-		C0873EC5249105FF00D47D34 /* ESPDataCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPDataCode.h; sourceTree = "<group>"; };
-		C0873EC6249105FF00D47D34 /* ESPDatumCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPDatumCode.h; sourceTree = "<group>"; };
-		C0873EC7249105FF00D47D34 /* ESPGuideCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPGuideCode.h; sourceTree = "<group>"; };
-		C0873EC8249105FF00D47D34 /* ESPDataCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPDataCode.m; sourceTree = "<group>"; };
-		C0873EC9249105FF00D47D34 /* ESPTouchGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchGenerator.h; sourceTree = "<group>"; };
-		C0873ECA249105FF00D47D34 /* ESPDatumCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPDatumCode.m; sourceTree = "<group>"; };
-		C0873ECC249105FF00D47D34 /* ESPTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTools.m; sourceTree = "<group>"; };
-		C0873ECD249105FF00D47D34 /* ESP_NetUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_NetUtil.m; sourceTree = "<group>"; };
-		C0873ECE249105FF00D47D34 /* ESP_ByteUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_ByteUtil.m; sourceTree = "<group>"; };
-		C0873ECF249105FF00D47D34 /* ESP_WifiUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_WifiUtil.m; sourceTree = "<group>"; };
-		C0873ED0249105FF00D47D34 /* ESP_CRC8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESP_CRC8.m; sourceTree = "<group>"; };
-		C0873ED1249105FF00D47D34 /* ESPVersionMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPVersionMacro.h; sourceTree = "<group>"; };
-		C0873ED2249105FF00D47D34 /* ESPAES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPAES.h; sourceTree = "<group>"; };
-		C0873ED3249105FF00D47D34 /* ESP_NetUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_NetUtil.h; sourceTree = "<group>"; };
-		C0873ED4249105FF00D47D34 /* ESP_ByteUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_ByteUtil.h; sourceTree = "<group>"; };
-		C0873ED5249105FF00D47D34 /* ESPTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTools.h; sourceTree = "<group>"; };
-		C0873ED6249105FF00D47D34 /* ESP_CRC8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_CRC8.h; sourceTree = "<group>"; };
-		C0873ED7249105FF00D47D34 /* ESP_WifiUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESP_WifiUtil.h; sourceTree = "<group>"; };
-		C0873ED8249105FF00D47D34 /* ESPAES.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPAES.m; sourceTree = "<group>"; };
-		C0873EDA2491060000D47D34 /* ESPTouchResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchResult.m; sourceTree = "<group>"; };
-		C0873EDB2491060000D47D34 /* ESPTouchTaskParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchTaskParameter.h; sourceTree = "<group>"; };
-		C0873EDC2491060000D47D34 /* ESPTouchTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchTask.h; sourceTree = "<group>"; };
-		C0873EDD2491060000D47D34 /* ESPTouchResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchResult.h; sourceTree = "<group>"; };
-		C0873EDE2491060000D47D34 /* ESPTouchDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ESPTouchDelegate.h; sourceTree = "<group>"; };
-		C0873EDF2491060000D47D34 /* ESPTouchTaskParameter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchTaskParameter.m; sourceTree = "<group>"; };
-		C0873EE02491060000D47D34 /* ESPTouchTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ESPTouchTask.m; sourceTree = "<group>"; };
 		C0B2F53E244C6FE3001079AA /* PetStoresViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PetStoresViewController.h; sourceTree = "<group>"; };
 		C0B2F53F244C6FE3001079AA /* PetStoresViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetStoresViewController.m; sourceTree = "<group>"; };
 		C0B2F540244C6FE3001079AA /* PetStoresViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PetStoresViewController.xib; sourceTree = "<group>"; };
@ -6285,6 +6287,86 @@
 			path = Frameworks;
 			sourceTree = "<group>";
 		};
+		2AC874DC26874F7500B6161C /* ESPTouch */ = {
+			isa = PBXGroup;
+			children = (
+				2AC874DD26874F7500B6161C /* udp */,
+				2AC874E226874F7500B6161C /* protocol */,
+				2AC874EB26874F7500B6161C /* README.md */,
+				2AC874EC26874F7500B6161C /* ESPUtils */,
+				2AC874FA26874F7500B6161C /* task */,
+				2AC874FF26874F7500B6161C /* esptouch */,
+			);
+			path = ESPTouch;
+			sourceTree = "<group>";
+		};
+		2AC874DD26874F7500B6161C /* udp */ = {
+			isa = PBXGroup;
+			children = (
+				2AC874DE26874F7500B6161C /* ESPUDPSocketClient.h */,
+				2AC874DF26874F7500B6161C /* ESPUDPSocketServer.m */,
+				2AC874E026874F7500B6161C /* ESPUDPSocketClient.m */,
+				2AC874E126874F7500B6161C /* ESPUDPSocketServer.h */,
+			);
+			path = udp;
+			sourceTree = "<group>";
+		};
+		2AC874E226874F7500B6161C /* protocol */ = {
+			isa = PBXGroup;
+			children = (
+				2AC874E326874F7500B6161C /* ESPGuideCode.m */,
+				2AC874E426874F7500B6161C /* ESPTouchGenerator.m */,
+				2AC874E526874F7500B6161C /* ESPDataCode.h */,
+				2AC874E626874F7500B6161C /* ESPDatumCode.h */,
+				2AC874E726874F7500B6161C /* ESPGuideCode.h */,
+				2AC874E826874F7500B6161C /* ESPDataCode.m */,
+				2AC874E926874F7500B6161C /* ESPTouchGenerator.h */,
+				2AC874EA26874F7500B6161C /* ESPDatumCode.m */,
+			);
+			path = protocol;
+			sourceTree = "<group>";
+		};
+		2AC874EC26874F7500B6161C /* ESPUtils */ = {
+			isa = PBXGroup;
+			children = (
+				2AC874ED26874F7500B6161C /* ESPTools.m */,
+				2AC874EE26874F7500B6161C /* ESP_NetUtil.m */,
+				2AC874EF26874F7500B6161C /* ESP_ByteUtil.m */,
+				2AC874F026874F7500B6161C /* ESP_WifiUtil.m */,
+				2AC874F126874F7500B6161C /* ESP_CRC8.m */,
+				2AC874F226874F7500B6161C /* ESPVersionMacro.h */,
+				2AC874F326874F7500B6161C /* ESPAES.h */,
+				2AC874F426874F7500B6161C /* ESP_NetUtil.h */,
+				2AC874F526874F7500B6161C /* ESP_ByteUtil.h */,
+				2AC874F626874F7500B6161C /* ESPTools.h */,
+				2AC874F726874F7500B6161C /* ESP_CRC8.h */,
+				2AC874F826874F7500B6161C /* ESP_WifiUtil.h */,
+				2AC874F926874F7500B6161C /* ESPAES.m */,
+			);
+			path = ESPUtils;
+			sourceTree = "<group>";
+		};
+		2AC874FA26874F7500B6161C /* task */ = {
+			isa = PBXGroup;
+			children = (
+				2AC874FB26874F7500B6161C /* ESPTouchResult.m */,
+				2AC874FC26874F7500B6161C /* ESPTouchTaskParameter.h */,
+				2AC874FD26874F7500B6161C /* ESPTouchTaskParameter.m */,
+				2AC874FE26874F7500B6161C /* ESPTouchTask.m */,
+			);
+			path = task;
+			sourceTree = "<group>";
+		};
+		2AC874FF26874F7500B6161C /* esptouch */ = {
+			isa = PBXGroup;
+			children = (
+				2AC8750026874F7500B6161C /* ESPTouchTask.h */,
+				2AC8750126874F7500B6161C /* ESPTouchResult.h */,
+				2AC8750226874F7500B6161C /* ESPTouchDelegate.h */,
+			);
+			path = esptouch;
+			sourceTree = "<group>";
+		};
 		3D13F838212FE46B00D725F7 /* categry */ = {
 			isa = PBXGroup;
 			children = (
@ -11960,8 +12042,8 @@
 		88F5ECA41D48C9C400CC7CAF /* ThirdPartUnity */ = {
 			isa = PBXGroup;
 			children = (
+				2AC874DC26874F7500B6161C /* ESPTouch */,
 				C0D3A11B2647EB9F008E6FD6 /* ZLRocker */,
-				C0873EBC249105FF00D47D34 /* ESPTouch */,
 				18C54F032350541400DF4E7D /* AlibcTradeSDK-3.1.1.96 */,
 				CB8B646A230FAD250032EB24 /* Bugly */,
 				88C6860D1EA60A40004CDFD9 /* TalkingDataV2.2.88 */,
@ -12213,77 +12295,6 @@
 			path = EGOCache;
 			sourceTree = "<group>";
 		};
-		C0873EBC249105FF00D47D34 /* ESPTouch */ = {
-			isa = PBXGroup;
-			children = (
-				C0873EBD249105FF00D47D34 /* udp */,
-				C0873EC2249105FF00D47D34 /* protocol */,
-				C0873ECB249105FF00D47D34 /* ESPUtils */,
-				C0873ED92491060000D47D34 /* task */,
-			);
-			path = ESPTouch;
-			sourceTree = "<group>";
-		};
-		C0873EBD249105FF00D47D34 /* udp */ = {
-			isa = PBXGroup;
-			children = (
-				C0873EBE249105FF00D47D34 /* ESPUDPSocketClient.h */,
-				C0873EBF249105FF00D47D34 /* ESPUDPSocketServer.m */,
-				C0873EC0249105FF00D47D34 /* ESPUDPSocketClient.m */,
-				C0873EC1249105FF00D47D34 /* ESPUDPSocketServer.h */,
-			);
-			path = udp;
-			sourceTree = "<group>";
-		};
-		C0873EC2249105FF00D47D34 /* protocol */ = {
-			isa = PBXGroup;
-			children = (
-				C0873EC3249105FF00D47D34 /* ESPGuideCode.m */,
-				C0873EC4249105FF00D47D34 /* ESPTouchGenerator.m */,
-				C0873EC5249105FF00D47D34 /* ESPDataCode.h */,
-				C0873EC6249105FF00D47D34 /* ESPDatumCode.h */,
-				C0873EC7249105FF00D47D34 /* ESPGuideCode.h */,
-				C0873EC8249105FF00D47D34 /* ESPDataCode.m */,
-				C0873EC9249105FF00D47D34 /* ESPTouchGenerator.h */,
-				C0873ECA249105FF00D47D34 /* ESPDatumCode.m */,
-			);
-			path = protocol;
-			sourceTree = "<group>";
-		};
-		C0873ECB249105FF00D47D34 /* ESPUtils */ = {
-			isa = PBXGroup;
-			children = (
-				C0873ECC249105FF00D47D34 /* ESPTools.m */,
-				C0873ECD249105FF00D47D34 /* ESP_NetUtil.m */,
-				C0873ECE249105FF00D47D34 /* ESP_ByteUtil.m */,
-				C0873ECF249105FF00D47D34 /* ESP_WifiUtil.m */,
-				C0873ED0249105FF00D47D34 /* ESP_CRC8.m */,
-				C0873ED1249105FF00D47D34 /* ESPVersionMacro.h */,
-				C0873ED2249105FF00D47D34 /* ESPAES.h */,
-				C0873ED3249105FF00D47D34 /* ESP_NetUtil.h */,
-				C0873ED4249105FF00D47D34 /* ESP_ByteUtil.h */,
-				C0873ED5249105FF00D47D34 /* ESPTools.h */,
-				C0873ED6249105FF00D47D34 /* ESP_CRC8.h */,
-				C0873ED7249105FF00D47D34 /* ESP_WifiUtil.h */,
-				C0873ED8249105FF00D47D34 /* ESPAES.m */,
-			);
-			path = ESPUtils;
-			sourceTree = "<group>";
-		};
-		C0873ED92491060000D47D34 /* task */ = {
-			isa = PBXGroup;
-			children = (
-				C0873EDA2491060000D47D34 /* ESPTouchResult.m */,
-				C0873EDB2491060000D47D34 /* ESPTouchTaskParameter.h */,
-				C0873EDC2491060000D47D34 /* ESPTouchTask.h */,
-				C0873EDD2491060000D47D34 /* ESPTouchResult.h */,
-				C0873EDE2491060000D47D34 /* ESPTouchDelegate.h */,
-				C0873EDF2491060000D47D34 /* ESPTouchTaskParameter.m */,
-				C0873EE02491060000D47D34 /* ESPTouchTask.m */,
-			);
-			path = task;
-			sourceTree = "<group>";
-		};
 		C0B2F53D244C6FAF001079AA /* pets */ = {
 			isa = PBXGroup;
 			children = (
@ -12891,7 +12902,6 @@
 				CB484E0422B8C8C80075F050 /* bprint.h in Headers */,
 				FAFC08232279CB5900B5A07B /* SetTimerCell.h in Headers */,
 				CB7D6AA122953BEB0014E5C7 /* YYKVStorage.h in Headers */,
-				C0873EF42491060000D47D34 /* ESP_NetUtil.h in Headers */,
 				CB484DE522B8C8C80075F050 /* rational.h in Headers */,
 				CB484DE922B8C8C80075F050 /* avutil.h in Headers */,
 				3D1C508C221A9EDF0096AE43 /* Utils.h in Headers */,
@ -12913,7 +12923,6 @@
 				3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */,
 				CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */,
 				C024B7A22379668B00509424 /* NSAttributedString+AvoidCrash.h in Headers */,
-				C0873EF62491060000D47D34 /* ESPTools.h in Headers */,
 				CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */,
 				C0EA8A2A23AF74F4003DC53B /* SDWebImageOperation.h in Headers */,
 				C072196D253B1F4F0065CF17 /* DatePickerCustomView.h in Headers */,
@ -12930,11 +12939,13 @@
 				C0EA89EC23AF73EE003DC53B /* UIColor+HexString.h in Headers */,
 				CB484DDC22B8C8C80075F050 /* Rtsp_instance.h in Headers */,
 				CB484DF722B8C8C80075F050 /* dict.h in Headers */,
+				2AC8752126874F7500B6161C /* ESPTouchTask.h in Headers */,
 				CBA6167A228F9AB100ED380D /* View+MASAdditions.h in Headers */,
 				FA08930E2275F03F0084A609 /* PlusTableViewCell.h in Headers */,
 				CB484E1322B8C8C90075F050 /* vaapi.h in Headers */,
 				3D1C50CC221A9EE00096AE43 /* MPNotificationView.h in Headers */,
 				3D1C50FF221A9EE00096AE43 /* YooseeCenterViewCell.h in Headers */,
+				2AC8751826874F7500B6161C /* ESP_ByteUtil.h in Headers */,
 				CBB0243323517947002900D5 /* NSObject+MJKeyValue.h in Headers */,
 				CB484CFF22B8B0D30075F050 /* Reachability.h in Headers */,
 				C0E7D6D423A1D16D00256A10 /* SendMessageToWXReq+requestWithTextOrMediaMessage.h in Headers */,
@ -12968,7 +12979,7 @@
 				3D1C50B7221A9EDF0096AE43 /* YTargetAndAction.h in Headers */,
 				3D1C510A221A9EE00096AE43 /* PlayBaseViewController.h in Headers */,
 				CB484DE222B8C8C80075F050 /* samplefmt.h in Headers */,
-				C0873EF72491060000D47D34 /* ESP_CRC8.h in Headers */,
+				2AC8750A26874F7500B6161C /* ESPDatumCode.h in Headers */,
 				3D1C50AA221A9EDF0096AE43 /* CyclePickerView.h in Headers */,
 				CB484DE322B8C8C80075F050 /* pixdesc.h in Headers */,
 				CB48204D2334D0A200A50C92 /* ConAquarChooseWiFiVC.h in Headers */,
@ -12989,6 +13000,7 @@
 				CB0F4E8722951A130091C76D /* SVIndefiniteAnimatedView.h in Headers */,
 				3D1C5090221A9EDF0096AE43 /* AccountResult.h in Headers */,
 				CB484E1822B8C8C90075F050 /* old_codec_ids.h in Headers */,
+				2AC8750D26874F7500B6161C /* ESPTouchGenerator.h in Headers */,
 				CB484CFC22B8B0AC0075F050 /* GCDAsyncSocket.h in Headers */,
 				CB7D6AB922954FB90014E5C7 /* FuncUserDefault.h in Headers */,
 				3D1C50C9221A9EE00096AE43 /* ContactDAO.h in Headers */,
@ -13004,19 +13016,23 @@
 				CB484DDE22B8C8C80075F050 /* error.h in Headers */,
 				3D1C5100221A9EE00096AE43 /* IfishCameraModel.h in Headers */,
 				3D1C508D221A9EDF0096AE43 /* CustomBorderButton.h in Headers */,
+				2AC8751626874F7500B6161C /* ESPAES.h in Headers */,
 				3D1C50AC221A9EDF0096AE43 /* CustomView.h in Headers */,
 				3D1C50B4221A9EDF0096AE43 /* YTheNaviBar.h in Headers */,
 				3D1C5121221A9EE00096AE43 /* CameraBottomCollectionViewCell.h in Headers */,
 				CB484E1222B8C8C90075F050 /* vdpau.h in Headers */,
 				C0B2F55D244D5577001079AA /* StoreNameView.h in Headers */,
+				2AC8752326874F7500B6161C /* ESPTouchDelegate.h in Headers */,
 				C0EA8A1323AF74F4003DC53B /* UIImageView+WebCache.h in Headers */,
 				CB4820962334E99700A50C92 /* IQUIView+Hierarchy.h in Headers */,
 				FA0892E9226B22C90084A609 /* Xuanduo2Model.h in Headers */,
+				2AC8751526874F7500B6161C /* ESPVersionMacro.h in Headers */,
 				3D1C5115221A9EE00096AE43 /* ShotScreenImgViewController.h in Headers */,
 				3D1C5083221A9EDF0096AE43 /* KTThumbsViewController.h in Headers */,
 				3D1C50AF221A9EDF0096AE43 /* YFonc.h in Headers */,
 				C024B7AD2379668B00509424 /* NSMutableDictionary+AvoidCrash.h in Headers */,
 				CB484E0222B8C8C80075F050 /* mem.h in Headers */,
+				2AC8751A26874F7500B6161C /* ESP_CRC8.h in Headers */,
 				CB484DD922B8C8C80075F050 /* elian.h in Headers */,
 				CB4820562334E30300A50C92 /* HKPieChartView.h in Headers */,
 				C0E7D6C023A1D11500256A10 /* WXApiRequestHandler.h in Headers */,
@ -13032,10 +13048,11 @@
 				CB48207F2334E99700A50C92 /* IQPreviousNextView.h in Headers */,
 				FA0893152275F7CF0084A609 /* XuanduoSelectHeader.h in Headers */,
 				C0837A58244FF5510034FEC5 /* EGOCache.h in Headers */,
+				2AC8751926874F7500B6161C /* ESPTools.h in Headers */,
 				3D1C50D1221A9EE00096AE43 /* SVPullToRefresh.h in Headers */,
 				CB7D6AB022954DE20014E5C7 /* CommonUtils.h in Headers */,
 				3D1C513C221A9EE10096AE43 /* FishControlFourthCell.h in Headers */,
-				C0873EF82491060000D47D34 /* ESP_WifiUtil.h in Headers */,
+				2AC8752226874F7500B6161C /* ESPTouchResult.h in Headers */,
 				3D1C5086221A9EDF0096AE43 /* KTThumbView.h in Headers */,
 				3D1C50E5221A9EE00096AE43 /* ShakeManager.h in Headers */,
 				3D1C5088221A9EDF0096AE43 /* KTThumbsView.h in Headers */,
@ -13045,7 +13062,6 @@
 				C024B79F2379668B00509424 /* AvoidCrash.h in Headers */,
 				C024B7AE2379668B00509424 /* NSObject+AvoidCrash.h in Headers */,
 				C0B2F541244C6FE3001079AA /* PetStoresViewController.h in Headers */,
-				C0873EFE2491060000D47D34 /* ESPTouchDelegate.h in Headers */,
 				3D1C50C7221A9EE00096AE43 /* LocalDevice.h in Headers */,
 				3D1C50A0221A9EDF0096AE43 /* TouchButton.h in Headers */,
 				CBB0243723517947002900D5 /* MJExtension.h in Headers */,
@ -13060,9 +13076,9 @@
 				3D1C50C4221A9EE00096AE43 /* OBGradientView.h in Headers */,
 				C0E7D6D223A1D16D00256A10 /* GetMessageFromWXResp+responseWithTextOrMediaMessage.h in Headers */,
 				3D1C509D221A9EDF0096AE43 /* GetContactMessageResult.h in Headers */,
+				2AC8751B26874F7500B6161C /* ESP_WifiUtil.h in Headers */,
 				CBB0243923517947002900D5 /* MJPropertyKey.h in Headers */,
 				CBA61681228F9AB100ED380D /* NSLayoutConstraint+MASDebugAdditions.h in Headers */,
-				C0873EE72491060000D47D34 /* ESPDataCode.h in Headers */,
 				3D1C5109221A9EE00096AE43 /* P2PPlaybackController.h in Headers */,
 				C024B7B02379668B00509424 /* NSMutableAttributedString+AvoidCrash.h in Headers */,
 				C0E7D6D323A1D16D00256A10 /* UIAlertView+WX.h in Headers */,
@ -13076,7 +13092,6 @@
 				C0EA8A1C23AF74F4003DC53B /* UIButton+WebCache.h in Headers */,
 				C024B7AC2379668B00509424 /* NSArray+AvoidCrash.h in Headers */,
 				CB48207D2334E99700A50C92 /* IQUIView+IQKeyboardToolbar.h in Headers */,
-				C0873EF52491060000D47D34 /* ESP_ByteUtil.h in Headers */,
 				C024B7AF2379668B00509424 /* NSMutableString+AvoidCrash.h in Headers */,
 				C0EA8A2023AF74F4003DC53B /* UIView+WebCacheOperation.h in Headers */,
 				CB48208A2334E99700A50C92 /* IQKeyboardReturnKeyHandler.h in Headers */,
@ -13084,11 +13099,10 @@
 				3D1C5095221A9EDF0096AE43 /* Alarm.h in Headers */,
 				CB4820872334E99700A50C92 /* IQKeyboardManagerConstantsInternal.h in Headers */,
 				C0EA8A2D23AF74F4003DC53B /* SDWebImagePrefetcher.h in Headers */,
-				C0873EEB2491060000D47D34 /* ESPTouchGenerator.h in Headers */,
 				3D1C5145221A9EE10096AE43 /* BootomViewSoketBackMasgConreol.h in Headers */,
-				C0873EF22491060000D47D34 /* ESPVersionMacro.h in Headers */,
 				3D1C5146221A9EE10096AE43 /* FishTankBootmDataHelper.h in Headers */,
-				C0873EE92491060000D47D34 /* ESPGuideCode.h in Headers */,
+				2AC8750B26874F7500B6161C /* ESPGuideCode.h in Headers */,
+				2AC8750926874F7500B6161C /* ESPDataCode.h in Headers */,
 				CB484DF522B8C8C80075F050 /* hmac.h in Headers */,
 				CB484E0922B8C8C80075F050 /* intreadwrite.h in Headers */,
 				CB484E0122B8C8C80075F050 /* imgutils.h in Headers */,
@ -13099,7 +13113,6 @@
 				3D1C5101221A9EE00096AE43 /* IfishP2PMonitorController.h in Headers */,
 				3D1C50F5221A9EE00096AE43 /* CameraManager.h in Headers */,
 				C0EA8A2423AF74F4003DC53B /* UIImageView+HighlightedWebCache.h in Headers */,
-				C0873EE82491060000D47D34 /* ESPDatumCode.h in Headers */,
 				CB484DF422B8C8C80075F050 /* common.h in Headers */,
 				3D1C50A3221A9EDF0096AE43 /* WaitingPageView.h in Headers */,
 				CB484DEB22B8C8C80075F050 /* xtea.h in Headers */,
@ -13115,14 +13128,13 @@
 				3D1C50F0221A9EE00096AE43 /* RecommendInfo.h in Headers */,
 				3D1C509C221A9EDF0096AE43 /* ModifyLoginPasswordResult.h in Headers */,
 				C0EA8A2E23AF74F4003DC53B /* SDWebImageCompat.h in Headers */,
-				C0873EFB2491060000D47D34 /* ESPTouchTaskParameter.h in Headers */,
 				CBA61680228F9AB100ED380D /* MASConstraint.h in Headers */,
-				C0873EE42491060000D47D34 /* ESPUDPSocketServer.h in Headers */,
 				CB484E0622B8C8C80075F050 /* timestamp.h in Headers */,
 				3D1C512E221A9EE10096AE43 /* CameraBottomHView.h in Headers */,
 				C0EA8A2223AF74F4003DC53B /* UIImage+WebP.h in Headers */,
 				CB484E0E22B8C8C80075F050 /* version.h in Headers */,
 				3D1C50E4221A9EE00096AE43 /* config.h in Headers */,
+				2AC8751E26874F7500B6161C /* ESPTouchTaskParameter.h in Headers */,
 				CBB0243223517947002900D5 /* NSObject+MJProperty.h in Headers */,
 				C017B1E2245ED2D4003151DF /* UIImage+WaterMark.h in Headers */,
 				3D1C5104221A9EE00096AE43 /* YooseConnectFirstViewController.h in Headers */,
@ -13135,6 +13147,8 @@
 				C0D3A12C2647ED99008E6FD6 /* UIView+Sizes.h in Headers */,
 				CB484DEA22B8C8C80075F050 /* intfloat_readwrite.h in Headers */,
 				CB4820922334E99700A50C92 /* IQNSArray+Sort.h in Headers */,
+				2AC8750326874F7500B6161C /* ESPUDPSocketClient.h in Headers */,
+				2AC8751726874F7500B6161C /* ESP_NetUtil.h in Headers */,
 				CB4820942334E99700A50C92 /* IQUITextFieldView+Additions.h in Headers */,
 				3D1C5139221A9EE10096AE43 /* FishControlSecondCell.h in Headers */,
 				C0EA8A1723AF74F4003DC53B /* SDWebImageDownloaderOperation.h in Headers */,
@ -13161,7 +13175,7 @@
 				3D1C511B221A9EE00096AE43 /* ShootImgDataSource.h in Headers */,
 				3D1C5132221A9EE10096AE43 /* CameraRecordViewController.h in Headers */,
 				CB48208B2334E99700A50C92 /* IQKeyboardManager.h in Headers */,
-				C0873EE12491060000D47D34 /* ESPUDPSocketClient.h in Headers */,
+				2AC8750626874F7500B6161C /* ESPUDPSocketServer.h in Headers */,
 				CB484DF122B8C8C80075F050 /* adler32.h in Headers */,
 				3D1C50A9221A9EDF0096AE43 /* MXSCycleScrollView.h in Headers */,
 				CB484E0322B8C8C80075F050 /* parseutils.h in Headers */,
@ -13174,9 +13188,7 @@
 				CB484DEE22B8C8C80075F050 /* md5.h in Headers */,
 				FAA732D4227BE2B80062C252 /* ReadTimerModel.h in Headers */,
 				C0EA8A1923AF74F4003DC53B /* SDImageCache.h in Headers */,
-				C0873EFC2491060000D47D34 /* ESPTouchTask.h in Headers */,
 				CBA61676228F9AB100ED380D /* MASConstraint+Private.h in Headers */,
-				C0873EF32491060000D47D34 /* ESPAES.h in Headers */,
 				CB484DF022B8C8C80075F050 /* attributes.h in Headers */,
 				3D1C508B221A9EDF0096AE43 /* KTPhotoScrollViewController.h in Headers */,
 				3D1C50DB221A9EE00096AE43 /* YAudioStreamPlayer.h in Headers */,
@ -13188,7 +13200,6 @@
 				3D1C5108221A9EE00096AE43 /* P2PPlayingbackVC.h in Headers */,
 				3D1C50AD221A9EDF0096AE43 /* FXBlurView.h in Headers */,
 				CB0F4E8A22951A130091C76D /* SVRadialGradientLayer.h in Headers */,
-				C0873EFD2491060000D47D34 /* ESPTouchResult.h in Headers */,
 				404D7CEB2238CF77005655F5 /* UIViewController+Swizzling.h in Headers */,
 				CB0F4E8E22951A130091C76D /* SVProgressAnimatedView.h in Headers */,
 				FA0892FD2275A1B30084A609 /* Xuanduo2SettingController.h in Headers */,
@ -13930,6 +13941,7 @@
 				883283691EAF235300A47157 /* GolaCoastListViewCell.xib in Resources */,
 				881A1D411DD4057100BA1AF4 /* MineKanEditSec0ViewCell.xib in Resources */,
 				8829571E1DBDA3A300E9DDD7 /* swimmingfish0013.png in Resources */,
+				2AC8750F26874F7500B6161C /* README.md in Resources */,
 				88F23F271EA9D18700E4D298 /* live_botton_like.png in Resources */,
 				883283371EAEE60500A47157 /* home_nav_news@2x.png in Resources */,
 				8856B0711DE83016009D384A /* live_upload_banner.png in Resources */,
@ -14750,6 +14762,7 @@
 				880707541DDD43D50076F65A /* P2PShareViewFour4Cell.m in Sources */,
 				883E783E1D48A5E50030E075 /* FourControlCanChangeImgController.m in Sources */,
 				886EAC731E2DFDDC00A4DF27 /* ShopDetailThredViewCell.m in Sources */,
+				2AC8750526874F7500B6161C /* ESPUDPSocketClient.m in Sources */,
 				883E78FE1D48A5E50030E075 /* ResetViewController.m in Sources */,
 				883E763F1D4897570030E075 /* SetSelectorTime.m in Sources */,
 				881671D71EA5DE2B00BEBF23 /* UMComSysCommonTableViewCell.m in Sources */,
@ -14823,7 +14836,6 @@
 				881672031EA5DE2B00BEBF23 /* UMComRefreshView.m in Sources */,
 				3D34479A212CF71C00CF3941 /* IfishHotBarVc.m in Sources */,
 				881672211EA5DE2B00BEBF23 /* UMComBriefEditView.m in Sources */,
-				C0873EEF2491060000D47D34 /* ESP_ByteUtil.m in Sources */,
 				881A1D4F1DD41AB000BA1AF4 /* MineKanEditSec1ThredCell.m in Sources */,
 				885C43BC1E89F79D00685A2E /* WMPageController.m in Sources */,
 				CBB0243C23517947002900D5 /* NSObject+MJClass.m in Sources */,
@ -14842,7 +14854,6 @@
 				881671AE1EA5DE2B00BEBF23 /* UMComUserUpdateDataController.m in Sources */,
 				885C43B71E89F79D00685A2E /* IfishLiveRecommendListViewController.m in Sources */,
 				8816721C1EA5DE2B00BEBF23 /* UMComSimplicityFindTableViewCell.m in Sources */,
-				C0873EEC2491060000D47D34 /* ESPDatumCode.m in Sources */,
 				88597ABD1E56BAF1003D0E5C /* WBSPopShareView.m in Sources */,
 				8816720E1EA5DE2B00BEBF23 /* UMComProgressHUD.m in Sources */,
 				886185C11EF2228000459AD1 /* ThreeControlNameViewController.m in Sources */,
@ -14853,10 +14864,10 @@
 				886185C71EF228E100459AD1 /* FourControlName.m in Sources */,
 				CBB0243523517947002900D5 /* NSString+MJExtension.m in Sources */,
 				881672251EA5DE2B00BEBF23 /* UMComSelectTopicViewController.m in Sources */,
-				C0873EEE2491060000D47D34 /* ESP_NetUtil.m in Sources */,
 				3D1C5140221A9EE10096AE43 /* BootomViewSoketBackMasgConreol.m in Sources */,
 				883E78601D48A5E50030E075 /* LeftViewController.m in Sources */,
 				3D1C511A221A9EE00096AE43 /* ShotScreenImgViewController.m in Sources */,
+				2AC8751426874F7500B6161C /* ESP_CRC8.m in Sources */,
 				883E78FA1D48A5E50030E075 /* LogInViewController.m in Sources */,
 				883E79A11D48B0280030E075 /* MyFishTankCell.m in Sources */,
 				881672071EA5DE2B00BEBF23 /* UMComGridTableViewCell.m in Sources */,
@ -14871,7 +14882,6 @@
 				8815D11E1DF7A0E300BEA2DA /* NSTimer+Convenience.m in Sources */,
 				3D1C50A4221A9EDF0096AE43 /* ProgressImageView.m in Sources */,
 				CB7D6AA022953BEB0014E5C7 /* YYDiskCache.m in Sources */,
-				C0873EE62491060000D47D34 /* ESPTouchGenerator.m in Sources */,
 				883E793E1D48ACFF0030E075 /* AFHttpTool.m in Sources */,
 				3DD7AB5121E2F2FB0064856A /* mask.c in Sources */,
 				883E787C1D48A5E50030E075 /* IfishMeViewController.m in Sources */,
@ -14915,6 +14925,7 @@
 				CBA61657228F9A6C00ED380D /* YYClassInfo.m in Sources */,
 				FA0892F2226CA3920084A609 /* NSString+Add.m in Sources */,
 				883E763E1D4897570030E075 /* ServerBackDeviceLogInModel.m in Sources */,
+				2AC8751126874F7500B6161C /* ESP_NetUtil.m in Sources */,
 				C0EA8A1223AF74F4003DC53B /* MKAnnotationView+WebCache.m in Sources */,
 				CBA616A822928B1700ED380D /* UIButton+button.m in Sources */,
 				3D1C5098221A9EDF0096AE43 /* UDManager.m in Sources */,
@ -15005,6 +15016,7 @@
 				881A1D4A1DD41A4900BA1AF4 /* MineKanEditSec1SecondCell.m in Sources */,
 				CB4820912334E99700A50C92 /* IQUIView+Hierarchy.m in Sources */,
 				883E76331D4897570030E075 /* appLogin.m in Sources */,
+				2AC8750426874F7500B6161C /* ESPUDPSocketServer.m in Sources */,
 				883E76301D4897570030E075 /* UserModel.m in Sources */,
 				88F5EFC31D48D08100CC7CAF /* JHRefreshAmazingAniView.m in Sources */,
 				8869B3831E6965770010F099 /* IfishLevelUpView.m in Sources */,
@ -15018,6 +15030,7 @@
 				3D1C50C1221A9EE00096AE43 /* Utils.m in Sources */,
 				88F5EFCC1D48D08100CC7CAF /* UIScrollView+JHRefresh.m in Sources */,
 				88591EE31D655B9E00A1316E /* AreaModel.m in Sources */,
+				2AC8750C26874F7500B6161C /* ESPDataCode.m in Sources */,
 				881671DA1EA5DE2B00BEBF23 /* UMComProfileSettingController.m in Sources */,
 				883283681EAF235300A47157 /* GolaCoastListViewCell.m in Sources */,
 				88591EE51D655B9E00A1316E /* ChinaArea.m in Sources */,
@ -15047,7 +15060,6 @@
 				CBB0244223517947002900D5 /* MJPropertyType.m in Sources */,
 				8871FAA41EBC0CE30038E99A /* ShopCerProgressHeaderView.m in Sources */,
 				88F5EFD81D48D08100CC7CAF /* MMVectorImage.m in Sources */,
-				C0873EF02491060000D47D34 /* ESP_WifiUtil.m in Sources */,
 				CBB0243623517947002900D5 /* NSObject+MJProperty.m in Sources */,
 				883E79B81D48B0280030E075 /* remindCyclePic.m in Sources */,
 				88696FCF1E9C8872005D4AFB /* MemeberEditeViewCustomCell.m in Sources */,
@ -15066,7 +15078,6 @@
 				883E78731D48A5E50030E075 /* SetNameTextViewController.m in Sources */,
 				88F5EFD51D48D08100CC7CAF /* MMProgressHUDViewController.m in Sources */,
 				3D1C507E221A9EDF0096AE43 /* KTPhotoBrowserGlobal.m in Sources */,
-				C0873F002491060000D47D34 /* ESPTouchTask.m in Sources */,
 				883E78931D48A5E50030E075 /* IfishDiscoverViewController.m in Sources */,
 				88696FD41E9C8B4A005D4AFB /* MemberEditeViewLocationCell.m in Sources */,
 				886F4DF61D753877001EDA34 /* Report3ViewCell.m in Sources */,
@ -15083,6 +15094,7 @@
 				8867F5B01E65421900AF021C /* IifshMineDJViewController.m in Sources */,
 				881671D81EA5DE2B00BEBF23 /* UMComSysLikeTableViewCell.m in Sources */,
 				887069531D4EE8A600BCF675 /* PopCell.m in Sources */,
+				2AC8750E26874F7500B6161C /* ESPDatumCode.m in Sources */,
 				887491F31E7921E400CDA284 /* IfishInformationListViewCell.m in Sources */,
 				88613F781E5C31E6008D2C69 /* XuanYanCellHCaculator.m in Sources */,
 				886FB18B1E5A977700256332 /* FishDoctorViewController.m in Sources */,
@ -15117,7 +15129,6 @@
 				3DD7AB9A21E474940064856A /* AsyncSocket.m in Sources */,
 				886B80641D62F57000E1B9B3 /* SOngNuoGuiDeng.m in Sources */,
 				881F0F591D73DFFF0091507E /* BaoGaoViewThirdCell.m in Sources */,
-				C0873EFA2491060000D47D34 /* ESPTouchResult.m in Sources */,
 				88653C9B1E76691E00FF973E /* IfishInformationViewController.m in Sources */,
 				88F5EFB81D48D08100CC7CAF /* UIRefreshControl+AFNetworking.m in Sources */,
 				88D3373C1DC7440C006C0ADB /* IfishConnectingView.m in Sources */,
@ -15134,6 +15145,7 @@
 				CBA6168C228F9AB100ED380D /* MASViewAttribute.m in Sources */,
 				883E762F1D4897570030E075 /* TemperatureSetModel.m in Sources */,
 				886B806A1D630BCE00E1B9B3 /* ShopCertificationIntroduceController.m in Sources */,
+				2AC8750726874F7500B6161C /* ESPGuideCode.m in Sources */,
 				CB484D8422B8BE830075F050 /* P2PClient.m in Sources */,
 				885979FD1E5424EA003D0E5C /* UITextField+KeyBordDoneView.m in Sources */,
 				88696FB21E9C6915005D4AFB /* MemberManageViewController.m in Sources */,
@ -15160,6 +15172,7 @@
 				C0EA8A1A23AF74F4003DC53B /* SDWebImageDownloader.m in Sources */,
 				CB4820822334E99700A50C92 /* IQUIView+IQKeyboardToolbar.m in Sources */,
 				886EAC621E2DE91300A4DF27 /* KanHuFirstSectionViewCell.m in Sources */,
+				2AC8751C26874F7500B6161C /* ESPAES.m in Sources */,
 				CBA61686228F9AB100ED380D /* View+MASAdditions.m in Sources */,
 				881671D61EA5DE2B00BEBF23 /* UMComSysCommentCell.m in Sources */,
 				885C43B31E89F79D00685A2E /* IfishLiveListViewCell.m in Sources */,
@ -15223,7 +15236,6 @@
 				881671C11EA5DE2B00BEBF23 /* UMComNavigationController.m in Sources */,
 				88380DB61EB1DA7B00FC7C0D /* ShopGoodsManageViewController.m in Sources */,
 				CB484D0022B8B0D30075F050 /* Reachability.m in Sources */,
-				C0873EE22491060000D47D34 /* ESPUDPSocketServer.m in Sources */,
 				887C36281EE63F6000964ACD /* XWCountryCodeController.m in Sources */,
 				883E786E1D48A5E50030E075 /* infoCollectionViewCell.m in Sources */,
 				881671C61EA5DE2B00BEBF23 /* UMComDiscoverViewController.m in Sources */,
@ -15301,11 +15313,11 @@
 				3D1C5110221A9EE00096AE43 /* PlayBaseViewController.m in Sources */,
 				88D0F27D1EA6F53E00286022 /* IfishSetViewController.m in Sources */,
 				885FBDE41E4C3DE400E0D7D1 /* ShopNotCertifyViewCell.m in Sources */,
+				2AC8751F26874F7500B6161C /* ESPTouchTaskParameter.m in Sources */,
 				8841D5BA1EE7A914007B0025 /* RunSunCHNameCustom.m in Sources */,
 				CBB0243023517947002900D5 /* MJFoundation.m in Sources */,
 				883E76451D4897570030E075 /* ZeroControlBackmsgModel.m in Sources */,
 				889133041ECE999A00F52EBC /* ArtPlayerView.m in Sources */,
-				C0873EE32491060000D47D34 /* ESPUDPSocketClient.m in Sources */,
 				881A1D371DD3025400BA1AF4 /* MineKankanEditViewController.m in Sources */,
 				883E79BE1D48B0280030E075 /* ChangeWaterCell.m in Sources */,
 				88696FDE1E9C8D51005D4AFB /* MemberDetailMarkDetailViewCell.m in Sources */,
@ -15341,6 +15353,7 @@
 				883E78401D48A5E50030E075 /* FourControlDataUnity.m in Sources */,
 				3D5C436E21339E9D00E15B66 /* IfishHistoryView.m in Sources */,
 				885928C71E67C20600E0011E /* MineDengJi.m in Sources */,
+				2AC8751D26874F7500B6161C /* ESPTouchResult.m in Sources */,
 				881478371E712E3A00BFB79C /* TaskKindViewCell.m in Sources */,
 				8829582B1DC18CD100E9DDD7 /* AFNOHeaderHttpTool.m in Sources */,
 				886185CD1EF255F900459AD1 /* XuToControlNameViewController.m in Sources */,
@ -15348,7 +15361,6 @@
 				881671FC1EA5DE2B00BEBF23 /* UMAssetsCollectionCheckMarkView.m in Sources */,
 				881477E61E71091300BFB79C /* IfishTaskModel.m in Sources */,
 				88C1B2BE1DD1749F00C2C99A /* IfishKanKanListViewController.m in Sources */,
-				C0873EFF2491060000D47D34 /* ESPTouchTaskParameter.m in Sources */,
 				8868FE511E66BDB4002F7F33 /* DengJiShuoMingViewCell.m in Sources */,
 				3D1C511D221A9EE00096AE43 /* IfishCameraRecordfirstCell.m in Sources */,
 				885C43B91E89F79D00685A2E /* WMMenuView.m in Sources */,
@ -15365,7 +15377,6 @@
 				CB7D6AB122954DE20014E5C7 /* CommonUtils.m in Sources */,
 				883E78EA1D48A5E50030E075 /* BookViewController.m in Sources */,
 				3D1C17552171BB0700A159A8 /* PNScatterChart.m in Sources */,
-				C0873EEA2491060000D47D34 /* ESPDataCode.m in Sources */,
 				883E79AB1D48B0280030E075 /* UIViewController+MaryPopin.m in Sources */,
 				CB48204A2334B46100A50C92 /* ConAquarNowWiFiPwdVC.m in Sources */,
 				881671B81EA5DE2B00BEBF23 /* UMComMessageManager.m in Sources */,
@ -15427,7 +15438,6 @@
 				88591EEC1D65B8B500A1316E /* ShopCertifyFailViewController.m in Sources */,
 				883E793C1D48ACFF0030E075 /* IfishDBHelper.m in Sources */,
 				886B807D1D63116E00E1B9B3 /* CertificationViewFourthCell.m in Sources */,
-				C0873EED2491060000D47D34 /* ESPTools.m in Sources */,
 				8867F5C51E656D0300AF021C /* IfishDengjiProgress.m in Sources */,
 				3D1C17502171BB0700A159A8 /* PNRadarChart.m in Sources */,
 				8870694A1D4EE89200BCF675 /* DXPopover.m in Sources */,
@ -15461,7 +15471,6 @@
 				883E78381D48A5E50030E075 /* MorShopViewController.m in Sources */,
 				881671A21EA5DE2B00BEBF23 /* UMComNoticeListDataController..m in Sources */,
 				883E78431D48A5E50030E075 /* KeLiAiBackMassage.m in Sources */,
-				C0873EF92491060000D47D34 /* ESPAES.m in Sources */,
 				3D3447A0212D113D00CF3941 /* IFishHotBarCell.m in Sources */,
 				8871FB101EBC80850038E99A /* FishSelectDeviceListViewCell.m in Sources */,
 				881672421EA5DE2B00BEBF23 /* UMComSimplicityUserCenterViewController.m in Sources */,
@ -15497,8 +15506,8 @@
 				3D1C508F221A9EDF0096AE43 /* LoginResult.m in Sources */,
 				882A75FD1EBAF2DB00AD1D15 /* IfishShopCerNewViewController.m in Sources */,
 				8816721E1EA5DE2B00BEBF23 /* UMComSimplicityUserInfoBar.m in Sources */,
+				2AC8750826874F7500B6161C /* ESPTouchGenerator.m in Sources */,
 				883E76251D4897570030E075 /* ChatroomModel.m in Sources */,
-				C0873EF12491060000D47D34 /* ESP_CRC8.m in Sources */,
 				3D1C5082221A9EDF0096AE43 /* KTPhotoScrollViewController.m in Sources */,
 				881671FA1EA5DE2B00BEBF23 /* UMComPageControlView.m in Sources */,
 				3D1C174A2171BB0700A159A8 /* PNBarChart.m in Sources */,
@ -15517,10 +15526,12 @@
 				C0EA8A2823AF74F4003DC53B /* NSData+ImageContentType.m in Sources */,
 				881671A71EA5DE2B00BEBF23 /* UMComTopicDataController.m in Sources */,
 				881671F81EA5DE2B00BEBF23 /* UMComMutiText.m in Sources */,
+				2AC8752026874F7500B6161C /* ESPTouchTask.m in Sources */,
 				3D1C50A5221A9EDF0096AE43 /* CyclePickerView.m in Sources */,
 				CBB0243423517947002900D5 /* NSObject+MJKeyValue.m in Sources */,
 				883E762B1D4897570030E075 /* setModel.m in Sources */,
 				CB48207B2334E99700A50C92 /* IQTextView.m in Sources */,
+				2AC8751026874F7500B6161C /* ESPTools.m in Sources */,
 				C0EA8A2523AF74F4003DC53B /* SDWebImageDownloaderOperation.m in Sources */,
 				881672151EA5DE2B00BEBF23 /* UMComSimpleCommentEditView.m in Sources */,
 				8868FE561E66C8BC002F7F33 /* DengJiShuoMingViewTopCell.m in Sources */,
@ -15545,6 +15556,7 @@
 				CB4820812334E99700A50C92 /* IQBarButtonItem.m in Sources */,
 				3D1C50C8221A9EE00096AE43 /* Alarm.m in Sources */,
 				881671A61EA5DE2B00BEBF23 /* UMComLocationListDataController.m in Sources */,
+				2AC8751226874F7500B6161C /* ESP_ByteUtil.m in Sources */,
 				CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */,
 				FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */,
 				3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */,
@ -15560,7 +15572,6 @@
 				3D1C5143221A9EE10096AE43 /* ifishdeviceListCell.m in Sources */,
 				881671DF1EA5DE2B00BEBF23 /* UMComUserTableViewCell.m in Sources */,
 				881671EE1EA5DE2B00BEBF23 /* UMComGridView.m in Sources */,
-				C0873EE52491060000D47D34 /* ESPGuideCode.m in Sources */,
 				881672281EA5DE2B00BEBF23 /* UMComFeedImageCollectionViewCell.m in Sources */,
 				88742C381D63FA060074F1F8 /* CertifyListThridCell.m in Sources */,
 				889C25E91E1C83F6004F745D /* RuSunBackMessageUtils.m in Sources */,
@ -15595,6 +15606,7 @@
 				8818692C1D6EE4FB00CE9DFF /* KanHuListModel.m in Sources */,
 				3D1C5099221A9EDF0096AE43 /* GetAlarmRecordResult.m in Sources */,
 				881671F71EA5DE2B00BEBF23 /* UMComMutiStyleTextView.m in Sources */,
+				2AC8751326874F7500B6161C /* ESP_WifiUtil.m in Sources */,
 				FA0892FE2275A1B30084A609 /* Xuanduo2SettingController.m in Sources */,
 				88C1B2C51DD19CE000C2C99A /* KankanListCollectionViewCell.m in Sources */,
 				C0E7D6C223A1D11500256A10 /* WXApiManager.mm in Sources */,
@ -15770,8 +15782,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
@ -15880,7 +15892,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.13;
+				MARKETING_VERSION = 5.1.14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@ -15920,9 +15932,9 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
@ -15998,7 +16010,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.13;
+				MARKETING_VERSION = 5.1.14;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@ -16009,7 +16021,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = fishdis12;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
 				VERSIONING_SYSTEM = "apple-generic";
--- a/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
 	<key>PreviewsEnabled</key>
 	<false/>
 </dict>
--- a/Ifish/ESPTouch/.DS_Store
+++ b/Ifish/ESPTouch/.DS_Store
--- a/Ifish/ESPTouch/ESPUtils/ESP_CRC8.h
+++ b/Ifish/ESPTouch/ESPUtils/ESP_CRC8.h
@ -53,7 +53,7 @@
 /**
 * Updates the checksum value with the given byte.
 *
- * @param value
+ * @param val
 *            the byte to update the checksum with.
 */
 - (void)updateWithValue:(int)value;
--- a/Ifish/ESPTouch/README.md
+++ b/Ifish/ESPTouch/README.md
@ -0,0 +1,31 @@
+# EspTouch
+
+## Example
+- [example](../UI/V1/)
+
+## APIs
+- Create task instance
+  ```Objective-C
+  ESPTouchTask *task = [[ESPTouchTask alloc] initWithApSsid:apSsid andApBssid:apBssid andApPwd:apPwd];
+  [task setEsptouchDelegate:delegate]; // Set result callback
+  [Task setPackageBroadcast:YES]; // if YES send broadcast packets, else send multicast packets
+  ```
+
+- Execute task
+  ```Objective-C
+  int expectCount = 1;
+  NSArray * results = [task executeForResults:expectCount];
+  ESPTouchResult *first = [results objectAtIndex:0];
+  if (first.isCancelled) {
+      // User cancel the task
+      return;
+  }
+  if (first.isSuc) {
+      // EspTouch successfully
+  }
+  ```
+
+- Cancel task
+  ```Objective-C
+  [task interrupt];
+  ```
--- a/Ifish/ESPTouch/esptouch/ESPTouchDelegate.h
+++ b/Ifish/ESPTouch/esptouch/ESPTouchDelegate.h
--- a/Ifish/ESPTouch/esptouch/ESPTouchResult.h
+++ b/Ifish/ESPTouch/esptouch/ESPTouchResult.h
--- a/Ifish/ESPTouch/esptouch/ESPTouchTask.h
+++ b/Ifish/ESPTouch/esptouch/ESPTouchTask.h
@ -11,7 +11,7 @@
 #import "ESPTouchDelegate.h"
 #import "ESPAES.h"

-#define ESPTOUCH_VERSION    @"SDK-v1.0.0"
+#define ESPTOUCH_VERSION    @"SDK-v1.1.0"

 #define DEBUG_ON   YES

@ -28,8 +28,10 @@
 *            the Ap's ssid
 * @param apBssid
 *            the Ap's bssid
- * @param apPwd
+ * @param apPassword
 *            the Ap's password
+ * @param isSsidHidden
+ *            whether the Ap's ssid is hidden
 */
 - (id) initWithApSsid: (NSString *)apSsid andApBssid: (NSString *) apBssid andApPwd: (NSString *)apPwd;

@ -45,10 +47,14 @@
 *            the Ap's ssid
 * @param apBssid
 *            the Ap's bssid
- * @param apPwd
+ * @param apPassword
 *            the Ap's password
- * @param timeoutMillisecond (it should be >= 15000+6000)
- *               millisecond of total timeout
+ * @param isSsidHidden
+ *            whether the Ap's ssid is hidden
+ * @param timeoutMillisecond(it should be >= 15000+6000)
+ * 			  millisecond of total timeout
+ * @param context
+ *            the Context of the Application
 */
 - (id) initWithApSsid: (NSString *)apSsid andApBssid: (NSString *) apBssid andApPwd: (NSString *)apPwd andTimeoutMillisecond: (int) timeoutMillisecond;

@ -59,12 +65,14 @@
 *            the Ap's ssid
 * @param apBssid
 *            the Ap's bssid
- * @param apPwd
+ * @param apPassword
 *            the Ap's password
 * @param isSsidHidden
 *            whether the Ap's ssid is hidden
- * @param timeoutMillisecond (it should be >= 15000+6000)
- *               millisecond of total timeout
+ * @param timeoutMillisecond(it should be >= 15000+6000)
+ * 			  millisecond of total timeout
+ * @param context
+ *            the Context of the Application
 */
 - (id) initWithApSsid: (NSString *)apSsid andApBssid: (NSString *) apBssid andApPwd: (NSString *)apPwd andIsSsidHiden: (BOOL) isSsidHidden andTimeoutMillisecond: (int) timeoutMillisecond  __deprecated_msg("Use initWithApSsid:(NSString *) andApBssid:(NSString *) andApPwd:(NSString *) andTimeoutMillisecond:(int) instead.");

--- a/Ifish/ESPTouch/task/ESPTouchTask.m
+++ b/Ifish/ESPTouch/task/ESPTouchTask.m
@ -62,20 +62,19 @@

 - (id)initWithApSsid:(NSString *)apSsid andApBssid:(NSString *)apBssid andApPwd:(NSString *)apPwd andAES:(ESPAES *)aes
 {
-    self = [super init];
    NSLog(@"Welcome Esptouch %@",ESPTOUCH_VERSION);
    if (apSsid==nil||[apSsid isEqualToString:@""])
    {
        perror("ESPTouchTask initWithApSsid() apSsid shouldn't be null or empty");
-        return self;
    }
    // the apSsid should be null or empty
-    assert(apSsid!=nil&&![apSsid isEqualToString:@""]);
+//    assert(apSsid!=nil&&![apSsid isEqualToString:@""]);
    if (apPwd == nil)
    {
        apPwd = @"";
    }
    
+    self = [super init];
    if (self)
    {
        if (DEBUG_ON)
--- a/Ifish/ESPTouch/task/ESPTouchTaskParameter.h
+++ b/Ifish/ESPTouch/task/ESPTouchTaskParameter.h
@ -156,7 +156,7 @@

 /**
 * set whether the router support IPv6
- * @param isIPv6Supported whether the router support IPv6
+ * @param isIPv4Supported whether the router support IPv6
 */
 - (void) setIsIPv6Supported:(BOOL) isIPv6Supported;

--- a/Ifish/ESPTouch/task/ESPTouchTaskParameter.m
+++ b/Ifish/ESPTouch/task/ESPTouchTaskParameter.m
@ -7,6 +7,7 @@
 //

 #import "ESPTouchTaskParameter.h"
+#import "ESP_NetUtil.h"

@interface ESPTaskParameter()
@property (nonatomic,assign) long intervalGuideCodeMillisecond;
@ -147,7 +148,9 @@ static int _datagramCount = 0;
 {
    if (_isIPv4Supported0) {
        if (self.broadcast) {
-            return @"255.255.255.255";
+            NSString *localInetAddr4 = [ESP_NetUtil getLocalIPv4];
+            NSArray *arr = [localInetAddr4 componentsSeparatedByString:@"."];
+            return [NSString stringWithFormat:@"%@.%@.%@.255",arr[0], arr[1], arr[2]];
        } else {
            int count = [self __getNextDatagramCount];
            return [NSString stringWithFormat: @"234.%d.%d.%d", count, count, count];
--- a/Ifish/ESPTouch/udp/ESPUDPSocketClient.h
+++ b/Ifish/ESPTouch/udp/ESPUDPSocketClient.h
@ -17,11 +17,11 @@
 /**
 * send the data by UDP
 *
- * @param bytesArray2
+ * @param bytes
 *            the array of datas to be sent
- * @param targetHostName
+ * @param targetHost
 *            the host name of target, e.g. 192.168.1.101
- * @param port
+ * @param targetPort
 *            the port of target
 * @param interval
 *            the milliseconds to between each UDP sent
@ -32,15 +32,15 @@
 /**
 * send the data by UDP
 *
- * @param bytesArray2
+ * @param data
 *            the data to be sent
 * @param offset
 * 			  the offset which data to be sent
 * @param count
 * 			  the count of the data
- * @param targetHostName
+ * @param targetHost
 *            the host name of target, e.g. 192.168.1.101
- * @param port
+ * @param targetPort
 *            the port of target
 * @param interval
 *            the milliseconds to between each UDP sent
--- a/Ifish/ESPTouch/udp/ESPUDPSocketClient.m
+++ b/Ifish/ESPTouch/udp/ESPUDPSocketClient.m
@ -133,7 +133,7 @@
                     andInterval: (long) interval
 {
    // init socket parameters
-    bool isBroadcast = [targetHostName isEqualToString:@"255.255.255.255"];
+    bool isBroadcast = [targetHostName hasSuffix:@"255"];
    socklen_t addr_len;
    struct sockaddr_in target_addr;
    memset(&target_addr, 0, sizeof(target_addr));
--- a/Ifish/ESPTouch/udp/ESPUDPSocketServer.h
+++ b/Ifish/ESPTouch/udp/ESPUDPSocketServer.h
@ -27,6 +27,7 @@
 *
 * @param timeout
 *            the timeout in milliseconds or 0 for no timeout.
+ * @return true whether the timeout is set suc
 */
 - (void) setSocketTimeout: (int) timeout;

--- a/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
+++ b/Ifish/controllers/ConnectAauariumVC/ConnectingAquarVC.m
@ -317,6 +317,10 @@ Copy NSString *deviceId;


 - (void)udpHelperMessage:(NSString *)msg {
+    if (!self.timer)
+    {
+        return;
+    }
    self.HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
    self.HUD.mode = MBProgressHUDModeIndeterminate;
    self.HUD.labelText = msg;
@ -324,6 +328,7 @@ Copy NSString *deviceId;
    {
        [self.HUD hide:YES afterDelay:3];
        [self endProgress];
+        [self.progressView endProgressWithString:@"连接失败"];
    }
 }
 -(void)endProgress{
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
@ -40,7 +40,7 @@
                xuanduoModel.waterLevel=[dataString substringWithRange:NSMakeRange(84, 2)];
            }
            }
-        else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]])
+        else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]&&[model isKindOfClass:[Xuanduo3fModel class]]&&dataString.length>67)
        {
            
            Xuanduo3fModel*xuanduoModel=model;
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
@ -1038,7 +1038,7 @@

 #pragma mark -设置页面 -
 - (void)setting {
-    if (self.dataModel.gasPump) {
+    if (self.dataModel.gasPump.length) {
        Xuanduo2SettingController *_settingVC = [[Xuanduo2SettingController alloc] init];
        _settingVC.currentdevice = self.currentDevice;
        _settingVC.dataModel = self.dataModel;
--- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m
+++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m
@ -25,7 +25,7 @@
   // CFShow((__bridge CFTypeRef)(infoDic));
    NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
    NSLog(@"app_Version%@",app_Version);
-    app_Version=@"4.7.13";
+    app_Version=@"4.7.14";
    NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
    NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
    if (buildVersion.length > 0) {
--- a/Ifish/views/StoreNameView.m
+++ b/Ifish/views/StoreNameView.m
@ -99,7 +99,10 @@
 }
 -(void)showStoreName:(UIButton*)button
 {
-    
+    if (self.titles.count)
+    {
+        
+   
    self.tableView.frame = CGRectMake(0, 0, self.frame.size.width-40, self.titles.count>2?2*44:self.titles.count*44);
    DXPopover *popover = [DXPopover new];
    self.tableView.layer.masksToBounds=YES;
@ -111,6 +114,11 @@
    
    
    [popover showAtPoint:CGPointMake(self.oldStoreNameField.center.x, self.oldStoreNameField.center.y+15) popoverPostion:DXPopoverPositionDown withContentView:self.tableView inView:self];
+    }
+    else
+    {
+        [self  makeToast:@"不存在其他宠物店"];
+    }
    
    
 }