换换图，修下 bug

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.0.201802061600</string>
+	<string>5.0.201802091630</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Coding_iOS/.DS_Store

@@ -282,7 +282,8 @@ - (void)loadPreview
 - (void)addtitleBtnClick
 {
     EditLabelViewController *vc = [[EditLabelViewController alloc] init];
-    vc.curProject = _curProTopic.project;
+//    vc.curProject = _curProTopic.project;
+    vc.curProject = _curProTopic.project ?: ({Project *p = [Project new]; p.id = _curProTopic.project_id; p;});
     vc.orignalTags = _curProTopic.mdLabels;
     @weakify(self);
     vc.tagsSelectedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){

Coding_iOS/Coding_iOS-Info.plist

@@ -68,26 +68,6 @@ - (void)viewDidLoad
     _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
     [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
 
-//    _myToolBar = ({
-//        EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@" 发表评论..." image:@"button_file_comment" disableImage:nil];
-//        
-//        NSDictionary *attributes = @{NSFontAttributeName : [UIFont systemFontOfSize:15],
-//                                     NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0xB5B5B5"]};
-//        [item setAttributes:attributes forUIControlState:UIControlStateNormal];
-//        
-//        EaseToolBar *toolBar = [EaseToolBar easeToolBarWithItems:@[item]];
-//        toolBar.delegate = self;
-//        [self.view addSubview:toolBar];
-//        [toolBar mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.bottom.equalTo(self.view.mas_bottom);
-//            make.size.mas_equalTo(toolBar.frame.size);
-//        }];
-//        toolBar;
-//    });    
-//    UIEdgeInsets contentInsets = UIEdgeInsetsMake(0.0, 0.0,CGRectGetHeight(self.myToolBar.frame), 0.0);
-//    self.myTableView.contentInset = contentInsets;
-//    self.myTableView.scrollIndicatorInsets = contentInsets;
-    
     [self refresh];
 }
 

Coding_iOS/Controllers/EditTopicViewController.m

@@ -126,7 +126,8 @@ - (void)viewDidAppear:(BOOL)animated
 - (void)addtitleBtnClick
 {
     EditLabelViewController *vc = [[EditLabelViewController alloc] init];
-    vc.curProject = self.curTopic.project;
+//    vc.curProject = self.curTopic.project;
+    vc.curProject = self.curTopic.project ?: ({Project *p = [Project new]; p.id = self.curTopic.project_id; p;});
     vc.orignalTags = self.curTopic.mdLabels;
     @weakify(self);
     vc.tagsSelectedBlock = ^(EditLabelViewController *vc, NSMutableArray *selectedTags){

Coding_iOS/Controllers/FileActivitiesViewController.m

@@ -78,7 +78,10 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             [self.contentView addSubview:self.progressView];
         }
         if (!_stateButton) {
-            _stateButton = [[UIButton alloc] initWithFrame:CGRectMake((kScreen_Width - 55), ([FileListFileCell cellHeight] - 25)/2, 45, 25)];
+            _stateButton = [[UIButton alloc] initWithFrame:CGRectMake((kScreen_Width - 60), ([FileListFileCell cellHeight] - 30)/2, 50, 30)];
+            [_stateButton doBorderWidth:1.0 color:kColorD8DDE4 cornerRadius:3];
+            _stateButton.titleLabel.font = [UIFont systemFontOfSize:14];
+            [_stateButton setTitleColor:kColorDark7 forState:UIControlStateNormal];
             [_stateButton addTarget:self action:@selector(clickedByUser) forControlEvents:UIControlEventTouchUpInside];
             [self.contentView addSubview:_stateButton];
         }
@@ -87,28 +90,33 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 }
 
 - (void)changeToState:(DownloadState)state{
-    NSString *stateImageName;
+    NSString *stateTitleStr;
     switch (state) {
         case DownloadStateDefault:
-            stateImageName = @"icon_file_state_download";
+            stateTitleStr = @"下载";
             break;
         case DownloadStateDownloading:
-            stateImageName = @"icon_file_state_pause";
+            stateTitleStr = @"暂停";
             break;
         case DownloadStatePausing:
-            stateImageName = @"icon_file_state_goon";
+            stateTitleStr = @"继续";
             break;
         case DownloadStateDownloaded:
-            stateImageName = @"icon_file_state_look";
+            stateTitleStr = @"查看";
             break;
         default:
-            stateImageName = @"icon_file_state_download";
+            stateTitleStr = @"下载";
             break;
     }
-    [self.contentView setBackgroundColor:(state == DownloadStateDownloaded)? [UIColor colorWithHexString:@"0x81BCFF" andAlpha:.1]:[UIColor whiteColor]];
+    [self setBackgroundColor:(state == DownloadStateDownloaded)? [UIColor colorWithHexString:@"0x81BCFF" andAlpha:.1]:[UIColor whiteColor]];
+    //addLineforPlainCell: 重置了 backgroundView，要改 layer 才行
+    CALayer *bgLayer = self.backgroundView.layer.sublayers.firstObject;
+    if (bgLayer && [bgLayer isKindOfClass:[CAShapeLayer class]]) {
+        ((CAShapeLayer *)bgLayer).fillColor = self.backgroundColor.CGColor;
+    }
     [self.progressView setHidden:!(state == DownloadStateDownloading || state == DownloadStatePausing)];
 
-    [_stateButton setImage:[UIImage imageNamed:stateImageName] forState:UIControlStateNormal];
+    [_stateButton setTitle:stateTitleStr forState:UIControlStateNormal];
 }
 
 - (void)layoutSubviews{

Coding_iOS/Controllers/TopicDetailViewController.m

@@ -68,7 +68,10 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             [self.contentView addSubview:self.progressView];
         }
         if (!_stateButton) {
-            _stateButton = [[UIButton alloc] initWithFrame:CGRectMake((kScreen_Width - 55), ([FileVersionCell cellHeight] - 25)/2, 45, 25)];
+            _stateButton = [[UIButton alloc] initWithFrame:CGRectMake((kScreen_Width - 60), ([FileVersionCell cellHeight] - 30)/2, 50, 30)];
+            [_stateButton doBorderWidth:1.0 color:kColorD8DDE4 cornerRadius:3];
+            _stateButton.titleLabel.font = [UIFont systemFontOfSize:14];
+            [_stateButton setTitleColor:kColorDark7 forState:UIControlStateNormal];
             [_stateButton addTarget:self action:@selector(clickedByUser) forControlEvents:UIControlEventTouchUpInside];
             [self.contentView addSubview:_stateButton];
         }
@@ -138,28 +141,33 @@ - (void)updateCompleted:(CGFloat)fractionCompleted{
 }
 
 - (void)changeToState:(DownloadState)state{
-    NSString *stateImageName;
+    NSString *stateTitleStr;
     switch (state) {
         case DownloadStateDefault:
-            stateImageName = @"icon_file_state_download";
+            stateTitleStr = @"下载";
             break;
         case DownloadStateDownloading:
-            stateImageName = @"icon_file_state_pause";
+            stateTitleStr = @"暂停";
             break;
         case DownloadStatePausing:
-            stateImageName = @"icon_file_state_goon";
+            stateTitleStr = @"继续";
             break;
         case DownloadStateDownloaded:
-            stateImageName = @"icon_file_state_look";
+            stateTitleStr = @"查看";
             break;
         default:
-            stateImageName = @"icon_file_state_download";
+            stateTitleStr = @"下载";
             break;
     }
     [self setBackgroundColor:(state == DownloadStateDownloaded)? [UIColor colorWithHexString:@"0x81BCFF" andAlpha:.1]:[UIColor whiteColor]];
+    //addLineforPlainCell: 重置了 backgroundView，要改 layer 才行
+    CALayer *bgLayer = self.backgroundView.layer.sublayers.firstObject;
+    if (bgLayer && [bgLayer isKindOfClass:[CAShapeLayer class]]) {
+        ((CAShapeLayer *)bgLayer).fillColor = self.backgroundColor.CGColor;
+    }
     [self.progressView setHidden:!(state == DownloadStateDownloading || state == DownloadStatePausing)];
 
-    [_stateButton setImage:[UIImage imageNamed:stateImageName] forState:UIControlStateNormal];
+    [_stateButton setTitle:stateTitleStr forState:UIControlStateNormal];
 }
 
 - (void)clickedByUser{