首页完成 评论接口完成

redstar/Assets.xcassets/home/task_00.imageset/Contents.json → redstar/Assets.xcassets/home/task_000.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "task_00@2x.png",
+      "filename" : "task_online@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "task_00@3x.png",
+      "filename" : "task_online@3x.png",
       "scale" : "3x"
     }
   ],

redstar/Assets.xcassets/home/task_03.imageset/Contents.json → redstar/Assets.xcassets/home/task_001.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "task_03@2x.png",
+      "filename" : "praise_report@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "task_03@3x.png",
+      "filename" : "praise_report@3x.png",
       "scale" : "3x"
     }
   ],

redstar/Assets.xcassets/home/task_002.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "praise_standard@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "praise_standard@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

redstar/Assets.xcassets/home/task_02.imageset/Contents.json → redstar/Assets.xcassets/home/task_003.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "task_02@2x.png",
+      "filename" : "praise_image@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "task_02@3x.png",
+      "filename" : "praise_image@3x.png",
       "scale" : "3x"
     }
   ],

redstar/Assets.xcassets/home/task_004.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "question_problem@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "question_problem@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

redstar/Assets.xcassets/home/task_01.imageset/Contents.json → redstar/Assets.xcassets/home/task_005.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "task_01@2x.png",
+      "filename" : "excellent_case@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "task_01@3x.png",
+      "filename" : "excellent_case@3x.png",
       "scale" : "3x"
     }
   ],

redstar/Assets.xcassets/home/task_04.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "task_04@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "task_04@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/home/task_05.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "task_05@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "task_05@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Classes/Macro/Constant.h

@@ -20,6 +20,7 @@
 #define kScreenWidth   [UIScreen mainScreen].bounds.size.width
 #define kScreenHeight  [UIScreen mainScreen].bounds.size.height
 
+#define kPushTag 2354924
 
 
 // ----- Login -----

redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m

@@ -153,6 +153,9 @@
         
         NSLayoutConstraint *titleImageHeight = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:45];
         [self.contentView addConstraint:titleImageHeight];
+        
+        NSLayoutConstraint *titleImageBottom = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
+        [self.contentView addConstraint:titleImageBottom];
     }
     return _dateLabel;
 }

redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m

@@ -194,6 +194,10 @@
         // 高度
         NSLayoutConstraint *stateHeight = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:16];
         [self.contentView addConstraint:stateHeight];
+        // 高度
+        NSLayoutConstraint *stateBottom = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-8];
+        [self.contentView addConstraint:stateBottom];
+        
     }
     return _dateLabel;
 }

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/Cell/InspectListCell.m

@@ -280,6 +280,9 @@
         
         NSLayoutConstraint *overDateHeight = [NSLayoutConstraint constraintWithItem:_allView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:25];
         [self.contentView addConstraint:overDateHeight];
+        
+        NSLayoutConstraint *overDateBottom = [NSLayoutConstraint constraintWithItem:_allView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-10];
+        [self.contentView addConstraint:overDateBottom];
 
     }
     return _allView;

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/View/RankListHeaderView.m

@@ -10,7 +10,6 @@
 #import "RankListModel.h"
 
 
-#define kPushTag 2354924
 @interface RankListHeaderView ()
 {
     UIView *_bgView;

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/ViewController/RankingListViewController.m

@@ -22,7 +22,6 @@
 
 #define kRankingCell @"RankingTableViewCell"
 #define kShopNameBtnTag 15000
-#define kPushTag 2354924
 
 @interface RankingListViewController () <UITableViewDataSource, UITableViewDelegate, RankListHeaderDelegate>
 @property (nonatomic, strong) UITableView *tableView;

redstar/Classes/Module/Home/Cell/HomeCellItem.m

@@ -30,16 +30,17 @@
     
     CGFloat btnW = self.width;
     CGFloat btnH = self.height;
-    self.imageView.frame = CGRectMake((btnW - 45) / 2 , 13, 45, 45);
+    CGFloat imageH = btnH * 0.7;
+    self.imageView.frame = CGRectMake(0, 7, btnW, imageH);
     
-    CGFloat titleH = btnH - 55;
-    CGFloat titleY = 61;
+    CGFloat titleH = btnH - imageH;
+    CGFloat titleY = imageH - 5;
     self.titleLabel.frame = CGRectMake(0, titleY, btnW, titleH);
     
-//    // 设置badgeView尺寸
-//    self.badgeView.x = self.width - self.badgeView.width - HMMargin;
-//    
-//    self.badgeView.y = 0;
+    //    // 设置badgeView尺寸
+    //    self.badgeView.x = self.width - self.badgeView.width - HMMargin;
+    //
+    //    self.badgeView.y = 0;
     
     
 }

redstar/Classes/Module/Home/Cell/HomeTitleTableCell.m

@@ -85,6 +85,9 @@
     
     NSLayoutConstraint *gradeBottom = [NSLayoutConstraint constraintWithItem:gradeLabel attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
     [self.contentView addConstraint:gradeBottom];
+    
+    NSLayoutConstraint *shoppingHheight = [NSLayoutConstraint constraintWithItem:gradeLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.2 constant:30];
+    [self.contentView addConstraint:shoppingHheight];
 }
 
 

redstar/Classes/Module/Home/View/HomeHeaderView.m

@@ -85,7 +85,7 @@
 - (UIScrollView *)scrollView
 {
     if (!_scrollView) {
-        _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 86)];
+        _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, 120)];
         _scrollView.bounces = NO;
         _scrollView.backgroundColor = [UIColor whiteColor];
         _scrollView.pagingEnabled = YES;