diff --git a/.DS_Store b/.DS_Store index df46f5a..3647ef0 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 38c3503..fe453e5 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15777,7 +15777,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15895,7 +15895,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 5bab6df..c2418a9 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -372,6 +372,8 @@ NSCameraUsageDescription 爱鱼奇需要您的同意,才能使用相机,以使用图片上传或扫一扫等功能 + NSLocalNetworkUsageDescription + 为给爱鱼奇智能硬件产品配置网络,发送指令等,需要使用本地网络 NSLocationAlwaysUsageDescription 为获取爱鱼奇智能硬件产品及用户的地址区域分布,以提供更好的特色服务,爱鱼奇将获取您的地址 NSLocationWhenInUseUsageDescription diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/IfishPlaybackViewCell.xib b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/IfishPlaybackViewCell.xib index b5880e7..db22efe 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/IfishPlaybackViewCell.xib +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/IfishPlaybackViewCell.xib @@ -37,10 +37,10 @@ - + - - + + diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/PlayBackViewController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/PlayBackViewController.m index 7155c59..1e12f95 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/PlayBackViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PPlayBack/PlayBackViewController.m @@ -23,7 +23,7 @@ // NSString *string = [formatter stringFromDate:self.model.date]; // [self setTitleString:@"视频回放"]; - self.view.backgroundColor=[UIColor lightGrayColor]; + self.view.backgroundColor=[UIColor blackColor]; [self connectDevice]; // Do any additional setup after loading the view from its nib. diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon.png b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon.png index 87d7b95..7b87f9b 100644 Binary files a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon.png and b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon.png differ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@2x.png b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@2x.png index 48454c3..a32db01 100644 Binary files a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@2x.png and b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@2x.png differ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@3x.png b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@3x.png index bad8923..818fe68 100644 Binary files a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@3x.png and b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/playBackIcon@3x.png differ