diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 11b7fa4..0acf175 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 = 3; + CURRENT_PROJECT_VERSION = 4; 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 = 3; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m index ee5854f..9d07a43 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m @@ -56,6 +56,7 @@ Strong UILabel *subTitleLabel; titleL.text = titleArr[i]; titleL.textColor = RGB(130, 130, 130); titleL.font = FontSize(18); + titleL.numberOfLines=2; [contentView addSubview:titleL]; [titleL mas_makeConstraints:^(MASConstraintMaker *make) { @@ -64,18 +65,13 @@ Strong UILabel *subTitleLabel; }]; if (i==1&&self.deviceType==DEVICECAMERA) { - UILabel *detailTitleL = InitObject(UILabel); - detailTitleL.text = @"(摇头机点此连接接方式)"; - detailTitleL.textColor = RGB(130, 130, 130); - detailTitleL.font = FontSize(12); - [contentView addSubview:detailTitleL]; - - [detailTitleL mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(iconImage.mas_right).offset(kSizeFrom750(30)); - make.top.mas_equalTo(titleL.mas_bottom).offset(-5); - make.width.mas_equalTo(titleL.mas_width); - make.height.mas_equalTo(30); - }]; + NSString*string=@"热点连接\n(摇头机点此连接方式)"; + NSMutableAttributedString*mua=[[NSMutableAttributedString alloc]initWithString:string]; + [mua addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:[string rangeOfString:@"(摇头机点此连接方式)"]]; + [mua addAttribute:NSFontAttributeName value:FontSize(18) range:[string rangeOfString:@"热点连接\n"]]; + [mua addAttribute:NSForegroundColorAttributeName value:RGB(130, 130, 130) range:NSMakeRange(0, string.length)]; + titleL.attributedText=mua; + } UIImageView *rightArrow = InitObject(UIImageView);