diff --git a/.DS_Store b/.DS_Store index d5c3220..dd28ec4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index c164bb8..5fa0855 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -27,78 +27,8 @@ 3D1C17532171BB0700A159A8 /* PNBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C17392171BB0700A159A8 /* PNBar.m */; }; 3D1C17542171BB0700A159A8 /* UICountingLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C173B2171BB0700A159A8 /* UICountingLabel.m */; }; 3D1C17552171BB0700A159A8 /* PNScatterChart.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C173E2171BB0700A159A8 /* PNScatterChart.m */; }; - 3D1C5037221A9EDE0096AE43 /* elian.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F04221A9EDD0096AE43 /* elian.h */; }; - 3D1C5038221A9EDE0096AE43 /* MD5Manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F06221A9EDD0096AE43 /* MD5Manager.h */; }; - 3D1C5039221A9EDE0096AE43 /* libMD5Manager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1C4F07221A9EDD0096AE43 /* libMD5Manager.a */; }; - 3D1C503A221A9EDE0096AE43 /* Rtsp_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F09221A9EDD0096AE43 /* Rtsp_instance.h */; }; - 3D1C503C221A9EDE0096AE43 /* intfloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F0D221A9EDD0096AE43 /* intfloat.h */; }; - 3D1C503D221A9EDE0096AE43 /* error.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F0E221A9EDD0096AE43 /* error.h */; }; - 3D1C503E221A9EDE0096AE43 /* fifo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F0F221A9EDD0096AE43 /* fifo.h */; }; - 3D1C503F221A9EDE0096AE43 /* blowfish.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F10221A9EDD0096AE43 /* blowfish.h */; }; - 3D1C5040221A9EDE0096AE43 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F11221A9EDD0096AE43 /* version.h */; }; - 3D1C5041221A9EDE0096AE43 /* samplefmt.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F12221A9EDD0096AE43 /* samplefmt.h */; }; - 3D1C5042221A9EDE0096AE43 /* pixdesc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F13221A9EDD0096AE43 /* pixdesc.h */; }; - 3D1C5043221A9EDE0096AE43 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F14221A9EDD0096AE43 /* base64.h */; }; - 3D1C5044221A9EDE0096AE43 /* rational.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F15221A9EDD0096AE43 /* rational.h */; }; - 3D1C5045221A9EDE0096AE43 /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F16221A9EDD0096AE43 /* sha.h */; }; - 3D1C5046221A9EDE0096AE43 /* avconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F17221A9EDD0096AE43 /* avconfig.h */; }; - 3D1C5047221A9EDE0096AE43 /* lfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F18221A9EDD0096AE43 /* lfg.h */; }; - 3D1C5048221A9EDE0096AE43 /* avutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F19221A9EDD0096AE43 /* avutil.h */; }; - 3D1C5049221A9EDE0096AE43 /* intfloat_readwrite.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1A221A9EDD0096AE43 /* intfloat_readwrite.h */; }; - 3D1C504A221A9EDE0096AE43 /* xtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1B221A9EDD0096AE43 /* xtea.h */; }; - 3D1C504B221A9EDF0096AE43 /* crc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1C221A9EDD0096AE43 /* crc.h */; }; - 3D1C504C221A9EDF0096AE43 /* file.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1D221A9EDD0096AE43 /* file.h */; }; - 3D1C504D221A9EDF0096AE43 /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1E221A9EDD0096AE43 /* md5.h */; }; - 3D1C504E221A9EDF0096AE43 /* audio_fifo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F1F221A9EDD0096AE43 /* audio_fifo.h */; }; - 3D1C504F221A9EDF0096AE43 /* attributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F20221A9EDD0096AE43 /* attributes.h */; }; - 3D1C5050221A9EDF0096AE43 /* adler32.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F21221A9EDD0096AE43 /* adler32.h */; }; - 3D1C5051221A9EDF0096AE43 /* timecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F22221A9EDD0096AE43 /* timecode.h */; }; - 3D1C5052221A9EDF0096AE43 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F23221A9EDD0096AE43 /* common.h */; }; - 3D1C5053221A9EDF0096AE43 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F24221A9EDD0096AE43 /* hmac.h */; }; - 3D1C5054221A9EDF0096AE43 /* eval.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F25221A9EDD0096AE43 /* eval.h */; }; - 3D1C5055221A9EDF0096AE43 /* dict.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F26221A9EDD0096AE43 /* dict.h */; }; - 3D1C5056221A9EDF0096AE43 /* random_seed.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F27221A9EDD0096AE43 /* random_seed.h */; }; - 3D1C5057221A9EDF0096AE43 /* opt.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F28221A9EDD0096AE43 /* opt.h */; }; - 3D1C5058221A9EDF0096AE43 /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F29221A9EDD0096AE43 /* log.h */; }; - 3D1C5059221A9EDF0096AE43 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2A221A9EDD0096AE43 /* aes.h */; }; - 3D1C505A221A9EDF0096AE43 /* bswap.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2B221A9EDD0096AE43 /* bswap.h */; }; - 3D1C505B221A9EDF0096AE43 /* old_pix_fmts.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2C221A9EDD0096AE43 /* old_pix_fmts.h */; }; - 3D1C505C221A9EDF0096AE43 /* cpu.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2D221A9EDD0096AE43 /* cpu.h */; }; - 3D1C505D221A9EDF0096AE43 /* audioconvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2E221A9EDD0096AE43 /* audioconvert.h */; }; - 3D1C505E221A9EDF0096AE43 /* channel_layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F2F221A9EDD0096AE43 /* channel_layout.h */; }; - 3D1C505F221A9EDF0096AE43 /* imgutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F30221A9EDD0096AE43 /* imgutils.h */; }; - 3D1C5060221A9EDF0096AE43 /* mem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F31221A9EDD0096AE43 /* mem.h */; }; - 3D1C5061221A9EDF0096AE43 /* parseutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F32221A9EDD0096AE43 /* parseutils.h */; }; - 3D1C5062221A9EDF0096AE43 /* bprint.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F33221A9EDD0096AE43 /* bprint.h */; }; - 3D1C5063221A9EDF0096AE43 /* pixfmt.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F34221A9EDD0096AE43 /* pixfmt.h */; }; - 3D1C5064221A9EDF0096AE43 /* timestamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F35221A9EDD0096AE43 /* timestamp.h */; }; - 3D1C5065221A9EDF0096AE43 /* avassert.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F36221A9EDD0096AE43 /* avassert.h */; }; - 3D1C5066221A9EDF0096AE43 /* mathematics.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F37221A9EDD0096AE43 /* mathematics.h */; }; 3D1C5067215CB6E300A2E5D6 /* IfishHotBarHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5066215CB6E300A2E5D6 /* IfishHotBarHeader.xib */; }; - 3D1C5067221A9EDF0096AE43 /* intreadwrite.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F38221A9EDD0096AE43 /* intreadwrite.h */; }; - 3D1C5068221A9EDF0096AE43 /* avstring.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F39221A9EDD0096AE43 /* avstring.h */; }; - 3D1C5069221A9EDF0096AE43 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F3B221A9EDD0096AE43 /* version.h */; }; 3D1C506A215CB6F600A2E5D6 /* IfishHotBarHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C5069215CB6F600A2E5D6 /* IfishHotBarHeader.m */; }; - 3D1C506A221A9EDF0096AE43 /* avio.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F3C221A9EDD0096AE43 /* avio.h */; }; - 3D1C506B221A9EDF0096AE43 /* avformat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F3D221A9EDD0096AE43 /* avformat.h */; }; - 3D1C506C221A9EDF0096AE43 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F3F221A9EDD0096AE43 /* version.h */; }; - 3D1C506D221A9EDF0096AE43 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F40221A9EDD0096AE43 /* swscale.h */; }; - 3D1C506E221A9EDF0096AE43 /* avcodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F42221A9EDD0096AE43 /* avcodec.h */; }; - 3D1C506F221A9EDF0096AE43 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F43221A9EDD0096AE43 /* version.h */; }; - 3D1C5070221A9EDF0096AE43 /* vdpau.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F44221A9EDD0096AE43 /* vdpau.h */; }; - 3D1C5071221A9EDF0096AE43 /* vaapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F45221A9EDD0096AE43 /* vaapi.h */; }; - 3D1C5072221A9EDF0096AE43 /* xvmc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F46221A9EDD0096AE43 /* xvmc.h */; }; - 3D1C5073221A9EDF0096AE43 /* avfft.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F47221A9EDD0096AE43 /* avfft.h */; }; - 3D1C5074221A9EDF0096AE43 /* vda.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F48221A9EDD0096AE43 /* vda.h */; }; - 3D1C5075221A9EDF0096AE43 /* dxva2.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F49221A9EDD0096AE43 /* dxva2.h */; }; - 3D1C5076221A9EDF0096AE43 /* old_codec_ids.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F4A221A9EDD0096AE43 /* old_codec_ids.h */; }; - 3D1C5077221A9EDF0096AE43 /* FfmpegInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F4B221A9EDD0096AE43 /* FfmpegInterface.h */; }; - 3D1C5078221A9EDF0096AE43 /* RtspInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F4C221A9EDD0096AE43 /* RtspInterface.mm */; }; - 3D1C5079221A9EDF0096AE43 /* RtspInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F4D221A9EDD0096AE43 /* RtspInterface.h */; }; - 3D1C507A221A9EDF0096AE43 /* libRTSP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1C4F4E221A9EDD0096AE43 /* libRTSP.a */; }; - 3D1C507B221A9EDF0096AE43 /* FfmpegInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F4F221A9EDD0096AE43 /* FfmpegInterface.m */; }; - 3D1C507C221A9EDF0096AE43 /* P2PCInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F51221A9EDD0096AE43 /* P2PCInterface.h */; }; - 3D1C507D221A9EDF0096AE43 /* libAVCtrl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1C4F52221A9EDD0096AE43 /* libAVCtrl.a */; }; 3D1C507E221A9EDF0096AE43 /* KTPhotoBrowserGlobal.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F55221A9EDD0096AE43 /* KTPhotoBrowserGlobal.m */; }; 3D1C507F221A9EDF0096AE43 /* KTPhotoBrowserDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F56221A9EDD0096AE43 /* KTPhotoBrowserDataSource.h */; }; 3D1C5080221A9EDF0096AE43 /* KTThumbsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F57221A9EDD0096AE43 /* KTThumbsView.m */; }; @@ -119,7 +49,6 @@ 3D1C508F221A9EDF0096AE43 /* LoginResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F66221A9EDD0096AE43 /* LoginResult.m */; }; 3D1C5090221A9EDF0096AE43 /* AccountResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F67221A9EDD0096AE43 /* AccountResult.h */; }; 3D1C5091221A9EDF0096AE43 /* RegisterResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F68221A9EDD0096AE43 /* RegisterResult.m */; }; - 3D1C5092221A9EDF0096AE43 /* P2PClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F69221A9EDD0096AE43 /* P2PClient.m */; }; 3D1C5093221A9EDF0096AE43 /* NetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F6A221A9EDD0096AE43 /* NetManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 3D1C5094221A9EDF0096AE43 /* ContactDAO.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F6B221A9EDD0096AE43 /* ContactDAO.m */; }; 3D1C5095221A9EDF0096AE43 /* Alarm.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F6C221A9EDD0096AE43 /* Alarm.h */; }; @@ -161,7 +90,6 @@ 3D1C50B9221A9EDF0096AE43 /* CheckNewMessageResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F98221A9EDD0096AE43 /* CheckNewMessageResult.h */; }; 3D1C50BA221A9EE00096AE43 /* NetManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F99221A9EDD0096AE43 /* NetManager.h */; }; 3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F9A221A9EDD0096AE43 /* RegisterResult.h */; }; - 3D1C50BC221A9EE00096AE43 /* P2PClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F9B221A9EDD0096AE43 /* P2PClient.h */; }; 3D1C50BD221A9EE00096AE43 /* LoginResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F9C221A9EDD0096AE43 /* LoginResult.h */; }; 3D1C50BE221A9EE00096AE43 /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1C4F9D221A9EDD0096AE43 /* Constants.h */; }; 3D1C50BF221A9EE00096AE43 /* AccountResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1C4F9E221A9EDD0096AE43 /* AccountResult.m */; }; @@ -303,7 +231,6 @@ 3D1C5147221A9EE10096AE43 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5031221A9EDD0096AE43 /* Localizable.strings */; }; 3D1C5148221A9EE10096AE43 /* IFISHYooseeImg.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5034221A9EDD0096AE43 /* IFISHYooseeImg.bundle */; }; 3D1C5149221A9EE10096AE43 /* Common-Configuration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3D1C5035221A9EDD0096AE43 /* Common-Configuration.plist */; }; - 3D1C514D221AA2A90096AE43 /* libelian.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1C514C221AA2A80096AE43 /* libelian.a */; }; 3D34479A212CF71C00CF3941 /* IfishHotBarVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */; }; 3D34479B212CF71C00CF3941 /* IfishHotBarVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */; }; 3D3447A0212D113D00CF3941 /* IFishHotBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D34479E212D113D00CF3941 /* IFishHotBarCell.m */; }; @@ -361,8 +288,6 @@ 3DD7AB5321E2F2FB0064856A /* rscode.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB4A21E2F2FB0064856A /* rscode.c */; }; 3DD7AB9921E474940064856A /* AsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9021E474930064856A /* AsyncUdpSocket.m */; }; 3DD7AB9A21E474940064856A /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9221E474930064856A /* AsyncSocket.m */; }; - 3DD7AB9B21E474940064856A /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9521E474930064856A /* GCDAsyncUdpSocket.m */; }; - 3DD7AB9C21E474940064856A /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9621E474930064856A /* GCDAsyncSocket.m */; }; 402591952238D91400CE4900 /* UINavigationController+Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 402591932238D91400CE4900 /* UINavigationController+Config.h */; }; 402591962238D91400CE4900 /* UINavigationController+Config.m in Sources */ = {isa = PBXBuildFile; fileRef = 402591942238D91400CE4900 /* UINavigationController+Config.m */; }; 404D7CEA2238CF77005655F5 /* UIViewController+Swizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 404D7CE82238CF77005655F5 /* UIViewController+Swizzling.m */; }; @@ -1098,7 +1023,6 @@ 882957C91DBE048100E9DDD7 /* registered_icon_validation_ws.png in Resources */ = {isa = PBXBuildFile; fileRef = 882957C71DBE048100E9DDD7 /* registered_icon_validation_ws.png */; }; 882957CA1DBE048100E9DDD7 /* registered_icon_validation.png in Resources */ = {isa = PBXBuildFile; fileRef = 882957C81DBE048100E9DDD7 /* registered_icon_validation.png */; }; 882957FD1DC0443600E9DDD7 /* IfishCardScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 882957FA1DC0443600E9DDD7 /* IfishCardScrollView.m */; }; - 882957FE1DC0443700E9DDD7 /* IfishSelectCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 882957FC1DC0443600E9DDD7 /* IfishSelectCardViewController.m */; }; 882958111DC04ED200E9DDD7 /* equipment_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 882958021DC04ED200E9DDD7 /* equipment_background.png */; }; 882958121DC04ED200E9DDD7 /* equipment_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 882958031DC04ED200E9DDD7 /* equipment_background@2x.png */; }; 882958131DC04ED200E9DDD7 /* equipment_background@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 882958041DC04ED200E9DDD7 /* equipment_background@3x.png */; }; @@ -1374,7 +1298,6 @@ 883E78F21D48A5E50030E075 /* SaySomethingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 883E78191D48A5E50030E075 /* SaySomethingViewController.xib */; }; 883E78F31D48A5E50030E075 /* SecondConnectWifiController.m in Sources */ = {isa = PBXBuildFile; fileRef = 883E781B1D48A5E50030E075 /* SecondConnectWifiController.m */; }; 883E78F41D48A5E50030E075 /* SecondConnectWifiController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 883E781C1D48A5E50030E075 /* SecondConnectWifiController.xib */; }; - 883E78F51D48A5E50030E075 /* SelectDeviceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 883E781E1D48A5E50030E075 /* SelectDeviceViewController.m */; }; 883E78F61D48A5E50030E075 /* SetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 883E78201D48A5E50030E075 /* SetViewController.m */; }; 883E78F71D48A5E50030E075 /* AgreementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 883E78231D48A5E50030E075 /* AgreementViewController.m */; }; 883E78F81D48A5E50030E075 /* ForgetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 883E78251D48A5E50030E075 /* ForgetViewController.m */; }; @@ -1802,7 +1725,6 @@ 88696FFB1E9CC07F005D4AFB /* IfishAiLiShopGoodsViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88696FFA1E9CC07F005D4AFB /* IfishAiLiShopGoodsViewCell.m */; }; 88696FFF1E9CC178005D4AFB /* IfishBCShopItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88696FFD1E9CC178005D4AFB /* IfishBCShopItemCell.m */; }; 886970001E9CC178005D4AFB /* IfishBCShopItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88696FFE1E9CC178005D4AFB /* IfishBCShopItemCell.xib */; }; - 886970021E9DD86E005D4AFB /* yw_1222.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 886970011E9DD86E005D4AFB /* yw_1222.jpg */; }; 886970051E9DFA12005D4AFB /* IfishGoodsData.m in Sources */ = {isa = PBXBuildFile; fileRef = 886970041E9DFA12005D4AFB /* IfishGoodsData.m */; }; 886970081E9E0EA0005D4AFB /* IfishAlibcWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 886970071E9E0EA0005D4AFB /* IfishAlibcWebViewController.m */; }; 8869B3751E6939FE0010F099 /* NJKWebViewProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 8869B3721E6939FE0010F099 /* NJKWebViewProgress.m */; }; @@ -1999,25 +1921,6 @@ 8871FB221EBC822B0038E99A /* select_waiting@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8871FB191EBC822B0038E99A /* select_waiting@2x.png */; }; 8871FB231EBC822B0038E99A /* select_waiting@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8871FB1A1EBC822B0038E99A /* select_waiting@3x.png */; }; 8872B6421D7E649A00D47C75 /* LXShareImageVIew.m in Sources */ = {isa = PBXBuildFile; fileRef = 8872B6411D7E649A00D47C75 /* LXShareImageVIew.m */; }; - 8872FFCB1E9B300800406C1D /* AlibabaAuthExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFB71E9B300800406C1D /* AlibabaAuthExt.framework */; }; - 8872FFCC1E9B300800406C1D /* AlibabaAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFB81E9B300800406C1D /* AlibabaAuthSDK.framework */; }; - 8872FFCD1E9B300800406C1D /* AlibcLinkPartnerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFB91E9B300800406C1D /* AlibcLinkPartnerSDK.framework */; }; - 8872FFCE1E9B300800406C1D /* AlibcTradeBiz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBA1E9B300800406C1D /* AlibcTradeBiz.framework */; }; - 8872FFCF1E9B300800406C1D /* AlibcTradeCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBB1E9B300800406C1D /* AlibcTradeCommon.framework */; }; - 8872FFD01E9B300800406C1D /* AlibcTradeSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBC1E9B300800406C1D /* AlibcTradeSDK.framework */; }; - 8872FFD11E9B300800406C1D /* AlipaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBD1E9B300800406C1D /* AlipaySDK.framework */; }; - 8872FFD21E9B300800406C1D /* OpenMtopExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBE1E9B300800406C1D /* OpenMtopExt.framework */; }; - 8872FFD31E9B300800406C1D /* OpenMtopSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFBF1E9B300800406C1D /* OpenMtopSDK.framework */; }; - 8872FFD41E9B300800406C1D /* SecurityGuardSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC01E9B300800406C1D /* SecurityGuardSDK.framework */; }; - 8872FFD51E9B300800406C1D /* SGMain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC11E9B300800406C1D /* SGMain.framework */; }; - 8872FFD61E9B300800406C1D /* SGNoCaptcha.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC21E9B300800406C1D /* SGNoCaptcha.framework */; }; - 8872FFD71E9B300800406C1D /* SGSecurityBody.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC31E9B300800406C1D /* SGSecurityBody.framework */; }; - 8872FFD81E9B300800406C1D /* UTDID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC41E9B300800406C1D /* UTDID.framework */; }; - 8872FFD91E9B300800406C1D /* UTMini.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8872FFC51E9B300800406C1D /* UTMini.framework */; }; - 8872FFDA1E9B300800406C1D /* AlibabaAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8872FFC71E9B300800406C1D /* AlibabaAuthSDK.bundle */; }; - 8872FFDB1E9B300800406C1D /* AlipaySDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8872FFC81E9B300800406C1D /* AlipaySDK.bundle */; }; - 8872FFDC1E9B300800406C1D /* ALPLinkPartnerSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8872FFC91E9B300800406C1D /* ALPLinkPartnerSDK.bundle */; }; - 8872FFDD1E9B300800406C1D /* NBResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8872FFCA1E9B300800406C1D /* NBResource.bundle */; }; 88742AED1EF7C792006BF401 /* window_heating.png in Resources */ = {isa = PBXBuildFile; fileRef = 88742AE71EF7C792006BF401 /* window_heating.png */; }; 88742AEE1EF7C792006BF401 /* window_heating@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88742AE81EF7C792006BF401 /* window_heating@2x.png */; }; 88742AEF1EF7C792006BF401 /* window_heating@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88742AE91EF7C792006BF401 /* window_heating@3x.png */; }; @@ -2365,7 +2268,6 @@ 88F5EFD71D48D08100CC7CAF /* MMRadialProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF571D48D08100CC7CAF /* MMRadialProgressView.m */; }; 88F5EFD81D48D08100CC7CAF /* MMVectorImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF591D48D08100CC7CAF /* MMVectorImage.m */; }; 88F5EFD91D48D08100CC7CAF /* MyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF5C1D48D08100CC7CAF /* MyControl.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 88F5EFDA1D48D08100CC7CAF /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF5F1D48D08100CC7CAF /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 88F740C01ECC28E800876AED /* ShopAddGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */; }; CB0F4E8622951A130091C76D /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = CB0F4E7B22951A130091C76D /* SVRadialGradientLayer.m */; }; CB0F4E8722951A130091C76D /* SVIndefiniteAnimatedView.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0F4E7C22951A130091C76D /* SVIndefiniteAnimatedView.h */; }; @@ -2376,6 +2278,108 @@ CB0F4E8C22951A130091C76D /* SVIndefiniteAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = CB0F4E8122951A130091C76D /* SVIndefiniteAnimatedView.m */; }; CB0F4E8D22951A130091C76D /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB0F4E8222951A130091C76D /* SVProgressHUD.bundle */; }; CB0F4E8E22951A130091C76D /* SVProgressAnimatedView.h in Headers */ = {isa = PBXBuildFile; fileRef = CB0F4E8322951A130091C76D /* SVProgressAnimatedView.h */; }; + CB484CF122B87D250075F050 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF52296A6FF0014E5C7 /* libresolv.tbd */; }; + CB484CF922B8B0AC0075F050 /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = CB484CF522B8B0AC0075F050 /* GCDAsyncUdpSocket.m */; }; + CB484CFA22B8B0AC0075F050 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = CB484CF622B8B0AC0075F050 /* GCDAsyncSocket.m */; }; + CB484CFB22B8B0AC0075F050 /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484CF722B8B0AC0075F050 /* GCDAsyncUdpSocket.h */; }; + CB484CFC22B8B0AC0075F050 /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484CF822B8B0AC0075F050 /* GCDAsyncSocket.h */; }; + CB484CFF22B8B0D30075F050 /* Reachability.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484CFD22B8B0D30075F050 /* Reachability.h */; }; + CB484D0022B8B0D30075F050 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = CB484CFE22B8B0D30075F050 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + CB484D8422B8BE830075F050 /* P2PClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CB484D8222B8BE830075F050 /* P2PClient.m */; }; + CB484D8522B8BE830075F050 /* P2PClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D8322B8BE830075F050 /* P2PClient.h */; }; + CB484DD822B8C8C80075F050 /* libelian.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484D8822B8C8C80075F050 /* libelian.a */; }; + CB484DD922B8C8C80075F050 /* elian.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D8922B8C8C80075F050 /* elian.h */; }; + CB484DDC22B8C8C80075F050 /* Rtsp_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D8E22B8C8C80075F050 /* Rtsp_instance.h */; }; + CB484DDD22B8C8C80075F050 /* intfloat.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9122B8C8C80075F050 /* intfloat.h */; }; + CB484DDE22B8C8C80075F050 /* error.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9222B8C8C80075F050 /* error.h */; }; + CB484DDF22B8C8C80075F050 /* fifo.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9322B8C8C80075F050 /* fifo.h */; }; + CB484DE022B8C8C80075F050 /* blowfish.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9422B8C8C80075F050 /* blowfish.h */; }; + CB484DE122B8C8C80075F050 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9522B8C8C80075F050 /* version.h */; }; + CB484DE222B8C8C80075F050 /* samplefmt.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9622B8C8C80075F050 /* samplefmt.h */; }; + CB484DE322B8C8C80075F050 /* pixdesc.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9722B8C8C80075F050 /* pixdesc.h */; }; + CB484DE422B8C8C80075F050 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9822B8C8C80075F050 /* base64.h */; }; + CB484DE522B8C8C80075F050 /* rational.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9922B8C8C80075F050 /* rational.h */; }; + CB484DE622B8C8C80075F050 /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9A22B8C8C80075F050 /* sha.h */; }; + CB484DE722B8C8C80075F050 /* avconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9B22B8C8C80075F050 /* avconfig.h */; }; + CB484DE822B8C8C80075F050 /* lfg.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9C22B8C8C80075F050 /* lfg.h */; }; + CB484DE922B8C8C80075F050 /* avutil.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9D22B8C8C80075F050 /* avutil.h */; }; + CB484DEA22B8C8C80075F050 /* intfloat_readwrite.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9E22B8C8C80075F050 /* intfloat_readwrite.h */; }; + CB484DEB22B8C8C80075F050 /* xtea.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484D9F22B8C8C80075F050 /* xtea.h */; }; + CB484DEC22B8C8C80075F050 /* crc.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA022B8C8C80075F050 /* crc.h */; }; + CB484DED22B8C8C80075F050 /* file.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA122B8C8C80075F050 /* file.h */; }; + CB484DEE22B8C8C80075F050 /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA222B8C8C80075F050 /* md5.h */; }; + CB484DEF22B8C8C80075F050 /* audio_fifo.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA322B8C8C80075F050 /* audio_fifo.h */; }; + CB484DF022B8C8C80075F050 /* attributes.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA422B8C8C80075F050 /* attributes.h */; }; + CB484DF122B8C8C80075F050 /* adler32.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA522B8C8C80075F050 /* adler32.h */; }; + CB484DF222B8C8C80075F050 /* ffmpegtime.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA622B8C8C80075F050 /* ffmpegtime.h */; }; + CB484DF322B8C8C80075F050 /* timecode.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA722B8C8C80075F050 /* timecode.h */; }; + CB484DF422B8C8C80075F050 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA822B8C8C80075F050 /* common.h */; }; + CB484DF522B8C8C80075F050 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DA922B8C8C80075F050 /* hmac.h */; }; + CB484DF622B8C8C80075F050 /* eval.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAA22B8C8C80075F050 /* eval.h */; }; + CB484DF722B8C8C80075F050 /* dict.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAB22B8C8C80075F050 /* dict.h */; }; + CB484DF822B8C8C80075F050 /* random_seed.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAC22B8C8C80075F050 /* random_seed.h */; }; + CB484DF922B8C8C80075F050 /* opt.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAD22B8C8C80075F050 /* opt.h */; }; + CB484DFA22B8C8C80075F050 /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAE22B8C8C80075F050 /* log.h */; }; + CB484DFB22B8C8C80075F050 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DAF22B8C8C80075F050 /* aes.h */; }; + CB484DFC22B8C8C80075F050 /* bswap.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB022B8C8C80075F050 /* bswap.h */; }; + CB484DFD22B8C8C80075F050 /* old_pix_fmts.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB122B8C8C80075F050 /* old_pix_fmts.h */; }; + CB484DFE22B8C8C80075F050 /* cpu.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB222B8C8C80075F050 /* cpu.h */; }; + CB484DFF22B8C8C80075F050 /* audioconvert.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB322B8C8C80075F050 /* audioconvert.h */; }; + CB484E0022B8C8C80075F050 /* channel_layout.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB422B8C8C80075F050 /* channel_layout.h */; }; + CB484E0122B8C8C80075F050 /* imgutils.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB522B8C8C80075F050 /* imgutils.h */; }; + CB484E0222B8C8C80075F050 /* mem.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB622B8C8C80075F050 /* mem.h */; }; + CB484E0322B8C8C80075F050 /* parseutils.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB722B8C8C80075F050 /* parseutils.h */; }; + CB484E0422B8C8C80075F050 /* bprint.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB822B8C8C80075F050 /* bprint.h */; }; + CB484E0522B8C8C80075F050 /* pixfmt.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DB922B8C8C80075F050 /* pixfmt.h */; }; + CB484E0622B8C8C80075F050 /* timestamp.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DBA22B8C8C80075F050 /* timestamp.h */; }; + CB484E0722B8C8C80075F050 /* avassert.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DBB22B8C8C80075F050 /* avassert.h */; }; + CB484E0822B8C8C80075F050 /* mathematics.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DBC22B8C8C80075F050 /* mathematics.h */; }; + CB484E0922B8C8C80075F050 /* intreadwrite.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DBD22B8C8C80075F050 /* intreadwrite.h */; }; + CB484E0A22B8C8C80075F050 /* avstring.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DBE22B8C8C80075F050 /* avstring.h */; }; + CB484E0B22B8C8C80075F050 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC022B8C8C80075F050 /* version.h */; }; + CB484E0C22B8C8C80075F050 /* avio.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC122B8C8C80075F050 /* avio.h */; }; + CB484E0D22B8C8C80075F050 /* avformat.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC222B8C8C80075F050 /* avformat.h */; }; + CB484E0E22B8C8C80075F050 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC422B8C8C80075F050 /* version.h */; }; + CB484E0F22B8C8C80075F050 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC522B8C8C80075F050 /* swscale.h */; }; + CB484E1022B8C8C90075F050 /* avcodec.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC722B8C8C80075F050 /* avcodec.h */; }; + CB484E1122B8C8C90075F050 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC822B8C8C80075F050 /* version.h */; }; + CB484E1222B8C8C90075F050 /* vdpau.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DC922B8C8C80075F050 /* vdpau.h */; }; + CB484E1322B8C8C90075F050 /* vaapi.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCA22B8C8C80075F050 /* vaapi.h */; }; + CB484E1422B8C8C90075F050 /* xvmc.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCB22B8C8C80075F050 /* xvmc.h */; }; + CB484E1522B8C8C90075F050 /* avfft.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCC22B8C8C80075F050 /* avfft.h */; }; + CB484E1622B8C8C90075F050 /* vda.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCD22B8C8C80075F050 /* vda.h */; }; + CB484E1722B8C8C90075F050 /* dxva2.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCE22B8C8C80075F050 /* dxva2.h */; }; + CB484E1822B8C8C90075F050 /* old_codec_ids.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DCF22B8C8C80075F050 /* old_codec_ids.h */; }; + CB484E1922B8C8C90075F050 /* FfmpegInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DD022B8C8C80075F050 /* FfmpegInterface.h */; }; + CB484E1A22B8C8C90075F050 /* RtspInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB484DD122B8C8C80075F050 /* RtspInterface.mm */; }; + CB484E1B22B8C8C90075F050 /* RtspInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DD222B8C8C80075F050 /* RtspInterface.h */; }; + CB484E1C22B8C8C90075F050 /* libRTSP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484DD322B8C8C80075F050 /* libRTSP.a */; }; + CB484E1D22B8C8C90075F050 /* FfmpegInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CB484DD422B8C8C80075F050 /* FfmpegInterface.m */; }; + CB484E1E22B8C8C90075F050 /* P2PCInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CB484DD622B8C8C80075F050 /* P2PCInterface.h */; }; + CB484E1F22B8C8C90075F050 /* libAVCtrl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484DD722B8C8C80075F050 /* libAVCtrl.a */; }; + CB484E3722B8CF9B0075F050 /* AlibabaAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB484E2222B8CF9A0075F050 /* AlibabaAuthSDK.bundle */; }; + CB484E3822B8CF9B0075F050 /* AlipaySDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB484E2322B8CF9A0075F050 /* AlipaySDK.bundle */; }; + CB484E3922B8CF9B0075F050 /* ALPLinkPartnerSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB484E2422B8CF9A0075F050 /* ALPLinkPartnerSDK.bundle */; }; + CB484E3A22B8CF9B0075F050 /* NBResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB484E2522B8CF9A0075F050 /* NBResource.bundle */; }; + CB484E3B22B8CF9B0075F050 /* yw_1222.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CB484E2622B8CF9A0075F050 /* yw_1222.jpg */; }; + CB484E3C22B8CF9B0075F050 /* AlibabaAuthExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2822B8CF9A0075F050 /* AlibabaAuthExt.framework */; }; + CB484E3D22B8CF9B0075F050 /* AlibabaAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2922B8CF9A0075F050 /* AlibabaAuthSDK.framework */; }; + CB484E3E22B8CF9B0075F050 /* AlibcTradeSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2A22B8CF9A0075F050 /* AlibcTradeSDK.framework */; }; + CB484E3F22B8CF9B0075F050 /* AlibcLinkPartnerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2B22B8CF9A0075F050 /* AlibcLinkPartnerSDK.framework */; }; + CB484E4022B8CF9B0075F050 /* SecurityGuardSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2C22B8CF9A0075F050 /* SecurityGuardSDK.framework */; }; + CB484E4122B8CF9B0075F050 /* UTDID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2D22B8CF9A0075F050 /* UTDID.framework */; }; + CB484E4222B8CF9B0075F050 /* AlibcTradeBiz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2E22B8CF9A0075F050 /* AlibcTradeBiz.framework */; }; + CB484E4322B8CF9B0075F050 /* SGMain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E2F22B8CF9A0075F050 /* SGMain.framework */; }; + CB484E4422B8CF9B0075F050 /* AlibcTradeCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3022B8CF9A0075F050 /* AlibcTradeCommon.framework */; }; + CB484E4522B8CF9B0075F050 /* UTMini.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3122B8CF9A0075F050 /* UTMini.framework */; }; + CB484E4622B8CF9B0075F050 /* OpenMtopSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3222B8CF9A0075F050 /* OpenMtopSDK.framework */; }; + CB484E4722B8CF9B0075F050 /* SGNoCaptcha.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3322B8CF9A0075F050 /* SGNoCaptcha.framework */; }; + CB484E4822B8CF9B0075F050 /* AlipaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3422B8CF9A0075F050 /* AlipaySDK.framework */; }; + CB484E4922B8CF9B0075F050 /* SGSecurityBody.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3522B8CF9A0075F050 /* SGSecurityBody.framework */; }; + CB484E4A22B8CF9B0075F050 /* OpenMtopExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E3622B8CF9A0075F050 /* OpenMtopExt.framework */; }; + CB484E4D22B8D29C0075F050 /* GWP2P.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E4B22B8D2990075F050 /* GWP2P.framework */; }; + CB484E4E22B8D29C0075F050 /* SDK使用说明 in Resources */ = {isa = PBXBuildFile; fileRef = CB484E4C22B8D29C0075F050 /* SDK使用说明 */; }; + CB484E4F22B8D2C40075F050 /* GWP2P.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB484E4B22B8D2990075F050 /* GWP2P.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CB7D6AA022953BEB0014E5C7 /* YYDiskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6A9822953BEB0014E5C7 /* YYDiskCache.m */; }; CB7D6AA122953BEB0014E5C7 /* YYKVStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB7D6A9922953BEB0014E5C7 /* YYKVStorage.h */; }; CB7D6AA222953BEB0014E5C7 /* YYCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6A9A22953BEB0014E5C7 /* YYCache.m */; }; @@ -2384,7 +2388,6 @@ CB7D6AA522953BEB0014E5C7 /* YYCache.h in Headers */ = {isa = PBXBuildFile; fileRef = CB7D6A9D22953BEB0014E5C7 /* YYCache.h */; }; CB7D6AA622953BEB0014E5C7 /* YYKVStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6A9E22953BEB0014E5C7 /* YYKVStorage.m */; }; CB7D6AA722953BEB0014E5C7 /* YYMemoryCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6A9F22953BEB0014E5C7 /* YYMemoryCache.m */; }; - CB7D6AA9229542880014E5C7 /* ffmpegtime.h in Headers */ = {isa = PBXBuildFile; fileRef = CB7D6AA8229542870014E5C7 /* ffmpegtime.h */; }; CB7D6AB022954DE20014E5C7 /* CommonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = CB7D6AAE22954DBC0014E5C7 /* CommonUtils.h */; }; CB7D6AB122954DE20014E5C7 /* CommonUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6AAF22954DE10014E5C7 /* CommonUtils.m */; }; CB7D6AB422954E090014E5C7 /* UIColor+HexString.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7D6AB222954E060014E5C7 /* UIColor+HexString.m */; }; @@ -2402,7 +2405,6 @@ CB7D6AF22296A6910014E5C7 /* UTDID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AEF2296A68E0014E5C7 /* UTDID.framework */; }; CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF02296A6900014E5C7 /* AlicloudUtils.framework */; }; CB7D6AF42296A6910014E5C7 /* UTMini.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF12296A6910014E5C7 /* UTMini.framework */; }; - CB7D6AF62296A7000014E5C7 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7D6AF52296A6FF0014E5C7 /* libresolv.tbd */; }; CBA615FC228E8E5A00ED380D /* MyMessageViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA615FA228E8E5A00ED380D /* MyMessageViewController.h */; }; CBA615FD228E8E5A00ED380D /* MyMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBA615FB228E8E5A00ED380D /* MyMessageViewController.m */; }; CBA6164C228F993B00ED380D /* BaseYYModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CBA6164A228F993B00ED380D /* BaseYYModel.h */; }; @@ -2534,6 +2536,20 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + CB484D0322B8B3540075F050 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + CB484E4F22B8D2C40075F050 /* GWP2P.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 3D13F833212FE2C200D725F7 /* IFishWaterChangeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IFishWaterChangeView.h; sourceTree = ""; }; 3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IFishWaterChangeView.m; sourceTree = ""; }; @@ -2576,76 +2592,6 @@ 3D1C17412171BB0700A159A8 /* PNLineChartData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNLineChartData.h; sourceTree = ""; }; 3D1C17422171BB0700A159A8 /* PNCircleChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNCircleChart.h; sourceTree = ""; }; 3D1C17432171BB0700A159A8 /* PNLineChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PNLineChart.h; sourceTree = ""; }; - 3D1C4F04221A9EDD0096AE43 /* elian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elian.h; sourceTree = ""; }; - 3D1C4F06221A9EDD0096AE43 /* MD5Manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MD5Manager.h; sourceTree = ""; }; - 3D1C4F07221A9EDD0096AE43 /* libMD5Manager.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMD5Manager.a; sourceTree = ""; }; - 3D1C4F09221A9EDD0096AE43 /* Rtsp_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Rtsp_instance.h; sourceTree = ""; }; - 3D1C4F0D221A9EDD0096AE43 /* intfloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intfloat.h; sourceTree = ""; }; - 3D1C4F0E221A9EDD0096AE43 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = ""; }; - 3D1C4F0F221A9EDD0096AE43 /* fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fifo.h; sourceTree = ""; }; - 3D1C4F10221A9EDD0096AE43 /* blowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blowfish.h; sourceTree = ""; }; - 3D1C4F11221A9EDD0096AE43 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; - 3D1C4F12221A9EDD0096AE43 /* samplefmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = samplefmt.h; sourceTree = ""; }; - 3D1C4F13221A9EDD0096AE43 /* pixdesc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixdesc.h; sourceTree = ""; }; - 3D1C4F14221A9EDD0096AE43 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = ""; }; - 3D1C4F15221A9EDD0096AE43 /* rational.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rational.h; sourceTree = ""; }; - 3D1C4F16221A9EDD0096AE43 /* sha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha.h; sourceTree = ""; }; - 3D1C4F17221A9EDD0096AE43 /* avconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avconfig.h; sourceTree = ""; }; - 3D1C4F18221A9EDD0096AE43 /* lfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lfg.h; sourceTree = ""; }; - 3D1C4F19221A9EDD0096AE43 /* avutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avutil.h; sourceTree = ""; }; - 3D1C4F1A221A9EDD0096AE43 /* intfloat_readwrite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intfloat_readwrite.h; sourceTree = ""; }; - 3D1C4F1B221A9EDD0096AE43 /* xtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xtea.h; sourceTree = ""; }; - 3D1C4F1C221A9EDD0096AE43 /* crc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crc.h; sourceTree = ""; }; - 3D1C4F1D221A9EDD0096AE43 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = ""; }; - 3D1C4F1E221A9EDD0096AE43 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = ""; }; - 3D1C4F1F221A9EDD0096AE43 /* audio_fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_fifo.h; sourceTree = ""; }; - 3D1C4F20221A9EDD0096AE43 /* attributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = attributes.h; sourceTree = ""; }; - 3D1C4F21221A9EDD0096AE43 /* adler32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adler32.h; sourceTree = ""; }; - 3D1C4F22221A9EDD0096AE43 /* timecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timecode.h; sourceTree = ""; }; - 3D1C4F23221A9EDD0096AE43 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; - 3D1C4F24221A9EDD0096AE43 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = ""; }; - 3D1C4F25221A9EDD0096AE43 /* eval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eval.h; sourceTree = ""; }; - 3D1C4F26221A9EDD0096AE43 /* dict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dict.h; sourceTree = ""; }; - 3D1C4F27221A9EDD0096AE43 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = ""; }; - 3D1C4F28221A9EDD0096AE43 /* opt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opt.h; sourceTree = ""; }; - 3D1C4F29221A9EDD0096AE43 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = ""; }; - 3D1C4F2A221A9EDD0096AE43 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; - 3D1C4F2B221A9EDD0096AE43 /* bswap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bswap.h; sourceTree = ""; }; - 3D1C4F2C221A9EDD0096AE43 /* old_pix_fmts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = old_pix_fmts.h; sourceTree = ""; }; - 3D1C4F2D221A9EDD0096AE43 /* cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu.h; sourceTree = ""; }; - 3D1C4F2E221A9EDD0096AE43 /* audioconvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audioconvert.h; sourceTree = ""; }; - 3D1C4F2F221A9EDD0096AE43 /* channel_layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = channel_layout.h; sourceTree = ""; }; - 3D1C4F30221A9EDD0096AE43 /* imgutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imgutils.h; sourceTree = ""; }; - 3D1C4F31221A9EDD0096AE43 /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = ""; }; - 3D1C4F32221A9EDD0096AE43 /* parseutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parseutils.h; sourceTree = ""; }; - 3D1C4F33221A9EDD0096AE43 /* bprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bprint.h; sourceTree = ""; }; - 3D1C4F34221A9EDD0096AE43 /* pixfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixfmt.h; sourceTree = ""; }; - 3D1C4F35221A9EDD0096AE43 /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timestamp.h; sourceTree = ""; }; - 3D1C4F36221A9EDD0096AE43 /* avassert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avassert.h; sourceTree = ""; }; - 3D1C4F37221A9EDD0096AE43 /* mathematics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mathematics.h; sourceTree = ""; }; - 3D1C4F38221A9EDD0096AE43 /* intreadwrite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intreadwrite.h; sourceTree = ""; }; - 3D1C4F39221A9EDD0096AE43 /* avstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avstring.h; sourceTree = ""; }; - 3D1C4F3B221A9EDD0096AE43 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; - 3D1C4F3C221A9EDD0096AE43 /* avio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avio.h; sourceTree = ""; }; - 3D1C4F3D221A9EDD0096AE43 /* avformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avformat.h; sourceTree = ""; }; - 3D1C4F3F221A9EDD0096AE43 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; - 3D1C4F40221A9EDD0096AE43 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; - 3D1C4F42221A9EDD0096AE43 /* avcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avcodec.h; sourceTree = ""; }; - 3D1C4F43221A9EDD0096AE43 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; - 3D1C4F44221A9EDD0096AE43 /* vdpau.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vdpau.h; sourceTree = ""; }; - 3D1C4F45221A9EDD0096AE43 /* vaapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vaapi.h; sourceTree = ""; }; - 3D1C4F46221A9EDD0096AE43 /* xvmc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xvmc.h; sourceTree = ""; }; - 3D1C4F47221A9EDD0096AE43 /* avfft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avfft.h; sourceTree = ""; }; - 3D1C4F48221A9EDD0096AE43 /* vda.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vda.h; sourceTree = ""; }; - 3D1C4F49221A9EDD0096AE43 /* dxva2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxva2.h; sourceTree = ""; }; - 3D1C4F4A221A9EDD0096AE43 /* old_codec_ids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = old_codec_ids.h; sourceTree = ""; }; - 3D1C4F4B221A9EDD0096AE43 /* FfmpegInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FfmpegInterface.h; sourceTree = ""; }; - 3D1C4F4C221A9EDD0096AE43 /* RtspInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RtspInterface.mm; sourceTree = ""; }; - 3D1C4F4D221A9EDD0096AE43 /* RtspInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtspInterface.h; sourceTree = ""; }; - 3D1C4F4E221A9EDD0096AE43 /* libRTSP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libRTSP.a; sourceTree = ""; }; - 3D1C4F4F221A9EDD0096AE43 /* FfmpegInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FfmpegInterface.m; sourceTree = ""; }; - 3D1C4F51221A9EDD0096AE43 /* P2PCInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PCInterface.h; sourceTree = ""; }; - 3D1C4F52221A9EDD0096AE43 /* libAVCtrl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAVCtrl.a; sourceTree = ""; }; 3D1C4F55221A9EDD0096AE43 /* KTPhotoBrowserGlobal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KTPhotoBrowserGlobal.m; sourceTree = ""; }; 3D1C4F56221A9EDD0096AE43 /* KTPhotoBrowserDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KTPhotoBrowserDataSource.h; sourceTree = ""; }; 3D1C4F57221A9EDD0096AE43 /* KTThumbsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KTThumbsView.m; sourceTree = ""; }; @@ -2666,7 +2612,6 @@ 3D1C4F66221A9EDD0096AE43 /* LoginResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginResult.m; sourceTree = ""; }; 3D1C4F67221A9EDD0096AE43 /* AccountResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountResult.h; sourceTree = ""; }; 3D1C4F68221A9EDD0096AE43 /* RegisterResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterResult.m; sourceTree = ""; }; - 3D1C4F69221A9EDD0096AE43 /* P2PClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = P2PClient.m; sourceTree = ""; }; 3D1C4F6A221A9EDD0096AE43 /* NetManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetManager.m; sourceTree = ""; }; 3D1C4F6B221A9EDD0096AE43 /* ContactDAO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactDAO.m; sourceTree = ""; }; 3D1C4F6C221A9EDD0096AE43 /* Alarm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Alarm.h; sourceTree = ""; }; @@ -2708,7 +2653,6 @@ 3D1C4F98221A9EDD0096AE43 /* CheckNewMessageResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheckNewMessageResult.h; sourceTree = ""; }; 3D1C4F99221A9EDD0096AE43 /* NetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetManager.h; sourceTree = ""; }; 3D1C4F9A221A9EDD0096AE43 /* RegisterResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterResult.h; sourceTree = ""; }; - 3D1C4F9B221A9EDD0096AE43 /* P2PClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PClient.h; sourceTree = ""; }; 3D1C4F9C221A9EDD0096AE43 /* LoginResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginResult.h; sourceTree = ""; }; 3D1C4F9D221A9EDD0096AE43 /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; 3D1C4F9E221A9EDD0096AE43 /* AccountResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountResult.m; sourceTree = ""; }; @@ -2854,7 +2798,6 @@ 3D1C5066215CB6E300A2E5D6 /* IfishHotBarHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHotBarHeader.xib; sourceTree = ""; }; 3D1C5068215CB6F600A2E5D6 /* IfishHotBarHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarHeader.h; sourceTree = ""; }; 3D1C5069215CB6F600A2E5D6 /* IfishHotBarHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarHeader.m; sourceTree = ""; }; - 3D1C514C221AA2A80096AE43 /* libelian.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libelian.a; sourceTree = ""; }; 3D344797212CF71C00CF3941 /* IfishHotBarVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHotBarVc.h; sourceTree = ""; }; 3D344798212CF71C00CF3941 /* IfishHotBarVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHotBarVc.m; sourceTree = ""; }; 3D344799212CF71C00CF3941 /* IfishHotBarVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHotBarVc.xib; sourceTree = ""; }; @@ -2980,10 +2923,6 @@ 3DD7AB9121E474930064856A /* AsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncSocket.h; sourceTree = ""; }; 3DD7AB9221E474930064856A /* AsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncSocket.m; sourceTree = ""; }; 3DD7AB9321E474930064856A /* AsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncUdpSocket.h; sourceTree = ""; }; - 3DD7AB9521E474930064856A /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = ""; }; - 3DD7AB9621E474930064856A /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = ""; }; - 3DD7AB9721E474930064856A /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = ""; }; - 3DD7AB9821E474930064856A /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = ""; }; 402591932238D91400CE4900 /* UINavigationController+Config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+Config.h"; sourceTree = ""; }; 402591942238D91400CE4900 /* UINavigationController+Config.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Config.m"; sourceTree = ""; }; 404D7CE82238CF77005655F5 /* UIViewController+Swizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Swizzling.m"; sourceTree = ""; }; @@ -3918,8 +3857,6 @@ 882957C81DBE048100E9DDD7 /* registered_icon_validation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = registered_icon_validation.png; sourceTree = ""; }; 882957F91DC0443600E9DDD7 /* IfishCardScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishCardScrollView.h; sourceTree = ""; }; 882957FA1DC0443600E9DDD7 /* IfishCardScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishCardScrollView.m; sourceTree = ""; }; - 882957FB1DC0443600E9DDD7 /* IfishSelectCardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishSelectCardViewController.h; sourceTree = ""; }; - 882957FC1DC0443600E9DDD7 /* IfishSelectCardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishSelectCardViewController.m; sourceTree = ""; }; 882958021DC04ED200E9DDD7 /* equipment_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = equipment_background.png; sourceTree = ""; }; 882958031DC04ED200E9DDD7 /* equipment_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "equipment_background@2x.png"; sourceTree = ""; }; 882958041DC04ED200E9DDD7 /* equipment_background@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "equipment_background@3x.png"; sourceTree = ""; }; @@ -4338,8 +4275,6 @@ 883E781A1D48A5E50030E075 /* SecondConnectWifiController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecondConnectWifiController.h; sourceTree = ""; }; 883E781B1D48A5E50030E075 /* SecondConnectWifiController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecondConnectWifiController.m; sourceTree = ""; }; 883E781C1D48A5E50030E075 /* SecondConnectWifiController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SecondConnectWifiController.xib; sourceTree = ""; }; - 883E781D1D48A5E50030E075 /* SelectDeviceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectDeviceViewController.h; sourceTree = ""; }; - 883E781E1D48A5E50030E075 /* SelectDeviceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectDeviceViewController.m; sourceTree = ""; }; 883E781F1D48A5E50030E075 /* SetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetViewController.h; sourceTree = ""; }; 883E78201D48A5E50030E075 /* SetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetViewController.m; sourceTree = ""; }; 883E78221D48A5E50030E075 /* AgreementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AgreementViewController.h; sourceTree = ""; }; @@ -4966,7 +4901,6 @@ 88696FFC1E9CC178005D4AFB /* IfishBCShopItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishBCShopItemCell.h; sourceTree = ""; }; 88696FFD1E9CC178005D4AFB /* IfishBCShopItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishBCShopItemCell.m; sourceTree = ""; }; 88696FFE1E9CC178005D4AFB /* IfishBCShopItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IfishBCShopItemCell.xib; sourceTree = ""; }; - 886970011E9DD86E005D4AFB /* yw_1222.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = yw_1222.jpg; sourceTree = ""; }; 886970031E9DFA12005D4AFB /* IfishGoodsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishGoodsData.h; sourceTree = ""; }; 886970041E9DFA12005D4AFB /* IfishGoodsData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IfishGoodsData.m; sourceTree = ""; }; 886970061E9E0EA0005D4AFB /* IfishAlibcWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IfishAlibcWebViewController.h; sourceTree = ""; }; @@ -5224,25 +5158,6 @@ 8871FB1A1EBC822B0038E99A /* select_waiting@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select_waiting@3x.png"; sourceTree = ""; }; 8872B6401D7E649A00D47C75 /* LXShareImageVIew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXShareImageVIew.h; sourceTree = ""; }; 8872B6411D7E649A00D47C75 /* LXShareImageVIew.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXShareImageVIew.m; sourceTree = ""; }; - 8872FFB71E9B300800406C1D /* AlibabaAuthExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibabaAuthExt.framework; sourceTree = ""; }; - 8872FFB81E9B300800406C1D /* AlibabaAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibabaAuthSDK.framework; sourceTree = ""; }; - 8872FFB91E9B300800406C1D /* AlibcLinkPartnerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcLinkPartnerSDK.framework; sourceTree = ""; }; - 8872FFBA1E9B300800406C1D /* AlibcTradeBiz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeBiz.framework; sourceTree = ""; }; - 8872FFBB1E9B300800406C1D /* AlibcTradeCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeCommon.framework; sourceTree = ""; }; - 8872FFBC1E9B300800406C1D /* AlibcTradeSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeSDK.framework; sourceTree = ""; }; - 8872FFBD1E9B300800406C1D /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = ""; }; - 8872FFBE1E9B300800406C1D /* OpenMtopExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenMtopExt.framework; sourceTree = ""; }; - 8872FFBF1E9B300800406C1D /* OpenMtopSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenMtopSDK.framework; sourceTree = ""; }; - 8872FFC01E9B300800406C1D /* SecurityGuardSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SecurityGuardSDK.framework; sourceTree = ""; }; - 8872FFC11E9B300800406C1D /* SGMain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGMain.framework; sourceTree = ""; }; - 8872FFC21E9B300800406C1D /* SGNoCaptcha.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGNoCaptcha.framework; sourceTree = ""; }; - 8872FFC31E9B300800406C1D /* SGSecurityBody.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGSecurityBody.framework; sourceTree = ""; }; - 8872FFC41E9B300800406C1D /* UTDID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTDID.framework; sourceTree = ""; }; - 8872FFC51E9B300800406C1D /* UTMini.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTMini.framework; sourceTree = ""; }; - 8872FFC71E9B300800406C1D /* AlibabaAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlibabaAuthSDK.bundle; sourceTree = ""; }; - 8872FFC81E9B300800406C1D /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = ""; }; - 8872FFC91E9B300800406C1D /* ALPLinkPartnerSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ALPLinkPartnerSDK.bundle; sourceTree = ""; }; - 8872FFCA1E9B300800406C1D /* NBResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = NBResource.bundle; sourceTree = ""; }; 88742AE71EF7C792006BF401 /* window_heating.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = window_heating.png; sourceTree = ""; }; 88742AE81EF7C792006BF401 /* window_heating@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "window_heating@2x.png"; sourceTree = ""; }; 88742AE91EF7C792006BF401 /* window_heating@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "window_heating@3x.png"; sourceTree = ""; }; @@ -5759,8 +5674,6 @@ 88F5EF591D48D08100CC7CAF /* MMVectorImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMVectorImage.m; sourceTree = ""; }; 88F5EF5B1D48D08100CC7CAF /* MyControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyControl.h; sourceTree = ""; }; 88F5EF5C1D48D08100CC7CAF /* MyControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyControl.m; sourceTree = ""; }; - 88F5EF5E1D48D08100CC7CAF /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = ""; }; - 88F5EF5F1D48D08100CC7CAF /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = ""; }; 88F740BE1ECC28E800876AED /* ShopAddGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddGoodsViewController.h; sourceTree = ""; }; 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = ""; }; CB0F4E7B22951A130091C76D /* SVRadialGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVRadialGradientLayer.m; sourceTree = ""; }; @@ -5772,6 +5685,107 @@ CB0F4E8122951A130091C76D /* SVIndefiniteAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVIndefiniteAnimatedView.m; sourceTree = ""; }; CB0F4E8222951A130091C76D /* SVProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVProgressHUD.bundle; sourceTree = ""; }; CB0F4E8322951A130091C76D /* SVProgressAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressAnimatedView.h; sourceTree = ""; }; + CB484CEF22B8720D0075F050 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; + CB484CF522B8B0AC0075F050 /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncUdpSocket.m; sourceTree = ""; }; + CB484CF622B8B0AC0075F050 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = ""; }; + CB484CF722B8B0AC0075F050 /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = ""; }; + CB484CF822B8B0AC0075F050 /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = ""; }; + CB484CFD22B8B0D30075F050 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = ""; }; + CB484CFE22B8B0D30075F050 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = ""; }; + CB484D8222B8BE830075F050 /* P2PClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = P2PClient.m; sourceTree = ""; }; + CB484D8322B8BE830075F050 /* P2PClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PClient.h; sourceTree = ""; }; + CB484D8822B8C8C80075F050 /* libelian.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libelian.a; sourceTree = ""; }; + CB484D8922B8C8C80075F050 /* elian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elian.h; sourceTree = ""; }; + CB484D8E22B8C8C80075F050 /* Rtsp_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Rtsp_instance.h; sourceTree = ""; }; + CB484D9122B8C8C80075F050 /* intfloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intfloat.h; sourceTree = ""; }; + CB484D9222B8C8C80075F050 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = ""; }; + CB484D9322B8C8C80075F050 /* fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fifo.h; sourceTree = ""; }; + CB484D9422B8C8C80075F050 /* blowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blowfish.h; sourceTree = ""; }; + CB484D9522B8C8C80075F050 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; + CB484D9622B8C8C80075F050 /* samplefmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = samplefmt.h; sourceTree = ""; }; + CB484D9722B8C8C80075F050 /* pixdesc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixdesc.h; sourceTree = ""; }; + CB484D9822B8C8C80075F050 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = ""; }; + CB484D9922B8C8C80075F050 /* rational.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rational.h; sourceTree = ""; }; + CB484D9A22B8C8C80075F050 /* sha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha.h; sourceTree = ""; }; + CB484D9B22B8C8C80075F050 /* avconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avconfig.h; sourceTree = ""; }; + CB484D9C22B8C8C80075F050 /* lfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lfg.h; sourceTree = ""; }; + CB484D9D22B8C8C80075F050 /* avutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avutil.h; sourceTree = ""; }; + CB484D9E22B8C8C80075F050 /* intfloat_readwrite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intfloat_readwrite.h; sourceTree = ""; }; + CB484D9F22B8C8C80075F050 /* xtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xtea.h; sourceTree = ""; }; + CB484DA022B8C8C80075F050 /* crc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crc.h; sourceTree = ""; }; + CB484DA122B8C8C80075F050 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = ""; }; + CB484DA222B8C8C80075F050 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = ""; }; + CB484DA322B8C8C80075F050 /* audio_fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_fifo.h; sourceTree = ""; }; + CB484DA422B8C8C80075F050 /* attributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = attributes.h; sourceTree = ""; }; + CB484DA522B8C8C80075F050 /* adler32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adler32.h; sourceTree = ""; }; + CB484DA622B8C8C80075F050 /* ffmpegtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffmpegtime.h; sourceTree = ""; }; + CB484DA722B8C8C80075F050 /* timecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timecode.h; sourceTree = ""; }; + CB484DA822B8C8C80075F050 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; + CB484DA922B8C8C80075F050 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = ""; }; + CB484DAA22B8C8C80075F050 /* eval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eval.h; sourceTree = ""; }; + CB484DAB22B8C8C80075F050 /* dict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dict.h; sourceTree = ""; }; + CB484DAC22B8C8C80075F050 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = ""; }; + CB484DAD22B8C8C80075F050 /* opt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opt.h; sourceTree = ""; }; + CB484DAE22B8C8C80075F050 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = ""; }; + CB484DAF22B8C8C80075F050 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; + CB484DB022B8C8C80075F050 /* bswap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bswap.h; sourceTree = ""; }; + CB484DB122B8C8C80075F050 /* old_pix_fmts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = old_pix_fmts.h; sourceTree = ""; }; + CB484DB222B8C8C80075F050 /* cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu.h; sourceTree = ""; }; + CB484DB322B8C8C80075F050 /* audioconvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audioconvert.h; sourceTree = ""; }; + CB484DB422B8C8C80075F050 /* channel_layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = channel_layout.h; sourceTree = ""; }; + CB484DB522B8C8C80075F050 /* imgutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imgutils.h; sourceTree = ""; }; + CB484DB622B8C8C80075F050 /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = ""; }; + CB484DB722B8C8C80075F050 /* parseutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parseutils.h; sourceTree = ""; }; + CB484DB822B8C8C80075F050 /* bprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bprint.h; sourceTree = ""; }; + CB484DB922B8C8C80075F050 /* pixfmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixfmt.h; sourceTree = ""; }; + CB484DBA22B8C8C80075F050 /* timestamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timestamp.h; sourceTree = ""; }; + CB484DBB22B8C8C80075F050 /* avassert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avassert.h; sourceTree = ""; }; + CB484DBC22B8C8C80075F050 /* mathematics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mathematics.h; sourceTree = ""; }; + CB484DBD22B8C8C80075F050 /* intreadwrite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intreadwrite.h; sourceTree = ""; }; + CB484DBE22B8C8C80075F050 /* avstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avstring.h; sourceTree = ""; }; + CB484DC022B8C8C80075F050 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; + CB484DC122B8C8C80075F050 /* avio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avio.h; sourceTree = ""; }; + CB484DC222B8C8C80075F050 /* avformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avformat.h; sourceTree = ""; }; + CB484DC422B8C8C80075F050 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; + CB484DC522B8C8C80075F050 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; + CB484DC722B8C8C80075F050 /* avcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avcodec.h; sourceTree = ""; }; + CB484DC822B8C8C80075F050 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; }; + CB484DC922B8C8C80075F050 /* vdpau.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vdpau.h; sourceTree = ""; }; + CB484DCA22B8C8C80075F050 /* vaapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vaapi.h; sourceTree = ""; }; + CB484DCB22B8C8C80075F050 /* xvmc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xvmc.h; sourceTree = ""; }; + CB484DCC22B8C8C80075F050 /* avfft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avfft.h; sourceTree = ""; }; + CB484DCD22B8C8C80075F050 /* vda.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vda.h; sourceTree = ""; }; + CB484DCE22B8C8C80075F050 /* dxva2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxva2.h; sourceTree = ""; }; + CB484DCF22B8C8C80075F050 /* old_codec_ids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = old_codec_ids.h; sourceTree = ""; }; + CB484DD022B8C8C80075F050 /* FfmpegInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FfmpegInterface.h; sourceTree = ""; }; + CB484DD122B8C8C80075F050 /* RtspInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RtspInterface.mm; sourceTree = ""; }; + CB484DD222B8C8C80075F050 /* RtspInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtspInterface.h; sourceTree = ""; }; + CB484DD322B8C8C80075F050 /* libRTSP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libRTSP.a; sourceTree = ""; }; + CB484DD422B8C8C80075F050 /* FfmpegInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FfmpegInterface.m; sourceTree = ""; }; + CB484DD622B8C8C80075F050 /* P2PCInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PCInterface.h; sourceTree = ""; }; + CB484DD722B8C8C80075F050 /* libAVCtrl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAVCtrl.a; sourceTree = ""; }; + CB484E2222B8CF9A0075F050 /* AlibabaAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlibabaAuthSDK.bundle; sourceTree = ""; }; + CB484E2322B8CF9A0075F050 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = ""; }; + CB484E2422B8CF9A0075F050 /* ALPLinkPartnerSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ALPLinkPartnerSDK.bundle; sourceTree = ""; }; + CB484E2522B8CF9A0075F050 /* NBResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = NBResource.bundle; sourceTree = ""; }; + CB484E2622B8CF9A0075F050 /* yw_1222.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = yw_1222.jpg; sourceTree = ""; }; + CB484E2822B8CF9A0075F050 /* AlibabaAuthExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibabaAuthExt.framework; sourceTree = ""; }; + CB484E2922B8CF9A0075F050 /* AlibabaAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibabaAuthSDK.framework; sourceTree = ""; }; + CB484E2A22B8CF9A0075F050 /* AlibcTradeSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeSDK.framework; sourceTree = ""; }; + CB484E2B22B8CF9A0075F050 /* AlibcLinkPartnerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcLinkPartnerSDK.framework; sourceTree = ""; }; + CB484E2C22B8CF9A0075F050 /* SecurityGuardSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SecurityGuardSDK.framework; sourceTree = ""; }; + CB484E2D22B8CF9A0075F050 /* UTDID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTDID.framework; sourceTree = ""; }; + CB484E2E22B8CF9A0075F050 /* AlibcTradeBiz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeBiz.framework; sourceTree = ""; }; + CB484E2F22B8CF9A0075F050 /* SGMain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGMain.framework; sourceTree = ""; }; + CB484E3022B8CF9A0075F050 /* AlibcTradeCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlibcTradeCommon.framework; sourceTree = ""; }; + CB484E3122B8CF9A0075F050 /* UTMini.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UTMini.framework; sourceTree = ""; }; + CB484E3222B8CF9A0075F050 /* OpenMtopSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenMtopSDK.framework; sourceTree = ""; }; + CB484E3322B8CF9A0075F050 /* SGNoCaptcha.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGNoCaptcha.framework; sourceTree = ""; }; + CB484E3422B8CF9A0075F050 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = ""; }; + CB484E3522B8CF9A0075F050 /* SGSecurityBody.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SGSecurityBody.framework; sourceTree = ""; }; + CB484E3622B8CF9A0075F050 /* OpenMtopExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenMtopExt.framework; sourceTree = ""; }; + CB484E4B22B8D2990075F050 /* GWP2P.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GWP2P.framework; sourceTree = ""; }; + CB484E4C22B8D29C0075F050 /* SDK使用说明 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SDK使用说明"; sourceTree = ""; }; CB7D6A9822953BEB0014E5C7 /* YYDiskCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYDiskCache.m; sourceTree = ""; }; CB7D6A9922953BEB0014E5C7 /* YYKVStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYKVStorage.h; sourceTree = ""; }; CB7D6A9A22953BEB0014E5C7 /* YYCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYCache.m; sourceTree = ""; }; @@ -5780,7 +5794,6 @@ CB7D6A9D22953BEB0014E5C7 /* YYCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYCache.h; sourceTree = ""; }; CB7D6A9E22953BEB0014E5C7 /* YYKVStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYKVStorage.m; sourceTree = ""; }; CB7D6A9F22953BEB0014E5C7 /* YYMemoryCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYMemoryCache.m; sourceTree = ""; }; - CB7D6AA8229542870014E5C7 /* ffmpegtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffmpegtime.h; sourceTree = ""; }; CB7D6AAE22954DBC0014E5C7 /* CommonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonUtils.h; sourceTree = ""; }; CB7D6AAF22954DE10014E5C7 /* CommonUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommonUtils.m; sourceTree = ""; }; CB7D6AB222954E060014E5C7 /* UIColor+HexString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+HexString.m"; sourceTree = ""; }; @@ -5936,10 +5949,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CB7D6AF62296A7000014E5C7 /* libresolv.tbd in Frameworks */, + CB484CF122B87D250075F050 /* libresolv.tbd in Frameworks */, + CB484E3E22B8CF9B0075F050 /* AlibcTradeSDK.framework in Frameworks */, 88C686401EA611AE004CDFD9 /* libsqlite3.tbd in Frameworks */, 3D4AFF6221F350820053BAA0 /* libstdc++.6.0.9.tbd in Frameworks */, + CB484E4022B8CF9B0075F050 /* SecurityGuardSDK.framework in Frameworks */, + CB484E4122B8CF9B0075F050 /* UTDID.framework in Frameworks */, CB7D6AF42296A6910014E5C7 /* UTMini.framework in Frameworks */, + CB484E3D22B8CF9B0075F050 /* AlibabaAuthSDK.framework in Frameworks */, 3D4AFF5F21F34E1C0053BAA0 /* libstdc++.tbd in Frameworks */, 3D1C50B8221A9EDF0096AE43 /* YTargetAndAction.a in Frameworks */, 3D4AFF6021F34E1C0053BAA0 /* libstdc++.6.tbd in Frameworks */, @@ -5947,25 +5964,31 @@ 88C6865E1EA612D0004CDFD9 /* libz.tbd in Frameworks */, 88C6865C1EA612BD004CDFD9 /* libiconv.tbd in Frameworks */, 88EE7AC31ECBF8BE00408C79 /* libc++.1.tbd in Frameworks */, + CB484DD822B8C8C80075F050 /* libelian.a in Frameworks */, 8857E43C1ECBE53A004A3D75 /* libc++.tbd in Frameworks */, 88C686581EA61298004CDFD9 /* AudioToolbox.framework in Frameworks */, + CB484E4622B8CF9B0075F050 /* OpenMtopSDK.framework in Frameworks */, + CB484E3F22B8CF9B0075F050 /* AlibcLinkPartnerSDK.framework in Frameworks */, + CB484E4322B8CF9B0075F050 /* SGMain.framework in Frameworks */, 88C6865A1EA612A6004CDFD9 /* AssetsLibrary.framework in Frameworks */, 88C686601EA612DE004CDFD9 /* Accelerate.framework in Frameworks */, 88C686561EA61285004CDFD9 /* AVFoundation.framework in Frameworks */, 88C686541EA61275004CDFD9 /* CFNetwork.framework in Frameworks */, 88C686521EA61267004CDFD9 /* CoreAudio.framework in Frameworks */, - 3D1C514D221AA2A90096AE43 /* libelian.a in Frameworks */, + CB484E4422B8CF9B0075F050 /* AlibcTradeCommon.framework in Frameworks */, + CB484E4222B8CF9B0075F050 /* AlibcTradeBiz.framework in Frameworks */, 3D1C50B0221A9EDF0096AE43 /* YMsgBox.a in Frameworks */, 88C686501EA61259004CDFD9 /* CoreLocation.framework in Frameworks */, 88C6864E1EA6124B004CDFD9 /* CoreVideo.framework in Frameworks */, 88C6864C1EA6123B004CDFD9 /* CoreTelephony.framework in Frameworks */, + CB484E3C22B8CF9B0075F050 /* AlibabaAuthExt.framework in Frameworks */, + CB484E1F22B8C8C90075F050 /* libAVCtrl.a in Frameworks */, 88C6864A1EA61228004CDFD9 /* CoreMedia.framework in Frameworks */, 3D1C50AE221A9EDF0096AE43 /* YFonc.a in Frameworks */, 88C686481EA61217004CDFD9 /* CoreGraphics.framework in Frameworks */, 88C686461EA611F7004CDFD9 /* ImageIO.framework in Frameworks */, 88C686441EA611DC004CDFD9 /* libc++abi.tbd in Frameworks */, 3D1C50B3221A9EDF0096AE43 /* YTheNaviBar.a in Frameworks */, - 3D1C507D221A9EDF0096AE43 /* libAVCtrl.a in Frameworks */, 88C6863C1EA6116C004CDFD9 /* libxml2.tbd in Frameworks */, 88C6863A1EA61149004CDFD9 /* MapKit.framework in Frameworks */, 88C686381EA61138004CDFD9 /* OpenGLES.framework in Frameworks */, @@ -5975,6 +5998,7 @@ 88C686321EA61105004CDFD9 /* CoreFoundation.framework in Frameworks */, 88C686301EA610F4004CDFD9 /* Security.framework in Frameworks */, 88C6862E1EA610E5004CDFD9 /* JavaScriptCore.framework in Frameworks */, + CB484E4822B8CF9B0075F050 /* AlipaySDK.framework in Frameworks */, 88C6862C1EA610D2004CDFD9 /* AdSupport.framework in Frameworks */, 88C6862A1EA610C0004CDFD9 /* CoreMotion.framework in Frameworks */, 88C686261EA61091004CDFD9 /* OpenAL.framework in Frameworks */, @@ -5992,40 +6016,29 @@ CB7D6AF32296A6910014E5C7 /* AlicloudUtils.framework in Frameworks */, 88C686011EA603A8004CDFD9 /* UShareUI.framework in Frameworks */, 88C685F91EA603A8004CDFD9 /* libSocialWeChat.a in Frameworks */, + CB484E4522B8CF9B0075F050 /* UTMini.framework in Frameworks */, 3DD7AB4B21E2F2FB0064856A /* libzbar.a in Frameworks */, 88C685F61EA603A8004CDFD9 /* libSocialSina.a in Frameworks */, CB7D6AEC2296A1A40014E5C7 /* CloudPushSDK.framework in Frameworks */, - 3D1C5039221A9EDE0096AE43 /* libMD5Manager.a in Frameworks */, - 8872FFCC1E9B300800406C1D /* AlibabaAuthSDK.framework in Frameworks */, - 8872FFD11E9B300800406C1D /* AlipaySDK.framework in Frameworks */, 88C685FF1EA603A8004CDFD9 /* libUMSocialLog.a in Frameworks */, 88C685FA1EA603A8004CDFD9 /* libWeChatSDK.a in Frameworks */, - 8872FFCF1E9B300800406C1D /* AlibcTradeCommon.framework in Frameworks */, 881671BB1EA5DE2B00BEBF23 /* UMComDataStorage.framework in Frameworks */, - 8872FFD31E9B300800406C1D /* OpenMtopSDK.framework in Frameworks */, - 8872FFCE1E9B300800406C1D /* AlibcTradeBiz.framework in Frameworks */, + CB484E4A22B8CF9B0075F050 /* OpenMtopExt.framework in Frameworks */, 883E7BCE1EA5FA1A00ED5D89 /* SMS_SDK.framework in Frameworks */, - 8872FFD51E9B300800406C1D /* SGMain.framework in Frameworks */, - 8872FFD41E9B300800406C1D /* SecurityGuardSDK.framework in Frameworks */, 88C685F71EA603A8004CDFD9 /* libWeiboSDK.a in Frameworks */, - 8872FFD91E9B300800406C1D /* UTMini.framework in Frameworks */, + CB484E4722B8CF9B0075F050 /* SGNoCaptcha.framework in Frameworks */, 881671BE1EA5DE2B00BEBF23 /* UMComNetwork.framework in Frameworks */, 88C685F41EA603A8004CDFD9 /* TencentOpenAPI.framework in Frameworks */, - 8872FFD81E9B300800406C1D /* UTDID.framework in Frameworks */, 88C685FC1EA603A8004CDFD9 /* UMSocialCore.framework in Frameworks */, - 3D1C507A221A9EDF0096AE43 /* libRTSP.a in Frameworks */, - 8872FFD21E9B300800406C1D /* OpenMtopExt.framework in Frameworks */, + CB484E1C22B8C8C90075F050 /* libRTSP.a in Frameworks */, 883E7BCD1EA5FA1A00ED5D89 /* MOBFoundationEx.framework in Frameworks */, - 8872FFD61E9B300800406C1D /* SGNoCaptcha.framework in Frameworks */, - 8872FFD01E9B300800406C1D /* AlibcTradeSDK.framework in Frameworks */, - 8872FFD71E9B300800406C1D /* SGSecurityBody.framework in Frameworks */, - 8872FFCD1E9B300800406C1D /* AlibcLinkPartnerSDK.framework in Frameworks */, 88C686111EA60A40004CDFD9 /* libTalkingData.a in Frameworks */, 882DF00E1EA70EF2009FF5D0 /* libemTMF_Ofical_jw160727.a in Frameworks */, + CB484E4D22B8D29C0075F050 /* GWP2P.framework in Frameworks */, 881671BD1EA5DE2B00BEBF23 /* UMCommunitySDK.framework in Frameworks */, 881671BC1EA5DE2B00BEBF23 /* UMComFoundation.framework in Frameworks */, + CB484E4922B8CF9B0075F050 /* SGSecurityBody.framework in Frameworks */, 88C685FD1EA603A8004CDFD9 /* UMSocialNetwork.framework in Frameworks */, - 8872FFCB1E9B300800406C1D /* AlibabaAuthExt.framework in Frameworks */, 88C685F31EA603A8004CDFD9 /* libSocialQQ.a in Frameworks */, 883E7BCC1EA5FA1A00ED5D89 /* MOBFoundation.framework in Frameworks */, ); @@ -6103,7 +6116,7 @@ 3D1C4F00221A9EDD0096AE43 /* IfishYooseeFile */ = { isa = PBXGroup; children = ( - 3D1C4F01221A9EDD0096AE43 /* IfishYsooseeNewLib */, + CB484D8622B8C8C80075F050 /* IfishYsooseeNewLib */, 3D1C4F53221A9EDD0096AE43 /* IfishYooseeHelper */, 3D1C4FE2221A9EDD0096AE43 /* IfishYooseeControlller */, 3D1C5030221A9EDD0096AE43 /* IfishYooseeSource */, @@ -6111,223 +6124,72 @@ path = IfishYooseeFile; sourceTree = ""; }; - 3D1C4F01221A9EDD0096AE43 /* IfishYsooseeNewLib */ = { - isa = PBXGroup; - children = ( - 3D1C4F02221A9EDD0096AE43 /* wifi */, - 3D1C4F05221A9EDD0096AE43 /* md5 */, - 3D1C4F08221A9EDD0096AE43 /* rtsp */, - 3D1C4F50221A9EDD0096AE43 /* libAVCtrlIOS */, - ); - path = IfishYsooseeNewLib; - sourceTree = ""; - }; - 3D1C4F02221A9EDD0096AE43 /* wifi */ = { - isa = PBXGroup; - children = ( - 3D1C514C221AA2A80096AE43 /* libelian.a */, - 3D1C4F04221A9EDD0096AE43 /* elian.h */, - ); - path = wifi; - sourceTree = ""; - }; - 3D1C4F05221A9EDD0096AE43 /* md5 */ = { - isa = PBXGroup; - children = ( - 3D1C4F06221A9EDD0096AE43 /* MD5Manager.h */, - 3D1C4F07221A9EDD0096AE43 /* libMD5Manager.a */, - ); - path = md5; - sourceTree = ""; - }; - 3D1C4F08221A9EDD0096AE43 /* rtsp */ = { - isa = PBXGroup; - children = ( - 3D1C4F09221A9EDD0096AE43 /* Rtsp_instance.h */, - 3D1C4F0A221A9EDD0096AE43 /* ffmpeg */, - 3D1C4F4B221A9EDD0096AE43 /* FfmpegInterface.h */, - 3D1C4F4C221A9EDD0096AE43 /* RtspInterface.mm */, - 3D1C4F4D221A9EDD0096AE43 /* RtspInterface.h */, - 3D1C4F4E221A9EDD0096AE43 /* libRTSP.a */, - 3D1C4F4F221A9EDD0096AE43 /* FfmpegInterface.m */, - ); - path = rtsp; - sourceTree = ""; - }; - 3D1C4F0A221A9EDD0096AE43 /* ffmpeg */ = { - isa = PBXGroup; - children = ( - 3D1C4F0B221A9EDD0096AE43 /* libavutil */, - 3D1C4F3A221A9EDD0096AE43 /* libavformat */, - 3D1C4F3E221A9EDD0096AE43 /* libswscale */, - 3D1C4F41221A9EDD0096AE43 /* libavcodec */, - ); - path = ffmpeg; - sourceTree = ""; - }; - 3D1C4F0B221A9EDD0096AE43 /* libavutil */ = { - isa = PBXGroup; - children = ( - CB7D6AA8229542870014E5C7 /* ffmpegtime.h */, - 3D1C4F0D221A9EDD0096AE43 /* intfloat.h */, - 3D1C4F0E221A9EDD0096AE43 /* error.h */, - 3D1C4F0F221A9EDD0096AE43 /* fifo.h */, - 3D1C4F10221A9EDD0096AE43 /* blowfish.h */, - 3D1C4F11221A9EDD0096AE43 /* version.h */, - 3D1C4F12221A9EDD0096AE43 /* samplefmt.h */, - 3D1C4F13221A9EDD0096AE43 /* pixdesc.h */, - 3D1C4F14221A9EDD0096AE43 /* base64.h */, - 3D1C4F15221A9EDD0096AE43 /* rational.h */, - 3D1C4F16221A9EDD0096AE43 /* sha.h */, - 3D1C4F17221A9EDD0096AE43 /* avconfig.h */, - 3D1C4F18221A9EDD0096AE43 /* lfg.h */, - 3D1C4F19221A9EDD0096AE43 /* avutil.h */, - 3D1C4F1A221A9EDD0096AE43 /* intfloat_readwrite.h */, - 3D1C4F1B221A9EDD0096AE43 /* xtea.h */, - 3D1C4F1C221A9EDD0096AE43 /* crc.h */, - 3D1C4F1D221A9EDD0096AE43 /* file.h */, - 3D1C4F1E221A9EDD0096AE43 /* md5.h */, - 3D1C4F1F221A9EDD0096AE43 /* audio_fifo.h */, - 3D1C4F20221A9EDD0096AE43 /* attributes.h */, - 3D1C4F21221A9EDD0096AE43 /* adler32.h */, - 3D1C4F22221A9EDD0096AE43 /* timecode.h */, - 3D1C4F23221A9EDD0096AE43 /* common.h */, - 3D1C4F24221A9EDD0096AE43 /* hmac.h */, - 3D1C4F25221A9EDD0096AE43 /* eval.h */, - 3D1C4F26221A9EDD0096AE43 /* dict.h */, - 3D1C4F27221A9EDD0096AE43 /* random_seed.h */, - 3D1C4F28221A9EDD0096AE43 /* opt.h */, - 3D1C4F29221A9EDD0096AE43 /* log.h */, - 3D1C4F2A221A9EDD0096AE43 /* aes.h */, - 3D1C4F2B221A9EDD0096AE43 /* bswap.h */, - 3D1C4F2C221A9EDD0096AE43 /* old_pix_fmts.h */, - 3D1C4F2D221A9EDD0096AE43 /* cpu.h */, - 3D1C4F2E221A9EDD0096AE43 /* audioconvert.h */, - 3D1C4F2F221A9EDD0096AE43 /* channel_layout.h */, - 3D1C4F30221A9EDD0096AE43 /* imgutils.h */, - 3D1C4F31221A9EDD0096AE43 /* mem.h */, - 3D1C4F32221A9EDD0096AE43 /* parseutils.h */, - 3D1C4F33221A9EDD0096AE43 /* bprint.h */, - 3D1C4F34221A9EDD0096AE43 /* pixfmt.h */, - 3D1C4F35221A9EDD0096AE43 /* timestamp.h */, - 3D1C4F36221A9EDD0096AE43 /* avassert.h */, - 3D1C4F37221A9EDD0096AE43 /* mathematics.h */, - 3D1C4F38221A9EDD0096AE43 /* intreadwrite.h */, - 3D1C4F39221A9EDD0096AE43 /* avstring.h */, - ); - path = libavutil; - sourceTree = ""; - }; - 3D1C4F3A221A9EDD0096AE43 /* libavformat */ = { - isa = PBXGroup; - children = ( - 3D1C4F3B221A9EDD0096AE43 /* version.h */, - 3D1C4F3C221A9EDD0096AE43 /* avio.h */, - 3D1C4F3D221A9EDD0096AE43 /* avformat.h */, - ); - path = libavformat; - sourceTree = ""; - }; - 3D1C4F3E221A9EDD0096AE43 /* libswscale */ = { - isa = PBXGroup; - children = ( - 3D1C4F3F221A9EDD0096AE43 /* version.h */, - 3D1C4F40221A9EDD0096AE43 /* swscale.h */, - ); - path = libswscale; - sourceTree = ""; - }; - 3D1C4F41221A9EDD0096AE43 /* libavcodec */ = { - isa = PBXGroup; - children = ( - 3D1C4F42221A9EDD0096AE43 /* avcodec.h */, - 3D1C4F43221A9EDD0096AE43 /* version.h */, - 3D1C4F44221A9EDD0096AE43 /* vdpau.h */, - 3D1C4F45221A9EDD0096AE43 /* vaapi.h */, - 3D1C4F46221A9EDD0096AE43 /* xvmc.h */, - 3D1C4F47221A9EDD0096AE43 /* avfft.h */, - 3D1C4F48221A9EDD0096AE43 /* vda.h */, - 3D1C4F49221A9EDD0096AE43 /* dxva2.h */, - 3D1C4F4A221A9EDD0096AE43 /* old_codec_ids.h */, - ); - path = libavcodec; - sourceTree = ""; - }; - 3D1C4F50221A9EDD0096AE43 /* libAVCtrlIOS */ = { - isa = PBXGroup; - children = ( - 3D1C4F51221A9EDD0096AE43 /* P2PCInterface.h */, - 3D1C4F52221A9EDD0096AE43 /* libAVCtrl.a */, - ); - path = libAVCtrlIOS; - sourceTree = ""; - }; 3D1C4F53221A9EDD0096AE43 /* IfishYooseeHelper */ = { isa = PBXGroup; children = ( - 3D1C4F54221A9EDD0096AE43 /* KTPhotoBrowser */, - 3D1C4F63221A9EDD0096AE43 /* Utils.h */, - 3D1C4F64221A9EDD0096AE43 /* CustomBorderButton.h */, - 3D1C4F65221A9EDD0096AE43 /* Contact.m */, - 3D1C4F66221A9EDD0096AE43 /* LoginResult.m */, + CB484D8322B8BE830075F050 /* P2PClient.h */, + CB484D8222B8BE830075F050 /* P2PClient.m */, 3D1C4F67221A9EDD0096AE43 /* AccountResult.h */, - 3D1C4F68221A9EDD0096AE43 /* RegisterResult.m */, - 3D1C4F69221A9EDD0096AE43 /* P2PClient.m */, - 3D1C4F6A221A9EDD0096AE43 /* NetManager.m */, - 3D1C4F6B221A9EDD0096AE43 /* ContactDAO.m */, - 3D1C4F6C221A9EDD0096AE43 /* Alarm.h */, - 3D1C4F6D221A9EDD0096AE43 /* LocalDevice.m */, - 3D1C4F6E221A9EDD0096AE43 /* TabView.m */, - 3D1C4F6F221A9EDD0096AE43 /* UDManager.m */, - 3D1C4F70221A9EDD0096AE43 /* GetAlarmRecordResult.m */, - 3D1C4F71221A9EDD0096AE43 /* ConnectFailurePromptView.h */, - 3D1C4F72221A9EDD0096AE43 /* CustomTopBar.m */, - 3D1C4F73221A9EDD0096AE43 /* ModifyLoginPasswordResult.h */, - 3D1C4F74221A9EDD0096AE43 /* GetContactMessageResult.h */, - 3D1C4F75221A9EDD0096AE43 /* Toast+UIView.m */, - 3D1C4F76221A9EDD0096AE43 /* YProgressView.h */, - 3D1C4F77221A9EDD0096AE43 /* TouchButton.h */, - 3D1C4F78221A9EDD0096AE43 /* View_Frame */, - 3D1C4F7B221A9EDD0096AE43 /* WaitingPageView.h */, - 3D1C4F7C221A9EDD0096AE43 /* ProgressImageView.m */, - 3D1C4F7D221A9EDD0096AE43 /* P2pPalybackViewPicView */, - 3D1C4F84221A9EDD0096AE43 /* CheckAlarmMessageResult.m */, - 3D1C4F85221A9EDD0096AE43 /* CustomView.h */, - 3D1C4F86221A9EDD0096AE43 /* FXBlurView.h */, - 3D1C4F87221A9EDD0096AE43 /* YooseeExtureLibs */, - 3D1C4F98221A9EDD0096AE43 /* CheckNewMessageResult.h */, - 3D1C4F99221A9EDD0096AE43 /* NetManager.h */, - 3D1C4F9A221A9EDD0096AE43 /* RegisterResult.h */, - 3D1C4F9B221A9EDD0096AE43 /* P2PClient.h */, - 3D1C4F9C221A9EDD0096AE43 /* LoginResult.h */, - 3D1C4F9D221A9EDD0096AE43 /* Constants.h */, 3D1C4F9E221A9EDD0096AE43 /* AccountResult.m */, - 3D1C4F9F221A9EDD0096AE43 /* Contact.h */, - 3D1C4FA0221A9EDD0096AE43 /* Utils.m */, - 3D1C4FA1221A9EDD0096AE43 /* CustomBorderButton.m */, - 3D1C4FA2221A9EDD0096AE43 /* OBGradientView */, - 3D1C4FA5221A9EDD0096AE43 /* UDManager.h */, - 3D1C4FA6221A9EDD0096AE43 /* TabView.h */, - 3D1C4FA7221A9EDD0096AE43 /* LocalDevice.h */, + 3D1C4F6C221A9EDD0096AE43 /* Alarm.h */, 3D1C4FA8221A9EDD0096AE43 /* Alarm.m */, + 3D1C4FBB221A9EDD0096AE43 /* CheckAlarmMessageResult.h */, + 3D1C4F84221A9EDD0096AE43 /* CheckAlarmMessageResult.m */, + 3D1C4F98221A9EDD0096AE43 /* CheckNewMessageResult.h */, + 3D1C4FB8221A9EDD0096AE43 /* CheckNewMessageResult.m */, + 3D1C4F71221A9EDD0096AE43 /* ConnectFailurePromptView.h */, + 3D1C4FB0221A9EDD0096AE43 /* ConnectFailurePromptView.m */, + 3D1C4F9D221A9EDD0096AE43 /* Constants.h */, + 3D1C4F9F221A9EDD0096AE43 /* Contact.h */, + 3D1C4F65221A9EDD0096AE43 /* Contact.m */, 3D1C4FA9221A9EDD0096AE43 /* ContactDAO.h */, + 3D1C4F6B221A9EDD0096AE43 /* ContactDAO.m */, + 3D1C4F64221A9EDD0096AE43 /* CustomBorderButton.h */, + 3D1C4FA1221A9EDD0096AE43 /* CustomBorderButton.m */, + 3D1C4FAF221A9EDD0096AE43 /* CustomTopBar.h */, + 3D1C4F72221A9EDD0096AE43 /* CustomTopBar.m */, + 3D1C4F85221A9EDD0096AE43 /* CustomView.h */, + 3D1C4FB9221A9EDD0096AE43 /* CustomView.m */, + 3D1C4F86221A9EDD0096AE43 /* FXBlurView.h */, + 3D1C4FBA221A9EDD0096AE43 /* FXBlurView.m */, + 3D1C4FB1221A9EDD0096AE43 /* GetAlarmRecordResult.h */, + 3D1C4F70221A9EDD0096AE43 /* GetAlarmRecordResult.m */, + 3D1C4F74221A9EDD0096AE43 /* GetContactMessageResult.h */, 3D1C4FAA221A9EDD0096AE43 /* GetContactMessageResult.m */, + 3D1C4FBC221A9EDD0096AE43 /* IfishYooseeP2PCore */, + 3D1C4F54221A9EDD0096AE43 /* KTPhotoBrowser */, + 3D1C4FA7221A9EDD0096AE43 /* LocalDevice.h */, + 3D1C4F6D221A9EDD0096AE43 /* LocalDevice.m */, + 3D1C4F9C221A9EDD0096AE43 /* LoginResult.h */, + 3D1C4F66221A9EDD0096AE43 /* LoginResult.m */, + 3D1C4F73221A9EDD0096AE43 /* ModifyLoginPasswordResult.h */, 3D1C4FAB221A9EDD0096AE43 /* ModifyLoginPasswordResult.m */, 3D1C4FAC221A9EDD0096AE43 /* MPNotificationView */, - 3D1C4FAF221A9EDD0096AE43 /* CustomTopBar.h */, - 3D1C4FB0221A9EDD0096AE43 /* ConnectFailurePromptView.m */, - 3D1C4FB1221A9EDD0096AE43 /* GetAlarmRecordResult.h */, - 3D1C4FB2221A9EDD0096AE43 /* SVPullToRefresh */, - 3D1C4FB8221A9EDD0096AE43 /* CheckNewMessageResult.m */, - 3D1C4FB9221A9EDD0096AE43 /* CustomView.m */, - 3D1C4FBA221A9EDD0096AE43 /* FXBlurView.m */, - 3D1C4FBB221A9EDD0096AE43 /* CheckAlarmMessageResult.h */, - 3D1C4FBC221A9EDD0096AE43 /* IfishYooseeP2PCore */, - 3D1C4FDD221A9EDD0096AE43 /* WaitingPageView.m */, + 3D1C4F99221A9EDD0096AE43 /* NetManager.h */, + 3D1C4F6A221A9EDD0096AE43 /* NetManager.m */, + 3D1C4FA2221A9EDD0096AE43 /* OBGradientView */, + 3D1C4F7D221A9EDD0096AE43 /* P2pPalybackViewPicView */, 3D1C4FDE221A9EDD0096AE43 /* ProgressImageView.h */, - 3D1C4FDF221A9EDD0096AE43 /* TouchButton.m */, - 3D1C4FE0221A9EDD0096AE43 /* YProgressView.m */, + 3D1C4F7C221A9EDD0096AE43 /* ProgressImageView.m */, + 3D1C4F9A221A9EDD0096AE43 /* RegisterResult.h */, + 3D1C4F68221A9EDD0096AE43 /* RegisterResult.m */, + 3D1C4FB2221A9EDD0096AE43 /* SVPullToRefresh */, + 3D1C4FA6221A9EDD0096AE43 /* TabView.h */, + 3D1C4F6E221A9EDD0096AE43 /* TabView.m */, 3D1C4FE1221A9EDD0096AE43 /* Toast+UIView.h */, + 3D1C4F75221A9EDD0096AE43 /* Toast+UIView.m */, + 3D1C4F77221A9EDD0096AE43 /* TouchButton.h */, + 3D1C4FDF221A9EDD0096AE43 /* TouchButton.m */, + 3D1C4FA5221A9EDD0096AE43 /* UDManager.h */, + 3D1C4F6F221A9EDD0096AE43 /* UDManager.m */, + 3D1C4F63221A9EDD0096AE43 /* Utils.h */, + 3D1C4FA0221A9EDD0096AE43 /* Utils.m */, + 3D1C4F78221A9EDD0096AE43 /* View_Frame */, + 3D1C4F7B221A9EDD0096AE43 /* WaitingPageView.h */, + 3D1C4FDD221A9EDD0096AE43 /* WaitingPageView.m */, + 3D1C4F87221A9EDD0096AE43 /* YooseeExtureLibs */, + 3D1C4F76221A9EDD0096AE43 /* YProgressView.h */, + 3D1C4FE0221A9EDD0096AE43 /* YProgressView.m */, ); path = IfishYooseeHelper; sourceTree = ""; @@ -6335,20 +6197,20 @@ 3D1C4F54221A9EDD0096AE43 /* KTPhotoBrowser */ = { isa = PBXGroup; children = ( - 3D1C4F55221A9EDD0096AE43 /* KTPhotoBrowserGlobal.m */, - 3D1C4F56221A9EDD0096AE43 /* KTPhotoBrowserDataSource.h */, - 3D1C4F57221A9EDD0096AE43 /* KTThumbsView.m */, - 3D1C4F58221A9EDD0096AE43 /* KTThumbView.m */, - 3D1C4F59221A9EDD0096AE43 /* KTPhotoScrollViewController.m */, - 3D1C4F5A221A9EDD0096AE43 /* KTThumbsViewController.h */, - 3D1C4F5B221A9EDD0096AE43 /* KTPhotoView.m */, - 3D1C4F5C221A9EDD0096AE43 /* KTPhotoBrowserGlobal.h */, - 3D1C4F5D221A9EDD0096AE43 /* KTThumbView.h */, 3D1C4F5E221A9EDD0096AE43 /* KTPhotoBrowser.bundle */, - 3D1C4F5F221A9EDD0096AE43 /* KTThumbsView.h */, - 3D1C4F60221A9EDD0096AE43 /* KTPhotoView.h */, - 3D1C4F61221A9EDD0096AE43 /* KTThumbsViewController.m */, + 3D1C4F56221A9EDD0096AE43 /* KTPhotoBrowserDataSource.h */, + 3D1C4F5C221A9EDD0096AE43 /* KTPhotoBrowserGlobal.h */, + 3D1C4F55221A9EDD0096AE43 /* KTPhotoBrowserGlobal.m */, 3D1C4F62221A9EDD0096AE43 /* KTPhotoScrollViewController.h */, + 3D1C4F59221A9EDD0096AE43 /* KTPhotoScrollViewController.m */, + 3D1C4F60221A9EDD0096AE43 /* KTPhotoView.h */, + 3D1C4F5B221A9EDD0096AE43 /* KTPhotoView.m */, + 3D1C4F5F221A9EDD0096AE43 /* KTThumbsView.h */, + 3D1C4F57221A9EDD0096AE43 /* KTThumbsView.m */, + 3D1C4F5A221A9EDD0096AE43 /* KTThumbsViewController.h */, + 3D1C4F61221A9EDD0096AE43 /* KTThumbsViewController.m */, + 3D1C4F5D221A9EDD0096AE43 /* KTThumbView.h */, + 3D1C4F58221A9EDD0096AE43 /* KTThumbView.m */, ); path = KTPhotoBrowser; sourceTree = ""; @@ -6466,38 +6328,38 @@ 3D1C4FBC221A9EDD0096AE43 /* IfishYooseeP2PCore */ = { isa = PBXGroup; children = ( - 3D1C4FBD221A9EDD0096AE43 /* RecommendInfo.m */, - 3D1C4FBE221A9EDD0096AE43 /* YAudioStreamPlayer.h */, - 3D1C4FBF221A9EDD0096AE43 /* PAIOUnit.h */, - 3D1C4FC0221A9EDD0096AE43 /* RecommendInfoDAO.h */, - 3D1C4FC1221A9EDD0096AE43 /* ShapeRenderNotifyMsg.mm */, - 3D1C4FC2221A9EDD0096AE43 /* MessageDAO.m */, - 3D1C4FC3221A9EDD0096AE43 /* ShapeRenderNotifyMsg.h */, - 3D1C4FC4221A9EDD0096AE43 /* FListManager.h */, - 3D1C4FC5221A9EDD0096AE43 /* UDPManager.h */, - 3D1C4FC6221A9EDD0096AE43 /* OpenGLView.h */, - 3D1C4FC7221A9EDD0096AE43 /* config.h */, - 3D1C4FC8221A9EDD0096AE43 /* ShakeManager.h */, - 3D1C4FC9221A9EDD0096AE43 /* ParamDao.h */, - 3D1C4FCA221A9EDD0096AE43 /* CameraManager.m */, - 3D1C4FCB221A9EDD0096AE43 /* Message.h */, 3D1C4FCC221A9EDD0096AE43 /* AlarmDAO.h */, - 3D1C4FCD221A9EDD0096AE43 /* des2.c */, - 3D1C4FCE221A9EDD0096AE43 /* FListManager.m */, - 3D1C4FCF221A9EDD0096AE43 /* MessageDAO.h */, - 3D1C4FD0221A9EDD0096AE43 /* RecommendInfoDAO.m */, - 3D1C4FD1221A9EDD0096AE43 /* PAIOUnit.m */, - 3D1C4FD2221A9EDD0096AE43 /* YAudioStreamPlayer.m */, - 3D1C4FD3221A9EDD0096AE43 /* RecommendInfo.h */, - 3D1C4FD4221A9EDD0096AE43 /* ShakeManager.m */, - 3D1C4FD5221A9EDD0096AE43 /* mesg.h */, - 3D1C4FD6221A9EDD0096AE43 /* OpenGLView.mm */, - 3D1C4FD7221A9EDD0096AE43 /* UDPManager.m */, - 3D1C4FD8221A9EDD0096AE43 /* CameraManager.h */, - 3D1C4FD9221A9EDD0096AE43 /* ParamDao.m */, 3D1C4FDA221A9EDD0096AE43 /* AlarmDAO.m */, + 3D1C4FD8221A9EDD0096AE43 /* CameraManager.h */, + 3D1C4FCA221A9EDD0096AE43 /* CameraManager.m */, + 3D1C4FC7221A9EDD0096AE43 /* config.h */, + 3D1C4FCD221A9EDD0096AE43 /* des2.c */, 3D1C4FDB221A9EDD0096AE43 /* des2.h */, + 3D1C4FC4221A9EDD0096AE43 /* FListManager.h */, + 3D1C4FCE221A9EDD0096AE43 /* FListManager.m */, + 3D1C4FD5221A9EDD0096AE43 /* mesg.h */, + 3D1C4FCB221A9EDD0096AE43 /* Message.h */, 3D1C4FDC221A9EDD0096AE43 /* Message.m */, + 3D1C4FCF221A9EDD0096AE43 /* MessageDAO.h */, + 3D1C4FC2221A9EDD0096AE43 /* MessageDAO.m */, + 3D1C4FC6221A9EDD0096AE43 /* OpenGLView.h */, + 3D1C4FD6221A9EDD0096AE43 /* OpenGLView.mm */, + 3D1C4FBF221A9EDD0096AE43 /* PAIOUnit.h */, + 3D1C4FD1221A9EDD0096AE43 /* PAIOUnit.m */, + 3D1C4FC9221A9EDD0096AE43 /* ParamDao.h */, + 3D1C4FD9221A9EDD0096AE43 /* ParamDao.m */, + 3D1C4FD3221A9EDD0096AE43 /* RecommendInfo.h */, + 3D1C4FBD221A9EDD0096AE43 /* RecommendInfo.m */, + 3D1C4FC0221A9EDD0096AE43 /* RecommendInfoDAO.h */, + 3D1C4FD0221A9EDD0096AE43 /* RecommendInfoDAO.m */, + 3D1C4FC8221A9EDD0096AE43 /* ShakeManager.h */, + 3D1C4FD4221A9EDD0096AE43 /* ShakeManager.m */, + 3D1C4FC3221A9EDD0096AE43 /* ShapeRenderNotifyMsg.h */, + 3D1C4FC1221A9EDD0096AE43 /* ShapeRenderNotifyMsg.mm */, + 3D1C4FC5221A9EDD0096AE43 /* UDPManager.h */, + 3D1C4FD7221A9EDD0096AE43 /* UDPManager.m */, + 3D1C4FBE221A9EDD0096AE43 /* YAudioStreamPlayer.h */, + 3D1C4FD2221A9EDD0096AE43 /* YAudioStreamPlayer.m */, ); path = IfishYooseeP2PCore; sourceTree = ""; @@ -6505,22 +6367,22 @@ 3D1C4FE2221A9EDD0096AE43 /* IfishYooseeControlller */ = { isa = PBXGroup; children = ( - 3D1C4FE3221A9EDD0096AE43 /* YooseeCenterViewCell.h */, - 3D1C4FE4221A9EDD0096AE43 /* IfishCameraModel.h */, - 3D1C4FE5221A9EDD0096AE43 /* IfishP2PMonitorController.h */, - 3D1C4FE6221A9EDD0096AE43 /* YooseeCenterViewCell.xib */, - 3D1C4FE7221A9EDD0096AE43 /* YooseeNextConnectViewController.mm */, - 3D1C4FE8221A9EDD0096AE43 /* YooseConnectFirstViewController.h */, - 3D1C4FE9221A9EDD0096AE43 /* YooseeCenterViewController.h */, - 3D1C4FEA221A9EDD0096AE43 /* IfishP2PPlayBack */, - 3D1C4FF8221A9EDD0096AE43 /* IfishP2PMonitorController.m */, - 3D1C4FF9221A9EDD0096AE43 /* ScreenShotView */, - 3D1C5002221A9EDD0096AE43 /* IfishCameraModel.m */, 3D1C5003221A9EDD0096AE43 /* IfishcameraBottomHView */, - 3D1C501A221A9EDD0096AE43 /* YooseeCenterViewCell.m */, - 3D1C501B221A9EDD0096AE43 /* YooseeNextConnectViewController.h */, + 3D1C4FE4221A9EDD0096AE43 /* IfishCameraModel.h */, + 3D1C5002221A9EDD0096AE43 /* IfishCameraModel.m */, + 3D1C4FE5221A9EDD0096AE43 /* IfishP2PMonitorController.h */, + 3D1C4FF8221A9EDD0096AE43 /* IfishP2PMonitorController.m */, + 3D1C4FEA221A9EDD0096AE43 /* IfishP2PPlayBack */, + 3D1C4FF9221A9EDD0096AE43 /* ScreenShotView */, + 3D1C4FE8221A9EDD0096AE43 /* YooseConnectFirstViewController.h */, 3D1C501C221A9EDD0096AE43 /* YooseConnectFirstViewController.m */, + 3D1C4FE3221A9EDD0096AE43 /* YooseeCenterViewCell.h */, + 3D1C501A221A9EDD0096AE43 /* YooseeCenterViewCell.m */, + 3D1C4FE6221A9EDD0096AE43 /* YooseeCenterViewCell.xib */, + 3D1C4FE9221A9EDD0096AE43 /* YooseeCenterViewController.h */, 3D1C501D221A9EDD0096AE43 /* YooseeCenterViewController.m */, + 3D1C501B221A9EDD0096AE43 /* YooseeNextConnectViewController.h */, + 3D1C4FE7221A9EDD0096AE43 /* YooseeNextConnectViewController.mm */, 3D1C501E221A9EDD0096AE43 /* yooseFishTankView */, ); path = IfishYooseeControlller; @@ -6529,19 +6391,19 @@ 3D1C4FEA221A9EDD0096AE43 /* IfishP2PPlayBack */ = { isa = PBXGroup; children = ( - 3D1C4FEB221A9EDD0096AE43 /* CameraNoParyBackVideoView.m */, - 3D1C4FEC221A9EDD0096AE43 /* IfishP2PPlayBackListViewController.m */, - 3D1C4FED221A9EDD0096AE43 /* P2PPlayingbackVC.h */, - 3D1C4FEE221A9EDD0096AE43 /* P2PPlaybackController.h */, - 3D1C4FEF221A9EDD0096AE43 /* PlayBaseViewController.h */, - 3D1C4FF0221A9EDD0096AE43 /* IfishPlaybackViewCell.h */, 3D1C4FF1221A9EDD0096AE43 /* CameraNoParyBackVideoView.h */, - 3D1C4FF2221A9EDD0096AE43 /* IfishPlaybackViewCell.xib */, - 3D1C4FF3221A9EDD0096AE43 /* P2PPlayingbackVC.m */, + 3D1C4FEB221A9EDD0096AE43 /* CameraNoParyBackVideoView.m */, 3D1C4FF4221A9EDD0096AE43 /* IfishP2PPlayBackListViewController.h */, - 3D1C4FF5221A9EDD0096AE43 /* PlayBaseViewController.m */, - 3D1C4FF6221A9EDD0096AE43 /* P2PPlaybackController.m */, + 3D1C4FEC221A9EDD0096AE43 /* IfishP2PPlayBackListViewController.m */, + 3D1C4FF0221A9EDD0096AE43 /* IfishPlaybackViewCell.h */, 3D1C4FF7221A9EDD0096AE43 /* IfishPlaybackViewCell.m */, + 3D1C4FF2221A9EDD0096AE43 /* IfishPlaybackViewCell.xib */, + 3D1C4FEE221A9EDD0096AE43 /* P2PPlaybackController.h */, + 3D1C4FF6221A9EDD0096AE43 /* P2PPlaybackController.m */, + 3D1C4FED221A9EDD0096AE43 /* P2PPlayingbackVC.h */, + 3D1C4FF3221A9EDD0096AE43 /* P2PPlayingbackVC.m */, + 3D1C4FEF221A9EDD0096AE43 /* PlayBaseViewController.h */, + 3D1C4FF5221A9EDD0096AE43 /* PlayBaseViewController.m */, ); path = IfishP2PPlayBack; sourceTree = ""; @@ -6564,28 +6426,28 @@ 3D1C5003221A9EDD0096AE43 /* IfishcameraBottomHView */ = { isa = PBXGroup; children = ( - 3D1C5004221A9EDD0096AE43 /* IfishCameraRecordfirstCell.m */, - 3D1C5005221A9EDD0096AE43 /* CameraBottomCollectionViewCell.xib */, - 3D1C5006221A9EDD0096AE43 /* IfishRecVideoViewCell.xib */, - 3D1C5007221A9EDD0096AE43 /* CameraBottomHView.m */, 3D1C5008221A9EDD0096AE43 /* CameraBottomCollectionViewCell.h */, - 3D1C5009221A9EDD0096AE43 /* IfishRecVideoViewCell.h */, - 3D1C500A221A9EDD0096AE43 /* CameraRecordViewController.m */, - 3D1C500B221A9EDD0096AE43 /* IfishCameraRecordThirdCell.h */, - 3D1C500C221A9EDD0096AE43 /* IfishCameraRecordFourCell.h */, - 3D1C500D221A9EDD0096AE43 /* IfishCameraRecordfirstCell.xib */, - 3D1C500E221A9EDD0096AE43 /* IfishCameraRecordSecondCell.h */, - 3D1C500F221A9EDD0096AE43 /* IfishCameraRecordThirdCell.xib */, - 3D1C5010221A9EDD0096AE43 /* IfishCameraRecordFourCell.xib */, - 3D1C5011221A9EDD0096AE43 /* IfishCameraRecordSecondCell.xib */, - 3D1C5012221A9EDD0096AE43 /* IfishCameraRecordfirstCell.h */, - 3D1C5013221A9EDD0096AE43 /* IfishRecVideoViewCell.m */, 3D1C5014221A9EDD0096AE43 /* CameraBottomCollectionViewCell.m */, + 3D1C5005221A9EDD0096AE43 /* CameraBottomCollectionViewCell.xib */, 3D1C5015221A9EDD0096AE43 /* CameraBottomHView.h */, - 3D1C5016221A9EDD0096AE43 /* IfishCameraRecordSecondCell.m */, - 3D1C5017221A9EDD0096AE43 /* IfishCameraRecordFourCell.m */, - 3D1C5018221A9EDD0096AE43 /* IfishCameraRecordThirdCell.m */, + 3D1C5007221A9EDD0096AE43 /* CameraBottomHView.m */, 3D1C5019221A9EDD0096AE43 /* CameraRecordViewController.h */, + 3D1C500A221A9EDD0096AE43 /* CameraRecordViewController.m */, + 3D1C5012221A9EDD0096AE43 /* IfishCameraRecordfirstCell.h */, + 3D1C5004221A9EDD0096AE43 /* IfishCameraRecordfirstCell.m */, + 3D1C500D221A9EDD0096AE43 /* IfishCameraRecordfirstCell.xib */, + 3D1C500C221A9EDD0096AE43 /* IfishCameraRecordFourCell.h */, + 3D1C5017221A9EDD0096AE43 /* IfishCameraRecordFourCell.m */, + 3D1C5010221A9EDD0096AE43 /* IfishCameraRecordFourCell.xib */, + 3D1C500E221A9EDD0096AE43 /* IfishCameraRecordSecondCell.h */, + 3D1C5016221A9EDD0096AE43 /* IfishCameraRecordSecondCell.m */, + 3D1C5011221A9EDD0096AE43 /* IfishCameraRecordSecondCell.xib */, + 3D1C500B221A9EDD0096AE43 /* IfishCameraRecordThirdCell.h */, + 3D1C5018221A9EDD0096AE43 /* IfishCameraRecordThirdCell.m */, + 3D1C500F221A9EDD0096AE43 /* IfishCameraRecordThirdCell.xib */, + 3D1C5009221A9EDD0096AE43 /* IfishRecVideoViewCell.h */, + 3D1C5013221A9EDD0096AE43 /* IfishRecVideoViewCell.m */, + 3D1C5006221A9EDD0096AE43 /* IfishRecVideoViewCell.xib */, ); path = IfishcameraBottomHView; sourceTree = ""; @@ -6893,8 +6755,8 @@ 3DD7AB8E21E474930064856A /* AsyncSocket */ = { isa = PBXGroup; children = ( + CB484CF422B8B0AC0075F050 /* GCD */, 3DD7AB8F21E474930064856A /* RunLoop */, - 3DD7AB9421E474930064856A /* GCD */, ); path = AsyncSocket; sourceTree = ""; @@ -6910,17 +6772,6 @@ path = RunLoop; sourceTree = ""; }; - 3DD7AB9421E474930064856A /* GCD */ = { - isa = PBXGroup; - children = ( - 3DD7AB9521E474930064856A /* GCDAsyncUdpSocket.m */, - 3DD7AB9621E474930064856A /* GCDAsyncSocket.m */, - 3DD7AB9721E474930064856A /* GCDAsyncUdpSocket.h */, - 3DD7AB9821E474930064856A /* GCDAsyncSocket.h */, - ); - path = GCD; - sourceTree = ""; - }; 880707411DDD3DAC0076F65A /* ifishP2PShareVIew */ = { isa = PBXGroup; children = ( @@ -9851,8 +9702,6 @@ 8867F5AA1E6541F700AF021C /* DengJi */, 882957F91DC0443600E9DDD7 /* IfishCardScrollView.h */, 882957FA1DC0443600E9DDD7 /* IfishCardScrollView.m */, - 882957FB1DC0443600E9DDD7 /* IfishSelectCardViewController.h */, - 882957FC1DC0443600E9DDD7 /* IfishSelectCardViewController.m */, 883E771B1D48A5E50030E075 /* IfishDeviceViewController.h */, 883E771C1D48A5E50030E075 /* IfishDeviceViewController.m */, 8867C8741D49B6BC0029F1FA /* TabBarDeviceShouYeCell.h */, @@ -9901,8 +9750,6 @@ 883E781A1D48A5E50030E075 /* SecondConnectWifiController.h */, 883E781B1D48A5E50030E075 /* SecondConnectWifiController.m */, 883E781C1D48A5E50030E075 /* SecondConnectWifiController.xib */, - 883E781D1D48A5E50030E075 /* SelectDeviceViewController.h */, - 883E781E1D48A5E50030E075 /* SelectDeviceViewController.m */, E5317A1421188F8A0014AFDD /* RestartDeviceModel.h */, E5317A1521188F8A0014AFDD /* RestartDeviceModel.m */, E5317A1121188F170014AFDD /* ResetDeviceModel.h */, @@ -11316,49 +11163,6 @@ path = LXShareView; sourceTree = ""; }; - 8872FFB51E9B300800406C1D /* AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage */ = { - isa = PBXGroup; - children = ( - 886970011E9DD86E005D4AFB /* yw_1222.jpg */, - 8872FFB61E9B300800406C1D /* Frameworks */, - 8872FFC61E9B300800406C1D /* Resources */, - ); - path = "AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage"; - sourceTree = ""; - }; - 8872FFB61E9B300800406C1D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 8872FFB71E9B300800406C1D /* AlibabaAuthExt.framework */, - 8872FFB81E9B300800406C1D /* AlibabaAuthSDK.framework */, - 8872FFB91E9B300800406C1D /* AlibcLinkPartnerSDK.framework */, - 8872FFBA1E9B300800406C1D /* AlibcTradeBiz.framework */, - 8872FFBB1E9B300800406C1D /* AlibcTradeCommon.framework */, - 8872FFBC1E9B300800406C1D /* AlibcTradeSDK.framework */, - 8872FFBD1E9B300800406C1D /* AlipaySDK.framework */, - 8872FFBE1E9B300800406C1D /* OpenMtopExt.framework */, - 8872FFBF1E9B300800406C1D /* OpenMtopSDK.framework */, - 8872FFC01E9B300800406C1D /* SecurityGuardSDK.framework */, - 8872FFC11E9B300800406C1D /* SGMain.framework */, - 8872FFC21E9B300800406C1D /* SGNoCaptcha.framework */, - 8872FFC31E9B300800406C1D /* SGSecurityBody.framework */, - 8872FFC41E9B300800406C1D /* UTDID.framework */, - 8872FFC51E9B300800406C1D /* UTMini.framework */, - ); - path = Frameworks; - sourceTree = ""; - }; - 8872FFC61E9B300800406C1D /* Resources */ = { - isa = PBXGroup; - children = ( - 8872FFC71E9B300800406C1D /* AlibabaAuthSDK.bundle */, - 8872FFC81E9B300800406C1D /* AlipaySDK.bundle */, - 8872FFC91E9B300800406C1D /* ALPLinkPartnerSDK.bundle */, - 8872FFCA1E9B300800406C1D /* NBResource.bundle */, - ); - path = Resources; - sourceTree = ""; - }; 8872FFEF1E9B7B1200406C1D /* IfishHuiYuan */ = { isa = PBXGroup; children = ( @@ -12035,6 +11839,7 @@ 88C686121EA60EA9004CDFD9 /* Frameworks */ = { isa = PBXGroup; children = ( + CB484CEF22B8720D0075F050 /* GLKit.framework */, CB7D6AF52296A6FF0014E5C7 /* libresolv.tbd */, 3D4AFF6121F350820053BAA0 /* libstdc++.6.0.9.tbd */, 3D4AFF5E21F34E1C0053BAA0 /* libstdc++.6.tbd */, @@ -12085,11 +11890,11 @@ 88F5ECA41D48C9C400CC7CAF /* ThirdPartUnity */ = { isa = PBXGroup; children = ( + CB484E2022B8CF9A0075F050 /* AlibcTradeSDK-3.1.1.96 */, 88C49B491EA6270B002BA5A8 /* Bugly-v2.4.7 */, 88C6860D1EA60A40004CDFD9 /* TalkingDataV2.2.88 */, 88C685C81EA603A8004CDFD9 /* UMSocial */, 883E7BC81EA5FA1A00ED5D89 /* SMS_SDK */, - 8872FFB51E9B300800406C1D /* AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage */, 884BF4B61D77E0CA00C8518A /* BaiLingSoundSdk */, 88F5ECBD1D48CA2800CC7CAF /* ESPTouch */, 88F5ECE51D48CA2800CC7CAF /* UMCommunity */, @@ -12174,6 +11979,7 @@ 88F5EEE81D48D04100CC7CAF /* libs */ = { isa = PBXGroup; children = ( + CB484CE822B76DEC0075F050 /* GWP2PSDK */, CB7D6AEA2296A1870014E5C7 /* AliPush */, CB7D6A9722953BEB0014E5C7 /* YYCache */, CB0F4E7A22951A130091C76D /* SVProgressHUD */, @@ -12358,8 +12164,8 @@ 88F5EF5D1D48D08100CC7CAF /* Reachability */ = { isa = PBXGroup; children = ( - 88F5EF5E1D48D08100CC7CAF /* Reachability.h */, - 88F5EF5F1D48D08100CC7CAF /* Reachability.m */, + CB484CFD22B8B0D30075F050 /* Reachability.h */, + CB484CFE22B8B0D30075F050 /* Reachability.m */, ); path = Reachability; sourceTree = ""; @@ -12388,6 +12194,218 @@ path = SVProgressHUD/SVProgressHUD; sourceTree = ""; }; + CB484CE822B76DEC0075F050 /* GWP2PSDK */ = { + isa = PBXGroup; + children = ( + CB484E4B22B8D2990075F050 /* GWP2P.framework */, + CB484E4C22B8D29C0075F050 /* SDK使用说明 */, + ); + path = GWP2PSDK; + sourceTree = ""; + }; + CB484CF422B8B0AC0075F050 /* GCD */ = { + isa = PBXGroup; + children = ( + CB484CF522B8B0AC0075F050 /* GCDAsyncUdpSocket.m */, + CB484CF622B8B0AC0075F050 /* GCDAsyncSocket.m */, + CB484CF722B8B0AC0075F050 /* GCDAsyncUdpSocket.h */, + CB484CF822B8B0AC0075F050 /* GCDAsyncSocket.h */, + ); + path = GCD; + sourceTree = ""; + }; + CB484D8622B8C8C80075F050 /* IfishYsooseeNewLib */ = { + isa = PBXGroup; + children = ( + CB484D8722B8C8C80075F050 /* wifi */, + CB484D8A22B8C8C80075F050 /* md5 */, + CB484D8D22B8C8C80075F050 /* rtsp */, + CB484DD522B8C8C80075F050 /* libAVCtrlIOS */, + ); + path = IfishYsooseeNewLib; + sourceTree = ""; + }; + CB484D8722B8C8C80075F050 /* wifi */ = { + isa = PBXGroup; + children = ( + CB484D8822B8C8C80075F050 /* libelian.a */, + CB484D8922B8C8C80075F050 /* elian.h */, + ); + path = wifi; + sourceTree = ""; + }; + CB484D8A22B8C8C80075F050 /* md5 */ = { + isa = PBXGroup; + children = ( + ); + path = md5; + sourceTree = ""; + }; + CB484D8D22B8C8C80075F050 /* rtsp */ = { + isa = PBXGroup; + children = ( + CB484D8E22B8C8C80075F050 /* Rtsp_instance.h */, + CB484D8F22B8C8C80075F050 /* ffmpeg */, + CB484DD022B8C8C80075F050 /* FfmpegInterface.h */, + CB484DD122B8C8C80075F050 /* RtspInterface.mm */, + CB484DD222B8C8C80075F050 /* RtspInterface.h */, + CB484DD322B8C8C80075F050 /* libRTSP.a */, + CB484DD422B8C8C80075F050 /* FfmpegInterface.m */, + ); + path = rtsp; + sourceTree = ""; + }; + CB484D8F22B8C8C80075F050 /* ffmpeg */ = { + isa = PBXGroup; + children = ( + CB484D9022B8C8C80075F050 /* libavutil */, + CB484DBF22B8C8C80075F050 /* libavformat */, + CB484DC322B8C8C80075F050 /* libswscale */, + CB484DC622B8C8C80075F050 /* libavcodec */, + ); + path = ffmpeg; + sourceTree = ""; + }; + CB484D9022B8C8C80075F050 /* libavutil */ = { + isa = PBXGroup; + children = ( + CB484D9122B8C8C80075F050 /* intfloat.h */, + CB484D9222B8C8C80075F050 /* error.h */, + CB484D9322B8C8C80075F050 /* fifo.h */, + CB484D9422B8C8C80075F050 /* blowfish.h */, + CB484D9522B8C8C80075F050 /* version.h */, + CB484D9622B8C8C80075F050 /* samplefmt.h */, + CB484D9722B8C8C80075F050 /* pixdesc.h */, + CB484D9822B8C8C80075F050 /* base64.h */, + CB484D9922B8C8C80075F050 /* rational.h */, + CB484D9A22B8C8C80075F050 /* sha.h */, + CB484D9B22B8C8C80075F050 /* avconfig.h */, + CB484D9C22B8C8C80075F050 /* lfg.h */, + CB484D9D22B8C8C80075F050 /* avutil.h */, + CB484D9E22B8C8C80075F050 /* intfloat_readwrite.h */, + CB484D9F22B8C8C80075F050 /* xtea.h */, + CB484DA022B8C8C80075F050 /* crc.h */, + CB484DA122B8C8C80075F050 /* file.h */, + CB484DA222B8C8C80075F050 /* md5.h */, + CB484DA322B8C8C80075F050 /* audio_fifo.h */, + CB484DA422B8C8C80075F050 /* attributes.h */, + CB484DA522B8C8C80075F050 /* adler32.h */, + CB484DA622B8C8C80075F050 /* ffmpegtime.h */, + CB484DA722B8C8C80075F050 /* timecode.h */, + CB484DA822B8C8C80075F050 /* common.h */, + CB484DA922B8C8C80075F050 /* hmac.h */, + CB484DAA22B8C8C80075F050 /* eval.h */, + CB484DAB22B8C8C80075F050 /* dict.h */, + CB484DAC22B8C8C80075F050 /* random_seed.h */, + CB484DAD22B8C8C80075F050 /* opt.h */, + CB484DAE22B8C8C80075F050 /* log.h */, + CB484DAF22B8C8C80075F050 /* aes.h */, + CB484DB022B8C8C80075F050 /* bswap.h */, + CB484DB122B8C8C80075F050 /* old_pix_fmts.h */, + CB484DB222B8C8C80075F050 /* cpu.h */, + CB484DB322B8C8C80075F050 /* audioconvert.h */, + CB484DB422B8C8C80075F050 /* channel_layout.h */, + CB484DB522B8C8C80075F050 /* imgutils.h */, + CB484DB622B8C8C80075F050 /* mem.h */, + CB484DB722B8C8C80075F050 /* parseutils.h */, + CB484DB822B8C8C80075F050 /* bprint.h */, + CB484DB922B8C8C80075F050 /* pixfmt.h */, + CB484DBA22B8C8C80075F050 /* timestamp.h */, + CB484DBB22B8C8C80075F050 /* avassert.h */, + CB484DBC22B8C8C80075F050 /* mathematics.h */, + CB484DBD22B8C8C80075F050 /* intreadwrite.h */, + CB484DBE22B8C8C80075F050 /* avstring.h */, + ); + path = libavutil; + sourceTree = ""; + }; + CB484DBF22B8C8C80075F050 /* libavformat */ = { + isa = PBXGroup; + children = ( + CB484DC022B8C8C80075F050 /* version.h */, + CB484DC122B8C8C80075F050 /* avio.h */, + CB484DC222B8C8C80075F050 /* avformat.h */, + ); + path = libavformat; + sourceTree = ""; + }; + CB484DC322B8C8C80075F050 /* libswscale */ = { + isa = PBXGroup; + children = ( + CB484DC422B8C8C80075F050 /* version.h */, + CB484DC522B8C8C80075F050 /* swscale.h */, + ); + path = libswscale; + sourceTree = ""; + }; + CB484DC622B8C8C80075F050 /* libavcodec */ = { + isa = PBXGroup; + children = ( + CB484DC722B8C8C80075F050 /* avcodec.h */, + CB484DC822B8C8C80075F050 /* version.h */, + CB484DC922B8C8C80075F050 /* vdpau.h */, + CB484DCA22B8C8C80075F050 /* vaapi.h */, + CB484DCB22B8C8C80075F050 /* xvmc.h */, + CB484DCC22B8C8C80075F050 /* avfft.h */, + CB484DCD22B8C8C80075F050 /* vda.h */, + CB484DCE22B8C8C80075F050 /* dxva2.h */, + CB484DCF22B8C8C80075F050 /* old_codec_ids.h */, + ); + path = libavcodec; + sourceTree = ""; + }; + CB484DD522B8C8C80075F050 /* libAVCtrlIOS */ = { + isa = PBXGroup; + children = ( + CB484DD622B8C8C80075F050 /* P2PCInterface.h */, + CB484DD722B8C8C80075F050 /* libAVCtrl.a */, + ); + path = libAVCtrlIOS; + sourceTree = ""; + }; + CB484E2022B8CF9A0075F050 /* AlibcTradeSDK-3.1.1.96 */ = { + isa = PBXGroup; + children = ( + CB484E2122B8CF9A0075F050 /* Resources */, + CB484E2622B8CF9A0075F050 /* yw_1222.jpg */, + CB484E2722B8CF9A0075F050 /* Frameworks */, + ); + path = "AlibcTradeSDK-3.1.1.96"; + sourceTree = ""; + }; + CB484E2122B8CF9A0075F050 /* Resources */ = { + isa = PBXGroup; + children = ( + CB484E2222B8CF9A0075F050 /* AlibabaAuthSDK.bundle */, + CB484E2322B8CF9A0075F050 /* AlipaySDK.bundle */, + CB484E2422B8CF9A0075F050 /* ALPLinkPartnerSDK.bundle */, + CB484E2522B8CF9A0075F050 /* NBResource.bundle */, + ); + path = Resources; + sourceTree = ""; + }; + CB484E2722B8CF9A0075F050 /* Frameworks */ = { + isa = PBXGroup; + children = ( + CB484E2822B8CF9A0075F050 /* AlibabaAuthExt.framework */, + CB484E2922B8CF9A0075F050 /* AlibabaAuthSDK.framework */, + CB484E2A22B8CF9A0075F050 /* AlibcTradeSDK.framework */, + CB484E2B22B8CF9A0075F050 /* AlibcLinkPartnerSDK.framework */, + CB484E2C22B8CF9A0075F050 /* SecurityGuardSDK.framework */, + CB484E2D22B8CF9A0075F050 /* UTDID.framework */, + CB484E2E22B8CF9A0075F050 /* AlibcTradeBiz.framework */, + CB484E2F22B8CF9A0075F050 /* SGMain.framework */, + CB484E3022B8CF9A0075F050 /* AlibcTradeCommon.framework */, + CB484E3122B8CF9A0075F050 /* UTMini.framework */, + CB484E3222B8CF9A0075F050 /* OpenMtopSDK.framework */, + CB484E3322B8CF9A0075F050 /* SGNoCaptcha.framework */, + CB484E3422B8CF9A0075F050 /* AlipaySDK.framework */, + CB484E3522B8CF9A0075F050 /* SGSecurityBody.framework */, + CB484E3622B8CF9A0075F050 /* OpenMtopExt.framework */, + ); + path = Frameworks; + sourceTree = ""; + }; CB7D6A9722953BEB0014E5C7 /* YYCache */ = { isa = PBXGroup; children = ( @@ -12576,216 +12594,218 @@ FAA732D0227B2F7C0062C252 /* SetTimerModel.h in Headers */, CBA6167C228F9AB100ED380D /* MASUtilities.h in Headers */, 3D1C50F8221A9EE00096AE43 /* des2.h in Headers */, + CB484E0422B8C8C80075F050 /* bprint.h in Headers */, FAFC08232279CB5900B5A07B /* SetTimerCell.h in Headers */, - 3D1C5058221A9EDF0096AE43 /* log.h in Headers */, - 3D1C5037221A9EDE0096AE43 /* elian.h in Headers */, CB7D6AA122953BEB0014E5C7 /* YYKVStorage.h in Headers */, + CB484DE522B8C8C80075F050 /* rational.h in Headers */, + CB484DE922B8C8C80075F050 /* avutil.h in Headers */, 3D1C508C221A9EDF0096AE43 /* Utils.h in Headers */, 3D1C510C221A9EE00096AE43 /* CameraNoParyBackVideoView.h in Headers */, + CB484DEC22B8C8C80075F050 /* crc.h in Headers */, 3D1C50BE221A9EE00096AE43 /* Constants.h in Headers */, CB7D6ABC229660370014E5C7 /* IfishConnectUsViewController.h in Headers */, FA0893012275D9AB0084A609 /* XuanduoSectionHeaderView.h in Headers */, - 3D1C5046221A9EDE0096AE43 /* avconfig.h in Headers */, + CB484E1622B8C8C90075F050 /* vda.h in Headers */, 3D1C50C5221A9EE00096AE43 /* UDManager.h in Headers */, CBA6164C228F993B00ED380D /* BaseYYModel.h in Headers */, 3D1C510F221A9EE00096AE43 /* IfishP2PPlayBackListViewController.h in Headers */, - 3D1C507C221A9EDF0096AE43 /* P2PCInterface.h in Headers */, + CB484E0D22B8C8C80075F050 /* avformat.h in Headers */, + CB484E0522B8C8C80075F050 /* pixfmt.h in Headers */, 3D1C5116221A9EE00096AE43 /* KTPhotoView+SDWebImage.h in Headers */, - 3D1C5070221A9EDF0096AE43 /* vdpau.h in Headers */, 3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */, CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */, + CB484E1122B8C8C90075F050 /* version.h in Headers */, 3D1C5122221A9EE00096AE43 /* IfishRecVideoViewCell.h in Headers */, + CB484DFD22B8C8C80075F050 /* old_pix_fmts.h in Headers */, + CB484DE822B8C8C80075F050 /* lfg.h in Headers */, 3D1C5137221A9EE10096AE43 /* ifishdeviceListCell.h in Headers */, - 3D1C5038221A9EDE0096AE43 /* MD5Manager.h in Headers */, - 3D1C5079221A9EDF0096AE43 /* RtspInterface.h in Headers */, 3D1C5085221A9EDF0096AE43 /* KTPhotoBrowserGlobal.h in Headers */, 3D1C50B6221A9EDF0096AE43 /* YSlider.h in Headers */, + CB484DDC22B8C8C80075F050 /* Rtsp_instance.h in Headers */, + CB484DF722B8C8C80075F050 /* dict.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 */, + CB484CFF22B8B0D30075F050 /* Reachability.h in Headers */, + CB484E0B22B8C8C80075F050 /* version.h in Headers */, + CB484E1722B8C8C90075F050 /* dxva2.h in Headers */, + CB484DE622B8C8C80075F050 /* sha.h in Headers */, FAA732D8227C1DA80062C252 /* Xuanduo2TimerModel.h in Headers */, - 3D1C5041221A9EDE0096AE43 /* samplefmt.h in Headers */, 3D1C50DC221A9EE00096AE43 /* PAIOUnit.h in Headers */, - 3D1C5050221A9EDF0096AE43 /* adler32.h in Headers */, - 3D1C506C221A9EDF0096AE43 /* version.h in Headers */, CB7D6AA322953BEB0014E5C7 /* YYMemoryCache.h in Headers */, 3D1C50E6221A9EE00096AE43 /* ParamDao.h in Headers */, + CB484DFC22B8C8C80075F050 /* bswap.h in Headers */, 3D1C5134221A9EE10096AE43 /* YooseeNextConnectViewController.h in Headers */, + CB484DFF22B8C8C80075F050 /* audioconvert.h in Headers */, + CB484DED22B8C8C80075F050 /* file.h in Headers */, CBA61654228F9A6C00ED380D /* YYClassInfo.h in Headers */, 3D1C50BA221A9EE00096AE43 /* NetManager.h in Headers */, + CB484DF622B8C8C80075F050 /* eval.h in Headers */, 3D1C513A221A9EE10096AE43 /* FishControlFirstCell.h in Headers */, - 3D1C5060221A9EDF0096AE43 /* mem.h in Headers */, 3D1C50EC221A9EE00096AE43 /* MessageDAO.h in Headers */, + CB484DF322B8C8C80075F050 /* timecode.h in Headers */, 3D1C50E2221A9EE00096AE43 /* UDPManager.h in Headers */, - CB7D6AA9229542880014E5C7 /* ffmpegtime.h in Headers */, 3D1C509A221A9EDF0096AE43 /* ConnectFailurePromptView.h in Headers */, - 3D1C505F221A9EDF0096AE43 /* imgutils.h in Headers */, CBA6168A228F9AB100ED380D /* ViewController+MASAdditions.h in Headers */, FA0892ED226C15000084A609 /* Xuanduo2DataUtility.h in Headers */, 3D1C50B7221A9EDF0096AE43 /* YTargetAndAction.h in Headers */, - 3D1C505E221A9EDF0096AE43 /* channel_layout.h in Headers */, - 3D1C5047221A9EDE0096AE43 /* lfg.h in Headers */, 3D1C510A221A9EE00096AE43 /* PlayBaseViewController.h in Headers */, + CB484DE222B8C8C80075F050 /* samplefmt.h in Headers */, 3D1C50AA221A9EDF0096AE43 /* CyclePickerView.h in Headers */, + CB484DE322B8C8C80075F050 /* pixdesc.h in Headers */, 3D1C50B1221A9EDF0096AE43 /* YMsgBox.h in Headers */, CBA6167D228F9AB100ED380D /* MASViewAttribute.h in Headers */, 3D1C50BD221A9EE00096AE43 /* LoginResult.h in Headers */, - 3D1C504E221A9EDF0096AE43 /* audio_fifo.h in Headers */, - 3D1C5077221A9EDF0096AE43 /* FfmpegInterface.h in Headers */, CB7D6AA522953BEB0014E5C7 /* YYCache.h in Headers */, 3D1C5118221A9EE00096AE43 /* KTThumbView+SDWebImage.h in Headers */, 3D1C50D0221A9EE00096AE43 /* GetAlarmRecordResult.h in Headers */, - 3D1C5044221A9EDE0096AE43 /* rational.h in Headers */, - 3D1C5064221A9EDF0096AE43 /* timestamp.h in Headers */, 3D1C510B221A9EE00096AE43 /* IfishPlaybackViewCell.h in Headers */, 3D1C50E1221A9EE00096AE43 /* FListManager.h in Headers */, - 3D1C5048221A9EDE0096AE43 /* avutil.h in Headers */, - 3D1C5072221A9EDF0096AE43 /* xvmc.h in Headers */, + CB484DEF22B8C8C80075F050 /* audio_fifo.h in Headers */, CBA61674228F9AB100ED380D /* MASCompositeConstraint.h in Headers */, - 3D1C503A221A9EDE0096AE43 /* Rtsp_instance.h in Headers */, 3D1C50CE221A9EE00096AE43 /* CustomTopBar.h in Headers */, - 3D1C5063221A9EDF0096AE43 /* pixfmt.h in Headers */, + CB484E0A22B8C8C80075F050 /* avstring.h in Headers */, 3D1C50DD221A9EE00096AE43 /* RecommendInfoDAO.h in Headers */, - 3D1C5055221A9EDF0096AE43 /* dict.h in Headers */, CB0F4E8722951A130091C76D /* SVIndefiniteAnimatedView.h in Headers */, 3D1C5090221A9EDF0096AE43 /* AccountResult.h in Headers */, + CB484E1822B8C8C90075F050 /* old_codec_ids.h in Headers */, + CB484CFC22B8B0AC0075F050 /* GCDAsyncSocket.h in Headers */, CB7D6AB922954FB90014E5C7 /* FuncUserDefault.h in Headers */, 3D1C50C9221A9EE00096AE43 /* ContactDAO.h in Headers */, - 3D1C503D221A9EDE0096AE43 /* error.h in Headers */, + CB484D8522B8BE830075F050 /* P2PClient.h in Headers */, CB7D6AA422953BEB0014E5C7 /* YYDiskCache.h in Headers */, - 3D1C506D221A9EDF0096AE43 /* swscale.h in Headers */, + CB484DF222B8C8C80075F050 /* ffmpegtime.h in Headers */, 3D1C50C0221A9EE00096AE43 /* Contact.h in Headers */, + CB484DF922B8C8C80075F050 /* opt.h in Headers */, FA0892F1226CA3920084A609 /* NSString+Add.h in Headers */, + CB484E0722B8C8C80075F050 /* avassert.h in Headers */, + CB484DDE22B8C8C80075F050 /* error.h in Headers */, 3D1C5100221A9EE00096AE43 /* IfishCameraModel.h in Headers */, - 3D1C505D221A9EDF0096AE43 /* audioconvert.h in Headers */, 3D1C508D221A9EDF0096AE43 /* CustomBorderButton.h in Headers */, 3D1C50AC221A9EDF0096AE43 /* CustomView.h in Headers */, 3D1C50B4221A9EDF0096AE43 /* YTheNaviBar.h in Headers */, 3D1C5121221A9EE00096AE43 /* CameraBottomCollectionViewCell.h in Headers */, - 3D1C50BC221A9EE00096AE43 /* P2PClient.h in Headers */, + CB484E1222B8C8C90075F050 /* vdpau.h in Headers */, FA0892E9226B22C90084A609 /* Xuanduo2Model.h in Headers */, 3D1C5115221A9EE00096AE43 /* ShotScreenImgViewController.h in Headers */, - 3D1C506F221A9EDF0096AE43 /* version.h in Headers */, 3D1C5083221A9EDF0096AE43 /* KTThumbsViewController.h in Headers */, - 3D1C5040221A9EDE0096AE43 /* version.h in Headers */, 3D1C50AF221A9EDF0096AE43 /* YFonc.h in Headers */, + CB484E0222B8C8C80075F050 /* mem.h in Headers */, + CB484DD922B8C8C80075F050 /* elian.h in Headers */, CBA615FC228E8E5A00ED380D /* MyMessageViewController.h in Headers */, + CB484E1522B8C8C90075F050 /* avfft.h in Headers */, + CB484E0022B8C8C80075F050 /* channel_layout.h in Headers */, 3D1C512B221A9EE10096AE43 /* IfishCameraRecordfirstCell.h in Headers */, 402591952238D91400CE4900 /* UINavigationController+Config.h in Headers */, + CB484DDF22B8C8C80075F050 /* fifo.h in Headers */, 3D1C5124221A9EE00096AE43 /* IfishCameraRecordThirdCell.h in Headers */, - 3D1C5045221A9EDE0096AE43 /* sha.h in Headers */, + CB484DFA22B8C8C80075F050 /* log.h in Headers */, FA0893152275F7CF0084A609 /* XuanduoSelectHeader.h in Headers */, - 3D1C5057221A9EDF0096AE43 /* opt.h in Headers */, 3D1C50D1221A9EE00096AE43 /* SVPullToRefresh.h in Headers */, - 3D1C5071221A9EDF0096AE43 /* vaapi.h in Headers */, - 3D1C504D221A9EDF0096AE43 /* md5.h in Headers */, CB7D6AB022954DE20014E5C7 /* CommonUtils.h in Headers */, 3D1C513C221A9EE10096AE43 /* FishControlFourthCell.h in Headers */, - 3D1C506A221A9EDF0096AE43 /* avio.h in Headers */, 3D1C5086221A9EDF0096AE43 /* KTThumbView.h in Headers */, 3D1C50E5221A9EE00096AE43 /* ShakeManager.h in Headers */, 3D1C5088221A9EDF0096AE43 /* KTThumbsView.h in Headers */, 3D1C513F221A9EE10096AE43 /* FishControlThreedViewCell.h in Headers */, - 3D1C5062221A9EDF0096AE43 /* bprint.h in Headers */, - 3D1C505C221A9EDF0096AE43 /* cpu.h in Headers */, FA0892F52270BED00084A609 /* XuanduoHuliModel.h in Headers */, - 3D1C5051221A9EDF0096AE43 /* timecode.h in Headers */, 3D1C50C7221A9EE00096AE43 /* LocalDevice.h in Headers */, 3D1C50A0221A9EDF0096AE43 /* TouchButton.h in Headers */, 3D1C50F2221A9EE00096AE43 /* mesg.h in Headers */, CBA6169922924F1E00ED380D /* MessageAlertView.h in Headers */, - 3D1C5049221A9EDE0096AE43 /* intfloat_readwrite.h in Headers */, + CB484E0C22B8C8C80075F050 /* avio.h in Headers */, 3D1C507F221A9EDF0096AE43 /* KTPhotoBrowserDataSource.h in Headers */, 3D1C50E9221A9EE00096AE43 /* AlarmDAO.h in Headers */, - 3D1C504C221A9EDF0096AE43 /* file.h in Headers */, CBA61658228F9A6C00ED380D /* NSObject+YYModel.h in Headers */, 3D1C50C4221A9EE00096AE43 /* OBGradientView.h in Headers */, 3D1C509D221A9EDF0096AE43 /* GetContactMessageResult.h in Headers */, CBA61681228F9AB100ED380D /* NSLayoutConstraint+MASDebugAdditions.h in Headers */, - 3D1C504A221A9EDE0096AE43 /* xtea.h in Headers */, 3D1C5109221A9EE00096AE43 /* P2PPlaybackController.h in Headers */, + CB484DE422B8C8C80075F050 /* base64.h in Headers */, + CB484E1922B8C8C90075F050 /* FfmpegInterface.h in Headers */, 3D1C50B9221A9EDF0096AE43 /* CheckNewMessageResult.h in Headers */, - 3D1C5052221A9EDF0096AE43 /* common.h in Headers */, CBA61678228F9AB100ED380D /* NSArray+MASShorthandAdditions.h in Headers */, 3D1C5095221A9EDF0096AE43 /* Alarm.h in Headers */, - 3D1C506E221A9EDF0096AE43 /* avcodec.h in Headers */, 3D1C5145221A9EE10096AE43 /* BootomViewSoketBackMasgConreol.h in Headers */, 3D1C5146221A9EE10096AE43 /* FishTankBootmDataHelper.h in Headers */, - 3D1C506B221A9EDF0096AE43 /* avformat.h in Headers */, + CB484DF522B8C8C80075F050 /* hmac.h in Headers */, + CB484E0922B8C8C80075F050 /* intreadwrite.h in Headers */, + CB484E0122B8C8C80075F050 /* imgutils.h in Headers */, 3D1C50A2221A9EDF0096AE43 /* UIViewExt.h in Headers */, CB7D6AE822969F090014E5C7 /* AppDelegate+AliPushConfig.h in Headers */, + CB484E1422B8C8C90075F050 /* xvmc.h in Headers */, 3D1C50E8221A9EE00096AE43 /* Message.h in Headers */, 3D1C5101221A9EE00096AE43 /* IfishP2PMonitorController.h in Headers */, 3D1C50F5221A9EE00096AE43 /* CameraManager.h in Headers */, - 3D1C5061221A9EDF0096AE43 /* parseutils.h in Headers */, - 3D1C5056221A9EDF0096AE43 /* random_seed.h in Headers */, + CB484DF422B8C8C80075F050 /* common.h in Headers */, 3D1C50A3221A9EDF0096AE43 /* WaitingPageView.h in Headers */, - 3D1C505B221A9EDF0096AE43 /* old_pix_fmts.h in Headers */, - 3D1C505A221A9EDF0096AE43 /* bswap.h in Headers */, - 3D1C5069221A9EDF0096AE43 /* version.h in Headers */, + CB484DEB22B8C8C80075F050 /* xtea.h in Headers */, + CB484DE022B8C8C80075F050 /* blowfish.h in Headers */, CB7D6AB522954E090014E5C7 /* UIColor+HexString.h in Headers */, - 3D1C504F221A9EDF0096AE43 /* attributes.h in Headers */, + CB484DE122B8C8C80075F050 /* version.h in Headers */, + CB484DDD22B8C8C80075F050 /* intfloat.h in Headers */, CBA61677228F9AB100ED380D /* MASLayoutConstraint.h in Headers */, - 3D1C503C221A9EDE0096AE43 /* intfloat.h in Headers */, - 3D1C5042221A9EDE0096AE43 /* pixdesc.h in Headers */, 3D1C50C6221A9EE00096AE43 /* TabView.h in Headers */, - 3D1C5073221A9EDF0096AE43 /* avfft.h in Headers */, + CB484DE722B8C8C80075F050 /* avconfig.h in Headers */, CBA61687228F9AB100ED380D /* View+MASShorthandAdditions.h in Headers */, 3D1C50A7221A9EDF0096AE43 /* MXSCycleScrollView3.h in Headers */, - 3D1C5067221A9EDF0096AE43 /* intreadwrite.h in Headers */, 3D1C50F0221A9EE00096AE43 /* RecommendInfo.h in Headers */, 3D1C509C221A9EDF0096AE43 /* ModifyLoginPasswordResult.h in Headers */, CBA61680228F9AB100ED380D /* MASConstraint.h in Headers */, + CB484E0622B8C8C80075F050 /* timestamp.h in Headers */, 3D1C512E221A9EE10096AE43 /* CameraBottomHView.h in Headers */, + CB484E0E22B8C8C80075F050 /* version.h in Headers */, 3D1C50E4221A9EE00096AE43 /* config.h in Headers */, 3D1C5104221A9EE00096AE43 /* YooseConnectFirstViewController.h in Headers */, - 3D1C503F221A9EDE0096AE43 /* blowfish.h in Headers */, + CB484E1E22B8C8C90075F050 /* P2PCInterface.h in Headers */, 3D1C5127221A9EE00096AE43 /* IfishCameraRecordSecondCell.h in Headers */, + CB484CFB22B8B0AC0075F050 /* GCDAsyncUdpSocket.h in Headers */, 3D1C50D9221A9EE00096AE43 /* CheckAlarmMessageResult.h in Headers */, 3D1C50E0221A9EE00096AE43 /* ShapeRenderNotifyMsg.h in Headers */, 3D1C5125221A9EE00096AE43 /* IfishCameraRecordFourCell.h in Headers */, - 3D1C503E221A9EDE0096AE43 /* fifo.h in Headers */, - 3D1C5075221A9EDF0096AE43 /* dxva2.h in Headers */, + CB484DEA22B8C8C80075F050 /* intfloat_readwrite.h in Headers */, 3D1C5139221A9EE10096AE43 /* FishControlSecondCell.h in Headers */, 3D1C50B2221A9EDF0096AE43 /* FounderButton.h in Headers */, 3D1C509F221A9EDF0096AE43 /* YProgressView.h in Headers */, + CB484E0822B8C8C80075F050 /* mathematics.h in Headers */, + CB484E0F22B8C8C80075F050 /* swscale.h in Headers */, CBA616AB22928BCF00ED380D /* UIButton+button.h in Headers */, - 3D1C5076221A9EDF0096AE43 /* old_codec_ids.h in Headers */, - 3D1C5068221A9EDF0096AE43 /* avstring.h in Headers */, 3D1C5144221A9EE10096AE43 /* MonitorBootmView.h in Headers */, 3D1C50D3221A9EE00096AE43 /* UIScrollView+SVInfiniteScrolling.h in Headers */, CBA61655228F9A6C00ED380D /* YYModel.h in Headers */, + CB484DFE22B8C8C80075F050 /* cpu.h in Headers */, 3D1C5089221A9EDF0096AE43 /* KTPhotoView.h in Headers */, + CB484DFB22B8C8C80075F050 /* aes.h in Headers */, + CB484E1022B8C8C90075F050 /* avcodec.h in Headers */, CB0F4E8822951A130091C76D /* SVProgressHUD.h in Headers */, - 3D1C5074221A9EDF0096AE43 /* vda.h in Headers */, - 3D1C5066221A9EDF0096AE43 /* mathematics.h in Headers */, 3D1C511B221A9EE00096AE43 /* ShootImgDataSource.h in Headers */, 3D1C50FE221A9EE00096AE43 /* Toast+UIView.h in Headers */, 3D1C5132221A9EE10096AE43 /* CameraRecordViewController.h in Headers */, + CB484DF122B8C8C80075F050 /* adler32.h in Headers */, 3D1C50A9221A9EDF0096AE43 /* MXSCycleScrollView.h in Headers */, + CB484E0322B8C8C80075F050 /* parseutils.h in Headers */, + CB484DF822B8C8C80075F050 /* random_seed.h in Headers */, CBA6167B228F9AB100ED380D /* NSArray+MASAdditions.h in Headers */, CBA61688228F9AB100ED380D /* Masonry.h in Headers */, 3D1C50FB221A9EE00096AE43 /* ProgressImageView.h in Headers */, + CB484E1B22B8C8C90075F050 /* RtspInterface.h in Headers */, + CB484DEE22B8C8C80075F050 /* md5.h in Headers */, FAA732D4227BE2B80062C252 /* ReadTimerModel.h in Headers */, - 3D1C5054221A9EDF0096AE43 /* eval.h in Headers */, CBA61676228F9AB100ED380D /* MASConstraint+Private.h in Headers */, + CB484DF022B8C8C80075F050 /* attributes.h in Headers */, 3D1C508B221A9EDF0096AE43 /* KTPhotoScrollViewController.h in Headers */, - 3D1C5059221A9EDF0096AE43 /* aes.h in Headers */, 3D1C50DB221A9EE00096AE43 /* YAudioStreamPlayer.h in Headers */, 3D1C50E3221A9EE00096AE43 /* OpenGLView.h in Headers */, CBA61679228F9AB100ED380D /* MASConstraintMaker.h in Headers */, 3D1C5105221A9EE00096AE43 /* YooseeCenterViewController.h in Headers */, 3D1C5108221A9EE00096AE43 /* P2PPlayingbackVC.h in Headers */, - 3D1C5053221A9EDF0096AE43 /* hmac.h in Headers */, 3D1C50AD221A9EDF0096AE43 /* FXBlurView.h in Headers */, - 3D1C5043221A9EDE0096AE43 /* base64.h in Headers */, CB0F4E8A22951A130091C76D /* SVRadialGradientLayer.h in Headers */, - 3D1C504B221A9EDF0096AE43 /* crc.h in Headers */, 404D7CEB2238CF77005655F5 /* UIViewController+Swizzling.h in Headers */, CB0F4E8E22951A130091C76D /* SVProgressAnimatedView.h in Headers */, FA0892FD2275A1B30084A609 /* Xuanduo2SettingController.h in Headers */, - 3D1C5065221A9EDF0096AE43 /* avassert.h in Headers */, FAB3721122619DB70051E107 /* Xuanduo2fController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -12802,6 +12822,7 @@ 8876A5801BB83447007A4B54 /* Frameworks */, 8876A5811BB83447007A4B54 /* Resources */, 885EC4DE1DB9DD62008134DA /* ShellScript */, + CB484D0322B8B3540075F050 /* Embed Frameworks */, ); buildRules = ( ); @@ -13025,6 +13046,7 @@ 882955DA1DBDA3A100E9DDD7 /* blac@3x.png in Resources */, 885FBDE51E4C3DE400E0D7D1 /* ShopNotCertifyViewCell.xib in Resources */, 8867F5D61E656F9100AF021C /* rank_iocn_mark@2x.png in Resources */, + CB484E3722B8CF9B0075F050 /* AlibabaAuthSDK.bundle in Resources */, 8829576B1DBDA3A400E9DDD7 /* Switch-Off.png in Resources */, 886F4DF21D753858001EDA34 /* Report2ViewCell.xib in Resources */, 882957711DBDA3A400E9DDD7 /* connect_tank@2x.png in Resources */, @@ -13120,6 +13142,7 @@ 882956231DBDA3A100E9DDD7 /* neves0038.png in Resources */, 882956DA1DBDA3A300E9DDD7 /* ifish_jieBang_device@3x.png in Resources */, 8815D1E61E02662500BEA2DA /* FullPlay_Play_down.png in Resources */, + CB484E3B22B8CF9B0075F050 /* yw_1222.jpg in Resources */, 8867F5B51E654DFD00AF021C /* DengJiView0Cell.xib in Resources */, 88C685F51EA603A8004CDFD9 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, 883517FF1E6664D200FCBE56 /* fishrank_tortoise@2x.png in Resources */, @@ -13290,7 +13313,6 @@ 881672311EA5DE2B00BEBF23 /* UMComFeedDetailTableViewCell.xib in Resources */, 882956EC1DBDA3A300E9DDD7 /* leftBlack.png in Resources */, 882956361DBDA3A200E9DDD7 /* neves0057.png in Resources */, - 8872FFDD1E9B300800406C1D /* NBResource.bundle in Resources */, 8867F5D21E656F9100AF021C /* rank_iocn_explain.png in Resources */, 8876A5931BB83447007A4B54 /* Assets.xcassets in Resources */, 882957B41DBDD6AC00E9DDD7 /* password.png in Resources */, @@ -13385,6 +13407,7 @@ 882956091DBDA3A100E9DDD7 /* neves0012.png in Resources */, 882956B81DBDA3A200E9DDD7 /* scan_left@3x.png in Resources */, 882958171DC04ED200E9DDD7 /* equipment_longpoint.png in Resources */, + CB484E4E22B8D29C0075F050 /* SDK使用说明 in Resources */, 882957431DBDA3A300E9DDD7 /* swimmingfish0050.png in Resources */, 88D3372C1DC71EB5006C0ADB /* linkingdevice_line@2x.png in Resources */, 882956E21DBDA3A300E9DDD7 /* bg2.png in Resources */, @@ -13427,7 +13450,6 @@ 8868FE5C1E66C8D7002F7F33 /* DengJiShuoMingViewBootomCell.xib in Resources */, 885E6FBE1E2F112200D4CE13 /* businesslistings_comments.png in Resources */, 8849EFB91EB883840096CAD7 /* enter_logo.png in Resources */, - 8872FFDC1E9B300800406C1D /* ALPLinkPartnerSDK.bundle in Resources */, 8832837B1EAF362600A47157 /* exploregold_coast@3x.png in Resources */, 885FBDEA1E4C3E1000E0D7D1 /* ShopAlreadyCertifyViewCell.xib in Resources */, 883283971EAF4BF800A47157 /* explore_iocn_messages.png in Resources */, @@ -13520,6 +13542,7 @@ 8856B0711DE83016009D384A /* live_upload_banner.png in Resources */, 8829578E1DBDA3A400E9DDD7 /* xutobtn1_on@1x.png in Resources */, 88C1B1E91DC9AF3700C2C99A /* home_iocn_camera@3x.png in Resources */, + CB484E3922B8CF9B0075F050 /* ALPLinkPartnerSDK.bundle in Resources */, 8829573A1DBDA3A300E9DDD7 /* swimmingfish0041.png in Resources */, 882957911DBDA3A400E9DDD7 /* xutobtn2_off@1x.png in Resources */, 882955EF1DBDA3A100E9DDD7 /* lightopen.png in Resources */, @@ -13557,6 +13580,7 @@ FA0893042275D9C60084A609 /* XuanduoSectionHeaderView.xib in Resources */, 882957C11DBDF3C700E9DDD7 /* registered_icon_tick_selected.png in Resources */, 882956A91DBDA3A200E9DDD7 /* fish_left@2x.png in Resources */, + CB484E3822B8CF9B0075F050 /* AlipaySDK.bundle in Resources */, 882956611DBDA3A200E9DDD7 /* lookafter_title.png in Resources */, 882956D01DBDA3A300E9DDD7 /* ifish_dropview_add@2x.png in Resources */, 887492461E7A90D000CDA284 /* fishdoctor_iocn_price@3x.png in Resources */, @@ -13653,7 +13677,6 @@ 882957221DBDA3A300E9DDD7 /* swimmingfish0017.png in Resources */, 881869311D6EECDA00CE9DFF /* shopNoCumtomerViewCell.xib in Resources */, 885FBDC61E4C0CB400E0D7D1 /* explore_iocn_authentication@3x.png in Resources */, - 8872FFDA1E9B300800406C1D /* AlibabaAuthSDK.bundle in Resources */, 882957061DBDA3A300E9DDD7 /* PFPump_off.png in Resources */, 883E78801D48A5E50030E075 /* AboutUsViewController.xib in Resources */, 887492061E7A378E00CDA284 /* degJiGuize.json in Resources */, @@ -13756,7 +13779,6 @@ 88D3372B1DC71EB5006C0ADB /* linkingdevice_line.png in Resources */, 882955F71DBDA3A100E9DDD7 /* Retina4.7.png in Resources */, 882955E11DBDA3A100E9DDD7 /* fish_a.png in Resources */, - 8872FFDB1E9B300800406C1D /* AlipaySDK.bundle in Resources */, 882955FC1DBDA3A100E9DDD7 /* set_a.png in Resources */, 8871FADC1EBC58D70038E99A /* attestation_laststep_button.png in Resources */, 8815D1E11E02662500BEA2DA /* FullPlay_NO_Silence.png in Resources */, @@ -13935,7 +13957,6 @@ 882957241DBDA3A300E9DDD7 /* swimmingfish0019.png in Resources */, 8829572C1DBDA3A300E9DDD7 /* swimmingfish0027.png in Resources */, 883E79A41D48B0280030E075 /* shopNameCell.xib in Resources */, - 886970021E9DD86E005D4AFB /* yw_1222.jpg in Resources */, 882957341DBDA3A300E9DDD7 /* swimmingfish0035.png in Resources */, 886484201EE166A40046C3BD /* RuSunChangeNameTextViewCell.xib in Resources */, 883283461EAEE60500A47157 /* ifish_look_off@2x.png in Resources */, @@ -14109,6 +14130,7 @@ 883E79C11D48B0280030E075 /* GuiDengViewCell.xib in Resources */, 882956001DBDA3A100E9DDD7 /* neves0003.png in Resources */, 882956B11DBDA3A200E9DDD7 /* refer_book@2x.png in Resources */, + CB484E3A22B8CF9B0075F050 /* NBResource.bundle in Resources */, 88768EAF1ED6C6D800545E23 /* ShopGoodsCollectionCell.xib in Resources */, CBA6169522924E5A00ED380D /* message_delete@3x.png in Resources */, 886EAC631E2DE91300A4DF27 /* KanHuFirstSectionViewCell.xib in Resources */, @@ -14267,7 +14289,6 @@ 883E76431D4897570030E075 /* TwoControlBackmsgmodel.m in Sources */, 3D3512DB2159C172009DDB0F /* IfishHotBarModifyNameVc.m in Sources */, 3D1C50A6221A9EDF0096AE43 /* MXSCycleScrollView.m in Sources */, - 3D1C5078221A9EDF0096AE43 /* RtspInterface.mm in Sources */, 886FB1A61E5A9DA700256332 /* FishDocSection0ViewlablCell.m in Sources */, 3D1C17472171BB0700A159A8 /* PNScatterChartDataItem.m in Sources */, 883E78721D48A5E50030E075 /* rightDeviceCollectionViewCell.m in Sources */, @@ -14284,6 +14305,7 @@ 88602DBE1E10D97E00F3DB5D /* UIImageView+WebCache.m in Sources */, 883E78561D48A5E50030E075 /* IfishBlackListCenterViewController.m in Sources */, 3D8F64F0215797E700F04BD3 /* IQTitleBarButtonItem.m in Sources */, + CB484E1A22B8C8C90075F050 /* RtspInterface.mm in Sources */, 883A3D181EC44EF300DA84FF /* IfishUsersActivityListController.m in Sources */, 883E78EB1D48A5E50030E075 /* ConnectErrorViewController.m in Sources */, 883E793F1D48ACFF0030E075 /* IfishDataUnity.m in Sources */, @@ -14391,9 +14413,9 @@ 886D15831E605EEF0085F7D6 /* CustomeLabel.m in Sources */, E51D7D55208CE08D001FF053 /* CustomModeSetCell.m in Sources */, 883E78531D48A5E50030E075 /* TwoControlNinetyninebiteViewController.m in Sources */, + CB484CFA22B8B0AC0075F050 /* GCDAsyncSocket.m in Sources */, 3D1C513B221A9EE10096AE43 /* FishControlThreedViewCell.m in Sources */, 3D1C50CD221A9EE00096AE43 /* MPNotificationView.m in Sources */, - 88F5EFDA1D48D08100CC7CAF /* Reachability.m in Sources */, 88F5EFC51D48D08100CC7CAF /* JHRefreshCommonAniView.m in Sources */, 3D1C50CA221A9EE00096AE43 /* GetContactMessageResult.m in Sources */, 887491F91E795E9400CDA284 /* IfishTaskRuletype.m in Sources */, @@ -14534,9 +14556,7 @@ 886185D61EF26F6C00459AD1 /* HaveHotCoolWenDuPicview.m in Sources */, 88673AFC1E1E57CB001D5F49 /* RuSunGuiDeng.m in Sources */, 883E788B1D48A5E50030E075 /* infoSureBtnCell.m in Sources */, - 883E78F51D48A5E50030E075 /* SelectDeviceViewController.m in Sources */, 88C1B1FB1DCB6E8700C2C99A /* IfishNewsModel.m in Sources */, - 882957FE1DC0443700E9DDD7 /* IfishSelectCardViewController.m in Sources */, 88673B041E1F6A4F001D5F49 /* SongNuoBDProtocol.m in Sources */, CB0F4E8622951A130091C76D /* SVRadialGradientLayer.m in Sources */, 3D1C5114221A9EE00096AE43 /* KTThumbView+SDWebImage.m in Sources */, @@ -14708,12 +14728,14 @@ 3D1C50DA221A9EE00096AE43 /* RecommendInfo.m in Sources */, 883E79B21D48B0280030E075 /* MerchantCell.m in Sources */, 883E76421D4897570030E075 /* TimerSateModel.m in Sources */, + CB484CF922B8B0AC0075F050 /* GCDAsyncUdpSocket.m in Sources */, 881869341D6FDD3B00CE9DFF /* ShopKanHuP2PViewController.m in Sources */, 3D8F64B52157522100F04BD3 /* NSObject+MJCoding.m in Sources */, CBA6168C228F9AB100ED380D /* MASViewAttribute.m in Sources */, 88602DB91E10D97E00F3DB5D /* UIButton+WebCache.m in Sources */, 883E762F1D4897570030E075 /* TemperatureSetModel.m in Sources */, 886B806A1D630BCE00E1B9B3 /* ShopCertificationIntroduceController.m in Sources */, + CB484D8422B8BE830075F050 /* P2PClient.m in Sources */, 885979FD1E5424EA003D0E5C /* UITextField+KeyBordDoneView.m in Sources */, 88696FB21E9C6915005D4AFB /* MemberManageViewController.m in Sources */, 88F5EFB21D48D08100CC7CAF /* AFNetworkActivityIndicatorManager.m in Sources */, @@ -14790,11 +14812,11 @@ 8864841A1EE166820046C3BD /* RuSunChangeNameTitleViewCell.m in Sources */, 88883B1C1EF0DAA500CAC0AE /* SongNuo86Name.m in Sources */, 88696FC51E9C81F2005D4AFB /* ShopMemberDetailViewInfoCell.m in Sources */, - 3DD7AB9C21E474940064856A /* GCDAsyncSocket.m in Sources */, 3D1C50D8221A9EE00096AE43 /* FXBlurView.m in Sources */, 883E76211D4897570030E075 /* BrandModel.m in Sources */, 881671C11EA5DE2B00BEBF23 /* UMComNavigationController.m in Sources */, 88380DB61EB1DA7B00FC7C0D /* ShopGoodsManageViewController.m in Sources */, + CB484D0022B8B0D30075F050 /* Reachability.m in Sources */, 887C36281EE63F6000964ACD /* XWCountryCodeController.m in Sources */, 883E786E1D48A5E50030E075 /* infoCollectionViewCell.m in Sources */, 881671C61EA5DE2B00BEBF23 /* UMComDiscoverViewController.m in Sources */, @@ -14860,7 +14882,6 @@ 88F5EE521D48CA2800CC7CAF /* ESPTouchTaskParameter.m in Sources */, 8871FB0C1EBC7EC90038E99A /* IfishBindDeviceSelectViewController.m in Sources */, 8876A58E1BB83447007A4B54 /* ViewController.m in Sources */, - 3D1C5092221A9EDF0096AE43 /* P2PClient.m in Sources */, 8891330B1ECE999A00F52EBC /* IfishVideoModel.m in Sources */, 880707581DDD76480076F65A /* P2PShareViewBootomView.m in Sources */, 8835180C1E66916400FCBE56 /* UIControl+YT.m in Sources */, @@ -14906,6 +14927,7 @@ 88F5EFB51D48D08100CC7CAF /* UIButton+AFNetworking.m in Sources */, 883E78611D48A5E50030E075 /* PuasiphysicalSkinViewController.m in Sources */, 8807074F1DDD42E60076F65A /* P2PShareViewTh3Cell.m in Sources */, + CB484E1D22B8C8C90075F050 /* FfmpegInterface.m in Sources */, 883E76411D4897570030E075 /* ThreeControlBackbackmsgModel.m in Sources */, 886484161EE165ED0046C3BD /* RunSunChangeNameViewController.m in Sources */, 88602DB01E10D97E00F3DB5D /* MKAnnotationView+WebCache.m in Sources */, @@ -15004,7 +15026,6 @@ 886F4DF11D753858001EDA34 /* Report2ViewCell.m in Sources */, 881671EB1EA5DE2B00BEBF23 /* UMComCommentEditView.m in Sources */, 886F4DE71D75166C001EDA34 /* LookAfterReportViewController.m in Sources */, - 3DD7AB9B21E474940064856A /* GCDAsyncUdpSocket.m in Sources */, 3D8F64C72157820700F04BD3 /* IfishHotBarPackegeVo.m in Sources */, 885622471EE4F88C00B55C70 /* RunSunCHControl.m in Sources */, 881671B51EA5DE2B00BEBF23 /* UMComLoginHandler.m in Sources */, @@ -15133,7 +15154,6 @@ 883E78F61D48A5E50030E075 /* SetViewController.m in Sources */, 8876A5881BB83447007A4B54 /* main.m in Sources */, 88602DB21E10D97E00F3DB5D /* SDImageCache.m in Sources */, - 3D1C507B221A9EDF0096AE43 /* FfmpegInterface.m in Sources */, 889133071ECE999A00F52EBC /* LXCompressionVideo.m in Sources */, 886E3A0B1EEA44B5007C0B04 /* UserExtendataArchaver.m in Sources */, 881F0F4F1D73DF4E0091507E /* BaoGaoViewFirstCell.m in Sources */, @@ -15378,24 +15398,19 @@ "$(PROJECT_DIR)/Ifish/", "$(PROJECT_DIR)/Ifish/", "$(PROJECT_DIR)/Ifish/SMS_SDK", - "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks", "$(PROJECT_DIR)/Ifish/UMCommunity/UMCommunitySDK/UMCommunitySDK", "$(PROJECT_DIR)/Ifish/UMSocial/SocialLibraries/QQ/QQSDK", "$(PROJECT_DIR)/Ifish/UMSocial/UMSocialSDK", "$(PROJECT_DIR)/Ifish/UMSocial/UMSocialUI", - "$(PROJECT_DIR)/Ifish/BMKMap3.3.0", "$(PROJECT_DIR)/Ifish/Bugly-v2.4.7", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YFonc", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YMsgBox", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YSlider", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YTargetAndAction", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/FounderButton", - "$(PROJECT_DIR)/Ifish/BaiduMap_IOSSDK_v4.2.1_Frameworks", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK", "$(PROJECT_DIR)/Ifish/AliPush", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMSDK", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMAVChat", + "$(PROJECT_DIR)/Ifish/GWP2PSDK", + "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks", ); GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch"; HEADER_SEARCH_PATHS = ""; @@ -15440,21 +15455,13 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/FFmpeg2.7.7/lib", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/FFmpeg2.7.7", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/AVLib", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/DeviceLink", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/FFmpeg2.7.7/lib", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/FFmpeg2.7.7", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/AVLib", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/DeviceLink", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMSDK/Libs", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMAVChat/Libs", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", "-Istdc++", + "-force_load", + "\"$(SRCROOT)/ifish/GWP2PSDK/GWP2P.framework/GWP2P\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -15505,24 +15512,19 @@ "$(PROJECT_DIR)/Ifish/", "$(PROJECT_DIR)/Ifish/", "$(PROJECT_DIR)/Ifish/SMS_SDK", - "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks", "$(PROJECT_DIR)/Ifish/UMCommunity/UMCommunitySDK/UMCommunitySDK", "$(PROJECT_DIR)/Ifish/UMSocial/SocialLibraries/QQ/QQSDK", "$(PROJECT_DIR)/Ifish/UMSocial/UMSocialSDK", "$(PROJECT_DIR)/Ifish/UMSocial/UMSocialUI", - "$(PROJECT_DIR)/Ifish/BMKMap3.3.0", "$(PROJECT_DIR)/Ifish/Bugly-v2.4.7", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YFonc", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YMsgBox", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YSlider", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/YTargetAndAction", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/YooseeExtureLibs/FounderButton", - "$(PROJECT_DIR)/Ifish/BaiduMap_IOSSDK_v4.2.1_Frameworks", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK", "$(PROJECT_DIR)/Ifish/AliPush", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMSDK", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMAVChat", + "$(PROJECT_DIR)/Ifish/GWP2PSDK", + "$(PROJECT_DIR)/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks", ); GCC_PREFIX_HEADER = "Ifish/Ifish-Prefix.pch"; HEADER_SEARCH_PATHS = ""; @@ -15567,21 +15569,13 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/FFmpeg2.7.7/lib", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/FFmpeg2.7.7", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/AVLib", - "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/SDK/lib/DeviceLink", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/FFmpeg2.7.7/lib", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/FFmpeg2.7.7", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/AVLib", - "$(PROJECT_DIR)/Ifish/ifishYooseeSdk/SDK/lib/DeviceLink", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMSDK/Libs", - "$(PROJECT_DIR)_develop_01/Ifish/YunXinIM/NIM_iOS_SDK_v3.5.5/NIMAVChat/Libs", ); ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", "-Istdc++", + "-force_load", + "\"$(SRCROOT)/ifish/GWP2PSDK/GWP2P.framework/GWP2P\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Ifish/.DS_Store b/Ifish/.DS_Store index 2db60cb..75392fa 100644 Binary files a/Ifish/.DS_Store and b/Ifish/.DS_Store differ diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/.DS_Store b/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/.DS_Store and /dev/null differ diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/.DS_Store b/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/.DS_Store deleted file mode 100644 index addc097..0000000 Binary files a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/.DS_Store and /dev/null differ diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/AlibabaAuthExt b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/AlibabaAuthExt similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/AlibabaAuthExt rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/AlibabaAuthExt diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/Headers/AlibabaAuthExt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/Headers/AlibabaAuthExt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/Headers/AlibabaAuthExt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/Headers/AlibabaAuthExt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthExt.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthExt.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBEnvConfig.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBEnvConfig.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBEnvConfig.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBEnvConfig.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSession.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSession.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSession.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBSession.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBUser.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBUser.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBUser.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Headers/ALBBUser.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibabaAuthSDK.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibabaAuthSDK.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/AlibcLinkPartnerSDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/AlibcLinkPartnerSDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/AlibcLinkPartnerSDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/AlibcLinkPartnerSDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPAuthPlugin.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPAuthPlugin.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPAuthPlugin.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPAuthPlugin.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePlugin.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePlugin.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePlugin.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePlugin.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePluginParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePluginParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePluginParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPBasePluginParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPError.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPError.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPError.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPError.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpFailedStrategy.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpFailedStrategy.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpFailedStrategy.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpFailedStrategy.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPJumpParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPPluginManager.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPPluginManager.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPPluginManager.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPPluginManager.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBAuthParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBAuthParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBAuthParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBAuthParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBDetailParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBDetailParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBDetailParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBDetailParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBJumpParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBJumpParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBJumpParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBJumpParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBLinkPartnerSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBLinkPartnerSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBLinkPartnerSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBLinkPartnerSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBShopParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBShopParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBShopParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBShopParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBURIParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBURIParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBURIParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Headers/ALPTBURIParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcLinkPartnerSDK.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcLinkPartnerSDK.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/ALPLinkPartnerSDK.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibcTradeBiz b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibcTradeBiz similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlibcTradeBiz rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlibcTradeBiz diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/bar@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/bar@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/bar@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/bar@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/refresh_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/AlipaySDK.bundle/shutdown_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAlipayBridge.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAlipayBridge.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAlipayBridge.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAlipayBridge.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAuthService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAuthService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAuthService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcAuthService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcChannelModule.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcChannelModule.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcChannelModule.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcChannelModule.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcConfigService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcConfigService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcConfigService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcConfigService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcHintProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcHintProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcHintProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcHintProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLinkPartnerBridge.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLinkPartnerBridge.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLinkPartnerBridge.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLinkPartnerBridge.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLoginBridge.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLoginBridge.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLoginBridge.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcLoginBridge.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTokenService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTokenService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTokenService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTokenService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTrackParams.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTrackParams.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTrackParams.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTrackParams.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBiz.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBiz.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBiz.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBiz.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizEvent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizEvent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizEvent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizEvent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeBizSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeEnv.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeEnv.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeEnv.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeEnv.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeError.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeError.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeError.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeError.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeTaokeParams.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeTaokeParams.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeTaokeParams.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcTradeTaokeParams.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcUserAgent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcUserAgent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcUserAgent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcUserAgent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcWebViewController.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcWebViewController.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Headers/AlibcWebViewController.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Headers/AlibcWebViewController.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Modules/module.modulemap b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Modules/module.modulemap similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/Modules/module.modulemap rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/Modules/module.modulemap diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/Root.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/Root.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/Root.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/Root.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/en.lproj/Root.strings b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/en.lproj/Root.strings similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/en.lproj/Root.strings rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/en.lproj/Root.strings diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/urlConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/urlConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/urlConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/urlConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/NBResource.bundle/whiteClose@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/OpenMtopExt-Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/OpenMtopExt-Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/OpenMtopExt-Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/OpenMtopExt-Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/OpenMtopSDK.podspec b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/OpenMtopSDK.podspec similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeBiz.framework/OpenMtopSDK.podspec rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeBiz.framework/OpenMtopSDK.podspec diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/AlibcTradeCommon b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/AlibcTradeCommon similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/AlibcTradeCommon rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/AlibcTradeCommon diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AliBCUserTrack.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AliBCUserTrack.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AliBCUserTrack.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AliBCUserTrack.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcConfig.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcConfig.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcConfig.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcConfig.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcHybridContext.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcHybridContext.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcHybridContext.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcHybridContext.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeDynamicHandler.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeDynamicHandler.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeDynamicHandler.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeDynamicHandler.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeParam.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeParam.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeParam.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeParam.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSBridgeService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSON.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSON.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSON.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcJSON.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcLog.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcLog.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcLog.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcLog.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMonitorUtil.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMonitorUtil.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMonitorUtil.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMonitorUtil.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBus.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBus.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBus.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBus.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBusHelp.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBusHelp.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBusHelp.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMsgBusHelp.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopBridge.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopBridge.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopBridge.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopBridge.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopCmd.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopCmd.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopCmd.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopCmd.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopRequestHelp.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopRequestHelp.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopRequestHelp.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMtopRequestHelp.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMultiDelegates.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMultiDelegates.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMultiDelegates.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcMultiDelegates.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNet.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNet.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNet.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNet.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetError.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetError.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetError.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetError.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetMock.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetMock.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetMock.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetMock.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetPacket.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetPacket.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetPacket.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetPacket.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceBase.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceBase.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceBase.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceBase.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceMtop.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceMtop.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceMtop.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNetServiceMtop.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNumber.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNumber.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNumber.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcNumber.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcReflectionUtil.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcReflectionUtil.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcReflectionUtil.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcReflectionUtil.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcSecurityGuardBridge.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcSecurityGuardBridge.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcSecurityGuardBridge.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcSecurityGuardBridge.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcString.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcString.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcString.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcString.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcThread.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcThread.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcThread.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcThread.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeBenchmarkable.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeBenchmarkable.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeBenchmarkable.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeBenchmarkable.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommon.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommon.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommon.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommon.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommonSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommonSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommonSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeCommonSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeInitMonitor.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeInitMonitor.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeInitMonitor.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeInitMonitor.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeMonitor.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeMonitor.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeMonitor.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcTradeMonitor.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURL.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURL.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURL.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURL.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBus.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBus.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBus.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBus.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBusContext.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBusContext.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBusContext.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcURLBusContext.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUT.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUT.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUT.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUT.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUTDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUTDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUTDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcUTDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewDelegate.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewDelegate.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewDelegate.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewDelegate.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewEventListener.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewEventListener.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewEventListener.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewEventListener.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewServiceImpl.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewServiceImpl.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewServiceImpl.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebViewServiceImpl.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebviewHookHelp.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebviewHookHelp.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebviewHookHelp.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/AlibcWebviewHookHelp.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSDictionary+TrimNSNull.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSDictionary+TrimNSNull.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSDictionary+TrimNSNull.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSDictionary+TrimNSNull.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSString+AlibcURL.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSString+AlibcURL.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSString+AlibcURL.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSString+AlibcURL.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSURL+ALIURL.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSURL+ALIURL.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Headers/NSURL+ALIURL.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Headers/NSURL+ALIURL.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Modules/module.modulemap b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Modules/module.modulemap similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeCommon.framework/Modules/module.modulemap rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeCommon.framework/Modules/module.modulemap diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/ALPLinkPartnerSDK.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibcTradeSDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibcTradeSDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlibcTradeSDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlibcTradeSDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/bar@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/bar@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/bar@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/bar@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/refresh_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/AlipaySDK.bundle/shutdown_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradePageFactory.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradePageFactory.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradePageFactory.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradePageFactory.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeResult.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeResult.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeResult.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeResult.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDKDefines.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDKDefines.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDKDefines.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeSDKDefines.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeShowParams.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeShowParams.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeShowParams.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeShowParams.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeTrackService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeTrackService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeTrackService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Headers/AlibcTradeTrackService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/Root.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/Root.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/Root.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/Root.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/en.lproj/Root.strings b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/en.lproj/Root.strings similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/en.lproj/Root.strings rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/en.lproj/Root.strings diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/urlConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/urlConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/urlConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/urlConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/NBResource.bundle/whiteClose@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/OpenMtopExt-Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/OpenMtopExt-Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/OpenMtopExt-Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/OpenMtopExt-Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/OpenMtopSDK.podspec b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/OpenMtopSDK.podspec similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlibcTradeSDK.framework/OpenMtopSDK.podspec rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlibcTradeSDK.framework/OpenMtopSDK.podspec diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/AlipaySDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/AlipaySDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/AlipaySDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/AlipaySDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Headers/APayAuthInfo.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Headers/APayAuthInfo.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Headers/APayAuthInfo.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Headers/APayAuthInfo.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Headers/AlipaySDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Headers/AlipaySDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Headers/AlipaySDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Headers/AlipaySDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/en.lproj/InfoPlist.strings b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/en.lproj/InfoPlist.strings similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/AlipaySDK.framework/en.lproj/InfoPlist.strings rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/AlipaySDK.framework/en.lproj/InfoPlist.strings diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopAuthProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopAuthProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopAuthProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopAuthProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopError.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopError.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopError.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopError.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopErrorDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopErrorDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopErrorDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopErrorDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopExtRequest.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopExtRequest.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopExtRequest.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopExtRequest.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopExtResponse.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopExtResponse.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopExtResponse.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopExtResponse.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopLoginProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopLoginProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopLoginProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopLoginProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopService.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopService.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/MtopService.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/MtopService.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/OpenMtopExt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/OpenMtopExt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/OpenMtopExt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/OpenMtopExt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/TBSDKConfiguration.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/TBSDKConfiguration.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Headers/TBSDKConfiguration.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Headers/TBSDKConfiguration.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/OpenMtopExt b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/OpenMtopExt similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/OpenMtopExt rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/OpenMtopExt diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Resources/OpenMtopExt-Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Resources/OpenMtopExt-Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Resources/OpenMtopExt-Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Resources/OpenMtopExt-Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Resources/OpenMtopSDK.podspec b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Resources/OpenMtopSDK.podspec similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopExt.framework/Resources/OpenMtopSDK.podspec rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopExt.framework/Resources/OpenMtopSDK.podspec diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/JsonUtils.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/JsonUtils.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/JsonUtils.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/JsonUtils.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/NetworkSDKDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/NetworkSDKDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/NetworkSDKDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/NetworkSDKDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnection.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnection.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnection.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnection.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionDelegate.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionDelegate.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionDelegate.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionDelegate.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKConnectionProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKEncryptionUntil.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKEncryptionUntil.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKEncryptionUntil.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKEncryptionUntil.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorHandleDelegate.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorHandleDelegate.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorHandleDelegate.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorHandleDelegate.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorRule.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorRule.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorRule.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKErrorRule.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKHTTPRequestOperation.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKHTTPRequestOperation.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKHTTPRequestOperation.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKHTTPRequestOperation.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKLogUtil.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKLogUtil.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKLogUtil.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKLogUtil.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKMTOPEnvConfig.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKMTOPEnvConfig.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKMTOPEnvConfig.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKMTOPEnvConfig.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkProgressProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkProgressProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkProgressProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkProgressProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDKUtil.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDKUtil.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDKUtil.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKNetworkSDKUtil.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKPersistentStorage.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKPersistentStorage.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKPersistentStorage.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKPersistentStorage.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKProgressDelegate.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKProgressDelegate.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKProgressDelegate.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKProgressDelegate.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequest.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequest.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequest.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequest.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestDelegate.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestDelegate.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestDelegate.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestDelegate.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestProgressProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestProgressProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestProgressProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKRequestProgressProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKSendFileObject.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKSendFileObject.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKSendFileObject.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKSendFileObject.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue+Private.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue+Private.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue+Private.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue+Private.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKServerQueue.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableArry.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableArry.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableArry.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableArry.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableDictionary.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableDictionary.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableDictionary.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKThreadSafeMutableDictionary.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKURLConnectionOperation.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKURLConnectionOperation.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDKURLConnectionOperation.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDKURLConnectionOperation.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDSKServerRule.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDSKServerRule.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDSKServerRule.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDSKServerRule.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDkSignUtility.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDkSignUtility.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/TBSDkSignUtility.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/TBSDkSignUtility.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/UIDevice+TBSDKIdentifierAddition.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/UIDevice+TBSDKIdentifierAddition.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Headers/UIDevice+TBSDKIdentifierAddition.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Headers/UIDevice+TBSDKIdentifierAddition.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/OpenMtopSDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/OpenMtopSDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/OpenMtopSDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/OpenMtopSDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Resources/OpenMtopSDK.podspec b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Resources/OpenMtopSDK.podspec similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/OpenMtopSDK.framework/Resources/OpenMtopSDK.podspec rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/OpenMtopSDK.framework/Resources/OpenMtopSDK.podspec diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenAtlasEncrypt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenAtlasEncrypt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenAtlasEncrypt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenAtlasEncrypt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDataCollection.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDataCollection.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDataCollection.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDataCollection.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataEncrypt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataEncrypt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataEncrypt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataEncrypt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataStore.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataStore.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataStore.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenDynamicDataStore.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenInitialize.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenInitialize.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenInitialize.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenInitialize.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenOpenSDK.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenOpenSDK.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenOpenSDK.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenOpenSDK.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSafeToken.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSafeToken.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSafeToken.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSafeToken.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSecureSignature.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSecureSignature.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSecureSignature.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenSecureSignature.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataEncrypt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataEncrypt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataEncrypt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataEncrypt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataStore.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataStore.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataStore.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticDataStore.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticKeyEncrypt.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticKeyEncrypt.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticKeyEncrypt.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenStaticKeyEncrypt.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenUMID.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenUMID.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenUMID.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Headers/ISecurityGuardOpenUMID.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/SGMain b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/SGMain similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGMain.framework/SGMain rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGMain.framework/SGMain diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/Headers/ISecurityGuardOpenNoCaptcha.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/Headers/ISecurityGuardOpenNoCaptcha.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/Headers/ISecurityGuardOpenNoCaptcha.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/Headers/ISecurityGuardOpenNoCaptcha.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/SGNoCaptcha b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/SGNoCaptcha similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGNoCaptcha.framework/SGNoCaptcha rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGNoCaptcha.framework/SGNoCaptcha diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenJAQVerification.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenJAQVerification.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenJAQVerification.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenJAQVerification.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenSimulatorDetect.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenSimulatorDetect.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenSimulatorDetect.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Headers/ISecurityGuardOpenSimulatorDetect.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/SGSecurityBody b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/SGSecurityBody similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SGSecurityBody.framework/SGSecurityBody rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SGSecurityBody.framework/SGSecurityBody diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityCipher.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityCipher.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityCipher.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityCipher.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecuritySignature.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecuritySignature.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecuritySignature.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecuritySignature.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityStorage.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityStorage.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityStorage.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityStorage.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityVerification.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityVerification.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityVerification.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SecurityVerification.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SimulatorDetect.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SimulatorDetect.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SimulatorDetect.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/JAQ/SimulatorDetect.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/IOpenSecurityGuardPlugin.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/IOpenSecurityGuardPlugin.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/IOpenSecurityGuardPlugin.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/IOpenSecurityGuardPlugin.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenAtlasEncrypt/IOpenAtlasEncryptComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenAtlasEncrypt/IOpenAtlasEncryptComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenAtlasEncrypt/IOpenAtlasEncryptComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenAtlasEncrypt/IOpenAtlasEncryptComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDataCollection/IOpenDataCollectionComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDataCollection/IOpenDataCollectionComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDataCollection/IOpenDataCollectionComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDataCollection/IOpenDataCollectionComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataEncrypt/IOpenDynamicDataEncryptComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataEncrypt/IOpenDynamicDataEncryptComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataEncrypt/IOpenDynamicDataEncryptComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataEncrypt/IOpenDynamicDataEncryptComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataStore/IOpenDynamicDataStoreComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataStore/IOpenDynamicDataStoreComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataStore/IOpenDynamicDataStoreComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenDynamicDataStore/IOpenDynamicDataStoreComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenInitialize/IOpenInitializeComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenInitialize/IOpenInitializeComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenInitialize/IOpenInitializeComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenInitialize/IOpenInitializeComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/IOpenNoCaptchaComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/IOpenNoCaptchaComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/IOpenNoCaptchaComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/IOpenNoCaptchaComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/OpenNoCaptchaDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/OpenNoCaptchaDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/OpenNoCaptchaDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenNoCaptcha/OpenNoCaptchaDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenOpenSDK/IOpenOpenSDKComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenOpenSDK/IOpenOpenSDKComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenOpenSDK/IOpenOpenSDKComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenOpenSDK/IOpenOpenSDKComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/IOpenSecureSignatureComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/IOpenSecureSignatureComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/IOpenSecureSignatureComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/IOpenSecureSignatureComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/OpenSecureSignatureDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/OpenSecureSignatureDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/OpenSecureSignatureDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecureSignature/OpenSecureSignatureDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardManager.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardManager.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardManager.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardManager.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardParamContext.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardParamContext.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardParamContext.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSecurityGuardParamContext.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSimulatorDetect/IOpenSimulatorDetectComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSimulatorDetect/IOpenSimulatorDetectComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSimulatorDetect/IOpenSimulatorDetectComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenSimulatorDetect/IOpenSimulatorDetectComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/IOpenStaticDataEncryptComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/IOpenStaticDataEncryptComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/IOpenStaticDataEncryptComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/IOpenStaticDataEncryptComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/OpenStaticDataEncryptDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/OpenStaticDataEncryptDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/OpenStaticDataEncryptDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataEncrypt/OpenStaticDataEncryptDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/IOpenStaticDataStoreComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/IOpenStaticDataStoreComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/IOpenStaticDataStoreComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/IOpenStaticDataStoreComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/OpenStaticDataStoreDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/OpenStaticDataStoreDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/OpenStaticDataStoreDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticDataStore/OpenStaticDataStoreDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/IOpenStaticKeyEncryptComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/IOpenStaticKeyEncryptComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/IOpenStaticKeyEncryptComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/IOpenStaticKeyEncryptComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/OpenStaticKeyEncryptDefine.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/OpenStaticKeyEncryptDefine.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/OpenStaticKeyEncryptDefine.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenStaticKeyEncrypt/OpenStaticKeyEncryptDefine.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenUMID/IOpenUMIDComponent.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenUMID/IOpenUMIDComponent.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenUMID/IOpenUMIDComponent.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Headers/Open/OpenUMID/IOpenUMIDComponent.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/SecurityGuardSDK b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/SecurityGuardSDK similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/SecurityGuardSDK.framework/SecurityGuardSDK rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/SecurityGuardSDK.framework/SecurityGuardSDK diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Headers b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Headers similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Headers rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Headers diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Resources b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Resources similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Resources rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Resources diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/UTDID b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/UTDID similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/UTDID rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/UTDID diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Headers/AidProtocol.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Headers/AidProtocol.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Headers/AidProtocol.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Headers/AidProtocol.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Headers/UTDevice.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Headers/UTDevice.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Headers/UTDevice.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Headers/UTDevice.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Resources/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/Resources/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/Resources/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/UTDID b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/UTDID similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/A/UTDID rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/A/UTDID diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/Current b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/Current similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTDID.framework/Versions/Current rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTDID.framework/Versions/Current diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Headers b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Headers similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Headers rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Headers diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Resources b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Resources similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Resources rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Resources diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/UTMini b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/UTMini similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/UTMini rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/UTMini diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitor.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitor.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitor.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitor.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorAlarm.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorAlarm.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorAlarm.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorAlarm.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorBase.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorBase.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorBase.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorBase.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorCounter.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorCounter.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorCounter.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorCounter.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimension.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimension.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimension.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimension.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionSet.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionSet.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionSet.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionSet.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionValueSet.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionValueSet.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionValueSet.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorDimensionValueSet.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasure.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasure.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasure.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasure.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureSet.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureSet.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureSet.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureSet.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValue.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValue.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValue.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValue.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValueSet.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValueSet.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValueSet.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorMeasureValueSet.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorStat.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorStat.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorStat.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorStat.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorTable.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorTable.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorTable.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/AppMonitorTable.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UT.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UT.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UT.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UT.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTAnalytics.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTAnalytics.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTAnalytics.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTAnalytics.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTBaseRequestAuthentication.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTBaseRequestAuthentication.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTBaseRequestAuthentication.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTBaseRequestAuthentication.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTCustomHitBuilder.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTCustomHitBuilder.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTCustomHitBuilder.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTCustomHitBuilder.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTHitBuilder.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTHitBuilder.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTHitBuilder.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTHitBuilder.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTICrashCaughtListener.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTICrashCaughtListener.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTICrashCaughtListener.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTICrashCaughtListener.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTIRequestAuthentication.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTIRequestAuthentication.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTIRequestAuthentication.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTIRequestAuthentication.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTOirginalCustomHitBuilder.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTOirginalCustomHitBuilder.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTOirginalCustomHitBuilder.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTOirginalCustomHitBuilder.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTPageHitBuilder.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTPageHitBuilder.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTPageHitBuilder.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTPageHitBuilder.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTSecuritySDKRequestAuthentication.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTSecuritySDKRequestAuthentication.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTSecuritySDKRequestAuthentication.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTSecuritySDKRequestAuthentication.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTTracker.h b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTTracker.h similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Headers/UTTracker.h rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Headers/UTTracker.h diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Resources/Info.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Resources/Info.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/Resources/Info.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/Resources/Info.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/UTMini b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/UTMini similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/A/UTMini rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/A/UTMini diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/Current b/Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/Current similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Frameworks/UTMini.framework/Versions/Current rename to Ifish/AlibcTradeSDK-3.1.1.96/Frameworks/UTMini.framework/Versions/Current diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/ALPLinkPartnerSDK.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/ALPLinkPartnerSDK.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlibabaAuthSDK.bundle/alibaba_auth_sdk.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlibabaAuthSDK.bundle/alimember_navbar_left@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/bar@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/bar@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/bar@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/bar@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/refresh@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/refresh@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/refresh@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/refresh@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/refresh_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/refresh_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/refresh_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/refresh_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/shutdown@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/shutdown@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/shutdown@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/shutdown@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/shutdown_click@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/shutdown_click@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/AlipaySDK.bundle/shutdown_click@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/AlipaySDK.bundle/shutdown_click@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/Root.plist b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/Root.plist similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/Root.plist rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/Root.plist diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/back@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/back@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/back@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/back@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/back@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/back@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/back@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/back@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/close@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/close@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/close@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/close@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/close@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/close@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/close@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/close@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/en.lproj/Root.strings b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/en.lproj/Root.strings similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/en.lproj/Root.strings rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/en.lproj/Root.strings diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/localConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/localConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/localConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/localConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/urlConfig.json b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/urlConfig.json similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/urlConfig.json rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/urlConfig.json diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/whiteClose@2x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/whiteClose@2x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/whiteClose@2x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/whiteClose@2x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/whiteClose@3x.png b/Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/whiteClose@3x.png similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/Resources/NBResource.bundle/whiteClose@3x.png rename to Ifish/AlibcTradeSDK-3.1.1.96/Resources/NBResource.bundle/whiteClose@3x.png diff --git a/Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/yw_1222.jpg b/Ifish/AlibcTradeSDK-3.1.1.96/yw_1222.jpg similarity index 100% rename from Ifish/AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage/yw_1222.jpg rename to Ifish/AlibcTradeSDK-3.1.1.96/yw_1222.jpg diff --git a/Ifish/AppDelegate.h b/Ifish/AppDelegate.h index 4dbf1f8..6dbe777 100644 --- a/Ifish/AppDelegate.h +++ b/Ifish/AppDelegate.h @@ -9,7 +9,6 @@ #import //#import #import "Contact.h"//重新调整监控画面 -//#import #define ap_address "192.168.1.1" #define NET_WORK_CHANGE @"NET_WORK_CHANGE" #import "Reachability.h" diff --git a/Ifish/AppDelegate.m b/Ifish/AppDelegate.m index 0c48cf0..de81a66 100644 --- a/Ifish/AppDelegate.m +++ b/Ifish/AppDelegate.m @@ -42,7 +42,6 @@ #import "TalkingData.h" #define TalkingDataAPPID @"351E6F7956CEF7FB6AABAEB64EF9BF18" #define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS" -//#import #import "Socketsingleton.h" #import #import @@ -63,6 +62,7 @@ //企业版 #define JPUSH_APPKEY @"d970d5e193cb2a0bbe41653c" //摄像头部分 +//#import #import "P2PClient.h" #import "MPNotificationView.h" #import "NetManager.h" @@ -335,7 +335,6 @@ if (kScreenSize.height>480) { self.dwApContactID = 0; [[UDPManager sharedDefault] ScanLanDevice]; - //阿里百川 初始化SDK // 百川平台基础SDK初始化，加载并初始化各个业务能力插件 [[AlibcTradeSDK sharedInstance] asyncInitWithSuccess:^{ @@ -417,8 +416,9 @@ if (kScreenSize.height>480) { [[Socketsingleton sharedInstance] cutOffSocket];//外部应用打断时断开soket 如电话 下拉系统通知栏 上拉系统通知栏短信查看等 //摄像头后台模式不能截图 self.isGoBack = YES; - +// [GWNetSingleton sharedClient] [[P2PClient sharedClient] p2pHungUp]; +#warning p2p appdelegate //2.3 版本 点击home 键 就直接挂起 不让app 后台运行 设置Application does not run in background ＝YES } @@ -434,18 +434,18 @@ if (kScreenSize.height>480) { //设置为假象服务器断开 - UIApplication *app = [UIApplication sharedApplication]; - UIBackgroundTaskIdentifier taskID = 0; - taskID = [app beginBackgroundTaskWithExpirationHandler:^{ - [[P2PClient sharedClient] p2pDisconnect]; - [app endBackgroundTask:taskID]; - }]; - - if (taskID == UIBackgroundTaskInvalid) { - [[P2PClient sharedClient] p2pDisconnect]; - NSLog(@"Failed to start background task!"); - return; - } +// UIApplication *app = [UIApplication sharedApplication]; +// UIBackgroundTaskIdentifier taskID = 0; +// taskID = [app beginBackgroundTaskWithExpirationHandler:^{ +// [[P2PClient sharedClient] disconnect]; +// [app endBackgroundTask:taskID]; +// }]; +// +// if (taskID == UIBackgroundTaskInvalid) { +// [[P2PClient sharedClient] disconnect]; +// NSLog(@"Failed to start background task!"); +// return; +// } self.isGoBack = YES; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/GWP2P b/Ifish/GWP2PSDK/GWP2P.framework/GWP2P new file mode 100755 index 0000000..ddf3360 Binary files /dev/null and b/Ifish/GWP2PSDK/GWP2P.framework/GWP2P differ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h new file mode 100755 index 0000000..66ea963 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNet.h @@ -0,0 +1,894 @@ +// +// GWNet.h +// GWNet +// +// Created by apple on 16/11/1. +// Copyright © 2016年 YHQ. All rights reserved. +// + +#import + +#ifndef GWNetSingleton +#define GWNetSingleton [GWNet shareInstance] +#endif + + +/** + 接口回调block + + @param success 仅代表网络请求是否成功,不代表相应的操作结果,具体的要从errorCode判断 + @param errorCode 错误码, 0 代表没有错误,其它每个数字字符串代表确定的错误原因 + @param errorString 描述具体的错误原因 + @param json 具体的返回数据 + */ +typedef void(^GWNetCompletionBlock)(BOOL success, NSString *errorCode, NSString *errorString, NSDictionary *json); + +//调接口时会话ID错误发出的通知,会话ID超时/错误时所有接口无法调用,应该让用户重新登录获取新的Session。每个接口处理过于麻烦,所以增加通知。 +extern NSString * const kGWNetSessionIdErrorNotification; + + +@interface GWNet : NSObject + +@property (nonatomic, assign) BOOL connectWithHttps;/**< 以https的方式连接我们的服务器.默认为NO,用http的方式连接 */ + +@property(nonatomic,assign)NSInteger theTag;//这个相当于Tag +@property(nonatomic,copy)NSString* theTagString;//这个相当于String类型的Tag + +#pragma mark - 获取单例 +/**获取单例,注意,本程序并不是全单例,而是半单例,本程序并没有重写alloc方法,所以alloc出来的依然是独立的地址*/ ++(instancetype)shareInstance;//获取单例 + +#pragma mark - 设置为输出日志 +-(void)stOutputLog:(BOOL)outputLog; + +#pragma mark - 必需设置的参数,如果不设置这些参数,会导致SDK传递的信息不正确 +/** + 中文简体 中文繁体 英文 日语 韩语 德语 俄语 + zh-Hans zh-Hant en ja ko de ru ,其它语言请自行查询 + */ +@property(nonatomic,copy)NSString* theAppLanguage;//设置SDK的语言,如果服务器支持的话,服务器会返回相应的语言,默认为iOS系统语言 +@property(nonatomic,copy)NSString* theAppVersion;//APP的版本,类似于 2.3.4.7 这样的版本号,默认为 0.0.0.0 +@property(nonatomic,copy)NSString* theAppName;//App名称,请尽可能提供相应的名称 +@property(nonatomic,copy)NSString* theAppId;//APPID要与技威公司联系申请,否则SDK不能正常使用 +@property(nonatomic,copy)NSString* theAppToken;//AppToken要与技威公司联系申请,否则SDK不能正常使用 + +/** + 服务器列表,自建服务器时才需要设置 + + 默认: + + @[@"api1.cloudlinks.cn",//中国大陆第一台 + + @"api2.cloudlinks.cn",//中国大陆第二台 + + @"api3.cloud-links.net",//外国第一台 + + @"api4.cloud-links.net"];//外国第二台 + */ +@property(nonatomic,copy)NSArray* serverList; + +#pragma mark - 账号基础接口 +#pragma mark 登录 +/** + 登录 + + 回调数据: + + "error_code" 返回码（0：成功，其他值代表失败） + + "UserID" 用户ID + + P2PVerifyCode p2p校验码1 + + P2PVerifyCode2 p2p校验码2 + + Email 用户邮箱地址 + + NickName 用户昵称 + + CountryCode 手机号国际代码 + + PhoneNO 手机号 + + ImageID 头像ID（0：系统默认头像） + + SessionID 会话ID（调用其他接口时用到 + + @param name 1 手机号码(手机号登录可以用不带国码，也可以用 国码-手机号码（如（国码中的+号也可以省略）：86-13800008888 或 +86-13800008888）登录,但是，如果用户信息表中如果存在两个手机号相同而国码不相同时必需用“国码-手机号码”. 2 邮箱 3 ID号(如:10000|0x80000000 = -2147473648, -2147473648&0x7fffffff = 10000,01000是显示给用户的ID号,传给服务器可以为-2147473648也可以为01000) + @param pwd 密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param token 苹果设备Token,用来远程推送,可空,空时则无法推送 + @param timeZone App用户当前时区，传输格式分钟，例：东八区 480 + @param completion 请求完成回调 + */ +-(void)loginWithUserName:(NSString*)name//可以为手机,如 +86-15200002222,或者邮箱地址,或者ID号,例如-2147473648 + withPassword:(NSString*)pwd//密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withAppleToken:(NSString*)token//苹果设备Token,用来远程推送,可空,空时则无法推送 + withTimeZone:(NSInteger)timeZone//App用户当前时区，传输格式分钟，例：东八区 480 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 第三方登录 +/** + 第三方登录 + + 调用接口时,先判断是哪个平台登录,platformType参数1表示微信,4表示Facebook,5表示LINE,客户使用此接口时还可使用2表示匿名登录3表示混合登录 + + 匿名登录是通过取设备的特征信息生成UID(User Identification), unionID参数可传设备的UDID, user,pwd可不传,option每次传"3"即可 + + 混合登录是用第三方平台已有系统账号作为特征信息之一生成UID,第三方可以是微信,facebook,line等, unionID参数正常传, user,pwd可不传,option每次传"3"即可 + + option传"1"时表示正常的登录,第一次登录时,账号还没有生成,此时不能传"1", 先传"2"或"3",传"2"表示绑定再有的Yoosee账号,此时user,pwd参数不能为空,传"3"时,服务器会自动生成一个Yoosee账号,生成账号后再调用初始化密码接口后,即可正常使用此账号 + + @param platformType 平台,1表示微信 2表示匿名登录 3表示混合登录 4表示Facebook 5表示LINE,此参数不可空 + @param unionID 第三方平台验证后传回的唯一标识符,如果是匿名登录,提供设备的唯一标识即可,不可空 + @param user Yoosee用户名,第三方平台登录后,绑定账号时要传,其它情况下可不传.可为手机,如+86-15200002222,或邮箱,或ID号,如010000, + @param pwd Yoosee账号密码,第三方平台登录后,绑定账号时要传,其它情况下可不传 + @param token 苹果设备Token,用来远程推送,可空,空时则无法推送 + @param option 1 仅登录 2绑定老用户并登录 3登录,若不存在则自动注册 + @param storeID 商城ID,需要商城版功能时必须上传,可空,不懂的话留空即可 + @param nickName 昵称,此参数传入微信,line等授权后的昵称作为账号默认的昵称 + @param timeZone App用户当前时区，传输格式分钟，例：东八区 480 + @param completion 回调 + */ +-(void)thirdLoginWithPlatformType:(NSString*)platformType//平台,1.微信 2.匿名登录 3 混合登录 4.Facebook 5.LINE,此参数不可空 + withUnionID:(NSString*)unionID//第三方平台的唯一标识符,如果是匿名登录,提供设备的唯一标识即可,不可空 + withUser:(NSString*)user//用户名,可为手机,如+86-15200002222,或邮箱,或ID号,如010000,绑定账号时不可空 + withPassword:(NSString*)pwd//密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密,绑定账号时不可空 + withAppleToken:(NSString*)token//苹果设备Token,用来远程推送,可空,空时则无法推送 + withOption:(NSString*)option//1仅登录 2绑定老用户并登录 3登录,若不存在则自动注册 + withStoreID:(NSString*)storeID//商城ID,需要商城版功能时必须上传,可空,不懂的话留空即可 + withNickName:(NSString*)nickName//此参数传入微信,line等授权后的昵称作为账号默认的昵称 + timeZone:(NSInteger)timeZone//App用户当前时区，传输格式分钟，例：东八区 480 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +/** + 第三方登陆后,初始化密码 + + 第三方登陆后,会自动生成一个Yoosee账号,但未生成密码,调用此接口配置密码 + + @param password 密码 + @param userId yoosee用户Id + @param sessionId 会话Id + @param completion 回调 + */ +- (void)thirdLoginInitPassword:(NSString *)password + withUserId:(NSString *)userId + sessionId:(NSString *)sessionId + completion:(GWNetCompletionBlock)completion; + +#pragma mark 退出登录 +/** + 退出登录 + + @param userId 用户ID,数据从登录时返回的json里获取 + @param sessionId 会话ID,数据从登录时返回的json里获取 + @param completion 回调 + */ +-(void)unLoginWithUserId:(NSString*)userId//这个应该从登录时返回的json里获取 + withSessionId:(NSString*)sessionId//这个应该从登录时返回的json里获取 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 邮箱注册 +-(void)regEmailWithEmail:(NSString*)name //邮箱地址 + withPwd:(NSString*)pwd //密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withRePwd:(NSString*)rePwd//再次密码,两次的密码应当一致 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark - 邮箱注册(增加邮箱验证码) +-(void)regEmailWithEmail:(NSString*)name //邮箱地址 + withPwd:(NSString*)pwd //密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withRePwd:(NSString*)rePwd //再次密码,两次的密码应当一致 + withIsValidMail:(NSString *)isValidMail //邮箱是否需要校验：1需要，0或空不需要 + withMailCode:(NSString *)mailCode //邮箱验证码 + completion:(GWNetCompletionBlock)completion; //请求完成回调 + +#pragma mark - 发送邮箱验证码 +- (void)sendEmailCodeWithEmail:(NSString *)email //邮箱地址 + withSendType:(NSString *)sendType //类型：注册请求0，绑定邮箱1,验证历史邮箱2 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + + +#pragma mark - 历史注册邮箱邮箱校验时验证码检测 +- (void)mailCodeCheckWithUserID:(NSString *)userID //用户ID + withSessionID:(NSString *)sessionID //会话ID + withUserPwd:(NSString *)userPwd //帐号密码（32位MD5值） + withEmail:(NSString *)email //邮箱地址 + withMailCode:(NSString *)mailCode //邮箱验证码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark - 获取支持手机注册的国家编码 +/** + 获取支持手机注册的国家编码列表 + + 国家编码之间由’|’分隔，例如：86|44|233 + + @param completion 回调 + */ +- (void)getContryCodesSupportedTelephoneRegisterWithCompletion:(GWNetCompletionBlock)completion; + +#pragma mark 手机号注册 +/** + 手机号注册 + + @param num 手机号 + @param cCode 国码,中国为 86,不要写成+86 + @param pwd 密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param rePwd 再次密码 + @param smsCode 短信验证码 + @param completion 回调 + */ +-(void)regPhoneWithNum:(NSString*)num//手机号 + withCountryCode:(NSString*)cCode//国码,中国为 86,不要写成+86 + withPassword:(NSString*)pwd//密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withRePwd:(NSString*)rePwd//再次密码 + withSmsCode:(NSString*)smsCode//短信验证码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 发验证码 +/** + 发验证码,注册时用,手机找回的时候不要用这个方法.此接口针对同一手机号及客户端IP有严格的调用限制策略。前端调用接口时服务器返回“0（发送验证码成功）”、“27或10902025（获取手机验证码太频繁）”后，客户端必须限定用户在120秒内不能再调用此接口。 + + @param code 国码 + @param num 手机号 + @param completion 回调 + */ +-(void)sendSmsWithCountryCode:(NSString*)code//国码 + withPhoneNum:(NSString*)num//手机号 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 验证验证码 +/** + 验证验证码是否输入正确,手机注册时用,手机找回的时候不要用这个方法 + + @param code 国码 + @param num 手机号 + @param vCode 短信验证码 + @param completion 回调 + */ +-(void)checkSmsWithCountryCode:(NSString*)code//国码 + withPhoneNum:(NSString*)num//手机号 + withVerifyCode:(NSString*)vCode//短信验证码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 通过邮箱找回 +/** + 通过邮箱找回密码,会向这个邮箱发一封找回的邮件,按照操作能重置密码 + + @param email 邮箱 + @param completion 回调 + */ +-(void)findFromEmailWithEmail:(NSString*)email//会向这个邮箱发一封找回的邮件,仅此而已 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 通过手机找回来重置密码必需严格按顺序按照下面3步执行,过程中会用到2个不同的vKey,都是由服务器返回 +#pragma mark 1.手机找回 +/** + 手机找回,服务器会自动向手机发验证码,不需要调用上面发验证码的方法 + + @param countryCode 国码,中国为 86,不要写成+86 + @param num 手机号 + @param completion 回调 + */ +-(void)findFromPhoneWithCountryCode:(NSString*)countryCode//国码,中国为 86,不要写成+86 + withPhoneNum:(NSString*)num//手机号 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 2.验证手机找回 +/** + 验证手机找回,用这个方法来验证刚才通过找回的验证码是否正确 + + @param theId 从手机找回返回的json里获取 + @param vKey 从手机找回返回的json里获取 + @param cCode 国码 + @param num 手机号 + @param smsCode 短信验证码 + @param completion 回调 + */ +-(void)checkFindFromPhoneWithID:(NSString*)theId//这个应该从返回的json里获取 + withVkey:(NSString*)vKey//这个应该从返回的json里获取 + withCountryCode:(NSString*)cCode//国码 + withPhoneNum:(NSString*)num//手机号 + withSmsCode:(NSString*)smsCode//短信验证码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 3.通过手机重置密码 +/** + 通过手机重置密码 + + @param theId 从手机找回返回的json里获取 + @param vkey 从手机找回返回的json里获取 + @param pwd 密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param rePwd 确认密码 + @param completion 回调 + */ +-(void)reSetPasswordWithId:(NSString*)theId//这个应该从返回的json里获取 + withVkey:(NSString*)vkey//这个应该从返回的json里获取 + withNewPwd:(NSString*)pwd//密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withRePwd:(NSString*)rePwd//再次密码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 检查账号是否存在 +/** + 检查要注册的账号是否存在 + + @param account 账号,邮箱或者手机 + @param completion 回调 + */ +-(void)checkAccountIsExistWithAccount:(NSString*)account//账号可以是邮箱或者手机 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 获取账户信息 +/** + 获取账户信息 + + 返回数据: + + Email 绑定的邮箱 + + CountryCode 绑定的国码 + + PhoneNO 绑定的手机号码 + + @param userID 用户ID + @param sessionID 会话ID + @param completion 回调 + */ +-(void)gtUserInfoWithUserID:(NSString*)userID//这个应该从登录时返回的json里获取 + withSessionID:(NSString*)sessionID//这个应该从登录时返回的json里获取 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 设置账户安全信息 +/** + 设置账户安全信息,用于绑定邮箱和手机号 + + @param userID 用户ID + @param sessionID 会话ID + @param email 邮箱,此参数当bFlag传"2"或者"0"时有效,为空则解除绑定邮箱 + @param cCode 国码,此参数当bFlag传"1"或者"0"时有效,为空则解除绑定手机 + @param phone 手机号,此参数当bFlag传"1"或者"0"时有效,为空则解除绑定手机,绑定的手机应该是未被注册过的手机 + @param Pwd 密码,绑定邮箱或者手机需要验证密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param bFlag //绑定标志(0:同时绑定手机和邮箱 1:仅绑定手机 2:仅绑定邮箱) 不可空 + @param sms 验证码,绑定手机的时候需要提供手机验证码,先调发验证码接口 + @param completion 回调 + */ +-(void)stUserInfoWithUserID:(NSString*)userID//这个应该从登录时返回的json里获取 + withSessionID:(NSString*)sessionID//这个应该从登录时返回的json里获取 + withEmail:(NSString*)email//绑定邮箱,此参数当bFlag=2或者0时有效,为空则解除绑定邮箱 + withCountryCode:(NSString*)cCode//国码,此参数当bFlag=1或者0时有效,为空则解除绑定手机 + withPhoneNum:(NSString*)phone//手机号,此参数当bFlag=1或者0时有效,为空则解除绑定手机,绑定的手机应该是未被注册过的手机 + withUserPwd:(NSString*)Pwd//绑定邮箱或者手机需要验证密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withBindFlag:(NSString*)bFlag//绑定标志(0:同时绑定手机和邮箱 1:仅绑定手机 2:仅绑定邮箱) 不可空 + withSms:(NSString*)sms//当绑定手机的时候需要提供手机验证码,可以调发验证码的接口就行了 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark 设置账户信息(增加邮箱验证码) +-(void)stUserInfoWithUserID:(NSString*)userID//这个应该从登录时返回的json里获取 + withSessionID:(NSString*)sessionID//这个应该从登录时返回的json里获取 + withEmail:(NSString*)email//绑定邮箱,此参数当bFlag=2或者0时有效,为空则解除绑定邮箱 + withCountryCode:(NSString*)cCode//国码,此参数当bFlag=1或者0时有效,为空则解除绑定手机 + withPhoneNum:(NSString*)phone//手机号,此参数当bFlag=1或者0时有效,为空则解除绑定手机,绑定的手机应该是未被注册过的手机 + withUserPwd:(NSString*)Pwd//绑定邮箱或者手机需要验证密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withBindFlag:(NSString*)bFlag//绑定标志(0:同时绑定手机和邮箱 1:仅绑定手机 2:仅绑定邮箱) 不可空 + withSms:(NSString*)sms//当绑定手机的时候需要提供手机验证码,可以调发验证码的接口就行了 + withIsValidMail:(NSString *)isValidMail//邮箱是否需要校验：1需要，0或空不需要 + withMailCode:(NSString *)mailCode//邮箱验证码 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark - 修改用户账号密码 +/** + 修改用户账号密码 + + @param userID 用户iD + @param sessionID 会话ID + @param oldPwd 账号的原密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param pwd 账号的新密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + @param rePwd 确认新密码 + @param completion 回调 + */ +-(void)changeUserPasswordWithUserID:(NSString*)userID//用户iD + withSessionID:(NSString*)sessionID//会话ID + withOldPwd:(NSString*)oldPwd//账号的原密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withPwd:(NSString*)pwd//账号的新密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + withRePwd:(NSString*)rePwd//两次确认的新密码,需要32位的md5加密处理,如果提供明文密码,内部会自动加密 + completion:(GWNetCompletionBlock)completion;//请求完成回调 + +#pragma mark - 设备同步接口 +#pragma mark 设备同步-增加设备 +/** + 增加设备 + + @param userID 用户ID + @param sessionID 会话ID + @param modifyTime 客户端本地修改时的UTC时间戳 + @param deviceID 设备ID + @param devicePwd 设备加密后的密码 + @param remarkName 设备昵称 + @param permission 权限(初始为0，表示不支持权限配置) + @param completion 回调 + */ +-(void)addDeviceWithUserID:(NSString*)userID//用户ID + sessionID:(NSString*)sessionID//会话ID + modifyTime:(NSString*)modifyTime//客户端本地修改时的UTC时间戳 + deviceID:(NSString*)deviceID//设备ID + devicePwd:(NSString*)devicePwd//设备加密后的密码 + remarkName:(NSString*)remarkName//设备昵称 + permission:(NSInteger)permission//权限（初始为0，表示不支持权限配置) + completion:(GWNetCompletionBlock)completion; + +#pragma mark 设备同步-删除设备 +/** + 删除设备,服务器不会真删除,只把状态标识变为0,下次拉取数据时设备还会返回 + + @param userID 用户ID + @param sessionID 会话ID + @param modifyTime 客户端本地修改时的UTC时间戳 + @param deviceID 设备ID + @param completion 回调 + */ +-(void)deleteDeviceWithUserID:(NSString*)userID//用户ID + sessionID:(NSString*)sessionID//会话ID + modifyTime:(NSString*)modifyTime//客户端本地修改时的UTC时间戳 + deviceID:(NSString*)deviceID//设备ID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 设备同步-修改设备 +/** + 修改设备,修改一台设备信息 + + @param userID 用户ID + @param sessionID 会话ID + @param modifyTime 客户端本地修改时的UTC时间戳 + @param deviceID 设备ID + @param devicePwd 设备加密后的密码 + @param remarkName 设备昵称 + @param permission 权限,不可通过此接口更改设备权限 + @param completion 回调 + */ +-(void)modifyDeviceWithUserID:(NSString*)userID//用户ID + sessionID:(NSString*)sessionID//会话ID + modifyTime:(NSString*)modifyTime//客户端本地修改时的UTC时间戳 + deviceID:(NSString*)deviceID//设备ID + devicePwd:(NSString*)devicePwd//设备加密后的密码 + remarkName:(NSString*)remarkName//设备昵称 + permission:(NSInteger)permission + completion:(GWNetCompletionBlock)completion; + +#pragma mark 设备同步-批量更新设备 +/** + 设备同步-批量更新设备 + + 参数 DeviceInfo 格式说明（两台设备信息之间用英式','分隔，各个信息字段用英式'|'分隔）,如 + + "操作选项1|修改时间1|设备信息版本号1|分组ID1|设备ID1|权限1|秘钥1|备注名1,操作选项2|修改时间2|设备信息版本号2|分组ID2|设备ID2|权限2|秘钥2|备注名2" + + 操作选项取值：1（添加）、2（删除）、3（修改）,最大包含200台设备信息。 + + @param userID 用户ID + @param sessionID 会话ID + @param deviceInfo 设备信息,要更改的设备信息,按上面说明的格式填写 + @param completion 回调 + */ +-(void)upgradeDevicesWithUserID:(NSString*)userID//用户ID + sessionID:(NSString*)sessionID//会话ID + deviceInfo:(NSString*)deviceInfo//设备信息 + completion:(GWNetCompletionBlock)completion; + +#pragma mark 设备同步-拉取设备信息 +/** + 设备同步-拉取设备信息 + + 回调数据说明: + + DeviceInfo格式,和批量更新不完全一致（两台设备信息之间用英式','分隔，各个信息字段用英式'|'分隔）,如: + + "修改时间1|设备信息版本号1|分组ID1|设备ID1|权限1|秘钥1|备注名1|状态1,修改时间2|设备信息版本号2|分组ID2|设备ID2|权限2|秘钥2|备注名2|状态2" + + 这里的“状态”取值：0（已标记为删除【实际上不会真正删除数据】，APP不要显示）、1（正常）。 + + @param userID 用户ID + @param sessionID 会话ID + @param preDeviceID 上次拉取时获取到的最后一个设备ID（第一次拉取填0 + @param requestCount 请求拉取的设备数量（每次最大200个） + @param upgradeFlag 本地缓存的列表最后更新标志,传"0"即可 + @param upgCheckList 要获取哪些设备有固件更新,格式为"设备ID1|设备ID2" + @param completion 回调 + */ +-(void)loadDevicesWithUserID:(NSString*)userID//用户ID + sessionID:(NSString*)sessionID//会话ID + preDeviceID:(NSString*)preDeviceID//上次拉取时获取到的最后一个设备ID（第一次拉取填0） + requestCount:(NSUInteger)requestCount//请求拉取的设备数量（每次最大200个） + upgradeFlag:(NSString*)upgradeFlag//本地缓存的列表最后更新标志 + upgCheckList:(NSString*)upgCheckList + completion:(GWNetCompletionBlock)completion; + +#pragma mark - 分享接口 +#pragma mark 锁定设备绑定主人的功能 +/** + 锁定设备绑定主人的功能 + + 锁定后其它用户不能再对此设备进行绑定主人操作 + + 同时此接口可查询设备是否已经被绑定了 + + @param deviceID 设备ID + @param userID 用户ID + @param sessionID 登陆会话ID + @param completion 绑定完成后的block + */ +- (void)lockBindingDevice:(NSString *)deviceID + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 绑定主人 +/** + 绑定主人 + + 关于权限的定义，Permission是8字节整型，总共有64个bit，从低位到高位分配如下： + + Bit0: 表示是否启用权限管理功能 + + Bit1: 表示是否是设备的主人(主人不受其他权限位的影响；不是主人才需要根据权限位的定义处理) + + Bit2：表示是否有基本权限(看视频、截屏、录制本地视频、查看当前流量，调整画质[分辨率]) + + Bit3：表示是否有摇头权限 + + Bit4：表示是否有语音（含对讲）权限； + + Bit5：表示是否有回放（包含云回放）权限 + + Bit6：表示是否有布撤防权限； + + Bit7：表示是否有开锁（支持锁的设备才显示开锁权限设置）权限； + + Bit8：表示是否有接收设备消息（报警、门铃、呼叫等）推送权限； + + Bit9: 表示是否开启接收设备消息（当Bit8为1，此位才有效）； + + Bit10 表示设备离线后是否开启接收离线通知（0：关闭离线通知，1：开启离线通知）； + + @param deviceID 设备ID + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param modifyTime 绑定时时间戳 + @param deviceInfoVersion 设备信息版本号(现在传 0，后续可使用不同版本号对应不同的加密方式等) + @param groupID 分组ID(现在传 0，表示不支持设备分组) + @param permission 权限(必须是开启权限功能且是主人,按权限值计算) + @param secretKey 设备加密后的密码(主人密码) + @param guestKey 设备加密后的访客密码 + @param remarkName 设备备注名称 + @param keyID 由DeviceID+Rkey组成(其中DeviceID、RKey需要加密) + @param customID 顾客ID,获取不到时应传入0 + @param macAddr Mac地址，长度固定为12，获取不到时用0填充 + @param isSupport 是否支持权限管理，1代表支持，0或者传空代表不支持 + @param completion 绑定完成后的block + */ +- (void)bindDevice:(NSString *)deviceID + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + modifyTime:(NSString *)modifyTime + deviceInfoVersion:(NSString *)deviceInfoVersion + groupID:(NSString *)groupID + permission:(NSInteger)permission + secretKey:(NSString *)secretKey + guestKey:(NSString *)guestKey + remarkName:(NSString *)remarkName + keyID:(UInt64)keyID + customID:(int)customID//顾客ID,获取不到时应传入0 + macAddr:(NSString *)macAddr//Mac地址，长度固定为12，获取不到时用0填充 + isSupport:(BOOL)isSupport//是否支持权限管理，1代表支持，0或者传空代表不支持 + completion:(GWNetCompletionBlock)completion; + +#pragma mark 获取邀请码 +/** + 获取邀请码,此接口已经不用,改用获取邀请链接 + + @param deviceID 设备ID + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param permission 权限(必须是开启权限功能且是主人) + @param completion 绑定完成后的block + */ +- (void)getInviteCodeWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + permission:(NSInteger)permission + completion:(GWNetCompletionBlock)completion DEPRECATED_MSG_ATTRIBUTE("use getShareLinkWithUserID:sessionID:deviceID:permission:guestID:guestRemark:appendMsg:completion:"); + +#pragma mark 获取邀请链接 +/** + 获取邀请链接 + + 返回ShareLink:分享链接(包含链接作用类型、邀请码、分享者的昵称、分享者APP的版本号、设备ID)。链接作用类型=1 代表是分享功能的链接 + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param deviceID 设备ID + @param permission 权限(必须是开启权限功能且是主人) + @param guestID 访客ID(二维码或链接分享时传空) + @param guestRemark 访客备注名(二维码或链接分享时传空) + @param appendMsg 留言(二维码或链接分享时传空) + @param completion 回调 + */ +- (void)getShareLinkWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + permission:(NSInteger)permission + guestID:(NSString *)guestID + guestRemark:(NSString *)guestRemark + appendMsg:(NSString *)appendMsg + completion:(GWNetCompletionBlock)completion; + +#pragma mark 获取访客列表 +/** + 获取访客列表 + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param deviceID 设备ID + @param completion 绑定完成后的block + */ +- (void)getGuestListWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 删除访客信息 +/** + 删除访客信息 + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param deviceID 设备ID + @param guestID 访客ID + @param completion 绑定完成后的block + */ +- (void)deleteGuestWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + guestID:(NSString *)guestID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 删除主人信息（解绑） +/** + 删除主人信息（解绑） + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param deviceID 设备ID + @param packageOption 是否有增值业务 + @param completion 绑定完成后的block + */ +- (void)deleteOwnerWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + packageOption:(BOOL)packageOption + completion:(GWNetCompletionBlock)completion; + +#pragma mark 获取设备密码 +/** + 获取设备密码 + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param deviceID 设备ID + @param completion 绑定完成后的block + */ +- (void)getSharedDevicePasswordWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 获取被分享的设备信息(访客添加被分享的设备) +/** + 获取被分享的设备信息(访客添加被分享的设备) + + @param userID 用户(访客)ID + @param sessionID 登陆会话ID + @param inviteCode 邀请码(设备主人分享得到,二维码或文本) + @param modifyTime 客户端本地修改时的UTC时间戳 + @param completion 绑定完成后的block + */ +- (void)getSharedDeviceInfomationWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + inviteCode:(NSString *)inviteCode + modifyTime:(NSString *)modifyTime + completion:(GWNetCompletionBlock)completion; + +#pragma mark 修改权限 +/** + 修改权限 + + @param userID 用户ID + @param sesssionID 会话ID + @param deviceID 设备ID + @param guestID 访客ID + @param permission 权限值 + @param completion 回调 + */ +- (void)modifyPermissionWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + guestID:(NSString *)guestID + permission:(NSString *)permission + completion:(GWNetCompletionBlock)completion; + +#pragma mark 主人分享时获取访客信息 +/** + 主人分享时获取访客信息 + + @param userID 主人ID + @param sessionID 会话ID + @param deviceID 设备ID + @param guestAccount 要分享的访客ID + @param completion 回调 + */ +- (void)getGuestInfoWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + guestAccount:(NSString *)guestAccount + completion:(GWNetCompletionBlock)completion; + +#pragma mark 修改访客备注 +/** + 修改访客备注 + + @param userID 主人ID + @param sessionID 会话ID + @param deviceID 设备ID + @param guestID 访客ID + @param remarkName 修改后的备注名 + @param completion 回调 + */ +- (void)modifyGuestRemarknameWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + guestID:(NSString *)guestID + remarkName:(NSString *)remarkName + completion:(GWNetCompletionBlock)completion; + +#pragma mark 修改用户昵称 +/** + 修改用户昵称 + + @param userID 用户ID + @param sessionID 会话ID + @param nickName 昵称 + @param completion 回调 + */ +- (void)modifyNicknameWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + nickName:(NSString *)nickName + completion:(GWNetCompletionBlock)completion; + +#pragma mark 主人/访客解除接收推送 +/** + 主人/访客解除接收推送 + + @param userID 用户ID + @param sessionID 会话ID + @param deviceID 设备ID + @param completion 回调 + */ +- (void)cancelReceivePushWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 预配网 +/** + 预配网 + + 只有智能联机时调此接口，告诉服务器，设备将开始配网 + + 设备连接到网络后，会以两种方式通知手机，一是局域网发包，二是p2p消息通知，调此接口后，将wifi信息发给服务器，服务器以这个信息判断是哪台设备正在配网。配网成功后，两种方式哪种先收到就处理哪种 + + @param deviceID 设备ID + @param wifiInfo wifi信息，用来核对是哪个设备正在配网，wifi用户名+密码 + @param userID 用户ID + @param sessionID 会话ID + @param completion 回调 + */ +- (void)tellServceDevice:(NSString *)deviceID + willLinkWifi:(NSString *)wifiInfo + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 设置设备离线推送状态 +/** + 设置设备离线推送状态，默认为开,设备离线后，会给app推送一条消息 + + @param on 离线推送状态 + @param userID 用户ID + @param sessionID 会话ID + @param deviceID 设备ID + @param completion 回调 + */ +- (void)setDeviceOffinePushState:(BOOL)on + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + completion:(GWNetCompletionBlock)completion; + +#pragma mark - app开启权限管理 +/** + app开启权限管理，适用于固件升级后支持权限管理，需要app开启权限管理 + + @param userID 用户ID + @param sessionID 会话ID + @param deviceID 设备ID + @param completion 回调 + */ +- (void)openAuthorityWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + deviceID:(NSString *)deviceID + completion:(GWNetCompletionBlock)completion; + +#pragma mark - 检查设备绑定状态 +/** + 检查设备绑定状态 + + @param deviceID 设备ID + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param completion 绑定完成后的block + */ +- (void)getBindedStatusDevice:(NSString *)deviceID + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + completion:(GWNetCompletionBlock)completion; + +#pragma mark 已联网方式转分享模式 +/** + 已联网方式转分享模式 + + @param deviceID 设备ID + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param modifyTime 绑定时时间戳 + @param deviceInfoVersion 设备信息版本号(现在传 0，后续可使用不同版本号对应不同的加密方式等) + @param groupID 分组ID(现在传 0，表示不支持设备分组) + @param permission 权限(必须是开启权限功能且是主人,按权限值计算) + @param secretKey 设备加密后的密码(主人密码) + @param guestKey 设备加密后的访客密码 + @param remarkName 设备备注名称 + @param isSupport 是否支持权限管理，1代表支持，0或者传空代表不支持 + @param completion 绑定完成后的block + */ +- (void)switchOwnerDevice:(NSString *)deviceID + withUserID:(NSString *)userID + sessionID:(NSString *)sessionID + modifyTime:(NSString *)modifyTime + deviceInfoVersion:(NSString *)deviceInfoVersion + groupID:(NSString *)groupID + permission:(NSInteger)permission + secretKey:(NSString *)secretKey + guestKey:(NSString *)guestKey + remarkName:(NSString *)remarkName + isSupport:(BOOL)isSupport + completion:(GWNetCompletionBlock)completion; + +#pragma mark 灰度控制app是否展示开启启动图 +/** + 灰度控制app是否展示开启启动图 + + @param userID 用户(主人)ID + @param sessionID 登陆会话ID + @param completion 回调 + */ +- (void)shouldShowSplashADWithUserID:(NSString *)userID + sessionID:(NSString *)sessionID + completion:(GWNetCompletionBlock)completion; + +#pragma mark - 自定义服务器地址请求 +/** + 自定义链接请求,适用于单独的Web API或者测试 + + @param urlStr 请求链接 + @param paras 除了公共参数之外的参数 + @param completion 回调 + */ +- (void)requestWithURLString:(NSString *)urlStr parameters:(NSDictionary *)paras completion:(GWNetCompletionBlock)completion; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h new file mode 100755 index 0000000..14ce9a7 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWNetError.h @@ -0,0 +1,102 @@ +// +// GWNetError.h +// Yoosee +// +// Created by zengyuying on 17/1/9. +// Copyright © 2017年 Gwelltimes. All rights reserved. +// + +//以下是根据新服务器网络接口错误码定义的宏,原为16进制的值,因为GWNet返回的是NSString,所以直接定义为字符串 + + +#define GWNET_RET_OPERATION_SUCCESS @"0" //成功 + +#define GWNET_RET_SHOW_SERVER_MESSAGE_1 @"10001" //app直接显示服务器返回的错误字符串 +#define GWNET_RET_SHOW_SERVER_MESSAGE_2 @"10901061" //app直接显示服务器返回的错误字符串 +#define GWNET_RET_SYSTEM_MAINTENANCE_ERROR @"10901060" //系统正在维护，请稍后再试 +#define GWNET_RET_PASSWORD_HAS_BEEN_INITED_ERROR @"10902076" //密码已被初始化过，无法再初始化 +#define GWNET_RET_COUNTRY_CODE_FORMAT_ERROR @"10902075" //国家码数据格式不正确 +#define GWNET_RET_REGIEST_FAILED @"10902072" //注册失败 +#define GWNET_RET_GET_PHONE_CODE_REACH_CEILING @"10902026" //获取手机验证码已到达上限 +#define GWNET_RET_GET_PHONE_CODE_TOO_TIMES @"10902025" //获取手机验证码太频繁 +#define GWNET_RET_SEND_VERIFY_CODE_FAILED @"10902024" //发送手机验证码失败 +#define GWNET_RET_SEND_VERIFY_EMAIL_FAILED @"10902023" //发送验证邮件失败 +#define GWNET_RET_EMAIL_USED @"10902021" //邮箱已被使用 +#define GWNET_RET_PHONE_USED @"10902020" //手机号已被使用 +#define GWNET_RET_ACCOUNT_DISABLED @"10902013" //帐号不可用_不可用的原因在error中返回帐号状态编号 +#define GWNET_RET_SESSION_ID_ERROR @"10902012" //会话ID不正确 +#define GWNET_RET_ACCOUNT_NOT_EXIST @"10902011" //用户不存在 +#define GWNET_RET_PHONE_CODE_TIMEOUT @"10902010" //手机验证码超时 +#define GWNET_RET_PHONE_CODE_ERROR @"10902009" //手机验证码不正确 +#define GWNET_RET_LACK_COUNTRY_CODE @"10902007" //请在手机号前输入国码 +#define GWNET_RET_BIND_ACCOUNT_PASSWORD_ERROR @"10902005" //绑定的用户密码错误 +#define GWNET_RET_BIND_ACCOUNT_NOT_EXIST @"10902004" //绑定的用户不存在 +#define GWNET_RET_ACCOUNT_PASSWORD_ERROR @"10902003" //用户密码错误 +#define GWNET_RET_THIRD_ACCOUNT_NOT_EXIST @"10902002" //第三方账号不存在 +#define GWNET_RET_THIRD_ACCOUNT_EXIST @"10902001" //第三方账号已存在 +#define GWNET_RET_SERVICE_NOT_SUPPORT @"10901071" //服务器不支持此项服务 +#define GWNET_RET_PASSWORD_FORMAT_ERROR @"10901024" //密码数据格式不符合要求 +#define GWNET_RET_EMAIL_FORMAT_ERROR @"10901023" //邮箱地址数据格式不符合要求 +#define GWNET_RET_PHONE_FORMAT_ERROR @"10901022" //手机号数据格式不符合要求 +#define GWNET_RET_LACK_PARAMETER_ERROR @"10901020" //缺少输入参数 +#define GWNET_RET_GET_EMAIL_CODE_TOO_OFTEN @"10902027" //获取邮件太频繁 +#define GWNET_RET_GET_EMAIL_CODE_COUNT_LIMIT @"10902028" //获取邮件已到达30分钟内的上限 +#define GWNET_RET_EMAIL_CODE_ERROR @"10902029" //邮件验证码不正确 +#define GWNET_RET_EMAIL_CODE_TIMEOUT @"10902030" //邮件验证码超时 + +//同步设备列表相关 +#define GWNET_RET_ADD_DEVICE_ALREADY_EXIST @"1090200A" //设备已存在，不能重复添加 +#define GWNET_RET_MODIFY_DEVICE_NOT_EXIST @"1090200B" //设备信息不存在 +#define GWNET_RET_MODIFY_DEVICE_SERVER_NEWER @"1090200C" //服务器上的记录比客户端的新，客户端需要重新加载 +#define GWNET_RET_DEVICE_ID_REPEATED @"1090200D" //设备ID重复 +#define GWNET_RET_LOAD_DEVICE_ALREADY_LAST @"1090200E" //您的设备列表已经是最新的，不需要从服务器拉取了 + +//设备分享 +#define GWNET_RET_SHARING_DEVICE_HAS_NO_OWNER @"10905002" //此设备还没有主人 +#define GWNET_RET_SHARING_DEVICE_HAS_OWNER @"10905001" //此设备已有主人 +#define GWNET_RET_SHARING_DEVICE_HAS_BE_LOCKED_AND_IS_BEENING_BINDED @"10905003" //此设备已被锁定，正在绑定主人信息 +#define GWNET_RET_SHARING_DEVICE_HAS_BE_LOCKED @"10905004" //此设备已被他人锁定及绑定主人信息 +#define GWNET_RET_SHARING_INSUFFICIONT_USER_PERMISSIONS @"10905005" //必须是主人权限才能操作 +#define GWNET_RET_SHARING_CREATE_INVATE_CODE_FAIL @"10905007" //创建邀请码失败 +#define GWNET_RET_SHARING_INVATE_CODE_INVANIDATE @"10905008" //邀请码无效（不存在或超时） +#define GWNET_RET_SHARING_IS_OWNER @"10905009" //已经是主人 +#define GWNET_RET_SHARING_IS_VISITOR @"10905010" //已经是访客 +#define GWNET_RET_PARAMETER_ERROR @"10901025" //参数错误 + +//设备数量限制 +#define GWNET_RET_ADD_DEVICE_COUNT_LIMIT @"10905014" //添加的当前设备数量已达到上限 +#define GWNET_RET_ADD_PAST_DEVICE_COUNT_LIMIT @"10905014" //添加的历史设备数量已达到上限 +#define GWNET_RET_DEVICE_BINDED_COUNT_LIMIT @"10905014" //当前设备被绑定的次数已达到上限 + +//权限管理 +#define GWNET_RET_VISITOR_HAS_DELETE_DEVICE @"10905017" //配置权限时访客已删除该设备 + + +//以下错误码在客户端暂时没用到,有需要时再进行定义 + +//需要用到再定义 #define @"10902074" //验证码为空 +//需要用到再定义 #define @"10902073" //验证码不存在 +//需要用到再定义 #define @"10902022" //为了你的帐号安全，请输入邮箱地址 +//需要用到再定义 #define @"10902014" //重置密码链接无效 +//需要用到再定义 #define @"10902008" //系统分配账号失败 +//需要用到再定义 #define @"10902006" //获取绑定的用户信息失败 +//需要用到再定义 #define @"109013E9" //请换用其他服务器接口 +//需要用到再定义 #define @"10901070" //访问受限制 +//需要用到再定义 #define @"10901061" //这里的内容动态生成，APP直接显示此内容 +//需要用到再定义 #define @"10901053" //APP客户号(内置主版本号)错误 +//需要用到再定义 #define @"10901052" //APP信息不存在 +//需要用到再定义 #define @"10901051" //此APP已被冻结 +//需要用到再定义 #define @"10901050" //APP信息(AppID、AppToken、包名等)不正确 +//需要用到再定义 #define @"10901040" //系统配置错误 +//需要用到再定义 #define @"1090103E" //请换用其他服务器接口 +//需要用到再定义 #define @"10901030" //发现非法字符 +//需要用到再定义 #define @"10901027" //参数超出范围 +//需要用到再定义 #define @"10901026" //用户ID必须以0开头 +//需要用到再定义 #define @"10901021" //输入数据格式错误 +//需要用到再定义 #define @"10901012" //文件操作失败 +//需要用到再定义 #define @"10901011" //文件不存在 +//需要用到再定义 #define @"10901010" //文件打开失败 +//需要用到再定义 #define @"10901004" //数据库操作异常 +//需要用到再定义 #define @"10901003" //数据库记录集为空 +//需要用到再定义 #define @"10901002" //数据库操作失败 +//需要用到再定义 #define @"10901001" //数据库连接失败 diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h new file mode 100755 index 0000000..54c47c1 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2P.h @@ -0,0 +1,47 @@ +// +/** @file GWP2P.h @brief 该文件包含GWP2P SDK所有头文件 */ +// P2PSDK +// +// Created by apple on 17/2/24. +// Copyright © 2017年 gwell. All rights reserved. +// + +// 用户接口 +#import "GWNet.h" +#import "GWNetError.h" + +//设置 +#import "GWP2PClient.h" //初始化连接 +#import "GWP2PClient+DeviceInfomation.h" +#import "GWP2PClient+PictureAndSound.h" +#import "GWP2PClient+Defense.h" +#import "GWP2PClient+Alarm.h" +#import "GWP2PClient+Record.h" +#import "GWP2PClient+SceneMode.h" +#import "GWP2PClient+APMode.h" +#import "GWP2PClient+Sensor.h" +#import "GWP2PClient+WhiteLight.h" +#import "GWP2PClient+GarageLight.h" +#import "GWP2PClient+HXVision.h" +#import "GWP2PDefine.h" + + +//监控、视频通话、回放 +#import "GWP2PPlayer.h" //播放器基类 +#import "GWP2PVideoPlayer.h" //监控、视频通话时使用 +#import "GWP2PPlaybackPlayer.h" //回放使用 +#import "GWP2PPlayerDefine.h" + +//配网 +#import "GWP2PDeviceLinker.h" //设备联网 + +//模型 +#import "GWP2PDevice.h" //设备 +#import "GWP2PLanDevice.h" //局域网搜索到的设备 + + +//服务器加密 +#import "MD5Manager.h" + + + diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+APMode.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+APMode.h new file mode 100755 index 0000000..247deff --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+APMode.h @@ -0,0 +1,62 @@ +// +/** @file GWP2PClient+APMode.h @brief 处理AP模式的分类 */ +// P2PSDK +// +// Created by apple on 17/3/7. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + +/** + @brief 处理AP模式的分类 + */ +@interface GWP2PClient (APMode) + +/** + 切换设备模式：从连网模式至AP模式 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceFromNetworkModeToAPModeWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 切换设备模式：AP配网单机模式切换到普通单机模式,单机模式指令,必需连接AP配网模式的设备wifi才能使用 + + 设备处于AP配网模式时,会发出配网提示音,执行这条指令后,不再发出配网提示音 + + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceFromConfigNetworkAPModeToNormalAPModeWithCompletionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备是否连接过wifi (若设备不支持，只会超时，此bug待日后更新) + + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceWiFiHasBeSettedWithCompletionBlock:(CompletionBlock)completionBlock; + +/** + AP模式下设置设备wifi，设置后设备切回连网模式并连接设置的wifi (若设备不支持，只会超时，此bug待日后更新) + + @param wifiName wifi名 + @param wifiPassword wifi密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWifiInAPModeWithWifiName:(NSString *)wifiName + wifiPassword:(NSString *)wifiPassword + completionBlock:(CompletionBlock)completionBlock; + +/** + AP模式下设置设备wifi密码 + + @param wifiPassword wifi密码：8-16位 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWifiPassword:(NSString *)wifiPassword inAPModeWithCompletionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h new file mode 100755 index 0000000..7cf3524 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Alarm.h @@ -0,0 +1,293 @@ +// +/** @file GWP2PClient+Alarm.h @brief 处理设备报警的分类 */ +// P2PSDK +// +// Created by apple on 17/3/2. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + +/** + 邮箱加密方式 + */ +typedef enum GWP2PAlarmEmailEncryptType { + GWP2PAlarmEmailEncryptTypeNone, /**< 不加密 */ + GWP2PAlarmEmailEncryptTypeSSL, /**< SSL加密 */ + GWP2PAlarmEmailEncryptTypeTLS, /**< TLS加密 */ +}GWP2PAlarmEmailEncryptType; + +/** + 解除报警推送账号的操作类型 + */ +typedef enum GWUnbindAlarmAccountOperationType { + GWUnbindAlarmAccountOperationTypeUnbindAlarmAccount = 0,/**< 解除设备报警推送账号(当前登陆服务器的) */ + GWUnbindAlarmAccountOperationTypeStopDoorBellPush = 1,/**< 停止门铃推送至当前账号(当前登陆服务器的) */ +}GWUnbindAlarmAccountOperationType; + + +/** + @brief 处理设备报警的分类 + */ +@interface GWP2PClient (Alarm) + +#pragma mark - 设备报警设置 +/** + 设置设备移动侦测状态 + + 获取设备移动侦测状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param motionDetetionOn 移动侦测是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceMotionDetetionState:(BOOL)motionDetetionOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; +/** + 设置设备移动侦测灵敏度 + + 获取设备移动侦测灵敏度请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param motionDetetionSensitivity 移动侦测灵敏度:0-6,数值越大,灵敏度越高 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceMotionDetetionSensitivity:(NSUInteger)motionDetetionSensitivity + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备物件追踪状态 + + 获取设备物件追踪状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param objectTrackingOn 物件追踪是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceObjectTrackingState:(BOOL)objectTrackingOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备蜂鸣器状态 + + 获取设备蜂鸣器状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param buzzTime 蜂鸣时长,单位为分,可设数字有:0(关闭), 1, 2, 3 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceBuzzerState:(NSUInteger)buzzTime + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备人体红外开关状态 + + 获取设备人体红外开关状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + 如果获取不到设备人体红外开关状态,调用些方法无效 + + @param humanInfraredOn 人体红外是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceHumanInfraredState:(BOOL)humanInfraredOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备有线报警输入开关状态 + + 获取设备蜂有线报警输入开关状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + 如果获取不到设备有线报警输入开关状态,调用些方法无效 + + @param wiredAlarmInputOn 有线报警输入是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWiredAlarmInputState:(BOOL)wiredAlarmInputOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备有线报警输出开关状态 + + 获取设备蜂有线报警输出开关状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + 如果获取不到设备有线报警输出开关状态,调用些方法无效 + + @param wiredAlarmOutputOn 有线报警输出是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWiredAlarmOutputState:(BOOL)wiredAlarmOutputOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备报警时推送的绑定账号 + + completionBlock返回字典: + + @"account count" 绑定账号的个数 + + @"account maxCount" 设备最大可绑定账号的个数 + + @"accounts" 绑定的账号,类型为 NSArray * + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceBindedAlarmAccountWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备报警时推送的绑定账号 + @param accounts 要绑定的账号数组(多个账号),参数为字符串,绑定成功后覆盖原来的数据。账号为登陆技威web服务器后返回的经过 & 0x7fffffff 位处理的数字账号，在yoosee上显示的以0开头的账号 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceBindedAlarmAccounts:(NSArray *)accounts + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备报警邮箱 + + completionBlock字典返回: + + @"email" 绑定的邮箱，类型：NSString + + @"email is verified" 邮箱是否验证，类型：BOOL YES表示未验证,NO表示已验证 + + @"surport SMTP" 设备是否支持SMTP邮箱，类型：BOOL + + @"password is right" SMTP邮箱密码是否正确，类型：BOOL + + @"SMTP server" SMTP服务器，类型：NSString + + @"SMTP port" SMTP端口，类型：NSNumber + + @"SMTP user" SMTP用户，类型：NSString + + @"SMTP password" SMTP密码，类型：NSString + + @"encrypt type" 加密类型，类型：GWP2PAlarmEmailEncryptType + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceAlarmEmailWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备报警邮箱,设置后返回的数据不准确,再调获取接口获取邮箱数据 + + 老设备,不支持SMTP,是否支持SMTP在获取报警邮箱时得到,则用技威服务器的邮箱发送邮件至设置邮箱 + + 新设备,支持SMTP,报警时,若完整地设置邮箱(SMTP及密码都通过验证),用设置的邮箱发送邮件至设置的邮箱自己 + + 一些常用的邮箱SMTP服务器与端口号: + + 腾讯: smtp.qq.com 465 + + yahoo: smtp.mail.yahoo.com 465 + + google: 173.194.193.108 465, 173.194.67.108 465, smtp.gmail.com 465 + + 189: smtp.189.cn 465 + + hotEmail: smtp.live.com 465 + + 网易: smtp.163.com 25 + + 新浪: smtp.sina.com.cn 465 + + completionBlock返回：获取后的邮箱密码等数据可能不准确,可参考的是邮箱是否验证成功,SMTP邮箱密码是否正确 + + @"success" BOOL类型，操作是否成功 + + @"email" 绑定的邮箱，类型：NSString + + @"email is verified" 邮箱是否验证，类型：NSNumber 1表示未验证,0表示已验证,这个与其它逻辑相反,要注意 + + @"surport SMTP" 设备是否支持SMTP邮箱，类型：NSNumber @(BOOL) + + @"password is right" SMTP邮箱密码是否正确，类型：NSNumber @(BOOL) + + @param alarmEmail 报警邮箱地址, 解绑时要传 @"0",否则解绑不成功 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param isSupportSMTP 设备是否支持SMTP邮箱:获取报警邮箱时可获取此参数;若设备支持,必须传入SMTP的服务器、端口、用户名、用户密码才能绑定邮箱，此参数也必须为YES + @param SMTPServer SMTP服务器 + @param SMTPPort SMTP服务器端口 + @param SMTPUser SMTP用户名:设备报警时用来发送邮件 + @param SMTPPassword SMTP密码 或者 SMTP授权码 + @param encryptType 加密类型 + @param emailTile 邮件主题:设备报警时发送邮件的标题 + @param emailContent 邮件内容:设备报警时发送邮件的内容 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceAlarmEmail:(NSString *)alarmEmail + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + isSupportSMTP:(BOOL)isSupportSMTP + SMTPServer:(NSString *)SMTPServer + SMTPPort:(NSUInteger)SMTPPort + SMTPUser:(NSString *)SMTPUser + SMTPPassword:(NSString *)SMTPPassword + encryptType:(GWP2PAlarmEmailEncryptType)encryptType + emailTitle:(NSString *)emailTile + emailContent:(NSString *)emailContent + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 设备报警后操作 +/** + 设备报警时,关闭蜂鸣器 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)closeBuzzerWhenDeviceIsAlarmingWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设备报警时解除关联的当前报警账号 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param operationType 操作类型,有 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)unbindDeviceCurrentAlarmAccountWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + operationType:(GWUnbindAlarmAccountOperationType)operationType + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h new file mode 100755 index 0000000..f76606a --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Defense.h @@ -0,0 +1,128 @@ +// +/** @file GWP2PClient+Defense.h @brief 处理布撤防和预置位的分类 */ +// P2PSDK +// +// Created by apple on 17/3/2. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + +/** + 操作预置位方式 + */ +typedef enum GWPresetPositionOperationType { + GWPresetPositionOperationTypeTurnTo,/**< 转向某预置位 */ + GWPresetPositionOperationTypeSet,/**< 在当前设备摄像头角度下增加给定索引的预置位，若给定索引设置过预置位，则覆盖原信息 */ + GWPresetPositionOperationTypeQuery,/**< 查看所有预置位信息 */ + GWPresetPositionOperationTypeDelete,/**< 删除某索引的预置位 */ +} GWPresetPositionOperationType; + + +/** + @brief 定时布防模型，一个 GWSheduleDefencesModel 对象对应一条定时布防数据 + */ +@interface GWSheduleDefencesModel : NSObject + +@property (nonatomic, assign) BOOL on; /**< 此定时布防是否打开 */ +@property (nonatomic, assign) NSUInteger index; /**< 此布防在设备的位置，一个设备最多五组布防 */ +@property (nonatomic, assign) NSUInteger startTime_Hour; /**< 开始于多少小时 */ +@property (nonatomic, assign) NSUInteger startTime_Minute; /**< 开始于多少分 */ +@property (nonatomic, assign) NSUInteger endTime_Hour; /**< 结束于多少小时 */ +@property (nonatomic, assign) NSUInteger endTime_Minute; /**< 结束于多少分 */ +//每天的开关状态 +@property (nonatomic, assign) BOOL mondayOn; /**< 周一是否打开 */ +@property (nonatomic, assign) BOOL tuesdayOn; /**< 周二是否打开 */ +@property (nonatomic, assign) BOOL wednesdayOn; /**< 周三是否打开 */ +@property (nonatomic, assign) BOOL thursdayOn; /**< 周四是否打开 */ +@property (nonatomic, assign) BOOL fridayOn; /**< 周五是否打开 */ +@property (nonatomic, assign) BOOL saturdayOn; /**< 周六是否打开 */ +@property (nonatomic, assign) BOOL sundayOn; /**< 周日是否打开 */ + +@end + + + +/** + @brief 处理布撤防和预置位的分类 + */ +@interface GWP2PClient (Defense) + +#pragma mark - 普通布撤防操作 +/** + 设置设备布防状态 + + 普通布防只是布防与不布防的操作,定时布防有很多数据,参见 GWSheduleDefencesModel + + @param defenceStateOn 布防的开关状态 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceDefenceState:(BOOL)defenceStateOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 定时布防操作 +/** + 获取设备定时布撤防数据：返回的字典中 @"schedule defences" 键对应一个 包含 GWSheduleDefencesModel 的数组 + + 这个接口可判断设备是否支持定时布防,设置接口判断不了 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSheduleDefenceDataWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备定时布撤防：每一次设置都会覆盖原来的布防记录，且index自动从0开始排 + + 若接口调用不成功,请先调获取定时布防数据接口判断设备是否支持,如果设备不支持,只会返回连接失败 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSheduleDefenceData:(NSArray *)sheduleDefencesArray + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark 预置位操作 +/** + 操作设备预置位 + + 功能介绍:摇头机转动位置，可以让用户设置几个特定的点,记住摇头机的位置(如门、窗或者其他位置)，设置好之后，发转向预置位指令，摇头机将转动到记住的位置 + + 获取时completionBlock返回信息 : + + @"preset position indexes" 键对应一个保存已有预置位索引值的数组 NSMutableArray * + + indexesArray传值： + + 查看时indexesArray传nil或空数组。 + + 转向某预置位时传一个元素，传多个取第一个，传nil或空数组取索引值为0的预置位。 + + 添加预置位时传一个元素，一次只能添加一个预置位，传多个取第一个元素，传nil或空数组取索引值为0的预置位。 + + 删除时传一个或多个元素，一次能删除多个预置位。不能传空数组或nil + + @param operationType GWPresetPositionOperationType枚举值 + @param indexesArray 保存预置位索引值的数组:索引值范围为0-4，一个设备最多5个预置位，索引值不能重复如@[@(0), @(3)]。 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)operateDevicePresetPositionWithOperationType:(GWPresetPositionOperationType)operationType + presetPositionIndexArray:(NSArray *)indexesArray + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h new file mode 100755 index 0000000..ff853e3 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+DeviceInfomation.h @@ -0,0 +1,556 @@ +// +/** @file GWP2PClient+DeviceInfomation.h @brief 该文件为P2PClient获取和设置设备状态信息的分类 */ +// P2PSDK +// +// Created by apple on 17/2/24. +// Copyright © 2017年 gwell. All rights reserved. +// + + + + +#import "GWP2PClient.h" + + +/** + 设备网络连接类型 + */ +typedef NS_ENUM(NSUInteger, GWDeviceNetworkType) { + GWDeviceNetworkTypeWired,/**< 有线 */ + GWDeviceNetworkTypeWifi, /**< wifi */ +}; + +/** + 设备的RTSP密码模式 + */ +typedef NS_ENUM(NSUInteger, GWDeviceRTSPPasswordMode) { + GWDeviceRTSPPasswordModeClosed = 0, /**< RTSP功能关闭 */ + GWDeviceRTSPPasswordModeOpenAndPasswordNeedless = 1, /**< RTSP功能打开,但不需要密码 */ + GWDeviceRTSPPasswordModeOpenAndPasswordNeeded = 2, /**< RTSP功能打开,并需要密码 */ + GWDeviceRTSPPasswordModeUnSetted = 3, /**< 设备支持RTSP功能,但没有设置过模式,设备初始化后会返回此值,如果设备返回此值,要调确认RTSP接口,再进行RTSP密码的设置,模式的修改等操作 */ + + GWDeviceRTSPPasswordModeNOSuchFile = 4, /**< 设备支持RTSP功能,但没有支持文件,也要判断为不支持 */ + + GWDeviceRTSPPasswordModeUnSurpurted = 999, /**< 设备不支持RTSP功能,设备模型初始化时附此值,方便后面判断 */ +}; + +/** + @brief 该分类可获取和设置设备各种状态信息 + */ +@interface GWP2PClient (DeviceInfomation) + +#pragma mark - 获取设备状态 +/** + 获取多项设备状态：以下key返回结果里没有时表示设备不支持该功能 + + completionBlock返回： + + @"defence state" （布防状态）: 类型：BOOL （YES 布防 , NO 撤防） + + @"buzzer state" （蜂鸣器蜂鸣时长）: 0 off , 1 2 3 min 蜂鸣时长 类型：NSNumber + + @"motion detect state"（移动侦测状态）: 类型：BOOL (NO off; YES on) + + @"record type" （录像类型） : manual; alarm; schedule 返回字典， record type 键对应 GWP2PRecordType 枚举 + + @"manually record state" （手动录像开关） : 类型：BOOL (NO off; YES on) + + @"planed record time" （计划录像时间）:返回字典，对应的值为 NSNumber类型，保存开始时间的时分，结束时间的时分四个键值对（24小时制） + + @"video format" （视频格式） 返回字符串 : NTSC , PAL 返回字典： + + @"alarm record time" （报警录像时间）0 表示1分钟, 1 表示2分钟 2 表示3分钟 + + @"net type" （网络类型） : 0 有线; 1 wifi; + + @"volume" （音量）: 0-9整数 + + @"auto update" （自动升级）: NO off; YES on + + @"body infrared state" （人体红外状态） : NO off; YES on + + @"wired alarm input" （有线报警输入状态） : NO off; YES on + + @"wired alarm output" （有线报警输出状态） : NO off; YES on + + @"time zone" （时区） : @(0-24) + + @"password" （用户密码） + + @"image reverse state" （图像倒转状态）返回BOOL值 : @(NO) 非倒转; @(YES) 是倒转 + + @"prerecord state" （预录像状态） : NO off YES on + + @"motion detect sensityvity" (移动侦测灵敏度) : 0-6 数值越大,灵敏度越高 -1表示返回数值有误 + + @"lamp state" （灯光控制状态） : NO off YES on + + @"visitor password" （访客密码） : 由非0开头的数字组成 + + @"focus zoom" （变焦 变倍） : 0 都没有; 1 只有变倍; 2 只有变焦; 3 变倍变焦都有 + + @"AP Mode" （AP模式） : 0 不支持; 1 支持(mode!=ap); 2 支持(mode=ap) + + @"type" （设备主类型）： GWDeviceType 类型,（如IPC、NPC...） （设备返回的主类型不准） + + @"subtype" （设备子类型）： GWDeviceSubtype 类型,（如30只支持868；31支持868+情景模式；32支持868+情景模式+分享） + + @"preset position suppurted" （是否支持预置位）: @(BOOL) NO 不支持; YES 支持 + + @"RTSP password mode" (RTSP密码模式,此项有值说明支持RTSP模式,没有值说明设备不支持) @(GWDeviceRTSPPasswordMode) + + @"confirm RTSP password mode" (需不需要确认RTSP密码模式,需要时,调确认RTSP密码模式接口后才能正常配置RTSP密码) + + @"white light suppurted" (是否支持白光灯功能) @(BOOL) + + @"white light on" (白光灯灯关是否打开) @(BOOL) + + @"sound control suppurted" (是否支持声音控制功能) @(BOOL) + + @"white light brightness" (白光灯亮度) @(int) + + @"433 doorbell suppurted" (是否支持433门铃传感器) @(BOOL) + + @"object tracking" (物件追踪，字典里没有表示不支持) @(BOOL) + + @param deviceID 设备ID + @param password 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getMultipleDeviceStatusWithDeviceID:(NSString *)deviceID + password:(NSString *)password + completionBlock:(CompletionBlock)completionBlock; + + +/** + 获取设备信息 + + completionBlock 返回字典对应的key: + + @"firmware version" 固件版本 + + @"uBoot uersion" uBoot版本 + + @"kernel version" 内核版本 + + @"system version" 系统版本 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceInfomationWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 下载文件 +/** + 从设备下载文件,下载结果在 GWP2PClientProtocol 的方法 client:didDownloadFile:withFilePath:deviceID: 中 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param remoteFilePath 远程文件路径,一般由设备返回 + @param localFilePath 下载后文件在本地的保存路径,文件在沙盒中的保存路径(包括文件名及文件扩展名),下载成功后文件直接保存在此路径 + + @return 下载是否开始 + */ +- (BOOL)downloadFileWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + remoteFilePath:(NSString *)remoteFilePath + localFilePath:(NSString *)localFilePath; + +/** + 从设备下载报警时的截图, 下载结果在 GWP2PClientProtocol 的 client:didDownloadFile:withFilePath:deviceID:result: 方法中回调 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param pictureNumber 报警时截图的数量,设备推送报警时,会推送此数据 + @param toDownloadIndex 要下载的图片索引, <= (pictureNumber - 1) + @param remoteFilePath 图片的路径,设备推送报警时,会推送此数据 + @param localFilePath 下载后图片在本地的保存路径,图片在沙盒中的保存路径(包括图片名及图片扩展名),下载成功后文件直接保存在此路径 + + @return 下载是否开始 + */ +- (BOOL)downloadAlarmPictureWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + pictureNumber:(NSUInteger)pictureNumber + toDownloadIndex:(NSUInteger)toDownloadIndex + remoteFilePath:(NSString *)remoteFilePath + localFilePath:(NSString *)localFilePath; + +#pragma mark - 网络 +/** + 获取设备搜索到的Wifi列表 + + 获取网络类型请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + completionBlock返回字典: + + @"wifi count" : wifi数目 + + @"current wifi index" : 正在使用的wifi索引值 索引值从0开始 + + @"wifi list" : wifi列表数组,数组内一个字典对应一个wifi的信息(wifi名,是否加密,wifi强度,加密类型) @[@{@"wifi name" : @"wifi名", @"has encrypted" : @(YES), @"wifi strength" : @"wifi强度"}, @"encrypted type" : @(0)];] + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceWifiListWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备网络连接类型，即在有线和wifi之间切换 + + @param networkType 网络类型 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceNetworkType:(GWDeviceNetworkType)networkType + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 不再使用 + + 连网模式下设置设备当前Wifi，设置后设备会连接到设置的wifi,此接口只支持WPA加密的wifi + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param encrypted wifi是否加密(可由获取到的wifi列表得到),传获取wifi列表字典中的@"has encrypted"对应的值 + @param wifiName wifi名 + @param wifiPassword wifi密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWifiInNetworkModeWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + wifiHasBeEncrypted:(BOOL)encrypted + wifiName:(NSString *)wifiName + wifiPassword:(NSString *)wifiPassword + completionBlock:(CompletionBlock)completionBlock DEPRECATED_ATTRIBUTE; + +/** + 连网模式下设置设备当前Wifi，设置后设备会连接到设置的wifi,新的接口,老的接口只支持WPA加密的wifi，此接口支持WEP加密和WPA加密的wifi + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param encryptedType wifi加密类型(可由获取到的wifi列表得到),传获取wifi列表字典中的@"encrypted type"对应的值 + @param wifiName wifi名 + @param wifiPassword wifi密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWifiInNetworkModeWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + wifiEncryptedType:(NSInteger)encryptedType + wifiName:(NSString *)wifiName + wifiPassword:(NSString *)wifiPassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 时间时区 +/** + 获取设备时间 : 返回 年 月 日 时 分 的数值, 不是NSDate,避免时区出错 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceTimeWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备时间 + + @param date 要设置的时间 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceTime:(NSDate *)date + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备时区 + + 获取时区请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param timeZone 要设置的时区,可设置如下数字:-11, -10, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 8, 9, 9.5, 10, 11, 12 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceTimeZone:(float)timeZone + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 安全 +#pragma mark 密码 +/** + 设置初始密码,重置设备后,设备没有密码(管理员)时调用,如果有密码,密码一般为123,具体请查看设备说明书 + + 必须保证手机与设备在同一局域网中,否则回调只会收到参数错误. 这一接口在发指令时一定要确保手机与设备在同一局域网中,指令将deviceID转成4位设备IP的最后一位,若不在同一局域网,获取不到设备IP,指令不会成功 + + @param initialPassword 初始密码,必须为包含字母、数字、其它字符中两种的6~30位的字符串 + @param deviceID 设备ID,直接传设备ID,内部处理成IP地址,也可以传4位IP的最后一位数字 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceInitialPassword:(NSString *)initialPassword + withDeviceID:(NSString *)deviceID + completionBlock:(CompletionBlock)completionBlock; + + + +/** + 设置管理员密码,设备已经有密码(管理员)时调用 + + @param oldPassword 老的管理员密码,可能为简单的初始密码,如123 + @param newPassword 新的管理员密码,必须为包含字母、数字、其它字符中两种的6~30位的字符串,否则会返回参数错误 + @param deviceID 设备ID + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceAdministratorPasswordWithOldPassword:(NSString *)oldPassword + newPassword:(NSString *)newPassword + deviceID:(NSString *)deviceID + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置访客密码,有管理员密码时调用 + + @param newVisitorPassword 新的访客密码(必须为非零开头的小于等于9位的数字) + @param administratorPassword 管理员密码 + @param deviceID 设备ID + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceVisitorPassword:(NSString *)newVisitorPassword + withAdministratorPassword:(NSString *)administratorPassword + deviceID:(NSString *)deviceID + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark RTSP密码 +/** + 设置RTSP密码 + + 不能获取密码 + + @param rtspPassword 要设置的RTSP密码 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceRTSPPassword:(NSString *)rtspPassword + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置RTSP密码模式 + + 获取RTSP模式请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param rtspPasswordMode rtsp密码模式 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceRTSPPasswordMode:(GWDeviceRTSPPasswordMode)rtspPasswordMode + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 确认RTSP密码模式 + + 新设备或查询RTSP密码模式为 GWDeviceRTSPPasswordModeUnSetted == 3 时,需要向设备发此指令,告诉设备开启RTSP密码的配置功能,之后才能正常设置RTSP密码 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)confirmDeviceRTSPPasswordModeWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 更新 +/** + 设置自动更新状态 + + 如果获取不到设备的自动更新状态,表明设备不支持,调此方法是收不到回调数据,只会超时 + + 获取自动更新状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param isAutoUpdate 是否自动更新 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceAutoUpdateState:(BOOL)isAutoUpdate + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 检查设备是否可更新 + + completionBlock返回字典对应的键值： + + @"current version" 当前固件版本 + + @"update version" 待更新的版本 + + @"can update" （是否可更新）：对应值为 NSNumber 包装的 BOOL 类型 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)checkDeviceUpdateWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 执行设备更新 + + 执行更新后下载进度在 GWP2PClientProtocol 协议的 [GWP2PClientProtocol client:updateProgress:resultCode:ofDeviceID:]方法中进行监听 + + completionBlock返回字典对应的键值： + + @"has begin update" （是否开始更新）：对应值为 NSNumber 包装的 BOOL 类型 + + @"update progress" （更新进度）：对应值为 NSNumber 包装的 int 类型 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)performUpdateWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 取消设备更新（此命令收不到设备回调） + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)cancelUpdateWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 获取设备分辨率,IP地址,MAC(网卡)地址 +/** + 获取设备分辨率,IP地址,MAC(网卡)地址 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceResolutionAndIpAndMacAddressWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 获取用户及设备列表在线状态等信息 +/** + 获取好友用户及设备列表在线状态等信息,此指令不能同时发两条,第二条要等第一条回调后再发,网络超时为25s + + completionBlock返回字典数据结构: + + @{ @"result" : @(NO), + @"description" : @"success", + @"操作描述" : @"获取好友用户及设备列表在线状态等信息", + @"status" : @[ @{//一个字典对应一个设备或一个好友用户信息 + @"deviceID" : @"设备ID或好友用户ID", + @"defence flag" : @(-1),//布防状态获取的时间标识,此值越大,表示获取的时间越晚,用于判断是否要刷新布防状态. -1表示不支持或设备不在线 + @"defence state" : @(-1),//-1表示不支持或设备不在线 + @"online state" : @(YES),//接口一定支持 + @"subtype" : @(-1)//-1表示不支持或设备不在线 + } + ] + } + + @param deviceIDsArray 设备ID数组,如果是用户(GWNet登陆的用户)ID,请在数字前加0,用于区分是设备ID还是用户ID + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDevicesOrUersStatusWithDeviceIDs:(NSArray *)deviceIDsArray + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - NVR设备 +/** + 获取设备NVR信息 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceNVRInfomationWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 更新设备id +/** + 更新设备id + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)updateDeviceIdWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 获取当前全景相机的配置信息 +/** + 获取当前全景相机的配置信息 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +-(void)getFisheyeDeviceInfoWithDeviceId:(NSString*)deviceID + devicePassword:(NSString*)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 恢复出厂设置 +/** + 恢复出厂设置 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceRestoreFactorySettingsWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; +#pragma mark -自动变焦 +/** +自动变焦 设置(set)变焦镜头马达当前位置的方法声明 + + @param deviceID 设备ID + @param password 设备密码 + @param params 对接参数 + @param completionBlock 与设备交互完成后的回调Block + */ +-(void)setAutoZoomWithId:(NSString*)deviceID + password:(NSString*)password + params:(int)params + completionBlock:(CompletionBlock)completionBlock; +/** + 自动变焦 获取变焦镜头马达当前位置方法声明 + + @param deviceID 设备ID + @param password 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +-(void)getAutoZoomWithId:(NSString*)deviceID + password:(NSString*)password + completionBlock:(CompletionBlock)completionBlock; +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+GarageLight.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+GarageLight.h new file mode 100755 index 0000000..dd7bd3a --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+GarageLight.h @@ -0,0 +1,77 @@ +// +// GWP2PClient+GarageLight.h +// GWP2P +// +// Created by duxiaoyan on 2018/6/26. +// Copyright © 2018年 apple. All rights reserved. +// + +#import + +@interface GWP2PClient (GarageLight) + +/** + 获取车库灯状态 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getGarageLightStatusWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置车库灯手动开关白光灯 + + @param on 车库灯手动开关白光灯,1开；0关 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setGarageLightWhiteLightOn:(BOOL)on + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置车库灯白光灯控制模式 + + @param mode 车库灯白光灯控制模式,0—关闭；1—晚上开灯；2—晚上+PIR触发开灯；3—PIR开灯 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setGarageLightWhiteLightMode:(NSInteger)mode + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置车库灯驱逐按钮 + + @param on 驱逐按钮开关,1开；0关 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setGarageLightExpelOn:(BOOL)on + DeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +/** + 设置车库灯项目PIR触发亮灯时间 + + @param lightUpTime 车库灯项目PIR触发亮灯时间 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setGarageLightPirLightUpTime:(NSUInteger)lightUpTime + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h new file mode 100755 index 0000000..2acc9ad --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+HXVision.h @@ -0,0 +1,48 @@ +// +// GWP2PClient+HXVision.h +// GWP2P +// +// Created by duxiaoyan on 2018/7/27. +// Copyright © 2018年 apple. All rights reserved. +// + +#import +#import +#import "GWP2PPlayerDefine.h" +#import +/** + 操作预置位方式 + */ +typedef enum GWHXVisonPreseSubcmdType { + GWHXVisonPreseSubcmdTypeAdd,//增加 + GWHXVisonPreseSubcmdTypeDelete,//删除 + GWHXVisonPreseSubcmdTypeGoTo,//转向 + GWHXVisonPreseSubcmdTypeGet,//获取 +} GWHXVisonPreseSubcmdType; + +@interface GWP2PClient (HXVision) + +#pragma mark 汇讯视通预置位操作 +/** + 操作设备预置位 + + @param subcmdType GWHXVisonPreseSubcmdType枚举值 + @param index 预置位，add、goto传0-4；get传0；delete传bit0-bit4对应值，例如5个预置位都删除，传31 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)operateHXVisonDevicePresetWithSubCmdType:(GWHXVisonPreseSubcmdType)subcmdType + presetIndex:(NSInteger)index + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +-(void)hxVison3DGestureCommand:(GWP2PHXVison3DGestureZoomType)zoomType + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + point:(CGPoint)point + size:(CGSize)size; +- (void)sendHXCommandTypeandOption:(int)option; +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h new file mode 100755 index 0000000..df959e1 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+PictureAndSound.h @@ -0,0 +1,117 @@ +// +/** @file GWP2PClient+PictureAndSound.h @brief 处理图像和声音的分类 */ +// P2PSDK +// +// Created by apple on 17/2/28. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + +/** + 视频制式枚举 + */ +typedef enum GWP2PSetVideoFormat{ + GWP2PSetVideoFormatNTSC, + GWP2PSetVideoFormatPAL +}GWP2PSetVideoFormat; + + +/** + 彩色模式 + */ +typedef enum GWP2PColorMode{ + GWP2PColorModeBlackWhite,/**< 黑白色/开启红外灯 */ + GWP2PColorModeColorful,/**< 彩色/关闭红外灯 */ +}GWP2PColorMode; + +/** + @brief 处理图像声音的分类 + */ +@interface GWP2PClient (PictureAndSound) + +/** + 设置设备视频制式: NTSC , PAL 两种 + + 获取视频制式请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param videoFormat 视频制式的枚举 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceVideoFormat:(GWP2PSetVideoFormat)videoFormat + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备音量 + + 获取音量请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param volume 0-9的整数 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceVolume:(NSUInteger)volume + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置图像倒转状态 + + 获取图像倒转状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param isImageReversed 图像是否倒转 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceImageReverseState:(BOOL)isImageReversed + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备指示灯状态 + + 返回 BOOL值, 指示灯是否打开 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceIndicatorLightStatusWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备指示灯状态 + + @param on 指示灯开头状态 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceIndicatorLightStatus:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备色彩模式 + + @param colorMode 色彩模式 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceColorMode:(GWP2PColorMode)colorMode + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h new file mode 100755 index 0000000..e045175 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Record.h @@ -0,0 +1,226 @@ +// +/** @file GWP2PClient+Record.h @brief 处理设备录制的分类 */ +// P2PSDK +// +// Created by apple on 17/3/6. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + +/** + 录像类型 + */ +typedef enum GWP2PRecordType{ + GWP2PRecordTypeManual,/**< 手动 */ + GWP2PRecordTypeAlarm,/**< 报警时录像 */ + GWP2PRecordTypeSchedule,/**< 定时录像 */ +}GWP2PRecordType; + +/** + 录像质量 + */ +typedef enum GWP2PRecordDefinition { + GWP2PRecordDefinitionTopSpeed, /**< 极速*/ + GWP2PRecordDefinitionFluent, /**< 流畅 */ + GWP2PRecordDefinitionStandardDefinition, /**< 标清 */ + GWP2PRecordDefinitionHighDefinition, /**< 高清 */ + GWP2PRecordDefinitionSuperDefinition, /**< 超清 */ +}GWP2PRecordDefinition; + + +/** + @brief 回放文件模型 + */ +@interface GWPlaybackFileModel : NSObject + +@property (nonatomic, assign) NSInteger discID; /**< 文件在存储设备的标识 播放时用 */ + +@property (nonatomic, assign) NSInteger year; /**< 文件时间 年 */ +@property (nonatomic, assign) NSInteger month; /**< 文件时间 月 */ +@property (nonatomic, assign) NSInteger day; /**< 文件时间 日 */ +@property (nonatomic, assign) NSInteger hour; /**< 文件时间 时 */ +@property (nonatomic, assign) NSInteger minute; /**< 文件时间 分 */ +@property (nonatomic, assign) NSInteger second; /**< 文件时间 秒 */ + +@property (nonatomic, strong) NSDate *date;/**< 记录上面的时间 */ + +@property (nonatomic, copy) NSString *cType; /**< 文件类型 一个字符 */ +@property (nonatomic, assign) NSInteger time; /**< 文件播放时长 若不支持,则为-1 */ + +@property (nonatomic, assign) NSInteger month_yoosee; //yoosee专用 + +@end + + +/** + @brief 处理设备录制的分类 + */ +@interface GWP2PClient (Record) +#pragma mark - 录像设置 +/** + 获取设备SD卡信息 + + completionBlock返回： + + @"storage exist" (存储是否存在，一般为SD卡): BOOL类型 + + @"storage count" (存储单元数量) ：NSNumber类型 + + @"total storage" (总存储空间) ： NSNumber类型 + + @"free storage" (可用空间) ： NSNumber类型 + + @"unit" : 返回空间数据的单位 M（兆） + + @"SD Card ID" : SD卡ID，用于后面对SD卡操作，如格式化 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceStorageInfomationWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备录像类型 + + 获取设备录像类型请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param recordType 录像类型 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceRecordType:(GWP2PRecordType)recordType + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备预录像开关状态 + + 获取设备预录像开关状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param prerecordOn 预录像是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDevicePrerecordState:(BOOL)prerecordOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备报警后的录像时间 + + 获取设备报警录像时间请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param alarmRecordTime 报警录像时间，单位：分 范围（1 ，2，3） + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceAlarmRecordTime:(NSUInteger)alarmRecordTime + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备计划录像时间 + + 获取设备报警录像时间请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param fromHour 录像时间开始于几时 (24小时制) + @param fromMinute 录像时间开始于几分 + @param toHour 录像时间结束于几时 (24小时制) + @param toMinute 录像时间结束于几分 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDevicePlanedRecordTimeWithFromHour:(NSUInteger)fromHour + fromMinute:(NSUInteger)fromMinute + toHour:(NSUInteger)toHour + toMinute:(NSUInteger)toMinute + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置手动录像开关状态:没有SD卡时，设置无效 + + 获取手动录像开关状态请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param manuallyRecordOn 手动录像是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceManuallyRecordState:(BOOL)manuallyRecordOn + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 格式化设备SD卡 + + @param SDCardID SD卡ID，获取SD卡信息时得到 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)formatDeviceSDCard:(NSUInteger)SDCardID + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取录像质量 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceRecordDefinitionWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置录像质量 + + @param recordDefinition 枚举值 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceRecordDefinition:(GWP2PRecordDefinition)recordDefinition + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 获取回话文件 +/** + 获取设备回放文件 + + 一次只能获取64个文件,如果给定的时间差大于64个文件,会分多次获取,一次返回多次获取文件,为保证每次数据都能正常返回,若无特殊要求,两次给定的时间差尽量小点 + + completionBlock返回字典： + + @"files" 键对应一个 NSMutableArray * + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param startDate 获取的文件早于给定的时间,如果传nil,会默认为1970-1-1 00:00 + @param endDate 获取的文件晚于给定的时间,如果传nil,会默认为2050-1-1 00:00 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDevicePlaybackFilesWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + startDate:(NSDate *)startDate + endDate:(NSDate *)endDate + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+SceneMode.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+SceneMode.h new file mode 100755 index 0000000..73de6d0 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+SceneMode.h @@ -0,0 +1,242 @@ +// +/** @file GWP2PClient+SceneMode.h @brief 处理情景模式的分类 */ +// P2PSDK +// +// Created by apple on 17/3/6. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PClient.h" + + +/** + 情景模式 + */ +typedef NS_ENUM(NSUInteger, GWP2PSceneMode) { + GWP2PSceneModeAtHome = 1,/**< 在家 */ + GWP2PSceneModeGoOut, /**< 外出 */ + GWP2PSceneModeSleep, /**< 睡眠 */ +}; + + +/** + @brief 情景模式，一个 GWSceneModeModel 对象对应一条情景模（定时组、防防护计划）式数据 + */ +@interface GWSceneModeModel : NSObject + +@property (nonatomic, assign) BOOL on; /**< 此情景模式是否打开 */ +@property (nonatomic, assign) NSUInteger index; /**< 此情景模式在设备的位置, 一个设备最多6个 index为0-5 */ +@property (nonatomic, assign) NSUInteger startTime_Hour; /**< 开始于多少小时 */ +@property (nonatomic, assign) NSUInteger startTime_Minute; /**< 开始于多少分 */ +@property (nonatomic, assign) GWP2PSceneMode workMode; /**< 工作模式 */ + +//每天的开关状态 +@property (nonatomic, assign) BOOL mondayOn; /**< 周一是否打开 */ +@property (nonatomic, assign) BOOL tuesdayOn; /**< 周二是否打开 */ +@property (nonatomic, assign) BOOL wednesdayOn; /**< 周三是否打开 */ +@property (nonatomic, assign) BOOL thursdayOn; /**< 周四是否打开 */ +@property (nonatomic, assign) BOOL fridayOn; /**< 周五是否打开 */ +@property (nonatomic, assign) BOOL saturdayOn; /**< 周六是否打开 */ +@property (nonatomic, assign) BOOL sundayOn; /**< 周日是否打开 */ + +@end + + + +/** + 防护模式 + */ +typedef NS_ENUM(NSInteger, GWProtectionPlanMode) { + GWProtectionPlanModeNotSurpport, /**< 设备不支持 */ + GWProtectionPlanModeOut = 1, /**< 外出 值和固件保持一致 */ + GWProtectionPlanModeAtHome, /**< 在家 */ +}; + +/** + 防护计划模型 + */ +@interface GWProtectionPlanModel : NSObject + +@property (nonatomic, assign) BOOL enable; /**< 是否生效 */ +@property (nonatomic, assign) GWProtectionPlanMode mode; /**< 防护模式 */ +@property (nonatomic, assign) NSUInteger hour; /**< 时间：时 */ +@property (nonatomic, assign) NSUInteger minute; /**< 时间：分 */ + +@end + +/** + 各传感器的防护设置状态 + */ +typedef NS_ENUM(uint8_t, GWProtectionSettingState) { + GWProtectionSettingStateNotSurpport, /**< 设备不支持 */ + GWProtectionSettingStateOn = 1, /**< 状态开 */ + GWProtectionSettingStateOff, /**< 状态关 */ +}; + + +/** + 防护设置模型 + */ +@interface GWProtectionSettingModel : NSObject + + +@property (nonatomic, assign) GWProtectionPlanMode protectionMode; + +@property (nonatomic, assign) GWProtectionSettingState motionDetectState; /**< 移动侦测 */ +@property (nonatomic, assign) NSInteger alarmSensitivity;/**< 报警灵敏度，同之前的移动侦测灵敏度 0-6表示灵敏度值，7表示不支持 */ +@property (nonatomic, assign) GWProtectionSettingState objectTrackingState; /**< 物件追踪 */ +@property (nonatomic, assign) GWProtectionSettingState humanBodyInfraredState; /**< 人体红外 */ +@property (nonatomic, assign) GWProtectionSettingState externalAlarmInputState; /**< 外部报警输入 */ +@property (nonatomic, assign) GWProtectionSettingState externalAlarmOutputState; /**< 外部报警输出 */ +@property (nonatomic, assign) GWProtectionSettingState externalSensorState; /**< 外部传感器 */ + +@end + + + +/** + @brief 处理情景模式的分类 + */ +@interface GWP2PClient (SceneMode) + +/** + 设置设备的情景模式，仅868情景模式设备支持 + + @param mode 情景模式，1,表示在家 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSceneMode:(GWP2PSceneMode)mode + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备所有情景模式 + + completionBlock返回字典 + + @"device scene models" 键对应一个数组 NSArray * + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSceneModelsWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备一个情景模式(定时组、防护计划) + + 非情景模式设备不要调用该指令，虽然可能会成功。发送命令给设备后，设备就会自动在指定的时间开启相应的模式 + + @param aSceneModeModel 一个情景模式的模型 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setADeviceSceneModel:(GWSceneModeModel *)aSceneModeModel + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 删除设备一个情景模式(定时组、防护计划) + + 非情景模式设备不要调用该指令，虽然可能会成功。 + + @param aSceneModeIndex 一个情景模式的索引值 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)removeADeviceSceneModelAtIndex:(NSUInteger)aSceneModeIndex + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +//设置优化由于和之前的情景模式比较相似，因此放到这个分类里面 + +/** + 获取设备的防护计划 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceProtectionPlansWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备的防护计划 + + @param protectionPlansArray 防护计划数组 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceProtectionPlans:(NSArray *)protectionPlansArray + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置设备的防护计划模式 + + @param protectionPlanMode 防护计划模式 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceProtectionPlanMode:(GWProtectionPlanMode)protectionPlanMode + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取设备对应模式的防护设置 + + completionBlock返回数据 @“protection setting” 对应一个类 GWProtectionSettingModel + + @param protectionMode 防护模式 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceProtectionSettingsWithProtectionMode:(GWProtectionPlanMode)protectionMode + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置防护模式 + + @param protectionSetting 设置项类，如果获取时设备不支持那一项，设置时也请传不支持 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceProtectionSettings:(GWProtectionSettingModel *)protectionSetting + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置报警推送间隔 + + @param timeinterval 报警推送间隔，可设的值有 10 60 300 600 1800，单位为秒 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceAlarmTimeinterval:(NSInteger)timeinterval + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h new file mode 100755 index 0000000..438afe1 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+Sensor.h @@ -0,0 +1,581 @@ +// +/** @file GWP2PClient+Sensor.h @brief 处理传感器的分类 */ +// P2PSDK +// +// Created by apple on 17/3/13. +// Copyright © 2017年 gwell. All rights reserved. +// + + + + +#import "GWP2PClient.h" + + +#pragma mark - 串口透传数据类型 + +#pragma pack(1) //告诉编译器,后面的数据类型以1(括号内参数)个字节的方式对齐 +/** + @brief 串口透传App采用IPC1的方式,串口设备收到的数据结构 + */ +struct sUserDefineMesg { + unsigned char UserCmdType;// 第1个字节 命令标识,串口透传为 31 + unsigned int RemotePhoneID; // 第2~5共4个字节 存储远程手机端ID:把Yoosee上看到的数据账号,转化为4个字节(32位)的二进制数据,把二进制的最高位(第32位)由0转为1,得到的数据就是实际传送到设备的数据.而串口工具显示还要按字节倒一下顺序,将得到的新的32位的二进制数据,分成4个8位的二进制数据,显示时用16进制,最后把4个数的顺序倒过来显示. + unsigned char cDataLength; // 第6个字节 最大值为251 sendData数据的字节数 + char *sendData; // 从第6个字节开始,最多251个字节 +}; +#pragma pack() //结束自定义对齐,采用默认的对齐方式.iOS情况下，是位宽为8字节，结构体对齐方式为按4字节对齐。 + +/** + 串口透传发送模式,App发送串口透传信息,数据前要以字符串“IPC1”或“IPC2”开头，所以分两种发送模式,详情请查阅技威硬件的"串口通信操作说明" + */ +typedef NS_ENUM(NSUInteger, GWSerialTransmissionSendingMode) { + + /** + 串口透传,数据结构前带有"IPC1"的字符串, + IPC设备会把消息类型(31),发送者账号ID,二进制数据的字节大小,二进制数据推送给串口设备,串口设备收到的数据结构具体格式参见结构体 sUserDefineMesg + */ + GWSerialTransmissionSendingModeIPC1, + + /** + 串口透传,数据结构前带有"IPC2"的字符串, + IPC设备只把二进制数据推送给串口设备 + */ + GWSerialTransmissionSendingModeIPC2, + + /** + 串口透传,数据中不带"IPC1"或"IPC2",由用户自己定义数据,满足一些特殊的客户需求 + */ + GWSerialTransmissionSendingModeOther, +}; + +#pragma mark - 情景模式设备数据模型 +/** + @brief 情景模式设备传感器唯一标识，由三个值标记，硬件规范。特殊传感器（移动侦测和攻防）不需要标识. + */ +typedef struct GWSceneModeDeviceSensorIdentify { + NSUInteger data0; + NSUInteger data1; + NSUInteger data2; +} GWSceneModeDeviceSensorIdentify; + + +/** + 特殊传感器类型 + */ +typedef NS_ENUM(NSUInteger, GWSceneModeDeviceSpecialSensorType) { + GWSceneModeDeviceSpecialSensorTypeMotionDetect, /**< 0 移动侦测 */ + GWSceneModeDeviceSpecialSensorTypeAttack, /**< 1 防攻击 */ + + GWSceneModeDeviceSpecialSensorTypeMAX = 8, // +}; + +/** + 普通传感器及遥控 + */ +typedef NS_ENUM(NSUInteger, GWSceneModeDeviceCommonSensorType) { + //传感器对应的UI (有无开关，有无情景模式) + GWSceneModeDeviceCommonSensorTypeRemoteController, /**< 0 遥控器 (无， 无) */ + GWSceneModeDeviceCommonSensorTypeDoorSwitch , /**< 1 门磁 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeSmokeTransducer, /**< 2 烟雾传感器 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeGasSensor , /**< 3 瓦斯探测传感器 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeLight, /**< 4 电灯 (有， 无) */ + GWSceneModeDeviceCommonSensorTypeCurtain, /**< 5 窗帘 (有， 无) */ + GWSceneModeDeviceCommonSensorTypeScocket, /**< 6 插座 (有， 无) */ + GWSceneModeDeviceCommonSensorTypePIR, /**< 7 人体红外 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeWaterInvade, /**< 8 水浸 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeUrgency, /**< 9 急救 (有， 有) */ + GWSceneModeDeviceCommonSensorTypeWarningSpeaker, /**< 10 警号 (有， 无) */ + GWSceneModeDeviceCommonSensorTypeAirConditioner /**< 11 空调传感器 (有, 无) */ +}; + + +/** + 情景模式设备传感器类型 + + 1 特殊传感器 ：移动侦测、防攻击 + + 0 普通传感器和遥控器 普通传感器类型有：1为门磁；2为烟雾；3为瓦斯；4为电灯；5为窗帘；7为插座；等等... + */ +typedef enum GWSceneModeDeviceSensorMainType{ + GWSceneModeDeviceSensorTypeCommonSensorOrRemoteController, /**< 0 普通传感器及遥控 */ + GWSceneModeDeviceSensorTypeSpecialSensor, /**< 1 特殊传感器 */ +} GWSceneModeDeviceSensorMainType; + +/** + @brief 情景模式设备传感器类型，硬件规范，用两个值来标识类型 + */ +typedef struct GWSceneModeDeviceSensorType { + GWSceneModeDeviceSensorMainType type; /**< 特殊传感器、普通传感器或遥控器 */ + NSUInteger subType;/**< 根据type的不同，表示不同的传感器 */ +} GWSceneModeDeviceSensorType; + + + +/** + 情景模式设备 类型插座的传感器的操作类型 + */ +typedef enum GWSensorLikeSocketOperationType { + GWSensorLikeSocketOperationTypeQuery = 1,//情景模式设备， 查询 类似插座传感器的开关状态 + GWSensorLikeSocketOperationTypeOpen,//情景模式设备， 打开 类似插座传感器的开关 + GWSensorLikeSocketOperationTypeClose,//情景模式设备， 关闭 类似插座传感器的开关 + GWSensorLikeSocketOperationTypeHalfOpen,//情景模式设备， 使类型插座传感器的开关处于 半开 状态 +} GWSensorLikeSocketOperationType; + + + + + + + +/** @brief 情景模式设备 各种传感器类型值及功能情况 + + 名称 type subType 有无开关 有无情景模式 有无传感器唯一标识 是否支持名字 + + 移动侦测 1 0 有 有 无 否 特殊传感器 + + 防攻击 1 1 有 有 无 否 特殊传感器 + + 遥控器 0 0 无 无 有 是 下面都是普通传感器或遥控器 + + 门磁 0 1 有 有 有 是 + + 烟雾传感器 0 2 有 有 有 是 + + 瓦斯探测传感器 0 3 有 有 有 是 + + 电灯 0 4 有 无 有 是 + + 窗帘 0 5 有 无 有 是 + + 插座 0 6 有 无 有 是 + + 人体红外 0 7 有 有 有 是 + + 水浸 0 8 有 有 有 是 + + 急救 0 9 有 有 有 是 + + 警号 0 10 有 无 有 是 + + 空调传感器 0 11 有 无 有 是 + */ +@interface GWSceneModeDeviceSensorModel : NSObject + +//2个值唯一标识某个传感器 硬件规范 +@property (nonatomic, assign) GWSceneModeDeviceSensorType sensorType;/**< 传感器类型。从硬件获取到，操作传感器时用，不要更改 */ +//3个值唯一标识某个传感器 硬件规范 +@property (nonatomic, assign) GWSceneModeDeviceSensorIdentify identify;/**< 传感器唯一标识，特殊传感器（移动侦测、攻防）不用标识。从硬件获取到，操作传感器时用，不要更改。 */ + +@property (nonatomic, assign) NSUInteger bindedPresetPositionIndex;/**< 绑定的预置位索引 */ + +//在家模式 +@property (nonatomic, assign) BOOL enableAtHome;/**< 在家模式是否开启 */ +@property (nonatomic, assign) BOOL enablePushAtHome;/**< 在家模式推送是否开启 */ +@property (nonatomic, assign) BOOL enableSnapshotAtHome;/**< 在家模式快照是否开启 */ +@property (nonatomic, assign) BOOL enableRecordAtHome;/**< 在家模式录像是否开启 */ +@property (nonatomic, assign) NSUInteger warningToneAtHome;/**< 在家模式的报警声音类型 */ + +//外出模式 +@property (nonatomic, assign) BOOL enableGoOut;/**< 外出模式是否开启 */ +@property (nonatomic, assign) BOOL enablePushGoOut;/**< 外出模式推送是否开启 */ +@property (nonatomic, assign) BOOL enableSnapshotGoOut;/**< 外出模式快照是否开启 */ +@property (nonatomic, assign) BOOL enableRecordGoOut;/**< 外出模式录像是否开启 */ +@property (nonatomic, assign) NSInteger warningToneGoOut;/**< 外出模式的报警声音类型 */ + +//睡眠模式 +@property (nonatomic, assign) BOOL enableSleep;/**< 睡眠模式是否开启 */ +@property (nonatomic, assign) BOOL enablePushSleep;/**< 睡眠模式推送是否开启 */ +@property (nonatomic, assign) BOOL enableSnapshotSleep;/**< 睡眠模式快照是否开启 */ +@property (nonatomic, assign) BOOL enableRecordSleep;/**< 睡眠模式录像是否开启 */ +@property (nonatomic, assign) NSUInteger warningToneSleep;/**< 睡眠模式的报警声音类型 */ + +@property (nonatomic, copy) NSString *name;/**< 传感器名字 */ +@property (nonatomic, assign) BOOL nameHasBeChanged;/**< 名字是否被改过 */ + +@property (nonatomic, assign) int bLampStatu;/**< 开关状态 */ + +@end + + + + +#pragma mark - GWP2PClient +/** + @brief 处理传感器的分类 + + 传感器接口分情景模式和非情景模式两种,调用接口时要先调[GWP2PClient getMultipleDeviceStatusWithDeviceID:password:completionBlock:]获取设备子类型,然后和 GWP2PDeviceIPCSubtype 子类型枚举值进行比较,注释里面支持情景模式的设备类型,请调用情景模式设备传感器接口操作传感器,不支持的请调用普通传感器接口操作传感器 + */ +@interface GWP2PClient (Sensor) + +#pragma mark - 普通设备传感器 +/** + 获取设备已连接的传感器及遥控器 + + completionBlock返回字典中： + + @"sensors" 键对应一个数组（NSMutableArray *），数组中一个字典对应一个设备连接的传感器 + + 传感器的字典中，index 键对应的值为传感器连接设备的防区位置，0-7为遥控器，8-63为普通传感器，64-71为特殊传感器，操作传感器时用做标识， description 键对应的值为字符串描述的传感器类型 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceConnectedSensorsWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取已连接传感器的开关状态（遥控器不支持） + + completionBlock返回字典中： + + @"swithches status" 键对应一个数组（NSMutableArray *）,数组中的字典个数与传入sensorIndexesArray的NSNumber个数对应，且index相同，字典中 on 键对应的值为BOOL封装的NSNumber类型，表示index下的传感器有没有打开 + + @param sensorIndexesArray 传感器的索引数组，索引范围为8-71（遥控器没有开关状态），不要重复，若所传的索引未添加传感器，获取到的开关状态会为YES + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSwitchStateOfConnectedSensorsWithSensorIndexes:(NSArray *)sensorIndexesArray + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取传感器绑定的预置位（报警时转向预置位）（遥控器不支持） + + 获取前先调 getMultipledeviceStatusWithDeviceID:password:completionBlock: 获取设备是否支持预置位功能（返回字典中没有支持预置位键 preset position suppurted 就是不支持），支持才获取 + + completionBlock返回字典中： + + @"sensor index" 键对应的值为传感器索引 + + @"preset position index" 键对应绑定的预置位索引值（0-4），255 表示未绑定预置位 + + @"alarm type" 暂时不用 + + @param sensorIndex 传感器的索引值，绑定预置位只支持索引值范围为8-15（普通传感器）、64-71（特殊传感器），其它的不支持 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDevicePresetPositionBindedByConnectedSensorWithSensorIndex:(NSUInteger)sensorIndex + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 让传感器绑定预置位（报警时转向预置位）（遥控器不支持） + + 设备不支持时调用无效 + + @param presetPositionIndex 预置位索引值 + @param sensorIndex 传感器的索引值，绑定预置位只支持索引值范围为8-15（普通传感器）、64-71（特殊传感器），其它的不支持 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)bindPresetPosition:(NSUInteger)presetPositionIndex + withConnectedSensor:(NSUInteger)sensorIndex + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取传感器的名字 (一次获取所有已连接传感器的名字) + + 先调用该接口，看看设备是否支持传感器名字存储，老版本设备不支持，app的名字操作在本地也要同时存储 + + completionBlock返回字典中： + + @"sensor names" 键对应一个数组（NSMutableArray *），数组中的每个字典对应一个传感器的索引（键为 index）和名字（键为 name） + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSensorNamesWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置传感器的名字 （一次只能设置一个传感器的名字） + + @param sensorName 要设置的传感器名字，长度为1-16位 + @param sensorIndex 传感器索引值 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSensorName:(NSString *)sensorName + withSensorIndex:(NSUInteger)sensorIndex + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 操作一个传感器或遥控器 + + 添加传感器时,先调增加指令,再一直按传感器的发送信号按钮发出信号,设备接收到添加指令然后搜索传感器信号,搜索到传感器信号后才会连接传感器 + + 遥控器当初设计时只是用来布防、撤防和紧急报警，遥控器的报警都是紧急报警，报警时，设备是没有传防区和通道给我们的服务器，所以服务器传到app的防区和通道是一个垃圾值，这时没有参考意义。 + + 如果想要知道是哪个遥控器报警，请把遥控器绑定在普通传感器和特殊传感器的索引值上,当成传感器用 + + @param sensorIndex 传感器索引值: 0-7为遥控器，8-63为普通传感器，64-71为特殊传感器，删除时若传入索引未连接传感器，可能会返回删除成功 + @param operationType 操作类型：只支持增加、删除 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)operateASensor:(NSUInteger)sensorIndex + withOperationType:(P2POperationType)operationType + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置一个传感器（不包括遥控器）的开关状态 + + @param sensorIndex 传感器索引值: 不支持遥控器，8-63为普通传感器，64-71为特殊传感器 + @param switchOn 是不是打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setASensor:(NSUInteger)sensorIndex + switchState:(BOOL)switchOn + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 情景模式设备传感器 +/** + 情景模式设备 获取所有传感器信息（包括遥控器、普通传感器、特殊传感器） + + completionBlock返回字典中： + + @"sensors" 键对应一个 NSArray * 数组 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceGetSensorsInfomationWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 操作一个插座类型的传感器的开关状态 + + 添加传感器时,先调指令,再一直按传感器的发送信号按钮发出信号,设备接收到添加指令然后搜索到传感器信号后才会连接传感器 + + 插座类型的判断条件 + + sensorType.type == 0 && //主类型为普通传感器或遥控器 + + (sensorType.subType == GWSceneModeDeviceCommonSensorTypeScocket || //子类型为 插座 + + sensorType.subType == GWSceneModeDeviceCommonSensorTypeLight || //子类型为 电灯 + + sensorType.subType == GWSceneModeDeviceCommonSensorTypeCurtain || //子类型为 窗帘 + + sensorType.subType == GWSceneModeDeviceCommonSensorTypeWarningSpeaker || //子类型为 警号 + + sensorType.subType == GWSceneModeDeviceCommonSensorTypeAirConditioner) //子类型为 空调传感器 + + @param sensorIdentify 传感器标识，由设备获取 + @param sensorType 传感器类型，由设备获取，类型和标识都要传对 + @param operationType 操作类型，四个枚举值 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceOperateSwitchStateOfSensorLikeSocket:(GWSceneModeDeviceSensorIdentify)sensorIdentify + withSensorType:(GWSceneModeDeviceSensorType)sensorType + operationType:(GWSensorLikeSocketOperationType)operationType + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 设置遥控器名字 + + @param remoteControlName 遥控器名字，16个字节，大于16个字节后的忽略 + @param remoteControlIdentify 遥控器标识，由设备获取 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceSetRemoteControlName:(NSString *)remoteControlName + withSensorIdentify:(GWSceneModeDeviceSensorIdentify)remoteControlIdentify + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 设置传感器名字 + + @param sensorName 遥控器名字，16个字节，大于16个字节后的忽略,设为空时传 @"" + @param sensorIdentify 传感器标识，由设备获取 + @param sensorType 传感器类型，由设备获取，类型和标识都要传对 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceSetSensorName:(NSString *)sensorName + withSensorIdentify:(GWSceneModeDeviceSensorIdentify)sensorIdentify + sensorType:(GWSceneModeDeviceSensorType)sensorType + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 删除一个遥控器 + + @param remoteControlIdentify 遥控器标识，由设备获取 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceRemoveARemoteControl:(GWSceneModeDeviceSensorIdentify)remoteControlIdentify + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 删除一个传感器 + + @param sensorType 传感器类型，由设备获取 + @param sensorIdentify 传感器标识，由设备获取，类型和标识都要传对 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceRemoveASensor:(GWSceneModeDeviceSensorIdentify)sensorIdentify + withSensorType:(GWSceneModeDeviceSensorType)sensorType + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 连接一个传感器或遥控器 + + 连接传感器时,先调指令,再一直按传感器的发送信号按钮发出信号,设备接收到添加指令然后搜索到传感器信号后才会连接传感器 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceConnectASensorOrRemoteControlWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 通过二维码扫描连接一个传感器或遥控器 + + @param codeString 二维码扫描到的字符串 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceConnectASensorOrRemoteControlWithQRCode:(NSString *)codeString + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 设置特殊传感器（包括移动侦测和防攻击。其它的传感器调此指令，即使返回成功，也无实际设置效果） + + 包括设置情景模式，预置位(需要设备支持) + + @param sensorModel 传感器模型 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceSetASpecialSensor:(GWSceneModeDeviceSensorModel *)sensorModel + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 设置普通传感器情景模式 + + 传感器是否支持情景模式参考 GWSceneModeDeviceSensorModel 的注释 + + @param sensorModel 传感器模型,只设置情景模式（在家、外出、睡眠三种情景模式的开关，提示音，推送，抓拍，录像情况），模型中其它的数据不处理 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceSetSceneMode:(GWSceneModeDeviceSensorModel *)sensorModel + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 情景模式设备 设置普通传感器预置位（需要设备支持，设置时先获取预置位信息） + + @param presetPositionIndex 预置位索引 + @param sensorIdentify 传感器标识，由设备获取，类型和标识都要传对 + @param sensorType 传感器类型，由设备获取 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sceneModeDeviceSetCommonSensorPresetPosition:(NSUInteger)presetPositionIndex + withSensorIdentify:(GWSceneModeDeviceSensorIdentify)sensorIdentify + sensorType:(GWSceneModeDeviceSensorType)sensorType + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 门铃开锁 +/** + 门铃设备开锁 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)doorbellDeviceUnlockWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 设置访客开锁权限 +/** + 设置访客开锁权限 + + @param onOrOff 访客是否拥有开锁权限 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setVisitorUnlockAuthorityState:(BOOL)onOrOff + withDeviceId:(NSString *)deviceID + devicePassword:(NSString*)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +#pragma mark - 串口透传 +/** + 发送串口透传数据 + + 如果 + + @param data 要发送的二进制数据,以GWSerialTransmissionSendingModeIPC1和GWSerialTransmissionSendingModeIPC2两种模式的数据长度必须在0~252字节之间,不能为0和252个字节,用户不需要在此data中增加"IPC1""IPC2",通过选择第二个参数的玫举值内部拼接好了.以GWSerialTransmissionSendingModeOther模式发送时,数据长度范围为0-256字节,用户需要在此data中增加命令标识,如"ALERTOR"等 + @param sendingMode 发送模式 + @param deviceID 设备ID,如果在同一局域网内,采用IPC1模式发送数据,串口设备收到的账号为IP,用此IP也能给手机发送数据 + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sendSerialTransmissionData:(NSData *)data + withSendingMode:(GWSerialTransmissionSendingMode)sendingMode + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h new file mode 100755 index 0000000..5260a30 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient+WhiteLight.h @@ -0,0 +1,260 @@ +// +// GWP2PClient+WhiteLight.h +// GWP2P +// +// Created by USER on 2018/4/20. +// Copyright © 2018年 apple. All rights reserved. +// + +#import + + + +/** + 白光灯定时动作模型,每天到达这个时间,设备怎么执行白光灯的开关动作 + */ +@interface GWWhiteLightScheduleModel : NSObject + +@property (nonatomic, assign) BOOL on;/**< 此时间点是开灯还是关灯 */ + +@property (nonatomic, assign) NSUInteger hour;/**< 时,取值 0-23 */ +@property (nonatomic, assign) NSUInteger munite;/**< 分 取值 0-59 */ + +@property (nonatomic, assign) BOOL enable;/**< 此时间设置是否生效 */ + +@end + + +/** + 设备声控抓拍截图的图片模型 + */ +@interface GWSoundControlPictureModel : NSObject + +@property (nonatomic, assign) NSInteger year; /**< 图片生成时间 年 */ +@property (nonatomic, assign) NSInteger month; /**< 图片生成时间 月 */ +@property (nonatomic, assign) NSInteger day; /**< 图片生成时间 日 */ +@property (nonatomic, assign) NSInteger hour; /**< 图片生成时间 时 */ +@property (nonatomic, assign) NSInteger minute; /**< 图片生成时间 分 */ +@property (nonatomic, assign) NSInteger second; /**< 图片生成时间 秒 */ +@property (nonatomic, assign) NSInteger number; /**< 如果1秒内有多张抓图,这个值代表第几张,一般是0 */ +@property (nonatomic, copy) NSString *type; /**< 字母"V" 区别于设备其它图片类型 */ + +@property (nonatomic, copy) NSString *path; /**< 图片在设备中的路径,调下载文件接口需要传入此路径 */ + +@end + + + +@interface GWP2PClient (WhiteLight) + +#pragma mark - 白光灯 +/** + 设置白光灯开关状态 + + 所有时间只能一次修改,不能一次只改一个时间点 + + 获取开关状态及支不支持白光灯功能请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param on 开关状态 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWhiteLightState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取白光灯定时动作设置 + + 设置和获取两条指令不能同时调,内部可能会把两条指令的回调搞混 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceWhiteLightSchedulesWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置白光灯定时动作,最多能设置6个时间 + + 设置和获取两条指令不能同时调,内部可能会把两条指令的回调搞混 + + @param modelsArray 时间设置模型数组,多于6个时间会返回参数错误,数据模型里的时间数据不能重复 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWhiteLightSchedules:(NSArray *)modelsArray + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +/** + 白光的 自动亮灯模式 开关 + + @param on YES：开 NO：关 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWhiteLightAutomaticMode:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 白光的 预设开关灯时间模式 开关 + + @param on YES：开 NO：关 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWhiteLightTimingMode:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + + +#pragma mark - 声控 +/** + 设置白光灯亮度,这个功能是在做声控时才加的,只有支持声控的设备才支持此功能 + + 获取亮度请调 getMultipledeviceStatusWithDeviceID:password:completionBlock: + + @param brightnessPersent 亮度百分比,取值范围0-100,建议设置范围为10-100 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceWhiteLightBrightness:(NSUInteger)brightnessPersent + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取声控拍照截图 + + 返回数据格式:@{@"picktures" : @[ GWSoundControlPictureModel ]} + + @param fromDate 开始时间,如果传nil,会默认为1970-1-1 00:00:01 + @param toDate 结束时间,如果传nil,会默认为2050-1-1 00:00:01 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSoundControlPickturesFromDate:(NSDate *)fromDate + toDate:(NSDate *)toDate + deviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 获取声控状态 + + 目前设备支持 录像(record),拍照(capture),情景切换(work mode),灯光控制(lampligh) 4种声控状态 + + 返回数据包括4种声控是否单独打开,及声控总开关状态"sound control",总开关关闭后,其它4种声控都无效 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)getDeviceSoundControlStateWithDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置声控总状态 + + 是否能让声音控制生效 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSoundControlState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置声控录像状态 + + 声音控制能否控制录像 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSoundControlRecordState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置声控拍照状态 + + 声音控制能否控制拍照 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSoundControlCaptureState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置声控情景切换状态 + + 声音控制能否切换情景状态 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSoundControlWorkModeState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置声控灯光控制状态 + + 声音控制能否控制灯光开关 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setDeviceSoundControlLamplighState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +/** + 设置旧灯光开关状态 + + @param on 是否打开 + @param deviceID 设备ID + @param devicePassword 设备密码 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)setOldLightState:(BOOL)on + withDeviceID:(NSString *)deviceID + devicePassword:(NSString *)devicePassword + completionBlock:(CompletionBlock)completionBlock; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h new file mode 100755 index 0000000..3d79e25 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PClient.h @@ -0,0 +1,223 @@ +// +/** @file GWP2PClient.h @brief P2P客户端及其协议,连接与断连P2P服务器,获取连接状态,获取AP模式ID等 */ +// P2PSDK +// +// Created by apple on 16/12/9. +// Copyright © 2016年 gwell. All rights reserved. +// + +#import +#import "GWP2PDefine.h" + + +@class GWP2PClient; + +#pragma mark - GWP2PClientProtocol +/** + @brief P2P客户端协议,包含接收设备报警和文件下载等回调 + */ +@protocol GWP2PClientProtocol + +@optional +/** + 接收到设备报警推送(包括门铃响铃推送的一种,而且是设备常用的一种): + + alarmDictionary字典各键对应的信息 + + @"alarm type" : 报警类型 GWSensorAlarmType 枚举值 + + @"can delete binded push ID" : 是否支持删除绑定的推送ID，即能否解除当前账号的报警推送 + + @"sensor name" : 传感器名字 + + 报警图片,由于情景模式设备与其它的设备图片存储方式不一样,因此可能返回@"scene mode device picture"与@"common device picture"两个键中的一个或两个,如果返回两个,要先判断设备类型,再用对应的图片路径去获取图片才能获取到 + + @"scene mode device picture" : 情景模式设备报警图片, 对应一个字典 + + @"common device picture" : 普通设备报警图片, 对应一个字典 + + 图片对应的字典@{@"path" : 图片在设备的路径，用来下载图片, @"picture number" : @"报警时,设备截图数量"} + + @param client GWP2PClient类 + @param alarmDictionary 保存报警信息的字典 + */ +- (void)client:(GWP2PClient *)client receavedDeviceAlarm:(NSDictionary *)alarmDictionary; + +/** + 串口透传接收到门铃的响铃推送,门铃响铃有两种方式推送到手机端: + + 一是通过报警推送, 其报警类型@"alarm type"的值为 GWSensorAlarmTypeDoorbellPush , 即 13, + + 二是通过串口透传,此方法接收到的报警信息就是通过串口透传推送的, + + ringingDictionary字典各键对应的信息: + + @"device ID" : @"设备id"; + + @"cmd" : @"串口透传命令"; + + @param client GWP2PClient类 + @param ringingDictionary 保存响铃信息的字典 + */ +- (void)client:(GWP2PClient *)client receavedDoorbellRingingBySerialTransmission:(NSDictionary *)ringingDictionary; + +/** + 下载文件回调 + + @param client GWP2PClient 类 + @param filePath 若下载成功,此路径为本地存储路径,若下载失败,此路径为远程路径或nil + @param deviceID 设备ID + @param success 是否下载成功 + @param resultDictionary 保存下载失败原因的字典 + */ +- (void)client:(GWP2PClient *)client didDownloadFile:(BOOL)success withFilePath:(NSString *)filePath deviceID:(NSString *)deviceID result:(NSDictionary *)resultDictionary; + +/** + 更新进度 + + 给设备发送更新命令后，设备开始更新，此方法会不停的调用，返回更新进度百分比,此方法在主线程运行，方便UI处理 + + @param client GWP2PClient 类 + @param persent 更新到百分之多少 + @param resultCode NSNumber对应更新结果：1更新中 65更新完成 + @param deviceID 设备ID + */ +- (void)client:(GWP2PClient *)client updateProgress:(NSInteger)persent resultCode:(NSNumber *)resultCode ofDeviceID:(NSString *)deviceID; + +/** + 收到串口透传的数据 + + @param client GWP2PClient 类 + @param data 串口透传回来的二进制数据,最大为248个字节 + */ +- (void)client:(GWP2PClient *)client receavedSerialTransmissionData:(NSDictionary *)data; + + +/** + P2P库接收到通知，包括 设备升级、系统消息、权限通知等 + + @param client GWP2PClient 类 + @param noti 通知数据字典 + + "PermissionMessage" + "AppNeedUpdate" + "SystemMessage" + */ +- (void)client:(GWP2PClient *)client didReceivedNotification:(NSDictionary *)userInfo; + +@end + + + + +#pragma mark - GWP2PClient类 +/** + @brief 控制设备的类,用单例,连接与断连P2P服务器,获取连接状态,获取AP模式ID等 + */ +@interface GWP2PClient : NSObject + +/** + 收到设备不支持的回调 + + 由于给设备发指令,收到设备回复时,是以指令类型去判断是哪条消息,而有的指令设备不支持这一数据覆盖了指令类型,所以设备不支持对应不到具体指令,只能单独传出来 + */ +@property (nonatomic, copy) void (^deviceNotSupportBlock)(GWP2PClient *client, NSString *deviceID); + +@property (nonatomic, assign) P2PLinkStatus linkStatus; /**< p2p连接状态 */ + +@property (nonatomic, weak) id delegate;/**< GWP2PClient的代理，一些设备事件的通知对象 */ + +@property (nonatomic, assign) BOOL isAPMode;/**< 是不是AP模式。此属性只保存上次与路由器交互后的数据，调 getDeviceIDInAPMode 方法会重新与路由器交互更新APMode状态，每次app进入前台时会更新APMode状态 */ + +@property (nonatomic, copy) NSString *serverList; /**< P2P服务器列表，自建服务器需要设置此属性，格式"|p2p1.cloudlinks.cn|p2p2.cloudlinks.cn|p2p3.cloud-links.net" */ + +#pragma mark 获取单例 +/** + * 获取单例 + */ ++ (instancetype)sharedClient; + + +#pragma mark 连接服务器 +/** + @method + @abstract 连接服务器 + @discussion 程序启动时首先要连接服务器，才能与设备通信。如果只需支持某一公司的设备，那么请向技威的技术支持咨询获取你们的客户ID + @param account 用户账号,不是注册时的邮箱,手机号,是登陆或注册时返回的值取后31位:[json[@"UserID"] intValue] & 0x7fffffff + @param codeStr1 用户账号登陆成功后返回的 P2PVerifyCode1 , 为固定值 + @param codeStr2 用户账号登陆成功后返回的 P2PVerifyCode2 , 为固定值 + @param sessionID1 用户账号登陆成功后返回的 sessionId1 , 每次登陆返回值不固定 + @param sessionID2 用户账号登陆成功后返回的 sessionId2 , 每次登陆返回值不固定 + @param customerIDsArray 技威客户公司id数组，传nil表示支持所有技威方案的设备。数组内传了几个公司的ID，连接后就支持对应公司的设备。最多支持10个。传入的ID值不正确时，支持不了设备，都传0时与传nil效果一样。要了解具体客户ID，请联系技威客服。 + @result 返回值代表是否连接成功 + */ +- (BOOL)connectWithAccount:(NSString *)account + codeStr1:(NSString *)codeStr1 + codeStr2:(NSString *)codeStr2 + sessionID1:(NSString *)sessionID1 + sessionID2:(NSString *)sessionID2 + customerIDs:(NSArray *)customerIDsArray; + +/** + @method + @abstract 连接服务器(为支持P2P通知消息增加三个参数） + @discussion 程序启动时首先要连接服务器，才能与设备通信。如果只需支持某一公司的设备，那么请向技威的技术支持咨询获取你们的客户ID + @param account 用户账号,不是注册时的邮箱,手机号,是登陆或注册时返回的值取后31位:[json[@"UserID"] intValue] & 0x7fffffff + @param codeStr1 用户账号登陆成功后返回的 P2PVerifyCode1 , 为固定值 + @param codeStr2 用户账号登陆成功后返回的 P2PVerifyCode2 , 为固定值 + @param sessionID1 用户账号登陆成功后返回的 sessionId1 , 每次登陆返回值不固定 + @param sessionID2 用户账号登陆成功后返回的 sessionId2 , 每次登陆返回值不固定 + @param customerIDsArray 技威客户公司id数组，传nil表示支持所有技威方案的设备。数组内传了几个公司的ID，连接后就支持对应公司的设备。最多支持10个。传入的ID值不正确时，支持不了设备，都传0时与传nil效果一样。要了解具体客户ID，请联系技威客服。 + @param appVersion 向技威申请得到的AppVersion(格式如00.46.03.03) + @param messageLanguage P2P通知消息语言，请传nil，设置无效，目前根据系统语言判定。 + @param lastSystemMessageID 最后一个系统消息ID + @param lastAuthorityMessageID 权限系统消息ID，配网时传密码也会走这个消息 + + @result 返回值代表是否连接成功 + */ +- (BOOL)connectWithAccount:(NSString *)account + codeStr1:(NSString *)codeStr1 + codeStr2:(NSString *)codeStr2 + sessionID1:(NSString *)sessionID1 + sessionID2:(NSString *)sessionID2 + customerIDs:(NSArray *)customerIDsArray + appVersion:(NSString *)appVersion + messageLanguage:(NSString *)messageLanguage + lastSystemMessageID:(NSString *)lastSystemMessageID + lastAuthorityMessageID:(NSString *)lastAuthorityMessageID; + + +/** + @abstract 断开连接 + */ +- (void)disconnect; + +/** + AP模式下获取设备ID，只有当设备为AP模式且手机连接到设备的wifi时才能成功获取并更新设备的APMode状态 + + @return 设备ID。返回值不为0时可确定设备处于AP模式；返回值为0时可能为AP，也可能是手机未连接到设备wifi + */ +- (NSUInteger)getDeviceIDInAPMode; + +#pragma mark - 发送二进制数据给设备 +/** + 直接向设备发送原始数据,本接口是为满足一些客户定制的需求,一般用户不需要直接使用此接口,具体的数据格式根据功能来定,请咨询技威客服 + + 在 GWP2PClient 的分类中各接口都是把各个功能的数据封装好后,进行调用.为了满足一些客户的特殊要求,公开这条接口,让客户自己去封装数据,回调的数据也是 NSData 类型,定制功能使用此接口时,用户需要自己将数据封装成 NSData 类型,然后传入此接口参数data中,封装时一定要注意字节对齐. + + 如果是 GWP2PClient 分类中有的指令,调这条接口直接发二进制数据是收不到回调数据的 + + 此接口发送后不能连续发这个条指令,必需要上一条数据返回时才能发下一条指令 + + @param deviceID 设备ID + @param devicePassword 设备密码 + @param data 要发送的数据,数据结构是由技威定义的结构体,封装成NSData时一定要注意字节对齐 + @param completionBlock 与设备交互完成后的回调Block + */ +- (void)sendBinaryDataToDevice:(NSString *)deviceID + withDevicePassword:(NSString *)devicePassword + data:(NSData *)data + completionBlock:(CompletionBlock)completionBlock; + + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h new file mode 100755 index 0000000..8064259 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDefine.h @@ -0,0 +1,143 @@ +// +/** @file GWP2PDefine.h @brief 定义的各种类型枚举,错误类型,密码强弱,操作类型,报警类型等 */ +// P2PSDK +// +// Created by apple on 17/2/28. +// Copyright © 2017年 gwell. All rights reserved. +// + +#ifndef GWP2PDefine_h +#define GWP2PDefine_h + + +@class GWP2PClient; + +/** + 给设备发消息后的回调block,block都没有在主线程调用,操作UI时,请注意回到主线程 + + 关于返回结果中设备ID的说明:如果手机和设备处理同一局域网,会直接通过局域网发消息给设备,这时发消息传递的设备ID不是实际的设备ID号,而是设备在局域网中IPV4地址的4位数字的最后一位,其值小于等于255,设备消息返回后,block字典中的"device ID"字段返回的也是中IPV4地址的4位数字的最后一位,而不是设备ID + + @abstract 由用户自己定义,实现与设备交互后的操作 + @param client GWP2PClient单例,调用此指针,避免循环引用 + @param success 是否与设备通信成功(不代表设备指令成功) + @param dataDictionary 返回数据,与设备通信成功后返回所请求的数据,不成功会返回失败原因，具体指令是否成功会保存在此字典的GWP2PMessageResult键对应的 NSNumber包装的BOOL值中：YES表示成功，可以取具体数据或操作设备成功；NO表示失败，GWP2PMessageDescription键对应的值中会描述具体原因.若有特殊要求,可取 GWP2PMessageErrorValue 键对应的NSNumber 包装的 P2PClientMessageError 枚举值,查看具体错误原因 + */ +typedef void (^CompletionBlock)(GWP2PClient *client, BOOL success, NSDictionary *dataDictionary); + +//CompletionBlock返回字典中对应的常量字符串 +static NSString *const GWP2PMessageDeviceNotSurported = @"device not surported";/**< 设备不支持 */ +static NSString *const GWP2PMessageDescription = @"description";/**< 具体的描述 */ +static NSString *const GWP2PMessageResult = @"result";/**< 结果 对应NSNumber包装的BOOL类型 */ +static NSString *const GWP2PMessageFailure = @"failure"; /**< 失败 */ +static NSString *const GWP2PMessageSuccess = @"success"; /**< 成功 */ +static NSString *const GWP2PMessageErrorValue = @"error value"; /**< NSNumber 包装的 P2PClientMessageError 枚举值 */ + + +/** + 发送设备指令后返回的错误类型 + */ +typedef NS_ENUM(NSUInteger, P2PClientMessageError) { + P2PClientMessageErrorNone, /**< 没有错误 */ + P2PClientMessageErrorPasswordFail, /**< 密码错误 */ + P2PClientMessageErrorTimeOut, /**< 超时 */ + P2PClientMessageErrorIOSPushError, /**< ios内部错误 */ + P2PClientMessageErrorNoRight, /**< 没有权限 */ + P2PClientMessageErrorSendFailed = 5, /**< 因缓存不够发送失败 */ + P2PClientMessageErrorDeviceOffline = 6, /**< 设备离线 */ + + P2PClientMessageErrorMessageIsSending = 9996, /**< 当前请求正在进行 */ + P2PClientMessageErrorParameterError = 9997, /**< 传递参数错误 */ + P2PClientMessageErrorOtherError = 9998, /**< 其它错误,返回结果一般会描述错误原因 */ + P2PClientMessageErrorUnKnow = 9999 /**< 未知错误,返回结果一般不会描述错误原因 */ +}; + +typedef NS_ENUM(NSUInteger, P2PLinkStatus) { + P2PLinkStatusOK = 0, /**< 连接成功 */ + P2PLinkStatusLinking, /**< 连接操作正在进行还没成功 */ + P2PLinkStatusDNSParseFailed, /**< DNS解析错误 */ + P2PLinkStatusCheckListServerFailed, /**< 列表服务器没有响应 */ + P2PLinkStatusGetServerListTimeOut, /**< 获取服务器列表超时 */ + P2PLinkStatusWaitHeartbeatFailed, /**< 等待P2P服务器心跳失败 */ + P2PLinkStatusLoginAnother, /**< 在其他设备登录了 */ + P2PLinkStatusUnknown /**< 未知 */ +}; + + + +/** + 管理员密码强度,设置密码时不能为弱密码 + */ +typedef NS_ENUM(NSUInteger, P2PAdministratorPasswordStrength) { + P2PAdministratorPasswordStrengthInValidate, /**< 无效 */ + P2PAdministratorPasswordStrengthWeak, /**< 弱 */ + P2PAdministratorPasswordStrengthMiddle, /**< 中 */ + P2PAdministratorPasswordStrengthStrong, /**< 强 */ +}; + + +/** + 设备操作类型 + */ +typedef NS_ENUM(NSUInteger, P2POperationType) { + P2POperationTypeInsert, /**< 增加 */ + P2POperationTypeDelete, /**< 删除 */ + P2POperationTypeUpdate, /**< 修改 */ +}; + +/** + 设备报警类型 + */ +typedef NS_ENUM(NSUInteger, GWSensorAlarmType) { + GWSensorAlarmTypeNone, + GWSensorAlarmTypeExternal = 1, /**< 1 外部报警 */ + GWSensorAlarmTypeMotionDetect, /**< 2 移动侦测 */ + GWSensorAlarmTypeForce, /**< 3 紧急 */ + GWSensorAlarmTypeDebug, /**< 4 调试 */ + GWSensorAlarmTypeLine = 5, /**< 5 有线 */ + GWSensorAlarmTypeVOL, /**< 6 低电压 */ + GWSensorAlarmTypePIR, /**< 7 人体红外 */ + GWSensorAlarmTypeDefence, /**< 8 布防 */ + GWSensorAlarmTypeCancelDefence, /**< 9 撤防 */ + GWSensorAlarmTypeBatteryLowVoltage = 10,/**< 10 电池低电 */ + GWSensorAlarmTypeParameterUpdateToServer,/**< 11 参数上传服务器 */ + GWSensorAlarmTypeTemperatureHumidity, /**< 12 温湿度 */ + GWSensorAlarmTypeDoorbellPush, /**< 13 门铃推送 */ + GWSensorAlarmTypeForceFromKeypress, /**< 14 按键触发报警(UI 显示紧急报警) */ + GWSensorAlarmTypeRecordFail = 15, /**< 15 录像失败 */ + GWSensorAlarmTypeEmailTooOften, /**< 16 邮箱发送过于频繁 */ + GWSensorAlarmTypeUARTInput, /**< 17 串口输入报警 */ + GWSensorAlarmTypeProberFire, /**< 18 防火报警 */ + GWSensorAlarmTypeProberGas, /**< 19 煤气泄漏 */ + GWSensorAlarmTypeProberSteal, /**< 20 防盗报警 */ + GWSensorAlarmTypeProberAround = 21, /**< 21 周界报警 */ + GWSensorAlarmTypeProberForce, /**< 22 */ + GWSensorAlarmTypeProber120, /**< 23 医疗求救 */ + GWSensorAlarmTypeProberPreventDisconnect,/**< 24 防拆报警 */ + GWSensorAlarmTypeProberCommunicationTiming,/**< 25 定时通讯 */ + GWSensorAlarmTypeProberLowPower = 26, /**< 26 低电报警 */ + GWSensorAlarmTypeProberLowPowerRecovery,/**< 27 低电恢复报警 */ + GWSensorAlarmTypeProberPowerOn, /**< 28 开机报警 */ + GWSensorAlarmTypeProberPowerOff, /**< 29 关机报警 */ + GWSensorAlarmTypeProberDefence, /**< 30 布防 */ + GWSensorAlarmTypeProberCancelDefence = 31,/**< 31 撤防 */ + GWSensorAlarmTypeProberEXT, /**< 32 门磁报警 */ + GWSensorAlarmTypeSound, /**< 33 声音报警 */ + GWSensorAlarmTypePIR1, /**< 34 */ + GWSensorAlarmTypeRecordAlert, /**< 35 录像 */ + GWSensorAlarmTypeExternalAttact = 36, /**< 36 外部攻击 */ + GWSensorAlarmTypeSensorAlarm, /**< 37 传感器报警 */ + GWSensorAlarmTypeForceSOS, /**< 38 sos */ + GWSensorAlarmTypeKeepSilent, /**< 39 silent */ + GWSensorAlarmTypeSmoke, /**< 40 smoke */ + GWSensorAlarmTypeGas = 41, /**< 41 gas */ + GWSensorAlarmTypeDoorMagnet, /**< 42 door magnet */ + GWSensorAlarmTypeTemprature, /**< 43 temprature */ + GWSensorAlarmTypeHumidity, /**< 44 humidity */ + GWSensorAlarmTypePIRAlarm, /**< 45 pir */ + GWSensorAlarmTypeUARTRecord = 46, /**< 46 UART RECORD */ + GWSensorAlarmTypeEmergencyCall, /**< 47 紧急呼叫 */ + GWSensorAlarmTypeMAX, +}; + + +#endif /* GWP2PDefine_h */ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h new file mode 100755 index 0000000..5f2f574 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDevice.h @@ -0,0 +1,172 @@ +// +/** @file GWP2PDevice.h @brief 设备模型和相关枚举 */ +// P2PSDK +// +// Created by zengyuying on 17/3/31. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import + +/** + 设备类型,设备的一些功能要根据设备类型来判断 + + 目前设备返回的类型不准确,做功能判断时都用设备子类型 GWP2PDeviceIPCSubtype + */ +typedef NS_ENUM(NSUInteger, GWP2PDeviceType) { + GWP2PDeviceTypeUnknown = 0, + GWP2PDeviceTypeNPC = 2, + GWP2PDeviceTypeDoorbell = 5, + GWP2PDeviceTypeIPC = 7, + GWP2PDeviceTypeNVR = 11, +}; + +//设备加密功能选项枚举值 +typedef NS_ENUM(uint64_t, GWDeviceFunctionType) { + + GWDeviceFunctionVoiceControl = 1 << 0, //声控功能 + GWDeviceFunctionBattryInside = 1 << 1, //内置电池 + GWDeviceFunction2kVideo = 1 << 2, //2K分辨率的图像 + GWDeviceFunction4kVideo = 1 << 3,//4K分辨率的图像 + GWDeviceFunctionSoundPos = 1 << 4,//听声辨位 + GWDeviceFunctionMotionTrack = 1 << 5,//物件追踪 + GWDeviceFunctionPanoPuzzle = 1 << 6,//全景拼图 + GWDeviceFunctionOneButtonCall = 1 <<7,//按钮呼叫 + GWDeviceFunctionGarageLight = 1 << 8,//智能车库灯 + GWDeviceFunctionHXVsion = 1 << 9,//汇讯视通 + +}; +/** + IPC设备(DeviceType=7)的设备子类型,目前只有IPC有子类型 + */ +typedef NS_ENUM(NSUInteger, GWP2PDeviceIPCSubtype) { + GWP2PDeviceIPCSubtypeNormal = 0, //摇头机,全功能 + GWP2PDeviceIPCSubtypeSimple, //卡片机, 不带马达 + GWP2PDeviceIPCSubtype38X38, //38板，不带马达，不带人体红外，不带回音消除 + GWP2PDeviceIPCSubtypeDoorbell, //门铃，不带马达，带语音优化 + GWP2PDeviceIPCSubtypeCostdown, //costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + GWP2PDeviceIPCSubtype38Module, + + GWP2PDeviceIPCSubtypeNvrPtz = 6, //预留 + GWP2PDeviceIPCSubtypeNvrNoPtz, //预留 + GWP2PDeviceIPCSubtypeSmarthome868, //支持 868 + 情景模式 + GWP2PDeviceIPCSubtypeRsv4, //预留 9 + + GWP2PDeviceIPCSubtype130wNormal, //130w,摇头机,全功能 + GWP2PDeviceIPCSubtype130wSimple = 11, //130w,卡片机, 不带马达 + GWP2PDeviceIPCSubtype130w38X38, //130w,38板，不带马达，不带人体红外，不带回音消除 + GWP2PDeviceIPCSubtype130wDoorbell, //130w,门铃，不带马达，带语音优化 + GWP2PDeviceIPCSubtype130wCostdown, //130w,costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + GWP2PDeviceIPCSubtype130w38Module, + + GWP2PDeviceIPCSubtype130wNvrPtz = 16, //预留 + GWP2PDeviceIPCSubtype130wNvrNoPtz, //预留 + GWP2PDeviceIPCSubtype130WSmarthome868, //支持 868 + 情景模式 + GWP2PDeviceIPCSubtype130wRsv4, //预留 19 + + GWP2PDeviceIPCSubtype200wNormal, //200w,摇头机,全功能 + GWP2PDeviceIPCSubtype200wSimple = 21, //200w,卡片机, 不带马达 + GWP2PDeviceIPCSubtype200w38X38, //200w,38板，不带马达，不带人体红外，不带回音消除 + GWP2PDeviceIPCSubtype200wDoorbell, //200w,门铃，不带马达，带语音优化 + GWP2PDeviceIPCSubtype200wCostdown, //200w,costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + GWP2PDeviceIPCSubtype200w38Module, + + GWP2PDeviceIPCSubtype200wNvrPtz = 26, //预留 + GWP2PDeviceIPCSubtype200wNvrNoPtz, //预留 + GWP2PDeviceIPCSubtype200WSmarthome868, //支持 868 + 情景模式 + GWP2PDeviceIPCSubtype200wRsv4, //预留 29 + + GWP2PDeviceIPCSubtype868, //只支持 868 + GWP2PDeviceIPCSubtypeSmarthome = 31, //支持 868 + 情景模式 + GWP2PDeviceIPCSubtypeSmarthomeShare, //支持 868 + 情景模式 + 分享, 这种设备很少 + GWP2PDeviceIPCSubtypeSC1135Fisheye360D, //360全景 + GWP2PDeviceIPCSubtypeSC1135Fisheye180D, //180全景 + GWP2PDeviceIPCSubtypeSC3035Fisheye360D, //360全景 + GWP2PDeviceIPCSubtypeSC3035Fisheye180D = 36, //180全景 + +}; + + +/** + 鱼眼设备分类,渲染使用,不要修改 + */ +typedef NS_ENUM(NSUInteger, GWP2PFisheyeType) { + GWP2PFisheyeType360 = 0, //360鱼眼 + GWP2PFisheyeType180 = 1, //180鱼眼 + GWP2PFisheyeTypeUnkown = 999, +}; + + +/** + 360鱼眼设备视频显示的形状 + */ +typedef NS_ENUM(NSUInteger, GWP2PFisheyeShapeType) { + GWP2PFisheyeShapeTypeCircle = 0, //圆形 360鱼眼使用 + GWP2PFisheyeShapeType180HalfSphere, //180°半球 180鱼眼使用 + GWP2PFisheyeShapeTypeCylider, //圆柱 360鱼眼使用 + GWP2PFisheyeShapeTypeBowle, //碗状 360鱼眼使用 + GWP2PFisheyeShapeTypeFourSplit //四分屏 360鱼眼使用 +}; + + +/** + 设备视频比例 + */ +typedef NS_ENUM(NSUInteger, GWP2PDeviceVideoRatio) { + GWP2PDeviceVideoRatio16X9 = 0, //大部分设备为默认的16:9 + GWP2PDeviceVideoRatio4X3, //130w的设备4:3 + GWP2PDeviceVideoRatio1X1, //360全景1:1 +}; + + +/** + @brief 设备模型,提供一些基础的可能用到的设备属性和设备判断方法,开发时要用到的其它设备数据此模型没有时,可在此模型的基础上新建子类 + */ +@interface GWP2PDevice : NSObject + +/** 设备ID */ +@property (nonatomic, copy) NSString *deviceID; + +/** 设备昵称 */ +@property (nonatomic, copy) NSString *deviceName; + +/** 设备密码 */ +@property (nonatomic, copy) NSString *devicePassword; + +/** 设备类型 */ +@property (nonatomic, assign) GWP2PDeviceType deviceType; + +/** 设备子类型 */ +@property (nonatomic, assign) GWP2PDeviceIPCSubtype deviceSubtype; + +/** + 是否鱼眼设备 + */ ++ (BOOL)isFisheyeDevice:(GWP2PDeviceIPCSubtype)deviceSubtype; + + +/** + 是否支持摇头功能 + 只能用于判断IPC(DeviceType=7)的设备子类型支持摇头功能 + */ ++ (BOOL)isSupportRotateIPCDevice:(GWP2PDeviceIPCSubtype)deviceSubtype; + + +/** + 获取鱼眼类型 180or360 + + @param deviceSubtype 设备子类型 + @return 鱼眼类型枚举值 + */ ++ (GWP2PFisheyeType)getFisheyeTypeWithSubtype:(GWP2PDeviceIPCSubtype)deviceSubtype; + +/** + 根据IPC子类型获取视频比例 + + @param deviceSubtype 设备子类型 + @return 视频比例枚举值 + */ ++ (GWP2PDeviceVideoRatio)getVideoRatioWithSubtype:(GWP2PDeviceIPCSubtype)deviceSubtype; + + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h new file mode 100755 index 0000000..5d9412d --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PDeviceLinker.h @@ -0,0 +1,138 @@ +// +/** @file GWP2PDeviceLinker.h @brief 设备配网的类和协议 */ +// GWP2PDeviceLinker +// +// Created by apple on 17/5/2. +// Copyright © 2017年 apple. All rights reserved. +// + +#import +#import "GWP2PLanDevice.h" + +extern NSString * const DUPLICATE_DEVICE_ID_NOTIFICATION; + +@class GWP2PDeviceLinker; + +/** + 设备通过任何方式联网成功后，会通过这个Block进行回调设备信息。目前配网并不是100%可靠，主要是因为设备联网成功后是通过广播消息的形式在局域网发送消息通知APP端的，如果有多台设备在同一个局域网同时联网，会有干扰。 + + 1、设备是通过局域网广播的方式通知APP联网成功的，所以手机所在网络需要与设备配置网络处于同一个局域网，才能收到消息。 + 2、由于iOS平台没有权限控制WiFi，通过设备的AP模式联网时，如果在配网成功后，手机没有自动连接到给设备配置的WiFi，是收不到配网成功消息的，此时建议在UI上添加一个按钮，让用户在听到设备“连接成功”的提示音后进行点击，点击后将设备添加到本地列表。 + 3、设备联网成功后，会在20秒内发送多次消息。 + */ +typedef void (^DeviceLinkInBlock)(NSDictionary *deviceDict); + + +/** + AP配网时，设备在收到WiFi及密码信息后，在断开AP热点去联网前，会回调相关信息 + + @param deviceId 设备ID + @param isSupport 是否支持AP模式联网 + */ +typedef void (^DeviceReceiveBlock)(NSString *deviceId, BOOL isSupport); + + +/** + @brief 设备配网回调协议 + */ +@protocol GWPP2PDeviceLinkerProtocol + +/** + 局域网里面有设备联网成功后，都会回调此方法。 + + @param deviceDict 设备信息 + */ +- (void)p2pDeviceLinker:(GWP2PDeviceLinker *)linker deviceLinkSuccess:(NSDictionary *)deviceDict; + +@end + +/** + @brief 设备配网的类 + */ +@interface GWP2PDeviceLinker : NSObject + +/** 协议 */ +@property (nonatomic, weak) id delegate; + +/** 局域网设备列表 */ +@property (nonatomic, strong) NSMutableArray *lanDevices; + +/** 智能联机是否发送声波 默认YES */ +@property (nonatomic, assign) BOOL smarkLinkSoundEnable; + +/** + 单例初始化 + */ ++ (instancetype)shareInstance; + + + +/** + 刷新局域网设备。lanDevices每30刷新，调用此方法马上发送一次刷新指令。 + */ +- (void)refreshLanDevices; + + + +/** + 智能联机，内部会同时发送声波、空中发包、SimpleConfig数据 + + 此接口停用，请调 [GWP2PDeviceLinker p2pSmartLinkDeviceWithWiFiSSID:password:useSimpleConfig:deviceLinkIn:] + + 一定要将手机连接上设备要连接的wifi,才能收到DeviceLinkInBlock连接成功的回调 + + @param ssid 设备需要连接的WiFi SSID + @param password 设备需要连接的WiFi 密码 + @param deviceLinkInBlock 设备连接到网络的回调,会回调多次,调接口时需要处理一下 + */ +- (void)p2pSmartLinkDeviceWithWiFiSSID:(NSString *)ssid + password:(NSString *)password + deviceLinkIn:(DeviceLinkInBlock)deviceLinkInBlock DEPRECATED_ATTRIBUTE; + + + +/** + 智能联机，内部会同时发送声波及用另一种方式发送数据（空中发包或SimpleConfig） + + 调此接口后一定要调 [GWP2PDeviceLinker p2pStopSmartLink 方法停止发送声波，空中发包，及SimpleConfig数据 + + 一定要将手机连接上设备要连接的wifi,才能收到DeviceLinkInBlock连接成功的回调 + + @param ssid 设备需要连接的WiFi SSID,手机一定要连到此wifi才能收到回调，目前设备只支持2.4Gwifi + @param password 设备需要连接的WiFi 密码 + @param useSimpleConfig 是否用SimpleConfig方式进行配网，传YES采用SimpleConfig和声波发wifi数据，传NO采用声波和空中发包发wifi数据 + @param deviceLinkInBlock 设备连接到网络的回调,会回调多次,调接口时需要处理一下 + */ +- (void)p2pSmartLinkDeviceWithWiFiSSID:(NSString *)ssid + password:(NSString *)password + useSimpleConfig:(BOOL)useSimpleConfig + deviceLinkIn:(DeviceLinkInBlock)deviceLinkInBlock; + +/** + 停止智能联机，请在设备联网成功后手动调用停止 + */ +- (void)p2pStopSmartLink; + + + +/** + AP配网。在连接到支持AP配网的设备的热点(GW_AP_XXXXXX)后,调用此方法给设备发送WiFi帐号及密码,以及要给设备初始化的管理密码 + + @param ssid wifi名称 + @param wifiPassword wifi密码 + @param devicePassword 设备密码 + @param deviceReceiveBlock 设备收到WiFi信息的回调,准备断开AP热点去连接WiFi。 + @param deviceLinkInBlock 设备连接到网络的回调 + */ +- (void)p2pAPLinkDeviceWithWiFiSSID:(NSString *)ssid + wifiPassword:(NSString *)wifiPassword + devicePassword:(NSString *)devicePassword + deviceReceive:(DeviceReceiveBlock)deviceReceiveBlock + deviceLinkIn:(DeviceLinkInBlock)deviceLinkInBlock; + +/** + 停止AP配网。如果配网中途停止，调此方法停止发送数据，正常配网成功不需要调此方法 + */ +- (void)p2pStopAPLink; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PLanDevice.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PLanDevice.h new file mode 100755 index 0000000..513c1e3 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PLanDevice.h @@ -0,0 +1,47 @@ +// +/** @file GWP2PLanDevice.h @brief 局域网设备模型 */ +// UDPSocket +// +// Created by apple on 17/5/2. +// Copyright © 2017年 apple. All rights reserved. +// +// 局域网搜索的返回的设备信息 + +#import +#import "GWP2PDevice.h" +/** + @brief 局域网设备模型 + */ +@interface GWP2PLanDevice : NSObject + +/** 设备ID */ +@property (nonatomic, copy) NSString *deviceId; + +/** 新设备ID（重复的设备号升级） */ +@property (nonatomic, copy) NSString *upgradeDeviceId; + +/** 设备类型 */ +@property (nonatomic, assign) GWP2PDeviceType deviceType; + +/** 设备IP地址 */ +@property (nonatomic, copy) NSString *ipAddress; + +/** 搜索到的时间 */ +@property (nonatomic, assign) NSTimeInterval lanTimeInterval; + +/** 是否设置过密码 */ +@property (nonatomic, assign) BOOL isInitPassword; + +/** 是否支持RTSP */ +@property (nonatomic, assign) NSInteger isSupportRtsp; + +/** 客户ID */ +@property (nonatomic, assign) NSInteger customID; + +/** MAC地址12个字母 */ +@property (nonatomic, copy) NSString *macAddress; + +/** 设备加密功能选项 */ +@property (nonatomic, assign) uint64_t deviceFuciton; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h new file mode 100755 index 0000000..274a70a --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlaybackPlayer.h @@ -0,0 +1,80 @@ +// +/** @file GWP2PPlaybackPlayer.h @brief 回放播放器 */ +// P2PSDK +// +// Created by zengyuying on 17/3/31. +// Copyright © 2017年 gwell. All rights reserved. +// +// + +#import "GWP2PPlayer.h" +#import "GWP2PDevice.h" +#import "GWP2PClient+Record.h" + +/** + @brief 回放播放器,继承自GWP2PPlayer + */ +@interface GWP2PPlaybackPlayer : GWP2PPlayer + +/** 当前播放的文件 */ +@property (nonatomic, readonly) GWPlaybackFileModel *playbackFile; + +/** 当前播放的时间,单位:微秒μs,可监听此时间变化更新播放进度条*/ +@property (nonatomic, readonly) uint64_t currentTime; + +/** 当前文件总时长,单位:微秒μs,开始播放时设备端会返回这个时间,正常情况下与playbackFile中的time是一样的,建议使用这个totalTime*/ +@property (nonatomic, readonly) uint64_t totalTime; + +/** 回放的状态 */ +@property (nonatomic, readonly) GWP2PPlaybackState playbackState; + +/** + 播放设备远程录像文件,原理和监控设备是一样的,需要先呼叫连接设备 + + @param deviceId 设备ID + @param password 设备密码 + @param playbackFile 回放文件对象,由GWP2PClient+Record中的获取回放文件列表方法获取 + @param callingBlock 正在呼叫回调,详见block定义注释 + @param acceptBlock 接收呼叫回调,详见block定义注释 + @param rejectBlock 拒绝连接回调,详见block定义注释 + @param readyBlock 连接就绪回调,详见block定义注释 + */ +- (void)p2pCallPlaybackFileWithDeviceId:(NSString *)deviceId + password:(NSString *)password + playbackFile:(GWPlaybackFileModel *)playbackFile + calling:(P2PCallingBlock)callingBlock + accept:(P2PAcceptBlock)acceptBlock + reject:(P2PRejectBlock)rejectBlock + ready:(P2PReadyBlock)readyBlock; + +/** + 播放远程录像文件,如果已经连接上设备,调用此方法即可快速切换回放文件 + + @param playbackFile 回放文件对象 + */ +- (void)p2pPlayPlaybackFile:(GWPlaybackFileModel *)playbackFile; + + +/** + 暂停或者继续播放 + */ +- (void)p2pPauseOrResume; + + +/** + 快进或者取消快进 + */ +- (void)p2pFastForwardOrCancel; + + +/** + 指定播放时间 + + @param seekTime 播放时间(单位是微秒,如要跳到第45秒,传入45*1000*1000) + */ +- (void)p2pSeekToTime:(uint64_t)seekTime; + + + + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h new file mode 100755 index 0000000..e554cb8 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayer.h @@ -0,0 +1,167 @@ +// +/** @file GWP2PPlayer.h @brief 播放器基类与其协议 */ +// P2PSDK +// +// Created by zengyuying on 17/3/8. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import +#import +#import "GWP2PPlayerDefine.h" + +@class GWP2PPlayer; + + +/** + 正在呼叫设备 + + @param parameters 目前只有一个参数. kP2PCallingIsSameDomainKey:设备与手机是否在同个局域网 + */ +typedef void (^P2PCallingBlock)(NSDictionary *parameters); + + +/** + 设备接受了呼叫请求,回调相关参数 + + @param parameters kP2PCallAcceptIsVideo960PKey:视频是否960P + kP2PCallAcceptIsVideoWidescreenKey:是否是否宽屏(16:9) + */ +typedef void (^P2PAcceptBlock)(NSDictionary *parameters); + + +/** + 设备拒绝了呼叫,回调错误详情 + + @param error 错误枚举,详见枚举中的注释 + @param errorCode 错误码,连接超时时会返回这个错误,详细说明连接超时的原因,详见错误枚举下方的说明 + */ +typedef void (^P2PRejectBlock)(GWP2PCallError error, NSString *errorCode); + + +/** + 连接上设备并准备就绪,开始显示画面 + */ +typedef void (^P2PReadyBlock)(void); + + +/** + 截图完成回调 + + @param screenshot UIImage格式截图 + @param timeInterval 截图时间戳,注意仅对鱼眼设备有效,转换成时间格式使用时区[NSTimeZone timeZoneForSecondsFromGMT:0] + */ +typedef void (^ScreenshotCompletionBlock)(UIImage *screenshot, NSTimeInterval timeInterval); + +/** + @brief 播放器基类的协议 + */ +@protocol GWP2PPlayerProtocol + + +/** + player内部对view添加了手势,每次手势触发时回调 + 普通设备:swipe(上下左右) + 鱼眼设备:tap(单击\双击),pan,pinch + + @param gesture 手势 + */ +- (void)p2pPlayer:(GWP2PPlayer *)player recieveGestureRecognizer:(UIGestureRecognizer *)gesture; + + +/** + 更新时间戳 + + @param player 播放器对象 + @param pts 显示时间戳(Presentation Time Stamp) + */ +- (void)p2pPlayer:(GWP2PPlayer *)player updatePTS:(NSTimeInterval)pts; + +@end + + + +/** + @brief 播放器基类 + */ +@interface GWP2PPlayer : NSObject + +/** 播放器ViewController */ +@property (nonatomic, readonly) UIViewController *viewController; + +/** 是否正在播放, 从call开始就为YES，播放中断置为NO */ +@property (nonatomic, assign, readonly) BOOL isPlaying; + +/** 无声播放 */ +@property (nonatomic, assign, getter=isSilent) BOOL silent; + +/** 静音, 当`silent=YES`时`mute=YES` */ +@property (nonatomic, assign, getter=isMute) BOOL mute; + +/** 手势开关 默认开启 (usePano=YES时无效)*/ +@property (nonatomic, assign) BOOL enableGesture; + +/** 代理 */ +@property (nonatomic, weak) id delegate; + +/** 是否使用新全景模式(半球,圆柱,画卷,四分,混合,广角)播放 */ +@property (nonatomic, assign, readonly) BOOL usePano; + +/** 当前全景视频pts,转化成时间戳(秒)=pts/(1000*1000) */ +@property (nonatomic, assign, readonly) uint64_t panoPTS; + +/** + 构造方法 + + @param usePano 是否使用新全景进行播放。目前所有情况都使用新全景库播放，此接口现在等价于默认的init方法。 + @return 实例 + */ +- (instancetype)initWithUsingPano:(BOOL)usePano; + + +/** + 停止监控/视频/回放 + */ +- (void)p2pStop; + + +/** + 截图 + @param completionBlock 回调 + */ +- (void)p2pScreenshot:(ScreenshotCompletionBlock)completionBlock; + +/** + 开始录制视频，当播放器销毁、视频监控中断、切换分辨率时，都会自动停止录制并保存视频 + + @param savePath 视频保存路径 + @param eventHandler 录制开始、异常等事件回调 + @param saveAlbum 是否将录制的视频保存到系统相册，将会占用应用沙盒和系统相册两份空间 + */ +- (void)startRecordWithSavePath:(NSString *)savePath saveToPhotosAlbum:(BOOL)saveAlbum eventHandler:(MP4RecordEventHandler)eventHandler; + +/** + 停止录制视频并保存视频 + */ +- (void)stopRecord; + +/** + 设置全景模式 + */ +@property (nonatomic, assign) PanoMode showMode; + + +/** + 设置全景切边参数，主要是中心点偏移、边缘剪切 + + @param x 切边中心点x,范围0~1 + @param y 切边中心点y,范围0~1 + @param ratio 边缘切边比例,范围0~1 + */ +- (void)setCutParam:(float)x y:(float)y ratio:(float)ratio; +/** + 设置开启关闭自动巡航 + */ +- (void)setWideAngleAuto:(BOOL)isAuto ; + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayerDefine.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayerDefine.h new file mode 100755 index 0000000..0542ef5 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PPlayerDefine.h @@ -0,0 +1,179 @@ +// +// GWP2PPlayerDefine.h +// GWP2P +// +// Created by WangShunXing on 2019/3/5. +// Copyright © 2019 apple. All rights reserved. +// + +#ifndef GWP2PPlayerDefine_h +#define GWP2PPlayerDefine_h + +/** + * 呼叫设备回调的参数字典的key常量声明 + */ +extern NSString * const kP2PCallingIsSameDomainKey; //与对方是否在同个局域网 +extern NSString * const kP2PCallAcceptIsVideo960PKey; //对方视频是否960P +extern NSString * const kP2PCallAcceptIsVideoWidescreenKey; //对方视频是否宽屏(16:9) +extern NSString * const kP2PCallAcceptVideoScaleKey; //视频画面边缘切边比例，NSNumber(float)，范围0~1 +extern NSString * const kP2PCallAcceptVideoCenterKey; //视频画面中心点, NSValue(CGPoint)，范围(0,0)~(1,1) + +typedef NS_ENUM(NSUInteger, GWP2PCallWay) {//呼叫方式 + GWP2PCallWayInitiative = 0, //主动呼叫设备 + GWP2PCallWayPassive, //被动呼叫,指NPC设备呼叫APP(通过用户ID) +}; + +typedef NS_ENUM(NSUInteger, GWP2PCallType) {//呼叫类型(主动呼叫设备时) + GWP2PCallTypeMonitor = 0, //监控 + GWP2PCallTypeVideo, //视频通话(NPC设备) + GWP2PCallTypePlayback, //回放 +}; + +typedef NS_ENUM(NSUInteger, GWP2PCallStatus) { //呼叫状态 + GWP2PCallStatusNone = 0, //默认 + GWP2PCallStatusCalling, //呼叫中 + GWP2PCallStatusRejected, //呼叫被对方拒绝 + GWP2PCallStatusAccepted, //呼叫被对方接受 + GWP2PCallStatusReady, //连接准备就绪 +}; + +typedef NS_ENUM(NSUInteger, GWP2PPlaybackState) { //回放状态 + GWP2PPlaybackStateNone, //默认 + GWP2PPlaybackStatePause, //暂停 + GWP2PPlaybackStatePlaying, //正常播放中 + GWP2PPlaybackStateFastForward, //快进中 + GWP2PPlaybackStateStop //停止 +}; + + +/** + 呼叫失败的错误枚举 + */ +typedef NS_ENUM(NSUInteger, GWP2PCallError) { + GWP2PCallErrorNone = 0, //0无原因 + GWP2PCallErrorDesidNotEnable, //1对方的ID 被禁用 + GWP2PCallErrorDesidOverDate, //2对方的ID 过期了 + GWP2PCallErrorDesidNotAcitve, //3对方的ID 尚未激活 + GWP2PCallErrorDesidOffline, //4对方离线 + GWP2PCallErrorDesidBusy, //5对方忙线中 + GWP2PCallErrorDesidPowerDown, //6对方已关机 + GWP2PCallErrorNoHelper, //7没有找到协助人 + GWP2PCallErrorHangUp, //8对方已经挂断 + GWP2PCallErrorTimeout, //9连接超时 + GWP2PCallErrorInterError, //10内部错误 + GWP2PCallErrorRingTimeout, //11无人接听 + GWP2PCallErrorPwdWrong, //12密码错误(在远程监控时用到密码，在视频通话是不需要) + GWP2PCallErrorConnFail, + GWP2PCallErrorNotSupport, +}; + +/** + CallErrorCode 呼叫失败(连接超时)还会返回具体错误的16进制errorCode + 由服务器定义,更多可在http://gwellserver2:8008/进行查询 + */ +//0x2010200A UDP转发服务器握手失败 +//0x20102009 连接tcp转发服务器成功，等待配对失败 +//0x20102008 连接tcp转发服务器失败 +//0x20102007 申请多路径传输，握手超时 +//0x20102006 申请多路径传输超时 +//0x20102005 局域网点对点连接失败 +//0x20102004 发出呼叫，等待目标ID的地址信息超时 +//0x20102003 传输数据中出现传输超时 +//0x20102002 连接状态准备好，尝试传输数据超时 + +/** + 全景模式 + + - PM_NONE: 黑屏,切换此模式无效 + - PM_HALF_SPHERE: 半球 + - PM_CYLINDER: 圆柱 + - PM_SCROLL: 画卷 + - PM_FOUR_SCREEN: 四画面 + - PM_MIX: 混合 + - PM_WIDE_ANGLE: 广角 + - PM_QUAD: 四边形,适用于普通监控 + */ +typedef NS_ENUM(NSUInteger, PanoMode) { + PM_NONE, + PM_HALF_SPHERE, + PM_CYLINDER, + PM_SCROLL, + PM_FOUR_SCREEN, + PM_MIX, + PM_WIDE_ANGLE, + PM_QUAD +}; + +/** + 录制过程中的事件 + */ +typedef NS_ENUM(NSUInteger, MP4RecordEvent) { + MP4RecordEventStart, /**< 等到视频流关键帧，开始录像 */ + MP4RecordEventStop, /**< 停止录像 */ + MP4RecordEventRatioChanged, /**< 切换了视频分辨率，停止录像 */ +}; + +/** + 定义录制过程中的事件回调代码块 + */ +typedef void(^MP4RecordEventHandler)(MP4RecordEvent stopEvent); + +/** + 控制镜头转向 + */ +typedef NS_ENUM(NSUInteger, GWP2PPTZDirection) { + GWP2PPTZDirectionLeft = 0, //左 + GWP2PPTZDirectionRight, //右 + GWP2PPTZDirectionUp, //上 + GWP2PPTZDirectionDown, //下 +}; + + +/** + 视频清晰度 + */ +typedef NS_ENUM(NSUInteger, GWP2PPTZDefinition) { + GWP2PPTZDefinitionLD = 0, //流畅,NPC:320*240 IPC:320*180 + GWP2PPTZDefinitionSD, //标清,NPC:640*480 IPC:640*360 + GWP2PPTZDefinitionHD, //高清,NPC:None IPC:1280*720 +}; + + +/** + 播放控制回调 + */ +typedef NS_ENUM(NSUInteger, GWP2PPlaybackControl) { + GWP2PPlaybackControlPlay, //播放 + GWP2PPlaybackControlPause, //暂停 + GWP2PPlaybackControlStop, //停止 + GWP2PPlaybackControlFileEnd, //文件播放完毕 + GWP2PPlaybackControlFastForward, //快进 + GWP2PPlaybackControlFastForwardCancel, //取消快进 + GWP2PPlaybackControlNextFile, //切换文件播放 + GWP2PPlaybackControlSeekTime, //指定时间播放 +}; + +/** + 汇讯视通控制镜头 + */ +typedef NS_ENUM(NSUInteger, GWP2PHXVisonDirection) { + GWP2PHXVisonDirectionLeft = 0, //左 + GWP2PHXVisonDirectionRight, //右 + GWP2PHXVisonDirectionUp, //上 + GWP2PHXVisonDirectionDown, //下 + GWP2PHXVisonDirectionShort, //缩小 + GWP2PHXVisonDirectionLong, //放大 + GWP2PHXVisonDirectionStop, //停止 +}; + +/** + 汇讯视通3D手势 + */ +typedef NS_ENUM(NSUInteger, GWP2PHXVison3DGestureZoomType) +{ + GWP2PHXVison3DGestureZoomTele = 0, //3D放大 + GWP2PHXVison3DGestureZoomWide, //3D缩小 + GWP2PHXVison3DGestureZoomLocate, //3D定位移动 +}; + +#endif /* GWP2PPlayerDefine_h */ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h new file mode 100755 index 0000000..29055a8 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/GWP2PVideoPlayer.h @@ -0,0 +1,188 @@ +// +/** @file GWP2PVideoPlayer.h @brief 监控和视频通话的播放器 */ +// P2PSDK +// +// Created by zengyuying on 17/4/7. +// Copyright © 2017年 gwell. All rights reserved. +// + +#import "GWP2PPlayer.h" +#import "GWP2PPlayerDefine.h" +#import "GWP2PDevice.h" + +@class GWP2PVideoPlayer; + +/** + NPC设备主动呼叫的通知 + 参数有设备ID和是否在同个局域网 + userInfo:@{@"deviceId":deviceId,kP2PCallingIsSameDomainKey:@(BOOL)} + */ +extern NSString * const kGWP2PDeviceIsCallingNotification; + + +/** + @brief GWP2PVideoPlayerProtocol协议包含监控时的设备状态信息的回调,按需要选择性实现 + */ +@protocol GWP2PVideoPlayerProtocol + +@optional + +/** + 观看人数变化回调 + 触发场景: + 1.呼叫设备后开始监控时 + 2.观看人数变化时(其他监控者加入或者断开) + 3.高清-标清,高清-流畅,两种情况的分辨率互相切换时(标清-流畅切换不触发) + + @param currentNumber 当前观看人数 + */ +- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player numberOfAudiencesChange:(NSUInteger)currentNumber; + +/** + 监控网速发生改变，每秒回调一次 + + @param player 播放器 + @param speed 网速 + */ +- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player networkSpeedChanged:(NSInteger)speed; + +/** + 远程录像(SD卡录像)状态发送改变 + + @param parameters 参数 @"isRemoteRecording":@(BOOL),是否正在录像 + @"hasSDCard":@(BOOL),是否有SD卡 + @"isRecordFalse":@(BOOL),是否录制失败,可能SD卡损坏 + */ +- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player remoteSDCardRecordStateChange:(NSDictionary *)parameters; + +/** + 布防状态发生改变 + + @param isDefenceOn 改变后的布防状态. YES:布防状态,NO:撤防状态 + */ +- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player defenceStateChange:(BOOL)isDefenceOn; + + +@end + + +/** + @brief 监控和视频通话的播放器,继承自GWP2PPlayer + */ +@interface GWP2PVideoPlayer : GWP2PPlayer + +/** 代理 */ +@property (nonatomic, weak) id delegate; + +/** 手势操作水平翻转 */ +@property (nonatomic, assign) BOOL isFlipHorizontal; + +/** 手势操作垂直翻转 */ +@property (nonatomic, assign) BOOL isFlipVertical; + + +/** + 呼叫一个设备,进行监控 + + @param deviceId 设备ID + @param password 设备密码 + @param definition 默认清晰度 + @param callingBlock 正在呼叫回调,详见block定义注释 + @param acceptBlock 接收呼叫回调,详见block定义注释 + @param rejectBlock 拒绝连接回调,详见block定义注释 + @param readyBlock 连接就绪回调,详见block定义注释 + */ +- (void)p2pCallDeviceWithDeviceId:(NSString *)deviceId + password:(NSString *)password + definition:(GWP2PPTZDefinition)definition + calling:(P2PCallingBlock)callingBlock + accept:(P2PAcceptBlock)acceptBlock + reject:(P2PRejectBlock)rejectBlock + ready:(P2PReadyBlock)readyBlock; + +/** + 呼叫一个NPC设备,进行视频对讲,目前只有NPC一种设备存在对讲视频对讲功能,所以不需要设备类型等参数 + + @param deviceId 设备ID + @param password 设备密码 + @param callingBlock 正在呼叫回调,详见block定义注释 + @param acceptBlock 接收呼叫回调,详见block定义注释 + @param rejectBlock 拒绝连接回调,详见block定义注释 + @param readyBlock 连接就绪回调,详见block定义注释 + */ +- (void)p2pCallNPCDeviceWithDeviceId:(NSString *)deviceId + password:(NSString *)password + calling:(P2PCallingBlock)callingBlock + accept:(P2PAcceptBlock)acceptBlock + reject:(P2PRejectBlock)rejectBlock + ready:(P2PReadyBlock)readyBlock; + + +/** + 接受当前的设备呼叫请求 + + @param acceptBlock 接收呼叫回调,详见block定义注释 + @param rejectBlock 拒绝连接回调,详见block定义注释 + @param readyBlock 连接就绪回调,详见block定义注释 + */ +- (void)p2pAcceptCallingWithaccept:(P2PAcceptBlock)acceptBlock + reject:(P2PRejectBlock)rejectBlock + ready:(P2PReadyBlock)readyBlock; + + +/** + 讲话开关。开启时向设备发送麦克风音频，默认关闭。 + + @param enable YES:开启,NO:关闭 + */ +- (void)p2pEnableSpeak:(BOOL)enable; + +/** + 控制摇头机镜头转向 + + @param direction 转动方向枚举 + */ + - (void)p2pTurnDirection:(GWP2PPTZDirection)direction; + +/** + 设置视频清晰度 + + @param definition 清晰度枚举 + */ +- (void)p2pSetDefinition:(GWP2PPTZDefinition)definition; + +/** + 控制汇讯视通镜头转向 + + @param direction 镜头转动方向 + */ +- (void)p2pHXVsionTurnDirection:(GWP2PHXVisonDirection)direction; + +/** + 汇讯视通3D手势 + + @param zoomType 3D手势类型 + @param point 手势坐标 + @param size 手势大小,当定位移动时，宽高必须传0 + */ +- (void)p2pHXVsionOperate3DGesture:(GWP2PHXVison3DGestureZoomType)zoomType point:(CGPoint)point size:(CGSize)size; + +/** + 开始摄像 + + @param view 显示画面视图 + */ +- (void)startCameraWithAddView:(UIView *)view; + +/** + 停止摄像 + */ +- (void)stopCamera; + +/** + 切换摄像镜头 + */ +- (void)switchCamera; + + +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h b/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h new file mode 100755 index 0000000..b6e26f8 --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Headers/MD5Manager.h @@ -0,0 +1,59 @@ +// +// MD5Manager.h +// 2cu +// +// Created by wutong on 15/12/16. +// Copyright © 2015年 guojunyi. All rights reserved. +// + +#import + +@interface MD5Manager : NSObject + +/* +函数功能: 密码转换 +szPassword: 1～30位字符串 +返回: 10位以下的unsigned int型数字 + */ ++(unsigned int)GetTreatedPassword:(const char*) szPassword; + + +/* + 函数功能:md5加密 兼容rtsp密码时会用到 + szInputBuffer: 6～30位字符串 (如果输入字符串位数不在6~30之间，或者输入10位以下的纯数字，则不作任何处理，直接返回NO) + szOutputBuffer: 32个字节的字符串，用来保存md5密码后的数据 + 返回: YES成功加密，结果保存在szOutputBuffer中；NO加密失败 + */ ++(BOOL)GetMD5PasswordWithSrc:(const char*)szInputBuffer Dst:(char*)szOutputBuffer; + + +/* + 函数功能:服务器保存的设备密码的解密函数（应用场景：从服务器获取设备列表） + szSrcData:密文 + szUserID:登陆账号关联的ID + szOutputBuffer:用于保存明文的缓存，由用户提供 + iLength:用于保存明文的缓存的长度 + 返回值:0-成功 1-因输出缓存太小而执行失败 + */ ++(unsigned int)PassswrodDecrypt:(char*)szSrcData UserID:(char*)szUserID Dst:(char*)szOutputBuffer Len:(unsigned int)iLength; + +/* + 函数功能:服务器保存的设备密码的加密函数（应用场景：上传设备列表到服务器） + szSrcData:明文 + szUserID:登陆账号关联的ID + szOutputBuffer:用于保存密文的缓存，由用户提供 + iLength:用于保存密文的缓存的长度 + 返回值:0-成功 1-因输出缓存太小而执行失败 + */ ++(unsigned int)PasswordEncrypt:(char*)szSrcData UserID:(char*)szUserID Dst:(char*)szOutputBuffer Len:(unsigned int)iLength; + +/* + 函数功能:base64解密,扫描二维码用到。 + */ ++(char *)lib_base64_decode:(const char* )data len:(int)data_len; + +/** + 加密设备ID，用于绑定主人验证 + */ ++ (UInt64)getSecretDeviceIdWithDeviceId:(NSString *)deviceId; +@end diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Info.plist b/Ifish/GWP2PSDK/GWP2P.framework/Info.plist new file mode 100755 index 0000000..a17728d Binary files /dev/null and b/Ifish/GWP2PSDK/GWP2P.framework/Info.plist differ diff --git a/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap b/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap new file mode 100755 index 0000000..fda938c --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module GWP2P { + umbrella header "GWP2P.h" + + export * + module * { export * } +} diff --git a/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources new file mode 100755 index 0000000..89a14de --- /dev/null +++ b/Ifish/GWP2PSDK/GWP2P.framework/_CodeSignature/CodeResources @@ -0,0 +1,496 @@ + + + + + files + + Headers/GWNet.h + + N5pUkPs/Hy2Ho7CTNdJM9v0GRz0= + + Headers/GWNetError.h + + XuUZaxW3FCFUD7kCae84h1j4pZM= + + Headers/GWP2P.h + + z+OqKE12S658by3dE2WRiaJTBEU= + + Headers/GWP2PClient+APMode.h + + YWt9QyVQpV7H7yUIgxv9XF970ZQ= + + Headers/GWP2PClient+Alarm.h + + DJxIDvTazePmEIyx1zw3Slq4S4k= + + Headers/GWP2PClient+Defense.h + + 6zVrEuqquHTWEi6JVxlqsemeWSs= + + Headers/GWP2PClient+DeviceInfomation.h + + GbWYbr66mmA7NUaBI4U60Bj0h+c= + + Headers/GWP2PClient+GarageLight.h + + wzZkqszej4Vt5j8CpUVj0GK5Kp4= + + Headers/GWP2PClient+HXVision.h + + pOIg8MCG63LtQgHpcJ9AoCyFNcI= + + Headers/GWP2PClient+PictureAndSound.h + + UpLweCptlUapxU4NycpkJR0wEsU= + + Headers/GWP2PClient+Record.h + + qysAbglaNAte6kAvCsuJo2b1b8s= + + Headers/GWP2PClient+SceneMode.h + + Hy2dYM269SmcX0k0DhF1dfsuiQ4= + + Headers/GWP2PClient+Sensor.h + + RqSbrK4aKGQI1YWKjt3a0UmuTKI= + + Headers/GWP2PClient+WhiteLight.h + + 9J4uDjnYUHd7HUAuaYfEDz617jU= + + Headers/GWP2PClient.h + + wfW/FSLqnWLcNollxT+5k9p0xYI= + + Headers/GWP2PDefine.h + + r9RrEnUXS7+K+O5UH0HbOWOqfOk= + + Headers/GWP2PDevice.h + + RgsP3k7cqDz9MKc/o+C6MkJ01ws= + + Headers/GWP2PDeviceLinker.h + + 0JxhyxTXFCy6G9ANACOwexCritE= + + Headers/GWP2PLanDevice.h + + RXa69pb9SgCjBkt6JUle2Om5fgM= + + Headers/GWP2PPlaybackPlayer.h + + iykJtuJYz3sGX/SbtOolvpf9tq8= + + Headers/GWP2PPlayer.h + + BVS74XH9oIh1SzC2yr6laNrGTzc= + + Headers/GWP2PPlayerDefine.h + + fcuQv9+oqRae0wAdcXWGDOAEFlw= + + Headers/GWP2PVideoPlayer.h + + lOAShVbPkdpBQ+UijARKgf82rUc= + + Headers/MD5Manager.h + + AUNlmZF9J/diTQOhzm0T2eaVNZs= + + Info.plist + + qJVlMog86xUFYdTivMuZae3v5Rg= + + Modules/module.modulemap + + XcT9XFrNnzUM0pWy50W8LSAt3wk= + + + files2 + + Headers/GWNet.h + + hash + + N5pUkPs/Hy2Ho7CTNdJM9v0GRz0= + + hash2 + + G4QevGNQ/qXoUVMeBj8owHPjPvVVHniejAFYPsJxnj0= + + + Headers/GWNetError.h + + hash + + XuUZaxW3FCFUD7kCae84h1j4pZM= + + hash2 + + ysqvbpkuGegIXAq56wPNE0OE5H9jUvX0N0v5Z/wnnqw= + + + Headers/GWP2P.h + + hash + + z+OqKE12S658by3dE2WRiaJTBEU= + + hash2 + + dCgEpTWpQ8DXxE5/SO4IMBr3pBGY7pJIvEmZLOvOZCs= + + + Headers/GWP2PClient+APMode.h + + hash + + YWt9QyVQpV7H7yUIgxv9XF970ZQ= + + hash2 + + 82Tv12fHc/l4At8i/gM6aaO8JuxyvcrvETTgy+Afki4= + + + Headers/GWP2PClient+Alarm.h + + hash + + DJxIDvTazePmEIyx1zw3Slq4S4k= + + hash2 + + XBMvs4Zk38Q/FY/h+jWQwQSAAm9KbKFLW8LpZ/Bv+DM= + + + Headers/GWP2PClient+Defense.h + + hash + + 6zVrEuqquHTWEi6JVxlqsemeWSs= + + hash2 + + Qxne7/XR3Nc14rWHGwHTohf8bKLm/AyPiCuFpEwyc5s= + + + Headers/GWP2PClient+DeviceInfomation.h + + hash + + GbWYbr66mmA7NUaBI4U60Bj0h+c= + + hash2 + + x9/09sgHeTyP+LND/0ilr94x7y+QbAA92lX28uhWEEY= + + + Headers/GWP2PClient+GarageLight.h + + hash + + wzZkqszej4Vt5j8CpUVj0GK5Kp4= + + hash2 + + n9H5jfgOS9nJ7gEGNu/YaG1n8PHxb3h4mukeUw/+V5c= + + + Headers/GWP2PClient+HXVision.h + + hash + + pOIg8MCG63LtQgHpcJ9AoCyFNcI= + + hash2 + + oi/0YLKo9ylqnNiPKdGKCAX4UWJsGny8kdSl6PZhVWA= + + + Headers/GWP2PClient+PictureAndSound.h + + hash + + UpLweCptlUapxU4NycpkJR0wEsU= + + hash2 + + YsAo3oH7aawUP8nqlQy9YcdQJYy+gex0dZeA4fybWNg= + + + Headers/GWP2PClient+Record.h + + hash + + qysAbglaNAte6kAvCsuJo2b1b8s= + + hash2 + + Fav1TFzUIHgOkvzrFrVy+OWRTO1K0TGy9Xqdoavpo24= + + + Headers/GWP2PClient+SceneMode.h + + hash + + Hy2dYM269SmcX0k0DhF1dfsuiQ4= + + hash2 + + 0dgzLlfhUDZTBxIkRFcZ/7FZZK6uSO9ia8H6ou2PiJk= + + + Headers/GWP2PClient+Sensor.h + + hash + + RqSbrK4aKGQI1YWKjt3a0UmuTKI= + + hash2 + + 7Mi6k1ye8HIp1lquPjGw1YZLtlv5nYZbBPfxZisDPT4= + + + Headers/GWP2PClient+WhiteLight.h + + hash + + 9J4uDjnYUHd7HUAuaYfEDz617jU= + + hash2 + + L4tdz86JCfSfMpiS21NXZX4st6+3Oy2gkpGzEB2ZY+4= + + + Headers/GWP2PClient.h + + hash + + wfW/FSLqnWLcNollxT+5k9p0xYI= + + hash2 + + OSfHL++HoGY8D/KgFmrpfvbWwxBdh0o3Tabc/tdLCRw= + + + Headers/GWP2PDefine.h + + hash + + r9RrEnUXS7+K+O5UH0HbOWOqfOk= + + hash2 + + Ob8/WyjnDAv6VByM99FsjKfTvFdZI0BZ2D613tzhiSM= + + + Headers/GWP2PDevice.h + + hash + + RgsP3k7cqDz9MKc/o+C6MkJ01ws= + + hash2 + + li6sGL0KHKeXgwn2DMy1d5sNaf5K4xI586VfMdVeFRk= + + + Headers/GWP2PDeviceLinker.h + + hash + + 0JxhyxTXFCy6G9ANACOwexCritE= + + hash2 + + GGQjb2C8KCwBno1XtmFdP0mELm8psWwvljEnt4vQRww= + + + Headers/GWP2PLanDevice.h + + hash + + RXa69pb9SgCjBkt6JUle2Om5fgM= + + hash2 + + Rl1ulWSt760pG+kTzP8pIP7hmZc5O6SgoTOFPXgMQ2Q= + + + Headers/GWP2PPlaybackPlayer.h + + hash + + iykJtuJYz3sGX/SbtOolvpf9tq8= + + hash2 + + Jqb9K/MeeBrysIqt+gFWF+p54P41nwsM3dhu2NDc/BU= + + + Headers/GWP2PPlayer.h + + hash + + BVS74XH9oIh1SzC2yr6laNrGTzc= + + hash2 + + Knlii/rz3zOtRep6fo7zWwqJHfOVDok/waC4U3BMUNQ= + + + Headers/GWP2PPlayerDefine.h + + hash + + fcuQv9+oqRae0wAdcXWGDOAEFlw= + + hash2 + + Fnf+HHRAxj+8iepgneNvleh8DmPWWThZSDSLOctYFy8= + + + Headers/GWP2PVideoPlayer.h + + hash + + lOAShVbPkdpBQ+UijARKgf82rUc= + + hash2 + + Otq4vl7WvvjiyuFaYsRLgvOpz0bS0SyFQzlZjqYl0Ec= + + + Headers/MD5Manager.h + + hash + + AUNlmZF9J/diTQOhzm0T2eaVNZs= + + hash2 + + Y6AKHotGffuSL2JJvsdQ+xggWQ53jO07IwE2uckzWss= + + + Modules/module.modulemap + + hash + + XcT9XFrNnzUM0pWy50W8LSAt3wk= + + hash2 + + mnXQFIUc7B+/60q91QbFv5vHNA0qnQJxxr3exyl8oJU= + + + + rules + + ^ + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^ + + weight + 20 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/Ifish/GWP2PSDK/SDK使用说明 b/Ifish/GWP2PSDK/SDK使用说明 new file mode 100755 index 0000000..b34e08b --- /dev/null +++ b/Ifish/GWP2PSDK/SDK使用说明 @@ -0,0 +1,9 @@ +为了防止与其它SDK冲突，我们整合了所有静态库，打包成了一个动态库，因此整个SDK只有一个framework，不需要加入任何依赖。 + +使用步骤： +1.使用动态库的集成方式集成GWP2P.framework，即在Embedded Binaries中进行添加； +2.参考Demo调用接口即可。 + +注意事项： +1.SDK文件夹中的GWP2P.framework是真机版，另一个压缩包中是模拟器+真机版； +2.平时开发建议用模拟器+真机版，打包上架时动态库要用纯真机版，否则无法上架。 diff --git a/Ifish/Utinitys/Define.h b/Ifish/Utinitys/Define.h index 6513129..babca16 100644 --- a/Ifish/Utinitys/Define.h +++ b/Ifish/Utinitys/Define.h @@ -135,13 +135,13 @@ alpha:1.0] // 云 @"app.ifish7.com" //正式环境 -//#define SOCKETPORT @"app.ifish7.com" -//#define JIEKOUPORT @"https://app.ifish7.com" -//#define JIEKOUPORTHTTP @"https://app.ifish7.com" -//测试环境 -#define SOCKETPORT @"test.ifish7.com:9955" -#define JIEKOUPORT @"http://139.196.24.156:7080" +#define SOCKETPORT @"app.ifish7.com" +#define JIEKOUPORT @"https://app.ifish7.com" #define JIEKOUPORTHTTP @"https://app.ifish7.com" +//测试环境 +//#define SOCKETPORT @"test.ifish7.com:9955" +//#define JIEKOUPORT @"http://139.196.24.156:7080" +//#define JIEKOUPORTHTTP @"https://app.ifish7.com" //云 @"https://app.ifish7.com" //云图片头像等地址 @"http://app.ifish7.com" //#define JIEKOUPORTHTTP @"https://app.ifish7.com" @@ -180,8 +180,6 @@ alpha:1.0] #define kUserLoginValidation [NSString stringWithFormat:@"%@/api/users/loginValidation",JIEKOUPORT] //更多用户数据如设备信息 #define kUserMoreUserData [NSString stringWithFormat:@"%@/api/users/moreUserData/",JIEKOUPORT] - - // 用户信息修改接口 #define kUpdateSafeUser [NSString stringWithFormat:@"%@/api/users/v3/updateInfo.do",JIEKOUPORT] // 头像上传接口 diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index 79b168f..686866f 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -46,9 +46,6 @@ #import "UIButton+WebCache.h" -//老版本选择设备界面 -//#import "SelectDeviceViewController.h" -//#import "IfishSelectCardViewController.h" #import "IfishBindDeviceSelectViewController.h" #import "IfishMianTabViewController.h" diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.h b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.h index 08dc930..2d565cb 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.h +++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.h @@ -10,6 +10,10 @@ #import "ShopKanHuP2PViewController.h" #import "IfishKankanListModel.h" #import "P2PShareViewBootomView.h" + +/** + 观看鱼友直播内容 + */ @interface IfishP2PLivePlayViewController : ShopKanHuP2PViewController @property(nonatomic,strong) P2PShareViewBootomView * subHbottomView; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m index 7f09800..8eabf38 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m @@ -20,11 +20,6 @@ [super viewDidLoad]; // Do any additional setup after loading the view. [self addTitleViewWithTitle:@"分享中"]; - //自定义封装播放器 由于xib创建OPGLview 无法显示（暂未找到方法）暂时不用 纯代码建UI可以试试 - //[self setupVideoPlayView]; - //现采用继承ShopKanHuP2PViewController 替换底部 HbootmView - - // self.HbootmView.hidden= YES; self.view.backgroundColor = TABLE_BACKGROUD_COLOR; [self resetBootomView]; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishP2PPlayView/IfishP2PVideoPlayView.h b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishP2PPlayView/IfishP2PVideoPlayView.h index 5489cee..5eeb389 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishP2PPlayView/IfishP2PVideoPlayView.h +++ b/Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishP2PPlayView/IfishP2PVideoPlayView.h @@ -11,7 +11,7 @@ #import "ProgressImageView.h" #import "OpenGLView.h" #import "TouchButton.h" - +#import #import "CustomBorderButton.h" #import "CustomView.h" #define FocalLength_Elongation_btnTag 300 diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.h b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.h index c9b83ad..4f5c48e 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.h +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.h @@ -8,6 +8,9 @@ #import "BaseViewController.h" +/** + 首页点击添加设备进入此添加设备页面 + */ @interface IfishBindDeviceSelectViewController : BaseViewController @end diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m index 09e25b6..f971093 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m @@ -8,7 +8,7 @@ #import "IfishBindDeviceSelectViewController.h" #import "FishSelectDeviceListViewCell.h" -#import "P2PClient.h" +#import #import "UDPManager.h" #import "YooseeNextConnectViewController.h" #import "SecondConnectWifiController.h" @@ -19,7 +19,6 @@ @interface IfishBindDeviceSelectViewController () @property (nonatomic,strong) UITableView *tableView; -@property(nonatomic)BOOL islogInGewell; @end extern BOOL isfromCameraView; @implementation IfishBindDeviceSelectViewController @@ -30,49 +29,23 @@ extern BOOL isfromCameraView; // Do any additional setup after loading the view. [self addTitleViewWithTitle:@"选择设备"]; [self creatTab]; - [self loginGewell]; + [self loginGWP2P]; } -(void)viewDidAppear:(BOOL)animated{ [super viewDidAppear:animated]; -// [self loginGewell]; -// if( _islogInGewell){ -// -// NSLog(@"p2pConnect success.成功,你可以操作设备了"); -// -// }else{//new added -// [self loginGewell]; -// NSLog(@"p2pConnect failure.失败,你将不能操作设备"); -// -//// return; -// } - } -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - //CGPoint curentpoint= [self.cardScrollView contentOffsetWithIndex:[self.cardScrollView currentCard]]; - //[self.cardScrollView.scrollView setContentOffset:curentpoint animated:NO]; - - // [self loginGewell]; - } -#pragma mark - loginGewell --(void)loginGewell{ +#pragma mark - loginGWP2P +-(void)loginGWP2P{ [SVProgressHUD showWithMaskType:SVProgressHUDMaskTypeBlack]; [[UDPManager sharedDefault] ScanLanDevice]; - - _islogInGewell = NO; - - // LoginResult *loginResult = [UDManager getLoginInfo]; - - // NSString * P2PVerifyCode1 = @"1528438234"; - // NSString * P2PVerifyCode2 = @"992805759"; - // NSString *UserID = @"-2144354932"; UserModel *model=[dataContorl getUserInfo]; - NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2); @@ -95,8 +68,8 @@ extern BOOL isfromCameraView; dispatch_queue_t queue = dispatch_queue_create("net.bujige.testQueue", DISPATCH_QUEUE_CONCURRENT); dispatch_async(queue, ^{ - // 追加任务1 - [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; +// // 追加任务1 +// self.islogInGewell = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil]; dispatch_async(dispatch_get_main_queue(), ^{ @@ -165,35 +138,24 @@ extern BOOL isfromCameraView; //wifi环境下转跳下一界面 switch (indexPath.row) { - case 0: - { //摄像头 NSArray * cameraArr =[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"]; - if ([cameraArr count]>=5) { - - [self.view makeToast:@"设备已达上线限"]; - + [self.view makeToast:@"设备已达上限"]; return; - } - - if ( self.islogInGewell) { - + if ( [GWP2PClient sharedClient].linkStatus==P2PLinkStatusOK) { self.hidesBottomBarWhenPushed = YES; YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init]; [self.navigationController pushViewController:nextvc animated:YES]; nextvc.conectType = 0; }else{ - UserModel *model=[dataContorl getUserInfo]; [self loginGewellWith:model]; - } - } break; case 1: @@ -204,7 +166,7 @@ extern BOOL isfromCameraView; if ([deviceArr count]>=5) { - [self.view makeToast:@"设备已达上线限"]; + [self.view makeToast:@"设备已达上限"]; return; } @@ -245,13 +207,13 @@ extern BOOL isfromCameraView; } --(void)loginGewellWith:(UserModel *)model; +-(void)loginGewellWith:(UserModel *)model { - NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; + NSString *accountId =[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; - if ([userIDName isEqualToString:@"0"]) { + if ([accountId isEqualToString:@"0"]) { [self.view makeToast:@"暂未检测到设备"]; @@ -266,10 +228,11 @@ extern BOOL isfromCameraView; [self.view makeToast:@"暂未检测到设备"]; return; } - - self.islogInGewell = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; + if ([GWP2PClient sharedClient]!=P2PLinkStatusOK) { + [[GWP2PClient sharedClient] connectWithAccount:accountId codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil]; + } //loginResult.contactId 用户ID号 - NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2); + NSLog(@"%@%@%@",accountId,model.P2PVerifyCode1,model.P2PVerifyCode2,model.sessionID,model.sessionID2); } diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 320afcf..3f08838 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -1158,6 +1158,7 @@ Assign NSInteger messageCount;//消息个数 //切换时主动 断开 soket [[Socketsingleton sharedInstance] cutOffSocket]; + //进入摄像头页面 IfishP2PMonitorController *p2pVC=[[IfishP2PMonitorController alloc] init]; p2pVC.contact = model.camera; UINavigationController *nav=[[UINavigationController alloc] initWithRootViewController:p2pVC]; diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.h b/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.h deleted file mode 100644 index c0b8207..0000000 --- a/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// IfishSelectCardViewController.h -// ShotViewAnimation -// -// Created by imac on 16/10/25. -// Copyright © 2016年 xiang. All rights reserved. -// - -#import -#import "BaseViewController.h" -//v4.4 之前版本界面 滑动选项卡选择绑定设备类型 -@interface IfishSelectCardViewController : BaseViewController - -@end diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.m deleted file mode 100644 index f48375c..0000000 --- a/Ifish/controllers/IfishTabControllers/设备/IfishSelectCardViewController.m +++ /dev/null @@ -1,375 +0,0 @@ -// -// IfishSelectCardViewController.m -// ShotViewAnimation -// -// Created by imac on 16/10/25. -// Copyright © 2016年 xiang. All rights reserved. -// - -#import "IfishSelectCardViewController.h" -#import "IfishCardScrollView.h" -#import "Reachability.h" -/** - * color config - */ -#define GCUIColorFromRGB(rgbValue) \ -[UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16)) / 255.0 \ -green:((float)((rgbValue & 0xFF00) >> 8)) / 255.0 \ -blue:((float)(rgbValue & 0xFF)) / 255.0 \ -alpha:1.0] - -#define kGCCardRatio 0.8 -#define kGCCardWidth CGRectGetWidth(self.view.frame)*kGCCardRatio -#define kGCCardHeight kGCCardWidth/kGCCardRatio -#import "SecondConnectWifiController.h" - -#import "UDPManager.h" -#import "UDManager.h" -#import "LoginResult.h" -#import "P2PClient.h" -#import "AFNetworking.h" -#import "YooseeNextConnectViewController.h" - -@interface IfishSelectCardViewController () -@property (nonatomic, strong) IfishCardScrollView *cardScrollView; -@property (nonatomic, strong) NSMutableArray *cards; -@property (nonatomic, strong) NSArray *cardsImg; -@property(nonatomic)BOOL islogInGewell; - -@end - -extern BOOL isfromCameraView; - -@implementation IfishSelectCardViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. - // 添加鱼缸设备不是来自摄像头界面 - isfromCameraView = NO; - [self addTitleViewWithTitle:@"选择设备"]; - self.view.backgroundColor = COLOR_MIAN; - - self.cardScrollView = [[IfishCardScrollView alloc] initWithFrame:CGRectMake(0,0, self.view.frame.size.width, self.view.frame.size.height)]; - self.cardScrollView.cardDelegate = self; - self.cardScrollView.cardDataSource = self; - [self.view addSubview:self.cardScrollView]; - - self.cards = [NSMutableArray array]; - for (NSInteger i = 0; i < 2; i++) { - [self.cards addObject:@(i)]; - } - - self.cardsImg = @[@"equipment_background",@"equipment_background_camera"]; - self.automaticallyAdjustsScrollViewInsets = NO; - -} - --(void)viewDidAppear:(BOOL)animated{ - [super viewDidAppear:animated]; - [self loginGewell]; - if( _islogInGewell){ - - NSLog(@"p2pConnect success.成功,你可以操作设备了"); - - }else{//new added - [self loginGewell]; - NSLog(@"p2pConnect failure.失败,你将不能操作设备"); - - return; - } - -} - --(void)viewWillAppear:(BOOL)animated{ - [super viewWillAppear:animated]; - //CGPoint curentpoint= [self.cardScrollView contentOffsetWithIndex:[self.cardScrollView currentCard]]; - //[self.cardScrollView.scrollView setContentOffset:curentpoint animated:NO]; - - [self loginGewell]; - -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - [self.cardScrollView loadCard]; - -} - --(void)viewWillDisappear:(BOOL)animated{ - - [super viewWillDisappear:animated]; - -} --(void)goBackAction{ - //充血返回事件 防止在选择水族箱 时 返回卡顿 - [self.cardScrollView.scrollView setContentOffset:CGPointMake(0, 0) animated:NO]; - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -#pragma mark - CardScrollViewDelegate -- (void)updateCard:(UIView *)card withProgress:(CGFloat)progress direction:(CardMoveDirection)direction { - if (direction == CardMoveDirectionNone) { - if (card.tag != [self.cardScrollView currentCard]) { - CGFloat scale = 1 - 0.1 * progress; - card.layer.transform = CATransform3DMakeScale(scale, scale, 1.0); - card.layer.opacity = 1 - 0.2*progress; - } else { - card.layer.transform = CATransform3DIdentity; - card.layer.opacity = 1; - } - } else { - NSInteger transCardTag = direction == CardMoveDirectionLeft ? [self.cardScrollView currentCard] + 1 : [self.cardScrollView currentCard] - 1; - if (card.tag != [self.cardScrollView currentCard] && card.tag == transCardTag) { - card.layer.transform = CATransform3DMakeScale(0.9 + 0.1*progress, 0.9 + 0.1*progress, 1.0); - card.layer.opacity = 0.8 + 0.2*progress; - } else if (card.tag == [self.cardScrollView currentCard]) { - card.layer.transform = CATransform3DMakeScale(1 - 0.1 * progress, 1 - 0.1 * progress, 1.0); - card.layer.opacity = 1 - 0.2*progress; - } - } -} - -#pragma mark - CardScrollViewDataSource -- (NSInteger)numberOfCards { - return self.cards.count; -} - -- (UIView *)cardReuseView:(UIView *)reuseView atIndex:(NSInteger)index { - if (reuseView) { - // you can set new style - return reuseView; - } - -// UIView *card = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kGCCardWidth * 0.9, kGCCardHeight)]; -// card.layer.backgroundColor = [UIColor whiteColor].CGColor; -// card.layer.cornerRadius = 4; -// card.layer.masksToBounds = YES; - - UIView *card = [[UIView alloc] initWithFrame:CGRectMake(0, 0,kGCCardWidth * 0.9, kGCCardWidth * 0.9 *1.55)]; - - card.layer.backgroundColor = [UIColor whiteColor].CGColor; - card.layer.cornerRadius = 4; - card.layer.masksToBounds = YES; - - UIImageView *cardImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0 , 0, kGCCardWidth * 0.9, kGCCardWidth * 0.9 *1.55)]; - - NSString *imagename=self.cardsImg[index]; - cardImgView.image = [UIImage imageNamed:imagename]; - cardImgView.userInteractionEnabled = YES; - - [card addSubview:cardImgView]; - //前往绑定按钮 - CGFloat qianWangBtnW = kGCCardWidth * 0.9 - 20*2; - CGFloat qianWangBtnY = kGCCardWidth * 0.9 *1.55 - 20 -qianWangBtnW *0.18; - - UIButton *qianWangBtn=[UIButton buttonWithType:UIButtonTypeCustom]; - qianWangBtn.frame = CGRectMake(CGRectGetMaxX(cardImgView.frame)/2 - qianWangBtnW/2, qianWangBtnY, qianWangBtnW , qianWangBtnW *0.18); - - [qianWangBtn setTitle:@"前往绑定" forState:UIControlStateNormal]; - [qianWangBtn addTarget:self action:@selector(qianWangBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - - qianWangBtn.tag = index *100; - -// qianWangBtn.layer.masksToBounds = YES; -// qianWangBtn.layer.cornerRadius = 5; - [qianWangBtn setBackgroundImage:[UIImage imageNamed:@"equipment_button"] forState:UIControlStateNormal]; - [cardImgView addSubview:qianWangBtn]; - - - return card; -} - --(void)qianWangBtnAction:(UIButton *)btn{ - - [self testwifiWithBtn:btn]; - - -} - -/** - * 检测是否wifi环境 - */ - --(void)testwifiWithBtn:(UIButton *)btn{ - - - - Reachability *currReach = [Reachability reachabilityForLocalWiFi]; - - NetworkStatus status = [currReach currentReachabilityStatus]; - - NSLog(@"NetworkStatus%ld", (long)status); - - if (status==AFNetworkReachabilityStatusReachableViaWiFi) { - //wifi环境下转跳下一界面 - - switch (btn.tag) { - - case 0: - - { - //水族箱 - NSArray * deviceArr =[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"]; - - if ([deviceArr count]>=5) { - - [self.view makeToast:@"设备已达上线限"]; - return; - - } - self.hidesBottomBarWhenPushed = YES; - - SecondConnectWifiController*wifivc=[[SecondConnectWifiController alloc]init]; - [self.navigationController pushViewController:wifivc animated:YES]; - - - } - break; - case 100: - { - //摄像头 - NSArray * cameraArr =[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"]; - - if ([cameraArr count]>=5) { - - [self.view makeToast:@"设备已达上线限"]; - - return; - - } - - if ( self.islogInGewell) { - - self.hidesBottomBarWhenPushed = YES; - YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init]; - [self.navigationController pushViewController:nextvc animated:YES]; - nextvc.conectType = 0; - - }else{ - UserModel *model=[dataContorl getUserInfo]; - [self loginGewellWith:model]; - - } - - } - break; - default: - break; - } - - - }else{ - [self.view makeToast:@"请切换到WiFi环境下绑定"]; - - } - - -} - --(void)loginGewellWith:(UserModel *)model; -{ - - - NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; - - if ([userIDName isEqualToString:@"0"]) { - - [self.view makeToast:@"暂未检测到设备"]; - //请求GewellCodes - //[self getGewellCodes]; - - return; - } - - if ([model.P2PVerifyCode1 isEqualToString:@""]) { - [self.view makeToast:@"暂未检测到设备"]; - return; - } - if ([model.P2PVerifyCode2 isEqualToString:@""]) { - [self.view makeToast:@"暂未检测到设备"]; - return; - } - - self.islogInGewell = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; - //loginResult.contactId 用户ID号 - NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2); - - - -} - -#pragma mark - loginGewell - --(void)loginGewell{ - - [[UDPManager sharedDefault] ScanLanDevice]; - - _islogInGewell = NO; - - // LoginResult *loginResult = [UDManager getLoginInfo]; - - // NSString * P2PVerifyCode1 = @"1528438234"; - // NSString * P2PVerifyCode2 = @"992805759"; - // NSString *UserID = @"-2144354932"; - UserModel *model=[dataContorl getUserInfo]; - - NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; - - NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2); - if ([userIDName isEqualToString:@"0"]) { - // - [self.view makeToast:@"摄像头用户名空错误码10001"]; - return; - } - - if ([model.P2PVerifyCode1 isEqualToString:@""]) { - [self.view makeToast:@"摄像头P2PVerifyCode1空错误码10002"]; - return; - } - if ([model.P2PVerifyCode2 isEqualToString:@""]) { - [self.view makeToast:@"摄像头P2PVerifyCode2空错误码10003"]; - return; - } - - _islogInGewell = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; - - -} - --(void)getGewellCodes{ - [self.view makeToast:@"连接服务器中。。"]; - UserModel *model= [dataContorl getUserInfo]; - NSString *userid = [NSString stringWithFormat:@"%@",model.userId]; - [AFHttpTool getGwellCodes:userid success:^(id response) { - - NSDictionary *reDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; - NSDictionary *data=reDic[@"data"]; - if ([reDic[@"result"] isEqualToString:@"100"]) { - model.P2PVerifyCode1 =data[@"P2PVerifyCode1"]; - model.P2PVerifyCode2 =data[@"P2PVerifyCode2"]; - model.gwellUserID =data[@"gwellUserID"]; - [dataContorl resetUser:model]; - [self loginGewellWith:model]; - [self.view makeToast:@"连接服务器成功请继续"]; - - }else{ - - - } - - } failure:^(NSError *err) { - NSLog(@"错误err%@",err); - }]; - -} -//- (void)deleteCardWithIndex:(NSInteger)index { -// [self.cards removeObjectAtIndex:index]; -//} - -@end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishCameraModel.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishCameraModel.h index c38dfd8..c348851 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishCameraModel.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishCameraModel.h @@ -18,7 +18,6 @@ @property(nonatomic,copy) NSString * isMaster; //是否授权 @property(nonatomic,copy) NSString * isActive; - //摄像头密码写死 全一样 123 md5 加密 @property(nonatomic,copy) NSString *cameraPass; // diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.h index c83f471..720e8ec 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.h @@ -4,26 +4,22 @@ // // Created by imac on 16/6/7. // Copyright © 2016年 xiang. All rights reserved. -// +//摄像头详情页面 #import -#import "P2PClient.h" #import - #import "TouchButton.h" -#import "OpenGLView.h" +//#import "OpenGLView.h" +#import #import "CustomBorderButton.h" #import "CustomView.h" #import "ProgressImageView.h" -//#import "MainController.h" -//#import "CustomTopBar.h" #import "AppDelegate.h" #define FocalLength_Elongation_btnTag 300 #define FocalLength_Shorten_btnTag 301 #define FocalLength_Change_sliderTag 302 #import "MonitorBootmView.h" -//#import "Socketsingleton.h" #import "SongBaoViewController.h" //竖屏 #define STOPBTN_TAG 1603227 @@ -53,10 +49,10 @@ #import "IifshSegmentView.h" @interface IfishP2PMonitorController : UIViewController< - AVCaptureVideoDataOutputSampleBufferDelegate,UIGestureRecognizerDelegate,TouchButtonDelegate, - OpenGLViewDelegate,UIScrollViewDelegate,UIAlertViewDelegate,P2PClientDelegate,MonitorBottomCollcetionSelectDelegate,LxPopViewDelegate,CameraBottomHViewDelegate,IfishSegmentViewDelegate> + AVCaptureVideoDataOutputSampleBufferDelegate,UIGestureRecognizerDelegate,TouchButtonDelegate,UIScrollViewDelegate,UIAlertViewDelegate,MonitorBottomCollcetionSelectDelegate,LxPopViewDelegate,CameraBottomHViewDelegate,IfishSegmentViewDelegate> -@property (nonatomic, strong) OpenGLView *remoteView; +//@property (nonatomic, strong) OpenGLView *remoteView; +@property (nonatomic, strong) GWP2PVideoPlayer *player;//摄像头页面 @property (nonatomic) BOOL isReject; @property (nonatomic) BOOL isFullScreen4B3; @property (nonatomic) BOOL isShowControllerBar; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index fa61f4b..4bac104 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -10,12 +10,11 @@ #import #import #import -#import "P2PClient.h" +#import #import "Toast+UIView.h" #import "AppDelegate.h" //#import "PAIOUnit.h" #import "UDManager.h" - #import "Utils.h" #import "TouchButton.h" #import "ContactDAO.h" @@ -59,7 +58,6 @@ #import "IfishDeviceInfo.h" #import "RusunHaveHeateSetViewController.h" #import "KanHuFuWuViewController.h" -//#import "IfishSelectCardViewController.h" #import "IfishBindDeviceSelectViewController.h" #import "MinekanHuNotSelectShopController.h" #import @@ -70,7 +68,7 @@ #import "Xuanduo2SettingController.h" //上部分视频封装 下部分分段控制器 封装 （下一步代码优化） -@interface IfishP2PMonitorController () +@interface IfishP2PMonitorController () { CGFloat _horizontalScreenH; CGFloat _monitorInterfaceW;//rtsp监控界面弹出修改 @@ -115,7 +113,8 @@ @property (strong, nonatomic) UIView *shutterView; @property(nonatomic,strong) HaveHotCoolWenDuPicview *xuanduoPicView; - +Weak UIView *remoteView;//显示player的载体 +Strong UIImage *screenShotImage;//截图 @end extern BOOL formLogIn;//连接页面是否来自登录界面 @@ -144,25 +143,16 @@ NSArray *yooseeDeviceArr = [[DataCenter defaultDtacenter] valueForKey:@"cameraArr"]; for (IfishCameraModel *camera in yooseeDeviceArr) { - if ([camera.cameraId isEqualToString:self.contact.cameraId]) { - - self.contact = camera; - } } [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveRemoteMessage:) name:RECEIVE_REMOTE_MESSAGE object:nil]; [self.bottomToolHView addObViserFromSelf]; - self.navigationController.navigationBarHidden = NO; - - _isCanAutoOrientation = YES; - //设置默认竖屏 [[AppDelegate sharedDefault] application:[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[AppDelegate sharedDefault].window]; - //先判断是否授权 if (!self.contact.isActive) { @@ -170,14 +160,13 @@ return; } - if ([self.contact.isActive isEqualToString:@"1"]) { [self cameraConnectSeting]; }else if ([self.contact.isActive isEqualToString:@"0"]){ - [[P2PClient sharedClient] setDelegate:self]; +// [[P2PClient sharedClient] setDelegate:self]; UIAlertView *alert=[[UIAlertView alloc] initWithTitle:@"" message:@"请扫描产品外包装上的激活码来激活摄像头" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"前往扫描", nil]; alert.tag = WEIJIHUO_ALERT; [alert show]; @@ -186,24 +175,16 @@ } //加tab 栏后新增 - -(void)cameraConnectSeting{ //rtsp监控界面弹出修改 [self monitorP2PCall]; //设置代理 - [[P2PClient sharedClient] setDelegate:self]; if (_isPushNextView) { return; } - [self hiddenMonitoringUI:NO callErrorInfo:nil isReCall:YES]; - + [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; } - --(void)viewDidAppear:(BOOL)animated{ - - -} - +//环境校验 -(void)testNetStatusByAF{ [[AFNetworkReachabilityManager sharedManager] startMonitoring]; [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { @@ -241,11 +222,6 @@ } --(void)initWIFIString{ - - -} - -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; @@ -255,8 +231,7 @@ [AppDelegate sharedDefault].canFullScreen = NO; self.isReject = YES; - - + [[UIApplication sharedApplication] setStatusBarHidden:NO]; if (self.isFullScreen){ if (self.scrollView){ @@ -270,7 +245,10 @@ [self.bottomToolHView removeObViserFromSelf]; } - +- (void)dealloc { + NSLog(@"%s %d",__func__,__LINE__); + [self.player p2pStop]; +} - (void)viewDidLoad { @@ -298,33 +276,27 @@ } #pragma mark - 初始化设备 p2pConnect - -(void)connectDevice{ - //LoginResult *loginResult = [UDManager getLoginInfo]; - //8225账号 -// NSString * P2PVerifyCode1 = @"1528438234"; -// NSString * P2PVerifyCode2 = @"992805759"; -// NSString *UserID = @"-2144354932"; - - UserModel *model=[[DataCenter defaultDtacenter] valueForKey:@"UserLogIn"]; + UserModel *model=[dataContorl getUserInfo]; NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; - - //初始化设备 if (!_isInItDevice) { NSLog(@"正在初始化设备"); - _isInItDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; - - // _isInItDevice = [[P2PClient sharedClient] p2pConnectWithId:model.gwellUserID codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; + _isInItDevice = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil]; } - if(_isInItDevice){ NSLog(@"p2pConnect success. 成功 可以操作设备了"); //成功 可以操作设备了 usleep(600000); - [self startMonitor]; + if (_isReject&&_isInItDevice) { + NSLog(@"发送呼叫命令"); + //尝试连接摄像头 + [self monitorP2PCallWithId:self.contact.cameraId]; + + NSLog(@"设备连接密码为：%@",self.contact.cameraPass); + } }else{//new added NSLog(@"p2pConnect failure.失败,不能操作设备"); @@ -334,67 +306,108 @@ } --(void)startMonitor{ - - if (_isReject&&_isInItDevice) { - NSLog(@"发送呼叫命令"); +-(void)monitorP2PCallWithId:(NSString *)callId { + WEAK_SELF; + dispatch_async(dispatch_get_global_queue(0, 0), ^{ - [[P2PClient sharedClient] setIsBCalled:NO]; - [[P2PClient sharedClient] setP2pCallState:P2PCALL_STATUS_CALLING]; - - //Contact *contact = self.deviceArr[0]; + [weakSelf.player p2pCallDeviceWithDeviceId:callId password:weakSelf.contact.cameraPass definition:GWP2PPTZDefinitionSD calling:^(NSDictionary *parameters) { + //呼叫设备 + NSLog(@"[p2pCallDevice-Calling],paras=%@",parameters); + + } accept:^(NSDictionary *parameters) { - [[P2PClient sharedClient] p2pCallWithId:self.contact.cameraId password:self.contact.cameraPass callType:P2PCALL_TYPE_MONITOR]; - - NSLog(@"contact.contactPassword%@",self.contact.cameraPass); - - } - -} - -#pragma mark - 协议的实现 -- (void)P2PClientCalling:(nullable NSDictionary*)info{ - - NSLog(@"正在呼叫"); -} -- (void)P2PClientReject:(nullable NSDictionary*)info{ - - _isReject=YES; - _isOkRenderVideoFrame = NO; - NSLog(@"视频挂断"); - - //[self addLogs:@"视频挂断"]; - + NSLog(@"[p2pCallDevice-Accept],paras=%@",parameters); + + } reject:^(GWP2PCallError error, NSString *errorCode) { + _isReject=YES; + _isOkRenderVideoFrame = NO; + NSLog(@"视频挂断"); while (_isPlaying) { usleep(50*1000); } - - - if (self.isIntoMonitorFromMonitor) { - self.isIntoMonitorFromMonitor = NO; - [self hiddenMonitoringUI:NO callErrorInfo:nil isReCall:YES]; - // [self monitorP2PCall]; - }else{ - [self hiddenMonitoringUI:NO callErrorInfo:info isReCall:NO]; - } + dispatch_async(dispatch_get_main_queue(), ^{ + if (self.isIntoMonitorFromMonitor) { + self.isIntoMonitorFromMonitor = NO; + [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; + }else{ + [self hiddenMonitoringUI:NO callWithErrorType:(NSInteger)error isReCall:NO]; + } + }); + + } ready:^{ + //呼叫成功操作 + NSLog(@"[p2pCallDevice-Ready] %@",[NSThread currentThread]); + [[P2PClient sharedClient] setP2pCallState:P2PCALL_STATUS_READY_P2P]; + + if([[P2PClient sharedClient] p2pCallType]==P2PCALL_TYPE_MONITOR){ + //连接就绪之后就开始启动渲染直播内容 + [self monitorStartRender]; + } + // //全景设备，180全景默认电视广角，360全景默认显示混合模式 + // GWP2PFisheyeType fisheyeType = [GWP2PDevice getFisheyeTypeWithSubtype:weakSelf.contact.deviceType]; + // if (fisheyeType == GWP2PFisheyeType180) { + // weakSelf.player.showMode = PM_WIDE_ANGLE; + // } else if (fisheyeType == GWP2PFisheyeType360) { + // weakSelf.player.showMode = PM_MIX; + // } else { + // //其它设备用默认的显示，没有形变 + // } + }]; + + + + }); +} +//视频播放 +#pragma mark - GWP2PPlayer代理回调测试 +- (void)p2pPlayer:(GWP2PPlayer *)player recieveGestureRecognizer:(UIGestureRecognizer *)gesture { + NSLog(@"-----delegate---recieveGestureRecognizer"); +} - +- (void)p2pVideoPlayer:(GWP2PVideoPlayer *)player numberOfAudiencesChange:(NSUInteger)currentNumber { + NSLog(@"-----delegate---numberOfAudiencesChange"); } -- (void)P2PClientAccept:(nullable NSDictionary*)info{ - - NSLog(@"接收数据"); -} -- (void)P2PClientReady:(nullable NSDictionary*)info{ - - NSLog(@"准备就绪"); - [[P2PClient sharedClient] setP2pCallState:P2PCALL_STATUS_READY_P2P]; - - if([[P2PClient sharedClient] p2pCallType]==P2PCALL_TYPE_MONITOR){ - //连接就绪之后就开始启动渲染 - [self monitorStartRender]; - } -} +//#pragma mark - 协议的实现 +//- (void)P2PClientCalling:(nullable NSDictionary*)info{ +// +// NSLog(@"正在呼叫"); +//} +//- (void)P2PClientReject:(nullable NSDictionary*)info{ +// +// _isReject=YES; +// _isOkRenderVideoFrame = NO; +// NSLog(@"视频挂断"); +// while (_isPlaying) { +// usleep(50*1000); +// } +// +// +// if (self.isIntoMonitorFromMonitor) { +// self.isIntoMonitorFromMonitor = NO; +// [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; +// // [self monitorP2PCall]; +// }else{ +// [self hiddenMonitoringUI:NO callWithErrorType:info isReCall:NO]; +// } +// +// +// +//} +//- (void)P2PClientAccept:(nullable NSDictionary*)info{ +// +// NSLog(@"接收数据"); +//} +//- (void)P2PClientReady:(nullable NSDictionary*)info{ +// +// NSLog(@"准备就绪"); +// [[P2PClient sharedClient] setP2pCallState:P2PCALL_STATUS_READY_P2P]; +// +// if([[P2PClient sharedClient] p2pCallType]==P2PCALL_TYPE_MONITOR){ +// //连接就绪之后就开始启动渲染 +// [self monitorStartRender]; +// } +//} #pragma mark - 准备渲染监控界面 -(void)monitorStartRender{ //[self addLogs:@"渲染>>>你可以看到画面了"]; @@ -402,9 +415,6 @@ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ [self renderView]; }); - //[[PAIOUnit sharedUnit] setMuteAudio:YES]; - // [[PAIOUnit sharedUnit] setSpeckState:YES]; - } @@ -449,16 +459,12 @@ #define LOADINGPRESSVIEW_WIDTH_HEIGHT (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? 50:80) +//详情页为竖直方向 -(void)initComponentForPortrait{ - - //view的背景颜色 [self.view setBackgroundColor:RGB(242, 242, 242)]; - //显示状态栏 [[UIApplication sharedApplication] setStatusBarHidden:NO]; - - //取得竖屏的rect CGRect rect = [AppDelegate getScreenSize:YES isHorizontal:NO]; CGFloat width = rect.size.width; @@ -503,7 +509,7 @@ //显示监控画面的载体canvasView CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16; UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, canvasView_h)]; - canvasView.backgroundColor = [UIColor blackColor]; + canvasView.backgroundColor = [UIColor clearColor]; [self.view addSubview:canvasView]; self.canvasView = canvasView; self.canvasframe = canvasView.frame; @@ -553,41 +559,47 @@ self.labelTip = labelTip; //显示监控的画布OpenGLView - OpenGLView *glView = [[OpenGLView alloc] init]; - glView.frame = CGRectMake(0.0, 0.0, self.canvasView.frame.size.width, self.canvasView.frame.size.height); - self.remoteView = glView; - self.remoteView.delegate = self; - [self.remoteView.layer setMasksToBounds:YES]; - [self.canvasView addSubview:self.remoteView]; +// OpenGLView *glView = [[OpenGLView alloc] init]; +// glView.frame = CGRectMake(0.0, 0.0, self.canvasView.frame.size.width, self.canvasView.frame.size.height); +// self.remoteView = glView; +// self.remoteView.delegate = self; +// [self.remoteView.layer setMasksToBounds:YES]; +// [self.canvasView addSubview:self.remoteView]; - //上划手势 - UISwipeGestureRecognizer *swipeGestureUp = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeUp:)]; - [swipeGestureUp setDirection:UISwipeGestureRecognizerDirectionUp]; - [swipeGestureUp setCancelsTouchesInView:YES]; - [swipeGestureUp setDelaysTouchesEnded:YES]; - //[_remoteView addGestureRecognizer:swipeGestureUp]; + self.player = [[GWP2PVideoPlayer alloc] init]; + self.player.delegate = self; + self.remoteView = self.player.viewController.view; + [self.canvasView addSubview:self.player.viewController.view]; + [self addChildViewController:self.player.viewController]; - //下划手势 - UISwipeGestureRecognizer *swipeGestureDown = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeDown:)]; - [swipeGestureDown setDirection:UISwipeGestureRecognizerDirectionDown]; - - [swipeGestureDown setCancelsTouchesInView:YES]; - [swipeGestureDown setDelaysTouchesEnded:YES]; - // [_remoteView addGestureRecognizer:swipeGestureDown]; - - //左划手势 - UISwipeGestureRecognizer *swipeGestureLeft = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeLeft:)]; - [swipeGestureLeft setDirection:UISwipeGestureRecognizerDirectionLeft]; - [swipeGestureLeft setCancelsTouchesInView:YES]; - [swipeGestureLeft setDelaysTouchesEnded:YES]; - //[_remoteView addGestureRecognizer:swipeGestureLeft]; - - //右划手势 - UISwipeGestureRecognizer *swipeGestureRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeRight:)]; - [swipeGestureRight setDirection:UISwipeGestureRecognizerDirectionRight]; - [swipeGestureRight setCancelsTouchesInView:YES]; - [swipeGestureRight setDelaysTouchesEnded:YES]; - //[_remoteView addGestureRecognizer:swipeGestureRight]; +// //上划手势 +// UISwipeGestureRecognizer *swipeGestureUp = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeUp:)]; +// [swipeGestureUp setDirection:UISwipeGestureRecognizerDirectionUp]; +// [swipeGestureUp setCancelsTouchesInView:YES]; +// [swipeGestureUp setDelaysTouchesEnded:YES]; +// //[_remoteView addGestureRecognizer:swipeGestureUp]; +// +// //下划手势 +// UISwipeGestureRecognizer *swipeGestureDown = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeDown:)]; +// [swipeGestureDown setDirection:UISwipeGestureRecognizerDirectionDown]; +// +// [swipeGestureDown setCancelsTouchesInView:YES]; +// [swipeGestureDown setDelaysTouchesEnded:YES]; +// // [_remoteView addGestureRecognizer:swipeGestureDown]; +// +// //左划手势 +// UISwipeGestureRecognizer *swipeGestureLeft = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeLeft:)]; +// [swipeGestureLeft setDirection:UISwipeGestureRecognizerDirectionLeft]; +// [swipeGestureLeft setCancelsTouchesInView:YES]; +// [swipeGestureLeft setDelaysTouchesEnded:YES]; +// //[_remoteView addGestureRecognizer:swipeGestureLeft]; +// +// //右划手势 +// UISwipeGestureRecognizer *swipeGestureRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeRight:)]; +// [swipeGestureRight setDirection:UISwipeGestureRecognizerDirectionRight]; +// [swipeGestureRight setCancelsTouchesInView:YES]; +// [swipeGestureRight setDelaysTouchesEnded:YES]; +// //[_remoteView addGestureRecognizer:swipeGestureRight]; //左边的按住说话弹出的声音图标 //进入横屏时，调整frame @@ -631,7 +643,7 @@ [appermidToolView setCancelsTouchesInView:YES]; [appermidToolView setDelaysTouchesEnded:YES]; - [self.canvasView addGestureRecognizer:appermidToolView]; + [self.remoteView addGestureRecognizer:appermidToolView]; //暂停按钮 self.stopBtnH = [UIButton buttonWithType:UIButtonTypeCustom]; @@ -730,9 +742,13 @@ //_shutterView.backgroundColor = [UIColor clearColor]; } - +#pragma mark - 播放器代理回调 +-(void)viewDidLayoutSubviews +{ + [super viewDidLayoutSubviews]; + self.player.viewController.view.frame = self.canvasframe; +} #pragma mark- 下拉菜单 - -(void)popAppear{ UIImage *image = [UIImage imageNamed:@"popover_background_image_notrangle"]; @@ -743,12 +759,12 @@ CGFloat popRowH=60*(image.size.height/image.size.width); LXPopView *pop=[[LXPopView alloc] init]; if (isBind) { - pop.frame = CGRectMake(0, 0, 160, popRowH * 4 +12 ); + pop.frame = CGRectMake(screen_width-160, 0, 160, popRowH * 4 +12 ); titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"equipment_icon_equipmentupdate",@"ifish_jieBang_device"]; titles=@[@"修改名称",@"删除设备",@"设备升级",@"解除绑定"]; }else{ - pop.frame = CGRectMake(0, 0, 160, popRowH * 3 +12); + pop.frame = CGRectMake(screen_width-160, 0, 160, popRowH * 3 +12); titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"equipment_icon_equipmentupdate"]; titles=@[@"修改名称",@"删除设备",@"设备升级"]; @@ -1140,7 +1156,8 @@ isfromCameraView = YES; //主动 释放 openGL 内存 以 free buffer [AppDelegate sharedDefault].canFullScreen = NO; - [self.remoteView releseromotViewSet]; +#warning 释放内存 +// [self.remoteView releseromotViewSet]; IfishBindDeviceSelectViewController *connectVC=[[IfishBindDeviceSelectViewController alloc]init]; [self.navigationController pushViewController:connectVC animated:YES]; @@ -1184,6 +1201,23 @@ } #pragma mark 点击竖屏上的按钮时，响应 +//截图按钮点击 +- (void)screenShot { +// WEAK_SELF; + //todo: 不停截图内存升高 + [self.player p2pScreenshot:^(UIImage *screenshot, NSTimeInterval timeInterval) { +// dispatch_async(dispatch_get_main_queue(), ^{ +// //weakself.screenShotView.image = nil; +// weakself..image = screenshot; +// weakself.screenShotView.hidden = NO; +// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ +// weakself.screenShotView.hidden = YES; +// }); +// +// }); + self.screenShotImage = screenshot; + }]; +} -(void)onVerticalBtnPress:(UIButton *)button{ switch(button.tag){ case SOUND_BUTTON_H_TAG://声音 @@ -1192,24 +1226,6 @@ //图像渲染出来前，不可以控制声音 return; } - - // UIImageView *soundImageViewH = (UIImageView *)button.subviews[0]; -// BOOL isMute = [[PAIOUnit sharedUnit] muteAudio]; -// if(isMute){ -// // [[PAIOUnit sharedUnit] setMuteAudio:NO]; -// //LXImageWithImageName(@"ic_ctl_new_sound_off.png"); -// soundImageViewH.image = LXImageWithImageName(@"monitor_sound_on_h.png"); -// //横屏，声音打开 -// UIButton *controllerSoundBtn = (UIButton *)[self.controllBar viewWithTag:CONTROLLER_BTN_TAG_SOUND]; -// [controllerSoundBtn setBackgroundImage:LXImageWithImageName(@"ic_ctl_new_sound_on.png") forState:UIControlStateNormal]; -// }else{ -// -// // [[PAIOUnit sharedUnit] setMuteAudio:YES]; -// soundImageViewH.image = LXImageWithImageName(@"monitor_sound_off_.png"); -// //横屏，声音关闭 -// UIButton *controllerSoundBtn = (UIButton *)[self.controllBar viewWithTag:CONTROLLER_BTN_TAG_SOUND]; -// [controllerSoundBtn setBackgroundImage:LXImageWithImageName(@"ic_ctl_new_sound_off.png") forState:UIControlStateNormal]; -// } } break; @@ -1348,14 +1364,16 @@ } } break; - case SCREENSHOT_BUTTON_H_TAG://载图 + case SCREENSHOT_BUTTON_H_TAG://截图 { - [self.remoteView setIsScreenShotting:YES]; + [self screenShot];//截屏 +// [self.remoteView setIsScreenShotting:YES]; + } break; case PROMPT_BUTTON_TAG://重新连接监控 { - [self hiddenMonitoringUI:NO callErrorInfo:nil isReCall:YES]; + [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; [self monitorP2PCall]; } @@ -1372,11 +1390,9 @@ UIImageView *stopImageViewH = (UIImageView *)button.subviews[0]; - + //暂停结束，继续播放视频 if(!_isOkRenderVideoFrame){ - - - [self hiddenMonitoringUI:NO callErrorInfo:nil isReCall:YES]; + [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; [self monitorP2PCall]; stopImageViewH.image = LXImageWithImageName(@"monitor_stop_h.png"); //横屏，声音打开 @@ -1912,7 +1928,7 @@ BOOL isSupportZoom = [dic[@"isSupportZoom"] boolValue]; UIPinchGestureRecognizer *pinchGestureRecognizer = [[UIPinchGestureRecognizer alloc] init]; if (!isSupportZoom) {//电子放大与焦距变倍不共存 - [_remoteView addGestureRecognizer:pinchGestureRecognizer]; + [_canvasView addGestureRecognizer:pinchGestureRecognizer]; } self.pinchGestureRecognizer = pinchGestureRecognizer; @@ -1967,19 +1983,16 @@ }else if(rightItemCount==3){//IPC //有高清 if(i==0){ - //label.text = NSLocalizedString(@"HD", nil); label.text = NSLocalizedString(@"高清", nil); label.tag = CONTROLLER_LABEL_TAG_HD; button.tag = CONTROLLER_BTN_TAG_HD; }else if(i==1){ label.text = NSLocalizedString(@"标清", nil); - //label.text = NSLocalizedString(@"SD", nil); label.tag = CONTROLLER_LABEL_TAG_SD; label.textColor = XBlue; button.tag = CONTROLLER_BTN_TAG_SD; }else if(i==2){ label.text = NSLocalizedString(@"流畅", nil); - //label.text = NSLocalizedString(@"LD", nil); label.tag = CONTROLLER_LABEL_TAG_LD; button.tag = CONTROLLER_BTN_TAG_LD; // @@ -2026,14 +2039,6 @@ //全屏暂停回来 openGlView 出现问题scale改变？ -// _HorizontalStopBtn=[UIButton buttonWithType:UIButtonTypeCustom]; -// -// _HorizontalStopBtn.frame = CGRectMake(5.0, (BOTTOM_BAR_HEIGHT-RESOLUTION_BTN_H)/2.0, CONTROLLER_LEFT_ITEM_WIDTH, RESOLUTION_BTN_H); -// _HorizontalStopBtn.tag =VT_STOPBTN_TAG; -// [_HorizontalStopBtn setBackgroundImage:LXImageWithImageName(@"monitor_stop_h.png") forState:UIControlStateNormal]; -// [_HorizontalStopBtn addTarget:self action:@selector(HorizontalStopBtnPress:) forControlEvents:UIControlEventTouchUpInside]; -// [bottomBarView addSubview:_HorizontalStopBtn]; -// //右边的切换屏幕图标 TouchButton *switchScreenButton = [self getBottomBarButton]; @@ -2068,13 +2073,6 @@ _btnDefence.hidden = YES; //LXImageWithImageName(@"long_press_lock.png") controllerBtn.tag = CONTROLLER_BTN_TAG_DEFENCE_LOCK; -// if ([AppDelegate sharedDefault].mainController.contact.defenceState == DEFENCE_STATE_ON || [AppDelegate sharedDefault].contact.defenceState == DEFENCE_STATE_ON) { -// [controllerBtn setBackgroundImage:LXImageWithImageName(@"ic_ctl_lock_on.png") forState:UIControlStateNormal]; -// self.isDefenceOn = YES; -// }else if([AppDelegate sharedDefault].mainController.contact.defenceState == DEFENCE_STATE_OFF || [AppDelegate sharedDefault].contact.defenceState == DEFENCE_STATE_OFF){ -// [controllerBtn setBackgroundImage:LXImageWithImageName(@"ic_ctl_lock_off.png") forState:UIControlStateNormal]; -// self.isDefenceOn = NO; -// } }else if(i==1){//声音开关 controllerBtn.tag = CONTROLLER_BTN_TAG_SOUND; [controllerBtn setBackgroundImage:LXImageWithImageName(@"ic_ctl_new_sound_on.png") forState:UIControlStateNormal]; @@ -2194,14 +2192,18 @@ //退出横屏时，隐藏 //提示器 UIActivityIndicatorView *progressView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - progressView.frame = CGRectMake(self.remoteView.frame.size.width-30.0-20.0, (self.remoteView.frame.size.height-30.0)/2, 30.0, 30.0); +// progressView.frame = CGRectMake(self.remoteView.frame.size.width-30.0-20.0, (self.remoteView.frame.size.height-30.0)/2, 30.0, 30.0); + progressView.frame = CGRectMake(self.canvasView.frame.size.width-30.0-20.0, (self.canvasView.frame.size.height-30.0)/2, 30.0, 30.0); + [self.remoteView addSubview:progressView]; self.progressView = progressView; [self.progressView setHidden:YES]; //若设备支持灯设备时，则显示开关；若不支持，则隐藏 UIButton *lightButton = [UIButton buttonWithType:UIButtonTypeCustom]; - lightButton.frame = CGRectMake(self.remoteView.frame.size.width-30.0-20.0, (self.remoteView.frame.size.height-30.0)/2, 30.0, 30.0); +// lightButton.frame = CGRectMake(self.remoteView.frame.size.width-30.0-20.0, (self.remoteView.frame.size.height-30.0)/2, 30.0, 30.0); + lightButton.frame = CGRectMake(self.canvasView.frame.size.width-30.0-20.0, (self.canvasView.frame.size.height-30.0)/2, 30.0, 30.0); + lightButton.backgroundColor = [UIColor clearColor]; [lightButton setBackgroundImage:[UIImage imageNamed:@"lighton.png"] forState:UIControlStateNormal]; [lightButton addTarget:self action:@selector(btnClickToSetLightState:) forControlEvents:UIControlEventTouchUpInside]; @@ -2217,7 +2219,7 @@ CGFloat focalLengthView_w = 40.0; CGFloat focalLengthView_h = 180.0; //焦距控件与屏幕右边框的间距 - CGFloat space_FocalLView_Screen = (width - self.remoteView.frame.size.width)/2+20+focalLengthView_w; + CGFloat space_FocalLView_Screen = (width - self.canvasView.width)/2+20+focalLengthView_w; UIView *focalLengthView = [[UIView alloc] initWithFrame:CGRectMake(width-space_FocalLView_Screen, height-self.bottomBarView.frame.size.height-20.0-focalLengthView_h, focalLengthView_w, focalLengthView_h)]; if (!isSupportZoom) {//电子放大与焦距变焦不共存 [self.view addSubview:focalLengthView]; @@ -2278,14 +2280,13 @@ //设置高清 if (rightItemCount==3) { - [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:7]; + [self.player p2pSetDefinition:GWP2PPTZDefinitionHD]; [self updateRightButtonState:CONTROLLER_BTN_TAG_HD]; }else if (rightItemCount == 2){ //设置标清 - - [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:5]; + [self.player p2pSetDefinition:GWP2PPTZDefinitionSD]; [self updateRightButtonState:CONTROLLER_BTN_TAG_SD]; } @@ -2295,7 +2296,7 @@ -(void)HorizontalStopBtnPress:(UIButton *)btn{ if(!_isOkRenderVideoFrame){ - [self hiddenMonitoringUI:NO callErrorInfo:nil isReCall:YES]; + [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:YES]; [self monitorP2PCall]; [_HorizontalStopBtn setBackgroundImage:LXImageWithImageName(@"monitor_stop_h.png") forState:UIControlStateNormal]; @@ -2414,43 +2415,23 @@ } } - +#pragma mark --尝试连接摄像头 //rtsp监控界面弹出修改 - -(void)monitorP2PCall{ - - //Contact *contact = self.deviceArr[0]; - - [[P2PClient sharedClient] p2pCallWithId:self.contact.cameraId password:self.contact.cameraPass callType:P2PCALL_TYPE_MONITOR]; - [[P2PClient sharedClient] setP2pCallState:P2PCALL_STATUS_CALLING]; - BOOL isBCalled = [[P2PClient sharedClient] isBCalled]; - P2PCallType type = [[P2PClient sharedClient] p2pCallType]; - NSString *callId = [[P2PClient sharedClient] callId]; - //NSString *callPassword = [[P2PClient sharedClient] callPassword]; - - if(!isBCalled){ - BOOL isApMode = ([[AppDelegate sharedDefault]dwApContactID] != 0); - if (!isApMode) - { - [[P2PClient sharedClient] p2pCallWithId:callId password:self.contact.cameraPass callType:type]; - } - else - { - [[P2PClient sharedClient] p2pCallWithId:@"1" password:self.contact.cameraPass callType:type]; - } - } + + // [self monitorP2PCallWithId:self.contact.cameraId]; } #pragma mark - 开始渲染监控画面 - (void)renderView { _isPlaying = YES; - + GAVFrame * m_pAVFrame ; - + while (!self.isReject) { - + if(fgGetVideoFrameToDisplay(&m_pAVFrame)) { if (!_isOkRenderVideoFrame) { @@ -2458,33 +2439,42 @@ _isOkFirstRenderVideoFrame = YES; dispatch_async(dispatch_get_main_queue(), ^{ //隐藏监控连接中的UI - [self hiddenMonitoringUI:YES callErrorInfo:nil isReCall:NO]; + [self hiddenMonitoringUI:YES callWithErrorType:100 isReCall:NO]; [self didHiddenMonitorUIWith:YES]; - - + + }); //设置默认高清 [self setGaoQingHuoBiaoQing]; - + } - - [self.remoteView render:m_pAVFrame]; +#warning frame +// [self.remoteView render:m_pAVFrame]; vReleaseVideoFrame(); } usleep(10000); } - + _isPlaying = NO; } - +#pragma mark --上送最后一帧截图数据 +-(void)getLastImgGoback{ + UIImage *image = self.screenShotImage; + if (!image) { + return; + } + NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)]; + int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode]; + [Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData]; +} #pragma mark - 返回 -(void)btnClickToBack:(UIButton*)btn{ if (_isOkRenderVideoFrame) { - [self.remoteView getLastImgGoback]; + [self getLastImgGoback]; } if(!_isReject){ @@ -2505,7 +2495,7 @@ [AppDelegate sharedDefault].canFullScreen = NO; - [self.remoteView releseromotViewSet]; +// [self.remoteView releseromotViewSet]; //改 tab 栏后新增 [self setAppTabRoot]; // [self dismissViewControllerAnimated:YES completion:^{ @@ -2703,7 +2693,8 @@ -(UIView*)viewForZoomingInScrollView:(UIScrollView *)scrollView{ //进入全屏时，方可允许操作缩放功能 if (self.isFullScreen) { - return self.remoteView; +// return self.remoteView; + return self.canvasView; } return nil; @@ -2779,11 +2770,11 @@ while (_isPlaying) { usleep(50*1000); } - [[P2PClient sharedClient] p2pHungUp]; - - self.remoteView.isQuitMonitorInterface = YES;//rtsp监控界面弹出修改 +// [[P2PClient sharedClient] p2pHungUp]; +// +// self.remoteView.isQuitMonitorInterface = YES;//rtsp监控界面弹出修改 + [self.player p2pStop]; } - //[self dismissViewControllerAnimated:YES completion:nil]; } break; case CONTROLLER_BTN_TAG_SOUND: @@ -2813,8 +2804,8 @@ break; case CONTROLLER_BTN_TAG_SCREENSHOT: { - - [self.remoteView setIsScreenShotting:YES]; + [self screenShot]; +// [self.remoteView setIsScreenShotting:YES]; } break; case CONTROLLER_BTN_TAG_GPIO1_0: @@ -2866,20 +2857,23 @@ break; case CONTROLLER_BTN_TAG_HD: { - [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:7]; +// [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:7]; + [self.player p2pSetDefinition:GWP2PPTZDefinitionHD];//高清 [self updateRightButtonState:CONTROLLER_BTN_TAG_HD]; } break; case CONTROLLER_BTN_TAG_SD: { - [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:5]; +// [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:5]; + [self.player p2pSetDefinition:GWP2PPTZDefinitionSD];//标清 [self updateRightButtonState:CONTROLLER_BTN_TAG_SD]; } break; case CONTROLLER_BTN_TAG_LD: { - [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:6]; +// [[P2PClient sharedClient] sendCommandType:USR_CMD_VIDEO_CTL andOption:6]; + [self.player p2pSetDefinition:GWP2PPTZDefinitionLD]; [self updateRightButtonState:CONTROLLER_BTN_TAG_LD]; } break; @@ -2940,10 +2934,9 @@ [self stopGLViewVideo]; [Socketsingleton sharedInstance].communiteDelegate=nil; [[Socketsingleton sharedInstance] cutOffSocket]; - - [self.remoteView getLastImgGoback]; + [self screenShot]; [AppDelegate sharedDefault].canFullScreen = NO; - [self.remoteView releseromotViewSet]; +// [self.remoteView releseromotViewSet]; [self setAppTabRoot]; @@ -3017,7 +3010,7 @@ } #pragma mark - 隐藏监控连接中的UI --(void)hiddenMonitoringUI:(BOOL)isHidden callErrorInfo:(NSDictionary*)info isReCall:(BOOL)isReCall{ +-(void)hiddenMonitoringUI:(BOOL)isHidden callWithErrorType:(GWP2PCallError)errorType isReCall:(BOOL)isReCall{ if (isHidden) { [self.yProgressView stop]; [self.yProgressView setHidden:YES]; @@ -3049,27 +3042,21 @@ //暂停 self.yProgressView.angle = 0.0f; self.yProgressView.backgroundView.image = LXImageWithImageName(@"ifishCamera_start"); - int errorFlag = [[info objectForKey:@"errorFlag"] intValue]; - self.labelTip.text = [self getCallErrorStringWith:errorFlag]; + self.labelTip.text = [self getCallErrorStringWithErrorType:errorType]; self.stopImageViewH.image = LXImageWithImageName(@"monitor_on_h.png"); }else{ self.yProgressView.angle = 0.0f; self.yProgressView.backgroundView.image = LXImageWithImageName(@"ifishCamera_start"); - int errorFlag = [[info objectForKey:@"errorFlag"] intValue]; - //int errorFlag = CALL_ERROR_HANGUP ; - self.labelTip.text = [self getCallErrorStringWith:errorFlag]; - + self.labelTip.text = [self getCallErrorStringWithErrorType:errorType]; self.stopImageViewH.image = LXImageWithImageName(@"monitor_on_h.png"); } self.yProgressView.angle = 0.0f; [self.yProgressView stop]; - - int errorFlag = [[info objectForKey:@"errorFlag"] intValue]; - self.labelTip.text = [self getCallErrorStringWith:errorFlag]; + self.labelTip.text = [self getCallErrorStringWithErrorType:errorType]; [self.promptButton setEnabled:YES]; [self.stopBtnH setEnabled:YES]; @@ -3084,83 +3071,100 @@ [self.canvasView bringSubviewToFront:self.promptButton]; } } +/* +GWP2PCallErrorNone = 0, //0无原因 +GWP2PCallErrorDesidNotEnable, //1对方的ID 被禁用 +GWP2PCallErrorDesidOverDate, //2对方的ID 过期了 +GWP2PCallErrorDesidNotAcitve, //3对方的ID 尚未激活 +GWP2PCallErrorDesidOffline, //4对方离线 +GWP2PCallErrorDesidBusy, //5对方忙线中 +GWP2PCallErrorDesidPowerDown, //6对方已关机 +GWP2PCallErrorNoHelper, //7没有找到协助人 +GWP2PCallErrorHangUp, //8对方已经挂断 +GWP2PCallErrorTimeout, //9连接超时 +GWP2PCallErrorInterError, //10内部错误 +GWP2PCallErrorRingTimeout, //11无人接听 +GWP2PCallErrorPwdWrong, //12密码错误(在远程监控时用到密码，在视频通话是不需要) +GWP2PCallErrorConnFail, +GWP2PCallErrorNotSupport, + */ +-(NSString *)getCallErrorStringWithErrorType:(GWP2PCallError)errorType{ --(NSString *)getCallErrorStringWith:(int)errorFlag{ - switch(errorFlag) + switch((int)errorType) { - case CALL_ERROR_NONE: + case GWP2PCallErrorNone: { return NSLocalizedString(@"id_unknown_error", nil); } break; - case CALL_ERROR_DESID_NOT_ENABLE: + case GWP2PCallErrorDesidNotEnable: { return NSLocalizedString(@"id_disabled", nil); } break; - case CALL_ERROR_DESID_OVERDATE: + case GWP2PCallErrorDesidOverDate: { return NSLocalizedString(@"id_overdate", nil); } break; - case CALL_ERROR_DESID_NOT_ACTIVE: + case GWP2PCallErrorDesidNotAcitve: { return NSLocalizedString(@"id_inactived", nil); } break; - case CALL_ERROR_DESID_OFFLINE: + case GWP2PCallErrorDesidOffline: { return NSLocalizedString(@"id_offline", nil); } break; - case CALL_ERROR_DESID_BUSY: + case GWP2PCallErrorDesidBusy: { return NSLocalizedString(@"id_busy", nil); } break; - case CALL_ERROR_DESID_POWERDOWN: + case GWP2PCallErrorDesidPowerDown: { return NSLocalizedString(@"id_powerdown", nil); } break; - case CALL_ERROR_NO_HELPER: + case GWP2PCallErrorNoHelper: { return NSLocalizedString(@"id_connect_failed", nil); } break; - case CALL_ERROR_HANGUP: + case GWP2PCallErrorHangUp: { return NSLocalizedString(@"id_hangup", nil); break; } - case CALL_ERROR_TIMEOUT: + case GWP2PCallErrorTimeout: { return NSLocalizedString(@"id_timeout", nil); } break; - case CALL_ERROR_INTER_ERROR: + case GWP2PCallErrorInterError: { return NSLocalizedString(@"id_internal_error", nil); } break; - case CALL_ERROR_RING_TIMEOUT: + case GWP2PCallErrorRingTimeout: { return NSLocalizedString(@"id_no_accept", nil); } break; - case CALL_ERROR_PW_WRONG: + case GWP2PCallErrorPwdWrong: { return NSLocalizedString(@"id_password_error", nil); } break; - case CALL_ERROR_CONN_FAIL: + case GWP2PCallErrorConnFail: { return NSLocalizedString(@"id_connect_failed", nil); } break; - case CALL_ERROR_NOT_SUPPORT: + case GWP2PCallErrorNotSupport: { return NSLocalizedString(@"id_not_support", nil); } @@ -3269,24 +3273,32 @@ [self didHiddenResolutionInterface]; } +//上滑动 - (void)swipeUp:(id)sender { - [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL - andOption:USR_CMD_OPTION_PTZ_TURN_DOWN]; -} +// [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL +// andOption:USR_CMD_OPTION_PTZ_TURN_DOWN]; + [self.player p2pTurnDirection:GWP2PPTZDirectionUp]; +} +//下滑 - (void)swipeDown:(id)sender { - [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL - andOption:USR_CMD_OPTION_PTZ_TURN_UP]; -} +// [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL +// andOption:USR_CMD_OPTION_PTZ_TURN_UP]; + [self.player p2pTurnDirection:GWP2PPTZDirectionDown]; +} +//左滑 - (void)swipeLeft:(id)sender { - [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL - andOption:USR_CMD_OPTION_PTZ_TURN_LEFT]; -} +// [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL +// andOption:USR_CMD_OPTION_PTZ_TURN_LEFT]; + [self.player p2pTurnDirection:GWP2PPTZDirectionLeft]; +} +//右滑 - (void)swipeRight:(id)sender { - [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL - andOption:USR_CMD_OPTION_PTZ_TURN_RIGHT]; +// [[P2PClient sharedClient] sendCommandType:USR_CMD_PTZ_CTL +// andOption:USR_CMD_OPTION_PTZ_TURN_RIGHT]; + [self.player p2pTurnDirection:GWP2PPTZDirectionRight]; } //竖屏幕 时 @@ -3446,21 +3458,12 @@ while (_isPlaying) { usleep(50*1000); } - [[P2PClient sharedClient] p2pHungUp]; - - self.remoteView.isQuitMonitorInterface = NO;//rtsp监控界面弹出修改 +// [[P2PClient sharedClient] p2pHungUp]; + [self.player p2pStop]; +// self.remoteView.isQuitMonitorInterface = NO;//rtsp监控界面弹出修改 } } -#pragma mark- 回放挂断 --(void)palyBackStopGLView -{ - - //self.remoteView.isQuitMonitorInterface = NO;//rtsp监控界面弹出修改 - //[self.remoteView releseromotViewSet]; - -} - #pragma mark - 计算文本的尺寸 -(CGSize)sizeWithString:(NSString*)string font:(UIFont*)font maxWidth:(CGFloat)maxWidth{ if ([UIDevice currentDevice].systemVersion.floatValue < 7.0) { @@ -3777,33 +3780,7 @@ self.canvasView.layer.contents = (id)headImg.CGImage; self.remoteView.frame = CGRectMake(0.0, 0.0, self.canvasframe.size.width, self.canvasframe.size.height); - -// BOOL is16B9 = [[P2PClient sharedClient] is16B9]; -// if (is16B9) { -// [UIView beginAnimations:nil context:nil]; -// [UIView setAnimationDuration:0.2]; -// -// if (CURRENT_VERSION>=8.0) { -// -// self.remoteView.layer.contentsScale = [UIScreen mainScreen].scale; -//// CGRect rect = [AppDelegate getScreenSize:YES isHorizontal:NO]; -//// CGFloat width = rect.size.width; -// -// -//// CGAffineTransform transform = CGAffineTransformMakeScale(16/9,16/9); -//// self.remoteView.transform = transform; -//// -// -// -// }else{ -// CGAffineTransform transform = CGAffineTransformMakeScale(1.0f,1.0f); -// self.remoteView.transform = transform; -// } -// [UIView commitAnimations]; -// -// } - - + NSString * plist = [[NSBundle mainBundle] pathForResource:@"Common-Configuration" ofType:@"plist"]; NSDictionary * dic = [NSDictionary dictionaryWithContentsOfFile:plist]; BOOL isSupportZoom = [dic[@"isSupportZoom"] boolValue]; @@ -4299,7 +4276,9 @@ } } --(void)cameraBindDeviceSuccess{} +-(void)cameraBindDeviceSuccess{ + +} -(void)noCanuserDevicePush{ @@ -4499,9 +4478,9 @@ [Socketsingleton sharedInstance].communiteDelegate=nil; [[Socketsingleton sharedInstance] cutOffSocket]; - [self.remoteView getLastImgGoback]; + [self screenShotImage]; [AppDelegate sharedDefault].canFullScreen = NO; - [self.remoteView releseromotViewSet]; +// [self.remoteView releseromotViewSet]; //改 tab 栏后新增 [self setAppTabRoot]; @@ -4818,8 +4797,10 @@ if (indexPath.row ==0) { //截图 - [self.remoteView setIsScreenShotting:YES]; + [self screenShot]; +// [self.remoteView setIsScreenShotting:YES]; }else if (indexPath.row ==1){ + //进入图库 if (_isOkRenderVideoFrame) { [self stopGLViewVideo]; @@ -4830,37 +4811,6 @@ [self.navigationController pushViewController:shootView animated:YES]; } - /* else if (indexPath.row ==2){ - //录制 - if (_isOkRenderVideoFrame) { - - [self stopGLViewVideo]; - } - usleep(50*1000); - _bottomToolHView.cameraHViewDelegate=nil; - - CameraRecordViewController *cameraRecordVc=[[CameraRecordViewController alloc] init]; - cameraRecordVc.camera = self.contact; - - [self.navigationController pushViewController:cameraRecordVc animated:YES]; - - }else if (indexPath.row ==3){ - //回放 - //if (_isOkRenderVideoFrame) { - - [self palyBackStopGLView]; - // } - _isPushNextView = YES; - _bottomToolHView.cameraHViewDelegate=nil; - IfishP2PPlayBackListViewController *palybackVC=[[IfishP2PPlayBackListViewController alloc] init]; - palybackVC.camera = self.contact; - [self.navigationController pushViewController:palybackVC animated:YES]; - - //P2PPlaybackController *palybackVC=[[P2PPlaybackController alloc] init]; - //palybackVC.camera = self.contact; - //[self.navigationController pushViewController:palybackVC animated:YES]; - - }*/ else if (indexPath.row ==2){ UserModel *mode=[dataContorl getUserInfo]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlaybackController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlaybackController.m index 870271e..c09195f 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlaybackController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlaybackController.m @@ -1331,9 +1331,6 @@ } NSString* pwdHead = PASSWORD_HEAD; //密码长度上限为30个字符 self.camera.cameraPass = [NSString stringWithFormat:@"%@%@", pwdHead, box.yMsgInputText]; - //[[FListManager sharedFList] updatee:self.camera]; - //[[FListManager sharedFList] getDefenceStates]; - if ([box.theTagString isEqualToString:@"Msg_flist_pwd_error"]) {//获取列表文件错误,就重发获取列表的命令 [[P2PClient sharedClient] setCurrentLabel:1]; [[P2PClient sharedClient] getPlaybackFilesWithId:self.camera.cameraId password:self.camera.cameraPass timeInterval:1]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m index dd03fd7..fff8a6e 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/P2PPlayingbackVC.m @@ -651,7 +651,7 @@ } }else if([[P2PClient sharedClient] gwplaybackState]==PLAYBACK_STATE_STOP){ _isPause=YES; - [[P2PClient sharedClient] sendCommandType:USR_CMD_PLAY_CTL + [[P2PClient sharedClient] sendCommandType:USR_CMD_REMOTLY_PLAY_CTL andOption:USR_CMD_OPTION_PLAY]; if (!_isSilence) { [self stSilence:NO]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseConnectFirstViewController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseConnectFirstViewController.m index e7b35f8..1105b1b 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseConnectFirstViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseConnectFirstViewController.m @@ -12,7 +12,8 @@ #import "UDPManager.h" #import "UDManager.h" #import "LoginResult.h" -#import "P2PClient.h" +//#import "P2PClient.h" +#import @interface YooseConnectFirstViewController () @property(nonatomic)BOOL isInitDevice; @@ -62,10 +63,7 @@ _isInitDevice = NO; // LoginResult *loginResult = [UDManager getLoginInfo]; - -// NSString * P2PVerifyCode1 = @"1528438234"; -// NSString * P2PVerifyCode2 = @"992805759"; -// NSString *UserID = @"-2144354932"; + UserModel *model=[[DataCenter defaultDtacenter] valueForKey:@"UserLogIn"]; NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff]; @@ -84,9 +82,7 @@ [self.view makeToast:@"摄像头P2PVerifyCode2空错误码10003"]; return; } - - _isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; - + _isInitDevice = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil]; } - (void)didReceiveMemoryWarning { @@ -185,7 +181,8 @@ [self showTitle:@"" messsage:@" 暂未检测到设备"]; - self.isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; +// self.isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2]; + self.isInitDevice = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil]; //loginResult.contactId 用户ID号 NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2); diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h index 6f13dab..04f748e 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.h @@ -20,6 +20,9 @@ enum conectType_qrcode }; +/** + 添加摄像头详情页面 + */ @interface YooseeNextConnectViewController : BaseViewController @property (nonatomic,strong) NSString *uuidString; @property (nonatomic,strong) NSString *wifiPwd; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 42313bf..a4d1234 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -31,7 +31,7 @@ #import "UDManager.h" #import "LoginResult.h" #import "Utils.h" -#import "MD5Manager.h" +#import #import "RightViewController.h" #import "LeftViewController.h" #import "ICSDrawerController.h" @@ -91,11 +91,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { - (void)viewDidLoad { [super viewDidLoad]; - //[self getWifiLoop]; - // Do any additional setup after loading the view from its nib. //智能联机 _initPwSuc = NO; - // [[P2PClient sharedClient] setDelegate:self]; self.conectType = conectType_Intelligent; self.addresses = [[NSMutableDictionary alloc] initWithCapacity:1]; self.view.backgroundColor = [UIColor whiteColor]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.h index 04d90ac..cbedcc4 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.h @@ -30,8 +30,6 @@ -(NSInteger)getMessageCount:(NSString*)contactId; -(void)setMessageCountWithId:(NSString*)contactId count:(NSInteger)count; --(void)getDefenceStates; - -(void)setIsClickDefenceStateBtnWithId:(NSString*)contactId isClick:(BOOL)isClick; -(BOOL)getIsClickDefenceStateBtn:(NSString*)contactId; @end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.m index 4f61c3c..ad8c98c 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/FListManager.m @@ -11,7 +11,7 @@ #import "ContactDAO.h" #import "Constants.h" #import "UDManager.h" -#import "P2PClient.h" +#import #import "ShakeManager.h" #import "LocalDevice.h" #import "AppDelegate.h" @@ -234,17 +234,4 @@ oldContact = contact; } - - --(void)getDefenceStates{ - NSArray *array = [self getContacts]; - for(Contact *contact in array){ - if(contact.contactType==CONTACT_TYPE_NPC|| - contact.contactType==CONTACT_TYPE_IPC|| - contact.contactType==CONTACT_TYPE_DOORBELL){ - [[P2PClient sharedClient] getDefenceState:contact.contactId password:contact.contactPassword]; - } - } -} - @end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/OpenGLView.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/OpenGLView.mm index aab5595..3e55341 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/OpenGLView.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/OpenGLView.mm @@ -14,8 +14,7 @@ #import #import "Constants.h" #import "Utils.h" -#import "P2PClient.h" - +#import #import "AppDelegate.h" #import "ShapeRenderNotifyMsg.h" ////////////////////////////////////////////////////////// @@ -428,9 +427,9 @@ static GLfloat modelviewProj[16]; const char * cVersion = [strSysVersion UTF8String]; NSLog(@"系统版本号：%@", strSysVersion);// e.g. @"4.0" - NSString *contactId = [[P2PClient sharedClient] callId]; - int callID = [contactId intValue]; - NSLog(@"callid：%@", contactId);// e.g. @"4.0" +// NSString *contactId = [[P2PClient sharedClient] callId]; + int callID = [[GWP2PClient sharedClient] getDeviceIDInAPMode]; +// NSLog(@"callid：%@", contactId);// e.g. @"4.0" if (self.isFisheyeDevice) {//can delete _shapeWarp.initData(self.bounds.size.width, self.bounds.size.height, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width, _shapeWarp.SHAPE_CIRCLE, cVersion, callID, uuid, _uniformMatrix,_shapeWarp.FISHEYE_360); @@ -591,13 +590,13 @@ static GLfloat modelviewProj[16]; UIImage *image = [[UIImage alloc] initWithCGImage:[self glToUIImage].CGImage]; NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)]; - NSString* contactid = [[P2PClient sharedClient] callId]; + int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode]; int dwApContactID = [[AppDelegate sharedDefault] dwApContactID]; if (dwApContactID != 0) { - contactid = [NSString stringWithFormat:@"%d", dwApContactID]; + contactid = dwApContactID; } - [Utils saveHeaderFileWithId:contactid data:imgData]; + [Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData]; if (dwApContactID != 0) { @@ -1072,13 +1071,13 @@ exit: NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)]; - NSString* contactid = [[P2PClient sharedClient] callId]; + int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode]; int dwApContactID = [[AppDelegate sharedDefault] dwApContactID]; if (dwApContactID != 0) { - contactid = [NSString stringWithFormat:@"%d", dwApContactID]; + contactid = dwApContactID; } - [Utils saveHeaderFileWithId:contactid data:imgData]; + [Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData]; if (dwApContactID != 0) { @@ -1137,12 +1136,9 @@ exit: if (!image) { return; } - NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)]; - NSString* contactid = [[P2PClient sharedClient] callId]; - [Utils saveHeaderFileWithId:contactid data:imgData]; - - + int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode]; + [Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData]; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.h index 3191080..599b8d7 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.h @@ -9,8 +9,8 @@ #import #import #import -#import "P2PClient.h" - +//#import "P2PClient.h" +#import @interface PAIOUnit : NSObject @property (nonatomic, assign) BOOL isRunning; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.m index 42edb8a..b88c63b 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/PAIOUnit.m @@ -9,7 +9,7 @@ #import "PAIOUnit.h" #import #import "AppDelegate.h" - +#import "P2PCInterface.h" //什么含义 #define kOutputBus 0 #define kInputBus 1 @@ -122,7 +122,8 @@ static OSStatus playbackCallback(void *inRefCon, AudioBufferList *ioData) { BOOL isGetAudioOk = NO; - if ([[P2PClient sharedClient]p2pCallState] == P2PCALL_STATUS_READY_P2P) +// if ([[P2PClient sharedClient]p2pCallState] == P2PCALL_STATUS_READY_P2P) + if ([[GWP2PClient sharedClient] linkStatus] == P2PLinkStatusOK) { isGetAudioOk = fgGetAudioDataToPlay(ioData->mBuffers[0].mData, ioData->mBuffers[0].mDataByteSize ); } @@ -366,7 +367,8 @@ static OSStatus playbackCallback(void *inRefCon, } else { - if ([[P2PClient sharedClient]p2pCallState] == P2PCALL_STATUS_READY_P2P) +// if ([[P2PClient sharedClient]p2pCallState] == P2PCALL_STATUS_READY_P2P) + if ([[GWP2PClient sharedClient] linkStatus] == P2PLinkStatusOK) { vFillAudioRawData(bufferList->mBuffers[0].mData, bufferList->mBuffers[0].mDataByteSize); } @@ -475,20 +477,4 @@ static OSStatus playbackCallback(void *inRefCon, AudioSessionSetProperty(kAudioSessionProperty_OverrideAudioRoute, sizeof(UInt32), &audioRoute); } --(void)setSpeckState:(BOOL)state{ - - if ([[P2PClient sharedClient]p2pCallState] == P2PCALL_STATUS_READY_P2P) { - self.silentAudio = state; - if(self.callType==P2PCALL_TYPE_MONITOR){ - if(self.silentAudio){ - fgSendUserData(5, 0, NULL, 0); - }else{ - fgSendUserData(5, 1, NULL, 0); - } - } - } -} - - - @end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/UDPManager.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/UDPManager.m index 03d99e3..22de17c 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/UDPManager.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/UDPManager.m @@ -120,7 +120,7 @@ NSString* ssid = [Utils currentWifiSSID]; //ap模式不搜索 - int dwApContactID = [[AppDelegate sharedDefault]dwApContactID]; + int dwApContactID = [[AppDelegate sharedDefault] dwApContactID]; //后台运行不搜索 UIApplicationState iState = [UIApplication sharedApplication].applicationState; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/P2PClient.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/P2PClient.m index edc8345..2532379 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/P2PClient.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/P2PClient.m @@ -7,7 +7,6 @@ // #import "P2PClient.h" -#import "P2PCInterface.h" #import "Utils.h" #import "Constants.h" #import "config.h" @@ -439,7 +438,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO - if (dwCmd == USR_CMD_PLAY_CTL) { + if (dwCmd == USR_CMD_REMOTLY_PLAY_CTL) { DLog(@"%i",dwOption); switch (dwOption) { @@ -568,7 +567,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO BYTE prm[8]; playbackCurrentFileIndex -= 1; memcpy(prm, &(playbackFiles[playbackCurrentFileIndex]), sizeof(sRecFilenameType)); - fgSendUserData(USR_CMD_PLAY_CTL, USR_CMD_OPTION_NEXT_FILE, prm, sizeof(sRecFilenameType)); + fgSendUserData(USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_OPTION_NEXT_FILE, prm, sizeof(sRecFilenameType)); } @@ -585,7 +584,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO BYTE prm[8]; playbackCurrentFileIndex += 1; memcpy(prm, &(playbackFiles[playbackCurrentFileIndex]), sizeof(sRecFilenameType)); - fgSendUserData(USR_CMD_PLAY_CTL, USR_CMD_OPTION_NEXT_FILE, prm, sizeof(sRecFilenameType)); + fgSendUserData(USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_OPTION_NEXT_FILE, prm, sizeof(sRecFilenameType)); vSetSupperDrop(TRUE); } @@ -593,7 +592,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO UInt64 jumpValue = (self.playback_startTime+value*1000000); - fgSendUserData(USR_CMD_PLAY_CTL, USR_CMD_OPTION_JUMP, (BYTE*)(&jumpValue), sizeof(UInt64)); + fgSendUserData(USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_OPTION_JUMP, (BYTE*)(&jumpValue), sizeof(UInt64)); vSetSupperDrop(TRUE); } @@ -603,7 +602,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO // UInt64 jumpValue =32; NSLog(@"fastBeginValue=%lld",(long long)jumpValue); - fgSendUserData(USR_CMD_PLAY_CTL, USR_CMD_OPTION_FAST_PLAY, (BYTE*)(&jumpValue), sizeof(UInt64)); + fgSendUserData(USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_OPTION_FAST_PLAY, (BYTE*)(&jumpValue), sizeof(UInt64)); vSetSupperDrop(TRUE); } /**不要快进*/ @@ -612,7 +611,7 @@ void commandSettingInAction(DWORD dwCmd, DWORD dwOption , DWORD * pdwData, DWO // UInt64 jumpValue =32; NSLog(@"fastEndValue=%lld",(long long)jumpValue); - fgSendUserData(USR_CMD_PLAY_CTL, USR_CMD_OPTION_FAST_PLAY_CANCEL, (BYTE*)(&jumpValue), sizeof(UInt64)); + fgSendUserData(USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_OPTION_FAST_PLAY_CANCEL, (BYTE*)(&jumpValue), sizeof(UInt64)); vSetSupperDrop(TRUE); } @@ -944,7 +943,7 @@ void vP2PConnReady(void) tables[i] = contactId.intValue; } } - fgP2PGetFriendsStatus(tables, [contacts count]); + fgGetFriendsStatusFromP2PServer(tables, [contacts count]); } //设备在线状态更新 @@ -3844,7 +3843,7 @@ void vRecvRemoteMessage(DWORD dwSrcID, unsigned int fgHasCheckdPassword, void memcpy(sMessage.cString, messageStr, length); mesg_id++; - fgP2PSendRemoteMessage(contactId.intValue|0x80000000, 0, mesg_id, &sMessage, length+4, sMessage.cString, length, (DWORD)PUSH_MESG_FRIEND); + fgP2PSendRemoteMessage(contactId.intValue|0x80000000, 0, mesg_id, &sMessage, length+4, sMessage.cString, length, (DWORD)PUSH_MESG_TYPE_NORMAL); return mesg_id; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Utils.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Utils.m index 986a68d..5dad5d4 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Utils.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/Utils.m @@ -16,7 +16,7 @@ #import #import #import -#import "MD5Manager.h" +#import #import "AppDelegate.h" #import "IfishCameraModel.h" @implementation Utils diff --git a/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/P2PCInterface.h b/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/P2PCInterface.h index a544566..aacfef0 100755 --- a/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/P2PCInterface.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/P2PCInterface.h @@ -1,4 +1,4 @@ -#ifndef _P2PC_INTERFACE_H_ +#ifndef _P2PC_INTERFACE_H_ #define _P2PC_INTERFACE_H_ #ifdef WIN32 @@ -14,39 +14,78 @@ #define KTRUE 1 -#define KFALSE 0 -#define DWORD unsigned int //32bits -#define WORD unsigned short //16bits -#define BYTE unsigned char //8bits -#define KBOOL unsigned int //32bits -#define UINT64 unsigned long long //64bits - +#define KFALSE 0 +#define DWORD unsigned int //32bits +#define WORD unsigned short //16bits +#define BYTE unsigned char //8bits +#define KBOOL unsigned int //32bits +#define UINT64 unsigned long long //64bits enum{ DEV_TYPE_NULL, DEV_TYPE_SERVER, - DEV_TYPE_NPC, + DEV_TYPE_NPC, // 2 DEV_TYPE_MOBILE, DEV_TYPE_PC, - DEV_TYPE_DOORBELL, DEV_TYPE_ALERTOR, - DEV_TYPE_IPC + DEV_TYPE_IPC, // 7 + DEV_TYPE_LOCK, //8 + DEV_TYPE_WIFI, //9 + DEV_TYPE_QQ_IPC, //10 + DEV_TYPE_NVR, }; -///dwServerType -enum{ - SERVER_TYPE_NULL, - SERVER_TYPE_P2P, - SERVER_TYPE_LIST, - SERVER_TYPE_EMAIL, - SERVER_TYPE_IOS_PUSH, - SERVER_TYPE_INDEX = 9, - SERVER_TYPE_DEV_UPG = 10, - SERVER_TYPE_LOG = 11, - +enum +{ + IPC_DEV_SUB_TYPE_NORMAL, ////摇头机,全功能 + IPC_DEV_SUB_TYPE_SIMPLE, ////卡片机, 不带马达， + IPC_DEV_SUB_TYPE_38X38, ////38板，不带马达，不带人体红外， 不带回音消除 + IPC_DEV_SUB_TYPE_DOORBELL,//门铃 ，不带马达，带语音优化 + IPC_DEV_SUB_TYPE_COSTDOWN_IPC, //costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + IPC_DEV_SUB_TYPE_38_MODULE, + + IPC_DEV_SUB_TYPE_NVR_PTZ,//预留 + IPC_DEV_SUB_TYPE_NVR_NO_PTZ,//预留 + IPC_DEV_SUB_TYPE_SMARTHOME_868,//预留 + IPC_DEV_SUB_TYPE_Rsv4,//预留 //9 + + IPC_DEV_SUB_TYPE_130W_NORMAL, ////摇头机,全功能 + IPC_DEV_SUB_TYPE_130W_SIMPLE, ////卡片机, 不带马达， + IPC_DEV_SUB_TYPE_130W_38X38, ////38板，不带马达，不带人体红外， 不带回音消除 + IPC_DEV_SUB_TYPE_130W_DOORBELL,//门铃 ，不带马达，带语音优化 + IPC_DEV_SUB_TYPE_130W_COSTDOWN_IPC, //costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + IPC_DEV_SUB_TYPE_130W_38_MODULE, + + IPC_DEV_SUB_TYPE_130W_NVR_PTZ,//预留 + IPC_DEV_SUB_TYPE_130W_NVR_NO_PTZ,//预留 + IPC_DEV_SUB_TYPE_130W_SMARTHOME_868,//预留 + IPC_DEV_SUB_TYPE_130W_Rsv4,//预留 //19 + + IPC_DEV_SUB_TYPE_200W_NORMAL, ////摇头机,全功能 + IPC_DEV_SUB_TYPE_200W_SIMPLE, ////卡片机, 不带马达， + IPC_DEV_SUB_TYPE_200W_38X38, ////38板，不带马达，不带人体红外， 不带回音消除 + IPC_DEV_SUB_TYPE_200W_DOORBELL,//门铃 ，不带马达，带语音优化 + IPC_DEV_SUB_TYPE_200W_COSTDOWN_IPC, //costdown版的摇头机，不带人体红外，不带外部无线传感器. 不带回音消除 + IPC_DEV_SUB_TYPE_200W_38_MODULE, + + IPC_DEV_SUB_TYPE_200W_NVR_PTZ,//预留 + IPC_DEV_SUB_TYPE_200W_NVR_NO_PTZ,//预留 + IPC_DEV_SUB_TYPE_200W_SMARTHOME_868,//预留 + IPC_DEV_SUB_TYPE_200W_Rsv4,//预留 //29 + + IPC_DEV_SUB_TYPE_FISHEYE,//鱼眼 + IPC_DEV_SUB_TYPE_SMARTHOME,//868 + 情景模式 + IPC_DEV_SUB_TYPE_SMARTHOME_FISHEYE, // + IPC_DEV_SUB_TYPE_SC1135_FISHEYE_360D, + IPC_DEV_SUB_TYPE_SC1135_FISHEYE_180D, + IPC_DEV_SUB_TYPE_SC3035_FISHEYE_360D, + IPC_DEV_SUB_TYPE_SC3035_FISHEYE_180D, + + IPC_DEV_SUB_TYPE_MAX + }; #define CONN_TYPE_VIDEO_CALL 0x00 @@ -78,6 +117,7 @@ enum CALL_ERROR_NOT_SUPPORT, }; + enum { MESG_TYPE_GET_SETTING, // 0 @@ -132,10 +172,13 @@ enum MESG_TYPE_UPG_CREATE_WHOLEFLASH_TO_FILE_RET, // 38 MESG_TYPE_GET_SYS_VERSION, // 39 MESG_TYPE_GET_SYS_VERSION_RET, // 40 - - - LAN_TRANS_SET_INIT_PASSWD = 48, // 48 - LAN_TRANS_RET_INIT_PASSWD, // 49 + + MESG_TYPE_CLEAR_MULTI_CODE, // 41 + MESG_TYPE_CLEAR_MULTI_CODE_RET, // 42 + + MESG_TYPE_CLEAR_FILES, // 43 + MESG_TYPE_CLEAR_FILES_RET, // 44 + MESG_TYPE_DRBL_ACK_GET = 58, MESG_TYPE_DRBL_ACK_RET, // 59 @@ -154,6 +197,9 @@ enum MESG_TYPE_SET_DEFENCE_SWITCH_STATE, //83 设置防区开关 MESG_TYPE_RET_DEFENCE_SWITCH_STATE, //84 设置返回值 + MESG_TYPE_UART1_GPIO_CTL, //85 + MESG_TYPE_UART1_GPIO_CTL_RET, //86 + MESG_TYPE_SET_MOTOR_PRESET_POS = 87, //预置位 MESG_TYPE_RET_MOTOR_PRESET_POS = 88, @@ -164,16 +210,67 @@ enum MESG_TYPE_SET_GPIO_CTL = 95, MESG_TYPE_RET_GPIO_CTL, //值：96 - MESG_TYPE_WORKMODE_SETTING =149, + MESG_TYPE_GET_LOWVOLTAGE_STATE, //97 + MESG_TYPE_SET_LOWVOLTAGE_STATE, //98 + MESG_TYPE_RET_LOWVOLTAGE_STATE, //99 - MESG_TYPE_QRCODE_LEARN_CODE =216, + MESG_TYPE_GET_ALARM_CENTER_PARAM, // 100 + MESG_TYPE_SET_ALARM_CENTER_PARAM, // 101 + MESG_TYPE_RET_ALARM_CENTER_PARAM, //102 - MESG_TYPE_CUSTOM_CMD_NO_VERRIFY_SET = 127, - MESG_TYPE_CUSTOM_CMD_NO_VERRIFY_RET, //128 + MESG_TYPE_GET_IP_CONFIG,//103 + MESG_TYPE_SET_IP_CONFIG,//104 + MESG_TYPE_RET_IP_CONFIG,//105 + + MESG_TYPE_GET_CSC_ATTR,//106 + MESG_TYPE_SET_CSC_ATTR,//107 + MESG_TYPE_RET_CSC_ATTR,//108 + + MESG_TYPE_SET_REMOTE_REBOOT,//109 + MESG_TYPE_RET_REMOTE_REBOOT,//110 + + MESG_TYPE_GET_IRLED_STATE,//111 + MESG_TYPE_SET_IRLED_STATE,//112 + MESG_TYPE_RET_IRLED_STATE,//113 + + MESG_TYPE_SET_CERINFO, //114 + MESG_TYPE_RET_CERINFO, //115 + + MESG_TYPE_GET_MOTOR_POS, //116 + MESG_TYPE_RET_MOTOR_POS, //117 + + MESG_TYPE_GET_LOG_FILE, // 118 + MESG_TYPE_RET_LOG_FILE, //119 + + MESG_TYPE_DEFENSE_NOTIFY, // 120 + + MESG_TYPE_GET_ALARM_INFO, // 121 + MESG_TYPE_RET_ALARM_INFO, //122 + MESG_TYPE_WHITELIST_RET,//123 + + MESG_TYPE_SET_CUSTOM_CMD, // 124 + MESG_TYPE_RET_CUSTOM_CMD, // 125 + + MEST_TYPE_SET_FOCUS_LENS,//126 + + MESG_TYPE_CUSTOM_CMD_NO_VERRIFY_SET, // 127 + MESG_TYPE_CUSTOM_CMD_NO_VERRIFY_RET, // 128 + +#ifdef PUSH_SERVER_REMOTE_CONFIG_SUPPORT + MESG_TYPE_SET_PUSH_SERVER_CONFIG_CMD,//129 + MESG_TYPE_RET_PUSH_SERVER_CONFIG_CMD,//130 +#endif MESG_TYPE_GET_NVR_INFO = 131, MESG_TYPE_RET_NVR_INFO, + MESG_TYPE_WORKMODE_SETTING =149, //DSD + + //150 till 210 will be use on the smartJack device + + + + MESG_TYPE_GET_DEVICE_LANGUAGE = 211, MESG_TYPE_SET_DEVICE_LANGUAGE, //212 MESG_TYPE_RET_DEVICE_LANGUAGE, //213 @@ -181,23 +278,178 @@ enum MESG_TYPE_GET_SCHEDULE_DEFENCE_INFO, //214 获取布撤防 MESG_TYPE_SET_SCHEDULE_DEFENCE_INFO, //215 + MESG_TYPE_QRCODE_LEARN_CODE =216, + //MESG_TYPE_QRCODE_LEARN_CODE_RET,// + MESG_TYPE_SEND_UART2_DATA = 218,// + MESG_TYPE_GET_UART2_DATA,//219 + MESG_TYPE_GET_MEMBER_LIST=220, + MESG_TYPE_GET_MEMBER_LIST_RET=221, + MESG_TYPE_MAIN_NONEED_PASSPWD=222, MESG_TYPE_MAIN_NEED_PASSPWD = 223, //223 获取和修改433传感器名字 预置位转动好后截图 MESG_TYPE_SETORGET_LENS_FOCUS_PARAMS = 224, // 自动变焦 获取和设置变焦镜头马达当前位置的命令是一样滴 消息头命令 + MESG_TYPE_GET_FTP, // 225 + MESG_TYPE_SET_FTP, // 226 + MESG_TYPE_RET_FTP, // 227 + MESG_TYPE_GET_FISHEYE = 228, //获取当前全景相机配置信息 MESG_TYPE_SET_FISHEYE,//229 设置当前全景相机配置信息 MESG_TYPE_RET_FISHEYE,//230 返回当前全景相机配置信息 + MESG_TYPE_EXT_ALARM_INFO =228,//科立信海思方案 + + MESG_TYPE_SET_AUTO_TEST_MODE=232, + MESG_TYPE_SET_AUTO_TEST_CAPTURE, + MESG_TYPE_TEST_IOS_PUSH, + MESG_TYPE_SET_AUTO_TEST_VOICELINK,//235 + MESG_TYPE_SET_AUTO_TEST_STATS_SAVE,// 保存句柄、内存统计信息 MESG_TYPE_RET_RECORD_STATE = 237, //设备当前的录像状态、有没有TF卡 + MESG_TYPE_TO_UART2_CMD,//238 MESG_TYPE_SET_VIDEO_CLEAR_LEVEL = 239, /**< 设置录像质量 */ MESG_TYPE_GET_VIDEO_CLEAR_LEVEL = 240, /**< 获取录像质量 */ MESG_TYPE_RET_VIDEO_CLEAR_LEVEL = 241, /**< 录像质量返回 */ - + + MESG_TYPE_GET_IF_WIFI_SETTED = 242, + MESG_TYPE_RET_IF_WIFI_SETTED = 243, + + MESG_TYPE_SET_STA_WIFI_INFO = 244, //ap转sta时设置wifi密码 + MESG_TYPE_RET_STA_WIFI_INFO = 245, + + MESG_TYPE_SET_WELOCK_INFO,//246 + MESG_TYPE_GET_WELOCK_INFO,//247 + MESG_TYPE_RET_WELOCK_INFO,//248 + MESG_TYPE_DEVICE_NOT_SUPPORT_RET = 0XFF, }; + + + +enum{ + MESG_SUBTYPE_SETTING_WORKMODE_DEFAULT,//0 + + MESG_SUBTYPE_SETTING_IPC_WORKMODE, //1 + MESG_SUBTYPE_SETTING_IPC_WORKMODE_RET,//2 + + MESG_SUBTYPE_SETTING_SENSOR_WORKMODE,//3 + MESG_SUBTYPE_SETTING_SENSOR_WORKMODE_RET,//4 + + MESG_SUBTYPE_SETTING_SCHEDULE_WORKMODE,//5 + MESG_SUBTYPE_SETTING_SCHEDULE_WORKMODE_RET,//6 + + MESG_SUBTYPE_DELETE_SCHEDULE,//7 + MESG_SUBTYPE_DELETE_SCHEDULE_RET,//8 + + MESG_SUBTYPE_GET_CURRENTWORKMODE,//9 + MESG_SUBTYPE_GET_CURRENTWORKMODE_RET,//10 + + MESG_SUBTYPE_GET_SENSORWORKMODE,//11 + MESG_SUBTYPE_GET_SENSORWORKMODE_RET,//12 + + MESG_SUBTYPE_GET_WORKMODE_SCHEDULE, //13 + MESG_SUBTYPE_GET_WORKMODE_SCHEDULE_RET,//14 + + MESG_SUBTYPE_SETTING_ALL_SENSOR_SWITCH,//15 + MESG_SUBTYPE_SETTING_ALL_SENSOR_SWITCH_RET,//16 + + MESG_SUBTYPE_GET_ALL_SENSOR_SWITCH,//17 + MESG_SUBTYPE_GET_ALL_SENSOR_SWITCH_RET,//18 + + MESG_SUBTYPE_SET_LOW_VOL_TIMEINTERVAL,//19 + MESG_SUBTYPE_SET_LOW_VOL_TIMEINTERVAL_RET,//20 + + MESG_SUBTYPE_GET_LOW_VOL_TIMEINTERVAL,//21 + MESG_SUBTYPE_GET_LOW_VOL_TIMEINTERVAL_RET,//22 + + MESG_SUBTYPE_DELETE_ONE_CONTROLER,//23 + MESG_SUBTYPE_DELETE_ONE_CONTROLER_RET,//24 + + MESG_SUBTYPE_DELETE_ONE_SENSOR,//25 + MESG_SUBTYPE_DELETE_ONE_SENSOR_RET,//26 + + MESG_SUBTYPE_CHANGE_CONTROLER_NAME,//27 + MESG_SUBTYPE_CHANGE_CONTROLER_NAME_RET,//28 + + MESG_SUBTYPE_CHANGE_SENSOR_NAME,//29 + MESG_SUBTYPE_CHANGE_SENSOR_NAME_RET,//30 + + MESG_SUBTYPE_INTO_LEARN_STATE,//31 + MESG_SUBTYPE_INTO_LEARN_STATE_RET,//32 + + MESG_SUBTYPE_TURN_SENSOR,//33 + MESG_SUBTYPE_TURN_SENSOR_RET,//34 + + MESG_SUBTYPE_SHARE_TO_MEMBER,//35 + MESG_SUBTYPE_SHARE_TO_MEMBER_RET,//36 + MESG_SUBTYPE_GOT_SHARE_MESG,//37 + + MESG_SUBTYPE_GOT_SHARE_MESG_RET,//38 + MESG_SUBTYPE_DEV_RECV_MEMBER_FEEDBACK,//39 + + MESG_SUBTYPE_ADMIN_DELETE_ONE_MEMBER,//40 + MESG_SUBTYPE_ADMIN_DELETE_ONE_MEMBER_RET,//41 + + MESG_SUBTYPE_DELETE_DEV,//42 + MESG_SUBTYPE_DELETE_DEV_RET,//43 + + MESG_SUBTYPE_SET_ONE_SPECIAL_ALARM=46, //46 + MESG_SUBTYPE_SET_ONE_SPECIAL_ALARM_RET, //47 + + MESG_SUBTYPE_GET_ALL_SPECIAL_ALARM, //48 + MESG_SUBTYPE_GET_ALL_SPECIAL_ALARM_RET, //49 + + MESG_SUBTYPE_DEAL_LAMP, //50 + MESG_SUBTYPE_DEAL_LAMP_RET, //51 + + MESG_SUBTYPE_KEEPCLIENT, //52 + MESG_SUBTYPE_KEEPCLIENT_RET, //53 + + MESG_SUBTYPE_CONTROL_LED=60,//60 //2016-7-19 设置指示灯led + MESG_SUBTYPE_CONTROL_LED_RET=61, //61 + + MESG_SUBTYPE_GET_LED_STATU,//62 //2016-7-19 获取指示灯led + MESG_SUBTYPE_GET_LED_STATU_RET,//63 + + MESG_SUBTYPE_SET_SESOR_PRESET_POS = 64, + MESG_SUBTYPE_SET_SESOR_PRESET_POS_RET,//65 + + MESG_SUBTYPE_MAX +}; + +enum{ + MESG_SUBTYPE_GET_MONITOR_LOG,//0 + MESG_SUBTYPE_GET_MONITOR_LOG_RET,//1 + + MESG_SUBTYPE_GET_433_SENSOR_NAME,//2 获取433传感器名字 + MESG_SUBTYPE_GET_433_SENSOR_NAME_RET,//3 + + MESG_SUBTYPE_EDIT_433_SENSOR_NAME,//4 修改433传感器名字 + MESG_SUBTYPE_EDIT_433_SENSOR_NAME_RET,//5 + + MESG_SUBTYPE_SETTING_LIGHT_CONTROL,//6 + MESG_SUBTYPE_SETTING_LIGHT_CONTROL_RET,//7 + MESG_SUBTYPE_GET_LIGHT_CONTROL_SETTING,//8 + MESG_SUBTYPE_GET_LIGHT_CONTROL_SETTING_RET,//9 + MESG_SUBTYPE_SET_IRCUT_ADCVALUE,//10 + MESG_SUBTYPE_SET_IRCUT_ADCVALUE_RET,//11 + MESG_SUBTYPE_GET_IRCUT_ADCVALUE,//12 + MESG_SUBTYPE_GET_IRCUT_ADCVALUE_RET,//13 + MESG_SUBTYPE_SET_MANUAL_GRAY,//14 manual to gray mode + MESG_SUBTYPE_GET_MANUAL_GRAY,//15 manual to gray mode + MESG_SUBTYPE_SET_MANUAL_GRAY_RET,//16 + MESG_SUBTYPE_TURNTO_PRESETPOS_OK =17 //17 + +}; + +enum{ + MESG_SDCARD_DONOT_HAVE_ENOUGH_SPACE=2, //2 + MESG_SDCARD_NOT_EXIST, //3 + MESG_MONITOR_LOG_FILE_NOT_EXIST,//4 + MESG_GET_MONITOR_LOG_NOT_SUPPORT,//5 +}; + enum { OS_ARM_LINUX, @@ -213,14 +465,15 @@ enum -enum { - PUSH_MESG_SYSTEM, - PUSH_MESG_VERIFY, - PUSH_MESG_FRIEND, - PUSH_MESG_ALARM, - PUSH_MESG_CALL, - PUSH_MESG_DOORBELL - }; +enum +{ + PUSH_MESG_TYPE_SYSTEM, + PUSH_MESG_TYPE_VERIFY, + PUSH_MESG_TYPE_NORMAL, + PUSH_MESG_TYPE_ALARM, + PUSH_MESG_TYPE_CALLING, + PUSH_MESG_TYPE_BELL, +}; enum { @@ -240,6 +493,27 @@ typedef struct sFriendsType }PACKED sFriendsType; +typedef struct sFriendsTypeV2 +{ + DWORD dwFriendsCount; //好友总数 + BYTE bRequestResult; //请求结果，等于0，则代表请求失败 + BYTE bReseve[3]; + + DWORD dwFriends[MAX_FRIENDS_NS]; //好友ID，注意：实际读取时为dwFriends[dwFriendsCount]; + DWORD dwFriendsIdProperty[MAX_FRIENDS_NS]; //好友ID属性，注意：实际读取时为bFriendsIdProperty[dwFriendsCount]; + BYTE bStatus[MAX_FRIENDS_NS]; //好友在线状态，注意：实际读取时为bStatus[dwFriendsCount]; + BYTE bDevType[MAX_FRIENDS_NS]; //好友帐号大类型，注意：实际读取时为bDevType[dwFriendsCount]; + BYTE bSubType[MAX_FRIENDS_NS]; //好友帐号子类型，注意：实际读取时为bSubType[dwFriendsCount]; + BYTE bDefenceState[MAX_FRIENDS_NS]; //设备布防状态，注意：实际读取时为bSubType[dwFriendsCount], 0xFF则不支持Index服务器获取,需要从设备端获取此值; + DWORD dwDefenceFlag[MAX_FRIENDS_NS]; + +}PACKED sFriendsTypeV2; +/* + dwFriendsIdProperty 好友ID属性说明： + Bit 0 : 1 代表该设备是支持设备布撤防信息和设备子类型上传服务器的， 0 则反之 +*/ + + typedef struct sCallingPrmType { KBOOL fgBCalled; @@ -280,7 +554,10 @@ typedef struct sCallingPrmType DWORD dwChBufSize[MAX_P2PCH_NS]; // 每个通道的缓存大小，请统一设置为(1024*512) DWORD dwPassword; //密码，请设为十进制数: 123456 DWORD dwCustomerID[10]; - + + DWORD SessionID1; // App端需要填写此ID,设备端不填 + DWORD SessionID2; // App端需要填写此ID,设备端不填 + // 被呼叫 时，当有人拨打进来，通过此函数 告知上层。 // 主叫时，拨打已经通了。对方正在响铃，也回调此函数。 // fgBCalled : TRUE 表示 被呼叫, FALSE 表示主叫。 @@ -293,7 +570,8 @@ typedef struct sCallingPrmType //呼叫被拒绝或者连接断开的回调函数 // fgBCalled : TRUE 表示 被呼叫, FALSE 表示主叫。 // dwErrorOption: 断开的原因，请参见前述枚举。 - void (* vRejectSignal )(BOOL fgBCalled, DWORD dwErrorOption); + // dwErrorCode : 断开的错误码，非0时要在UI呈现给用户 + void (* vRejectSignal )(BOOL fgBCalled, DWORD dwErrorOption, DWORD dwErrorCode); //接听回调函数, 当对方接通了或本机接听了来电，通过此函数告知上层。 // fgBCalled : TRUE 表示 被呼叫, FALSE 表示主叫。 @@ -306,19 +584,21 @@ typedef struct sCallingPrmType void (* vSendMessageAck)(DWORD dwDesID, DWORD dwMesgID, DWORD dwError); void (* vFriendsStatusUpdate)(sFriendsType * pFriends); - + void (*vIndexFriendsStatusUpdate)(sFriendsTypeV2 *pFriends); #ifdef UPDATE_FLAG_SUPPORT -void (* vFlagUpdate)(DWORD *pdwFlags ); + void (* vFlagUpdate)(DWORD *pdwFlags ); #endif - -//【远程获取文件结果回调】 -//参数-dwDesID: 目标设备ID -//参数-pFilename: 文件名 -//参数-dwErrorCode: 错误代码(详情见上枚举) -void (* vGetFileCmdACK)(DWORD dwDesID, char *pFilename, DWORD dwErrorCode); - -}sP2PInitPrm; + + //【远程获取文件结果回调】 + //参数-dwDesID: 目标设备ID + //参数-pFilename: 文件名 + //参数-dwErrorCode: 错误代码(详情见上枚举) + void (* vGetFileCmdACK)(DWORD dwDesID, char *pFilename, DWORD dwErrorCode); + + void (* LoginInAnotherOne)(DWORD LoginStatus); //APP在别处登录 + + }sP2PInitPrm; #ifdef UPDATE_FLAG_SUPPORT void vP2PSetUpdateFlag(DWORD *pdwFlag); @@ -335,6 +615,13 @@ enum KBOOL fgP2PInit(sP2PInitPrm * pPrm); // 网络库初始化 void vP2PExit(void); // 网络库退出并释放资源 +/* + 函数：DWORD ReLogin(DWORD SessionID1, DWORD SessionID2) + 功能：P2P重新登录 + 返回值： 0 成功; 1 P2P未初始化 ; 2 参数错误 ; + */ + DWORD ReLogin(DWORD SessionID1, DWORD SessionID2); + KBOOL fgP2PLinkOK(void); // 查看网络库状态.(类似与QQ 是否在线) @@ -349,8 +636,8 @@ void vP2PHungup(KBOOL fgWaitFinish); // 挂断连接 void vP2PAccept(DWORD *pdwPrm); // 接受呼叫 KBOOL fgP2PSendRemoteMessage(DWORD dwDesID, DWORD dwRemotePW, DWORD dwMesgID, void * pMesg, DWORD dwMesgSize, char * pPushMesg, DWORD dwPushMesgLen, DWORD dwType); -KBOOL fgP2PGetFriendsStatus(DWORD *pFriendsTable, DWORD dwCount); - +KBOOL fgGetFriendsStatusFromP2PServer(DWORD *pFriendsTable, DWORD dwCount); +KBOOL fgGetFriendsStatusFromIndexServer(DWORD *pFriendsTable, DWORD dwCount); //-------------------------------------------- //【获取远程文件】 @@ -414,20 +701,19 @@ typedef struct sAVBlockHeaderType - typedef struct sAVInfoType { - WORD AudioType: 3; //音频编码格式 - WORD AudioCodecOption: 4; //音频编码的参数 - WORD AudioMode: 1; // 音频模式： 单声道/双声道 - WORD AudioBitWidth: 2; // 音频位宽，目前只支持16bit - WORD AudioSampleRate : 3; // 音频采样率 - WORD SampleNumPerFrame : 3; //每帧数据里的采样数 - - DWORD VideoType: 4; /// 视频类型，目前只支持H264 - DWORD VideoWidth: 12; // 视频像素宽度 - DWORD VideoHeight: 10; //视频像素高度 - DWORD videoFrameRate: 6; // 视频帧率 + WORD AudioType: 3; //音频编码格式 + WORD AudioCodecOption: 4; //音频编码的参数 + WORD AudioMode: 1; // 音频模式： 单声道/双声道 + WORD AudioBitWidth: 2; // 音频位宽，目前只支持16bit + WORD AudioSampleRate : 3; // 音频采样率 + WORD SampleNumPerFrame : 3; //每帧数据里的采样数 + + DWORD VideoType: 4; /// 视频类型，目前只支持H264 + DWORD VideoWidth: 12; // 视频像素宽度 + DWORD VideoHeight: 10; //视频像素高度 + DWORD videoFrameRate: 6; // 视频帧率 }PACKED sAVInfoType; @@ -445,6 +731,7 @@ typedef struct sAVBlockHeader2Type }PACKED sAVBlockHeader2Type; + /////音频类型 enum { @@ -505,13 +792,12 @@ enum ////音频每帧采样数 enum { - SAMPLE_NUM_80 = 0, - SAMPLE_NUM_160 , - SAMPLE_NUM_320 , - SAMPLE_NUM_480 , - SAMPLE_NUM_1024 , - SAMPLE_NUM_2048 , - + SAMPLE_NUM_80 = 0, + SAMPLE_NUM_160 , + SAMPLE_NUM_320 , + SAMPLE_NUM_480 , + SAMPLE_NUM_1024 , + SAMPLE_NUM_2048 , }; @@ -532,10 +818,14 @@ enum USR_CMD_PTZ_CTL, //云台控制 USR_CMD_VIDEO_CTL, // 视频控制 USR_CMD_REMOTLY_DEFENCE_CTL, // - USR_CMD_PLAY_CTL, + USR_CMD_REMOTLY_PLAY_CTL, USR_CMD_AUDIO_ONLY, USR_CMD_FM1188_CTL, USR_CMD_CURRENT_USERS_NS, + USR_CMD_CAR_DIR_CTL, // 车子方向控制 + USR_CMD_FILE_INFO, + USER_CMD_FOCALIZE = 0x09, + USR_CMD_RECORD_STATUS, USR_CMD_MAX_NS, }; @@ -557,6 +847,9 @@ enum USR_CMD_OPTION_VIDEO_FAST_FORWARD, // 快进 USR_CMD_OPTION_VIDEO_SLOW_FORWARD, //慢进 USR_CMD_OPTION_VIDEO_STEP, // 单步 + USR_CMD_OPTION_VIDEO_LD, //high definition NPC:640*480 IPC:640*360 + USR_CMD_OPTION_VIDEO_FL, //low definition NPC:320*240 IPC:320*180 + USR_CMD_OPTION_VIDEO_HD, //low definition NPC:None IPC:1280*720 }; //bCommandOption @@ -678,49 +971,49 @@ BOOL fgGetServerIPAddr(DWORD *pdwIPAddr,WORD *pwPort,const DWORD dwSerType); #ifdef __cplusplus class ShapeWarp { - + public: - ShapeWarp(); - ~ShapeWarp(); - - //key status - const static int KEY_NONE = -1; - const static int KEY_DOWN = 0; - const static int KEY_UP = 1; - const static int KEY_MOVE = 2; - - //animation - const static int ANI_NONE = 0; - const static int ANI_ZOOM_AUTO_IN = 1; - const static int ANI_ZOOM_AUTO_OUT = 2; - const static int ANI_FLING = 3; - const static int ROTE_SLOWLY = 4; - - // graph mode - const static int MANUL = 0; //manual - const static int PANORAMA = 1; //panorama - const static int PLAN = 2; //plan - - //GestrueMode - const static int GESTRUE_MODE_NONE = -1; - const static int GESTRUE_MODE_FINGER = 0; - const static int GESTRUE_MODE_SENSOR = 1; - - //fisheye position - const static int FISHEYE_TOP = 0; - const static int FISHEYE_BOTTOM = 1; - const static int FISHEYE_WALL = 2; - - //fisheye type - const static int FISHEYE_360 = 0; - const static int FISHEYE_180 = 1; - - // shape type - const static int SHAPE_CIRCLE = 0; - const static int SHAPE_180_HALF_SPHERE = 1; - const static int SHAPE_CYLIDER = 2; - const static int SHAPE_BOWLE = 3; - + ShapeWarp(); + ~ShapeWarp(); + + //key status + const static int KEY_NONE = -1; + const static int KEY_DOWN = 0; + const static int KEY_UP = 1; + const static int KEY_MOVE = 2; + + //animation + const static int ANI_NONE = 0; + const static int ANI_ZOOM_AUTO_IN = 1; + const static int ANI_ZOOM_AUTO_OUT = 2; + const static int ANI_FLING = 3; + const static int ROTE_SLOWLY = 4; + + // graph mode + const static int MANUL = 0; //manual + const static int PANORAMA = 1; //panorama + const static int PLAN = 2; //plan + + //GestrueMode + const static int GESTRUE_MODE_NONE = -1; + const static int GESTRUE_MODE_FINGER = 0; + const static int GESTRUE_MODE_SENSOR = 1; + + //fisheye position + const static int FISHEYE_TOP = 0; + const static int FISHEYE_BOTTOM = 1; + const static int FISHEYE_WALL = 2; + + //fisheye type + const static int FISHEYE_360 = 0; + const static int FISHEYE_180 = 1; + + // shape type + const static int SHAPE_CIRCLE = 0; + const static int SHAPE_180_HALF_SPHERE = 1; + const static int SHAPE_CYLIDER = 2; + const static int SHAPE_BOWLE = 3; + const static int SHAPE_QUAD = 4; typedef void (*ShapeNotify)(int MsgType, int MsgAction); @@ -867,4 +1160,25 @@ public: #endif +//return bytes per second +DWORD dwGetAvBytesPerSec(); + + +/* + BYTE bMainVersion = (wValue >> 8) & 0xff + BYTE bSubVersion = wValue & 0xff + */ +WORD wGetSDKVersion(); + +#define LINK_OK 0 //link success +#define LINK_ERROR_NONE 0x20104001 //no error, opertion is running. +#define LINK_DNS_PARSE_FAILED 0x20104002 //parse DNS failed +#define LINK_CHECK_LISTSERVER_RESPONSE_FAILED 0x20104003 //response from ListServer is invalidate +#define LINK_GET_SERVERLIST_TIMEOUT 0x20104004 //get servers form ListServer timeout +#define LINK_GET_P2PSERVER_HEARTBEAT_RESPONSE_FAILED 0x20104005 //wait heart beat from P2PServer failed +#define LINK_LOGIN_ANOTHER_MACHINE 0x20104006 // login with another App Or Pc + +unsigned int iP2PLinkStatus(); + + #endif //_P2PC_INTERFACE_H diff --git a/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl.a b/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl.a old mode 100755 new mode 100644 index 2d1d4ef..ba67b94 Binary files a/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl.a and b/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl.a differ diff --git a/Ifish/controllers/leftcontrollers/.DS_Store b/Ifish/controllers/leftcontrollers/.DS_Store index e46ae0c..c62876f 100644 Binary files a/Ifish/controllers/leftcontrollers/.DS_Store and b/Ifish/controllers/leftcontrollers/.DS_Store differ diff --git a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.h b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.h deleted file mode 100644 index 5b3e0aa..0000000 --- a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// SelectDeviceViewController.h -// Ifish -// -// Created by imac on 16/6/27. -// Copyright © 2016年 lianxiang. All rights reserved. -// - -#import "BaseViewController.h" - -@interface SelectDeviceViewController : BaseViewController - -@end diff --git a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m deleted file mode 100644 index 3aab2a9..0000000 --- a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m +++ /dev/null @@ -1,178 +0,0 @@ -// -// SelectDeviceViewController.m -// Ifish -// -// Created by imac on 16/6/27. -// Copyright © 2016年 lianxiang. All rights reserved. -// - -#import "SelectDeviceViewController.h" -#import "FirstConnectWifiController.h" -#import "LeftViewController.h" -#import "ICSDrawerController.h" -#import "YooseConnectFirstViewController.h" -#import "IfishMianTabViewController.h" -@interface SelectDeviceViewController () -@property(nonatomic,strong)ICSDrawerController*ics; -@end -extern BOOL formLogIn;//连接页面是否来自登录界面 -extern BOOL isfromCameraView; - -@implementation SelectDeviceViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - - // 添加鱼缸设备不是来自摄像头界面 - isfromCameraView = NO; - - - [self initUI]; - self.view.backgroundColor = COLOR_MIAN; - [self addTitleViewWithTitle:@"选择设备"]; -// UIButton*rightButton = [[UIButton alloc]initWithFrame:CGRectMake(25,0,60,60)]; -// [rightButton setTitle:@"跳过" forState:UIControlStateNormal]; -// rightButton.backgroundColor=[UIColor clearColor]; -// [rightButton addTarget:self action:@selector(passClick:) forControlEvents:UIControlEventTouchUpInside]; -// UIImageView*imageView=[[UIImageView alloc]initWithFrame:CGRectMake(25,0,60,60)]; - - -// [imageView addSubview:rightButton]; -// imageView.userInteractionEnabled=YES; -// UIBarButtonItem*rightItem = [[UIBarButtonItem alloc]initWithCustomView:imageView]; - // self.navigationItem.rightBarButtonItem = rightItem; - - -// if (formLogIn==YES) {// 判断是否来自登录界面 隐藏返回按钮 -// formLogIn=NO; -// rightButton.hidden=NO; -// -// self.bakbutton.hidden=YES; -// }else if (formLogIn==NO){ -// -// rightButton.hidden=YES; -// self.bakbutton.hidden=NO; -// -// } - - // Do any additional setup after loading the view. - UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil]; - self.navigationItem.backBarButtonItem = item; - - - - -} - - - - -#pragma mark - 暂时跳过 - --(void)passClick:(UIButton*)btn{ - - - IfishMianTabViewController *mianVC=[[IfishMianTabViewController alloc] init]; - - - [UIApplication sharedApplication].delegate.window.rootViewController=mianVC; - - -} - --(void)initUI{ - - CGFloat BarHeit = 64; - CGFloat botomSpace = 44; - CGFloat spaceH = 50; - - UILabel *bindLabel=[[UILabel alloc] initWithFrame:CGRectMake(0,BarHeit + 50, kScreenSize.width, 30)]; - bindLabel.textColor = [UIColor whiteColor]; - bindLabel.textAlignment = NSTextAlignmentCenter; - bindLabel.text = @"请选择您要绑定的设备类型"; - [self.view addSubview:bindLabel]; - - CGFloat btnWid= (kScreenSize.height - 64 - botomSpace - 4*spaceH -30)/2 ; - - UIButton *tankBtn=[UIButton buttonWithType:UIButtonTypeCustom]; - - tankBtn.frame =CGRectMake(kScreenSize.width/2 - btnWid/2, CGRectGetMaxY(bindLabel.frame) + spaceH, btnWid, btnWid); - [tankBtn setBackgroundImage:[UIImage imageNamed:@"ifish_tank_logo"] forState:UIControlStateNormal]; - - [tankBtn addTarget:self action:@selector(tankBtn:) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:tankBtn]; - - - UIButton *yooseeBtn=[UIButton buttonWithType:UIButtonTypeCustom]; - - yooseeBtn.frame =CGRectMake(kScreenSize.width/2 - btnWid/2, CGRectGetMaxY(tankBtn.frame) + spaceH, btnWid, btnWid); - [yooseeBtn setBackgroundImage:[UIImage imageNamed:@"ifish_yoosee_logo"] forState:UIControlStateNormal]; - [yooseeBtn addTarget:self action:@selector(yooseeBtn:) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:yooseeBtn]; - - - - -} - - - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - - --(void)tankBtn:(UIButton*)btn{ - NSArray * deviceArr =[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"]; - - if ([deviceArr count]>=5) { - - [self.view makeToast:@"设备已达上线限"]; - return; - - } - - self.hidesBottomBarWhenPushed = YES; - FirstConnectWifiController *first = [[FirstConnectWifiController alloc] init]; - - [self.navigationController pushViewController:first animated:YES]; - -} - --(void)yooseeBtn:(UIButton*)btn{ - NSArray * cameraArr =[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"]; - - if ([cameraArr count]>=5) { - - [self.view makeToast:@"设备已达上线限"]; - - return; - - } - - self.hidesBottomBarWhenPushed = YES; - YooseConnectFirstViewController *fistVC=[[YooseConnectFirstViewController alloc] init]; - - [self.navigationController pushViewController:fistVC animated:YES]; - - -} - --(void)viewWillAppear:(BOOL)animated{ - - - -} - -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ - -@end diff --git a/Ifish/controllers/logAddRegistController/LogInViewController.m b/Ifish/controllers/logAddRegistController/LogInViewController.m index 6c2ddc7..7a5fbfe 100644 --- a/Ifish/controllers/logAddRegistController/LogInViewController.m +++ b/Ifish/controllers/logAddRegistController/LogInViewController.m @@ -86,21 +86,9 @@ self.navigationItem.titleView=labe; self.navigationItem.hidesBackButton=YES; - //可自定义按钮背景 -// UIButton*rightButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// rightButton.frame = CGRectMake(25, 0, 60, 60); -// rightButton.backgroundColor = [UIColor redColor]; -// [rightButton setTitle:@"注册" forState:UIControlStateNormal]; -// [rightButton addTarget:self action:@selector(backItemBtn) forControlEvents:UIControlEventTouchUpInside]; -// UIImageView*imageView=[[UIImageView alloc]initWithFrame:CGRectMake(25,0,60,60)]; -// [imageView addSubview:rightButton]; -// imageView.userInteractionEnabled=YES; - - // UIBarButtonItem*rightItem = [[UIBarButtonItem alloc]initWithCustomView:imageView]; UIBarButtonItem*rightItem= [[UIBarButtonItem alloc] initWithTitle:@"注册" style:UIBarButtonItemStyleDone target:self action:@selector(backItemBtn)]; -// rightItem.tintColor=[UIColor whiteColor]; -// [rightItem setTintColor:[UIColor whiteColor]]; + self.navigationItem.rightBarButtonItem= rightItem; [self.navigationItem.rightBarButtonItem setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:14],UITextAttributeFont, [UIColor whiteColor], UITextAttributeTextColor, nil] forState:UIControlStateNormal]; @@ -127,11 +115,7 @@ #pragma mark 定位 -(void)getLocation{ //初始化BMKLocationService -// _locService=[[BMKLocationService alloc]init]; -// _locService.delegate=self; -// //启动LocationService -// [_locService startUserLocationService]; -// _geocodesearch=[[BMKGeoCodeSearch alloc]init]; + if ([CLLocationManager locationServicesEnabled]) { _locationManager = [[CLLocationManager alloc]init]; _locationManager.delegate = self; diff --git a/Ifish/models/ifishUserModel/UserModel.h b/Ifish/models/ifishUserModel/UserModel.h index baec45e..4aaf5e5 100644 --- a/Ifish/models/ifishUserModel/UserModel.h +++ b/Ifish/models/ifishUserModel/UserModel.h @@ -16,8 +16,12 @@ @property(nonatomic,copy)NSString*userSex; @property(nonatomic,copy)NSString*signature;//用户签名 @property(nonatomic,copy)NSString*userImg; +//用于P2P登录 @property(nonatomic,copy) NSString *P2PVerifyCode1; @property(nonatomic,copy) NSString *P2PVerifyCode2; + +@property(nonatomic,copy) NSString *sessionID; +@property(nonatomic,copy)NSString *sessionID2; @property(nonatomic,copy) NSString *gwellUserID; @property(nonatomic,copy) NSString *messageIsRead;//0存在未读消息，1，没有未读消息 //商铺Id diff --git a/Ifish/models/ifishUserModel/UserModel.m b/Ifish/models/ifishUserModel/UserModel.m index 9b204b1..71b63f9 100644 --- a/Ifish/models/ifishUserModel/UserModel.m +++ b/Ifish/models/ifishUserModel/UserModel.m @@ -19,6 +19,9 @@ [aCoder encodeObject:self forKey:@"signature"]; [aCoder encodeObject:self forKey:@"P2PVerifyCode1"]; [aCoder encodeObject:self forKey:@"P2PVerifyCode2"]; + [aCoder encodeObject:self forKey:@"sessionID"]; + [aCoder encodeObject:self forKey:@"sessionID2"]; + [aCoder encodeObject:self forKey:@"gwellUserID"]; [aCoder encodeObject:self forKey:@"shopsUserId"]; [aCoder encodeObject:self forKey:@"userType"]; @@ -38,6 +41,9 @@ self.signature=[aDecoder decodeObjectForKey:@"signature"]; self.P2PVerifyCode1 = [aDecoder decodeObjectForKey:@"P2PVerifyCode1"]; self.P2PVerifyCode2 = [aDecoder decodeObjectForKey:@"P2PVerifyCode2"]; + self.sessionID = [aDecoder decodeObjectForKey:@"sessionID"]; + self.sessionID2 = [aDecoder decodeObjectForKey:@"sessionID2"]; + self.gwellUserID = [aDecoder decodeObjectForKey:@"gwellUserID"]; self.shopsUserId = [aDecoder decodeObjectForKey:@"shopsUserId"]; self.userType = [aDecoder decodeObjectForKey:@"userType"]; @@ -59,6 +65,8 @@ _signature = [dict objectForKey:@"signature"]; _P2PVerifyCode1 = [dict objectForKey:@"p2PVerifyCode1"]; _P2PVerifyCode2 = [dict objectForKey:@"p2PVerifyCode2"]; + _sessionID = [dict objectForKey:@"sessionID"]; + _sessionID2 = [dict objectForKey:@"sessionID2"]; _gwellUserID = [dict objectForKey:@"gwellUserID"]; _shopsUserId = [dict objectForKey:@"shopsUserId"]; _userType = [dict objectForKey:@"userType"]; diff --git a/Ifish/views/ChinaPlckerView/ChinaPlckerView.m b/Ifish/views/ChinaPlckerView/ChinaPlckerView.m index 9ea8e2b..6234e13 100755 --- a/Ifish/views/ChinaPlckerView/ChinaPlckerView.m +++ b/Ifish/views/ChinaPlckerView/ChinaPlckerView.m @@ -8,12 +8,6 @@ #import "ChinaPlckerView.h" -// 屏幕的高度 -#define kScreenHeight [[UIScreen mainScreen] bounds].size.height - -// 屏幕的宽度 -#define kScreenWidth [[UIScreen mainScreen] bounds].size.width - //键盘高度 253 #define IT_KEYBOARD_HEIGHT 253 diff --git a/Ifish/views/CustomImgpicFiles/CustomView/PopView.m b/Ifish/views/CustomImgpicFiles/CustomView/PopView.m index efa35df..2b74c8a 100755 --- a/Ifish/views/CustomImgpicFiles/CustomView/PopView.m +++ b/Ifish/views/CustomImgpicFiles/CustomView/PopView.m @@ -9,9 +9,6 @@ #import "PopView.h" #import "DrawView.h" -//屏幕宽和高 -#define kScreenWidth ([UIScreen mainScreen].bounds.size.width) -#define kScreenHeight ([UIScreen mainScreen].bounds.size.height) typedef NS_ENUM(NSInteger, PopViewType){ PopViewNormalType = 0, diff --git a/Ifish/views/CustomcamerFile/CusomeCameraViewController.m b/Ifish/views/CustomcamerFile/CusomeCameraViewController.m index e0130e8..a6575e0 100644 --- a/Ifish/views/CustomcamerFile/CusomeCameraViewController.m +++ b/Ifish/views/CustomcamerFile/CusomeCameraViewController.m @@ -8,8 +8,6 @@ #import "CusomeCameraViewController.h" #define kScreenBounds [UIScreen mainScreen].bounds -#define kScreenWidth kScreenBounds.size.width*1.0 -#define kScreenHeight kScreenBounds.size.height*1.0 #import "ViewController.h" #import @interface CusomeCameraViewController ()