From 7460e2d7f95b5b741ec9376e327ab5eb87b6bedb Mon Sep 17 00:00:00 2001 From: kai60 Date: Mon, 17 May 2021 11:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E5=90=91=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=AE=BE=E5=A4=87=E7=9A=84=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 +-- .../CameraBottomCollectionViewCell.h | 1 + .../CameraBottomCollectionViewCell.xib | 27 ++++++++++++++----- .../CameraBottomHView.m | 8 ++++-- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 037d2af..701561f 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15805,7 +15805,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15923,7 +15923,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.h b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.h index 0109057..bf48830 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.h +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.h @@ -12,5 +12,6 @@ @property (weak, nonatomic) IBOutlet UIImageView *kindImage; @property (weak, nonatomic) IBOutlet UILabel *kindName; @property (weak, nonatomic) IBOutlet UIImageView *hotImg; +@property (weak, nonatomic) IBOutlet UILabel *detailLabel; @end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.xib b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.xib index 2c0cbbf..b5b169b 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.xib +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomCollectionViewCell.xib @@ -1,11 +1,9 @@ - - - - - + + + - + @@ -42,16 +40,31 @@ + + + + + + - + diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m index f8fc251..e74d056 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m @@ -118,13 +118,17 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell"; cell.kindImage.image = _dataImgArray[indexPath.row]; cell.kindName.text = _dataNameArray[indexPath.row]; + cell.detailLabel.text=@""; if (indexPath.row ==3) { cell.hotImg.image= LXImageWithImageName(@"devicename_iocn_label"); //cell.hotImg.hidden = NO; - }else if (indexPath.row ==2){ + }else if (indexPath.row ==8){ - //cell.hotImg.image= LXImageWithImageName(@"devicename_iocn_new"); + + + cell.detailLabel.text=@"(此功能仅限摇头机)"; + } return cell;