no message

zhangxiaowen
1 parent 5b43147f
Showing 14 changed files with 66 additions and 25 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Home/CNHomeBaseViewController.m
CNLiveScioLive/Pages/Home/CNHomeENViewController.m
CNLiveScioLive/Pages/Home/CNHomeModel.h
CNLiveScioLive/Pages/Home/CNHomeModel.m
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsNoPicTableViewCell.m
CNLiveScioLive/Pages/Home/答记者问/Controller/CNLiveReporterAskedViewController.m
CNLiveScioLive/Pages/My/通知公告/Controller/CNMyAnnouncementsViewController.m
CNLiveScioLive/Pages/My/通知公告/Model/CNMyAnnouncementsModel.h
CNLiveScioLive/Pages/My/通知公告/Model/CNMyAnnouncementsModel.m
CNLiveScioLive/Pages/My/通知公告/View/CNMyAnnouncementsTableViewCell.m
CNLiveScioLive/Pages/Sources/en.lproj/Localizable.strings
CNLiveScioLive/Pages/Sources/zh-Hans.lproj/Localizable.strings
@@ -31,9 +31,6 @@
     //推送
     [self registerRemoteNotification];
     [self registerNotification:launchOptions];
-    
-    //版本更新
-    [self checkAppUpdate];
     //收藏
     [[DBAction sharedDBAction] createTable];
@@ -45,7 +42,10 @@
     //语言
     [self setApplicationLanguage];
-
+    
+    //版本更新
+    [self checkAppUpdate];
+    
     [self initializeSDKConfiguration];
     if(IS_CHINESE){
@@ -478,11 +478,11 @@
     NSString *newVersion =[results objectForKey:@"version"];
     if([newVersion compare:nowVersion options:NSNumericSearch] == NSOrderedDescending) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"upDate"];
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"版本更新"
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"VersionUpdate")
                                                         message:[results objectForKey:@"releaseNotes"]
                                                        delegate:self
-                                              cancelButtonTitle:@"取消"
-                                              otherButtonTitles:@"更新",nil];
+                                              cancelButtonTitle:CustomStr(@"Cancel")
+                                              otherButtonTitles:CustomStr(@"Update"),nil];
         [alert show];
         return;
     }
@@ -126,7 +126,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
 }
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    
     CNHomeModel *model = self.data[indexPath.row];
     if([model.showType isEqualToString:@"0"]){
         return 200*MainHScale+85;//一张图 上边
@@ -136,7 +135,8 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
     else if([model.showType isEqualToString:@"2"]){
         return (MainScreenWidth-20-20)/3.0+85;//三张图
@@ -146,11 +146,13 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
-        
+//        return 80;//无图
+        return model.titleHeight+40;//无图
+
     }else{
-        return 80;//无图
-        
+//        return 80;//无图
+        return model.titleHeight+40;//无图
+
     }
 }
@@ -144,7 +144,8 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
     else if([model.showType isEqualToString:@"2"]){
         return (MainScreenWidth-20-20)/3.0+85;//三张图
@@ -154,10 +155,12 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }else{
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
 }
@@ -49,4 +49,7 @@
 @property (nonatomic, copy) NSString *playType;
 @property (nonatomic, copy) NSString *gxbArticleId;
+
+@property (nonatomic, assign) CGFloat titleHeight;
+
 @end
@@ -9,5 +9,15 @@
 #import "CNHomeModel.h"
 @implementation CNHomeModel
+static NSInteger const margin = 10;
+- (CGFloat)titleHeight{
+    
+    NSStringDrawingOptions options =  NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading;
+    
+    CGRect titleRect = [_title boundingRectWithSize:CGSizeMake(MainScreenWidth - 4*margin,MAXFLOAT) options:options attributes:@{NSFontAttributeName:Font(16)} context:nil];
+    
+    return titleRect.size.height;
+    
+}
 @end
@@ -169,7 +169,8 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
     else if([model.showType isEqualToString:@"2"]){
 //        return 210*MainScale;//三张图
@@ -180,10 +181,12 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }else{
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
 }
@@ -88,7 +88,7 @@
         make.left.equalTo(self->_backgroundImage.mas_left).with.offset(10);
         make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5);
         make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10);
-        make.height.offset(40);
+//        make.height.offset(self->_model.titleHeight);
     }];
@@ -140,7 +140,8 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
     else if([model.showType isEqualToString:@"2"]){
         return (MainScreenWidth-20-20)/3.0+85;//三张图
@@ -150,10 +151,12 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         if(model.img && ![model.img isEqualToString:@""]){
             return 80*MainScale+20;//一张图 左边
         }
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }else{
-        return 80;//无图
+//        return 80;//无图
+        return model.titleHeight+40;//无图
     }
 }
@@ -156,7 +156,8 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
  */
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return 80;
+    CNMyAnnouncementsModel *model = self.data[indexPath.row];
+    return model.titleHeight+40;
 }
@@ -69,4 +69,6 @@
 @property (nonatomic, copy) NSString *videoUrl;
 @property (nonatomic, copy) NSString *vipFlag;
+@property (nonatomic, assign) CGFloat titleHeight;
+
 @end
@@ -9,5 +9,15 @@
 #import "CNMyAnnouncementsModel.h"
 @implementation CNMyAnnouncementsModel
+static NSInteger const margin = 10;
+- (CGFloat)titleHeight{
+    
+    NSStringDrawingOptions options =  NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading;
+    
+    CGRect titleRect = [_title boundingRectWithSize:CGSizeMake(MainScreenWidth - 2*margin,MAXFLOAT) options:options attributes:@{NSFontAttributeName:Font(15)} context:nil];
+    
+    return titleRect.size.height;
+    
+}
 @end
@@ -26,7 +26,7 @@ static NSInteger margin = 10;
         self.contentView.backgroundColor = [UIColor whiteColor];
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.numberOfLines = 2;
+        _titleLabel.numberOfLines = 0;
         _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _titleLabel.textColor = HEXCOLOR(0x333333);
         _titleLabel.font = [UIFont systemFontOfSize:15];
@@ -20,6 +20,8 @@
 "Reset" = "Reset";
 "Unlimited" = "Unlimited";
 "Clear" = "Clear";
+"VersionUpdate" = "Version Update";
+"Update" = "Update";
 //NEWS
 "NEWS" = "NEWS";
@@ -20,6 +20,8 @@
 "Reset" = "重置";
 "Unlimited" = "不限制";
 "Clear" = "清空";
+"VersionUpdate" = "版本更新";
+"Update" = "更新";
 //NEWS
 "NEWS" = "新闻";