修改项说明：完成积分相应模块开发，等待后台接口

Class/ApplyPrizeViewController.m

@@ -177,7 +177,9 @@
         NSMutableArray *array = [NSMutableArray array];
         for (PrizeListModel *model in self.selectArray) {
             TOPrizeBillDetailsEntity *entity = [[TOPrizeBillDetailsEntity alloc]init];
-            entity.prize = model.fid;
+            TOPrizeEntity *prize = [[TOPrizeEntity alloc]init];
+            prize.fid = model.fid;
+            entity.prize = prize;
             [array addObject:entity];
         }
         _prizeBill.details = (NSArray<TOPrizeBillDetailsEntity> *)array;

Class/GiftInformationView.h

+//
+//  GiftInformationView.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/29.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GiftInformationView : UIView
+
+
+/**
+ 初始化礼品View
+
+ @return GiftInformationView
+ */
+- (instancetype)initWithializeGiftView:(NSString *)picture withGiftName:(NSString *)name;
+
+@end

Class/GiftInformationView.m

+//
+//  GiftInformationView.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/29.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "GiftInformationView.h"
+
+@implementation GiftInformationView
+
+/**
+ 初始化礼品View
+ 
+ @return GiftInformationView
+ */
+- (instancetype)initWithializeGiftView:(NSString *)picture withGiftName:(NSString *)name
+{
+    if (self = [super init]) {
+        //图片
+        UIImageView *giftImageView = [[UIImageView alloc]init];
+        [giftImageView sd_setImageWithURL:[NSURL URLWithString:picture] placeholderImage:REPLACEIMAGE];
+        [self addSubview:giftImageView];
+        //文字
+        UILabel *giftLabel = [[UILabel alloc]init];
+        giftLabel.text = name;
+        [self addSubview:giftLabel];
+        [giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.top.equalTo(self);
+            make.size.mas_equalTo(CGSizeMake(100, 100));
+        }];
+        [giftLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(giftImageView.mas_right).offset(10);
+            make.top.equalTo(giftImageView).offset(10);
+            make.size.mas_equalTo(CGSizeMake(100, 30));
+        }];
+    }
+    return self;
+}
+
+@end

Class/IntegralDetailsViewController.m

@@ -194,6 +194,8 @@
         case PrizeTableView:
         {
             PrizeExchangeDetailsViewController *exchangeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeExchangeDetailsViewController"];
+            RsPrizeBill *bill = self.datasArray[indexPath.row];
+            exchangeDetails.isDelivery = ![bill.bill.state isEqualToString:TOPRIZEBILLENTITYSTATE_REQUESTED];
             [self.navigationController pushViewController:exchangeDetails animated:YES];
         }
             break;

Class/LearningCenter/OnlineLearning/VideoDetailViewController.m

@@ -26,6 +26,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    [self addChildWebViewController];
     [self setUpTableView];
 }
 
@@ -44,7 +45,7 @@
         webView.view.frame = CGRectMake(0, 0, ScreenWidth, contentHeight);
         [weakSelf.studyItemDetailsTableView reloadData];
     }];
-    self.introductionHeight = 44;//默认值
+    self.introductionHeight = 100;//默认值
     webView.view.frame = CGRectMake(0, 0, ScreenWidth, self.introductionHeight);
     [self addChildViewController:webView];
 }

Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m

@@ -14,6 +14,11 @@
 
 @property (nonatomic,strong) WYPopoverController *popover;
 
+/**
+ 闯关数据
+ */
+@property (nonatomic,strong) PassLevelResponse *emigratedResponse;
+
 @end
 
 @implementation EmigratedMainViewController
@@ -28,15 +33,29 @@
 - (void)getThroughHistoryDatasAction
 {
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        
-        
+    PassLevelCondition *emigrated = [[PassLevelCondition alloc]init];
+    emigrated.employeeIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
+    emigrated.beginDateFrom = [[self class] getTimeby:-7];
+    emigrated.endDateTo = [[self class] getTimeby:0];
+    DataPage *page = [[DataPage alloc]init];
+    page.page = ONE;
+    page.rows = KROWS;
+    emigrated.page = page;
+    [self CreateMBProgressHUDLoding];
+    NSLog(@"%@",[emigrated toDictionary]);
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:emigrated WithReturnValueBlock:^(id returnValue) {
+        
+        NSLog(@"%@",returnValue);
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            weakSelf.emigratedResponse = [[PassLevelResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+        }else {
+            [weakSelf RemoveMBProgressHUDLoding];
+        }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        
-        
+        [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
 }
 

Class/OrderdetailsViewController.m

@@ -297,10 +297,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         deductionModel.priority = oldPromotion.prority;
                         [weakSelf.promotionInformationArray addObject:deductionModel];
                         
-                    } else if (![BaseViewController isBlankString:[oldPromotion.JDEcardDenomation stringValue]]) {
+                    } else if (![BaseViewController isBlankString:[oldPromotion.jdEcardDenomation stringValue]]) {
                         // 京东E卡
                         PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init];
-                        jdECardModel.total = [oldPromotion.JDEcardDenomation integerValue];
+                        jdECardModel.total = [oldPromotion.jdEcardDenomation integerValue];
                         jdECardModel.body = GUIDE;
                         jdECardModel.type = JDECardAction;
                         jdECardModel.priority = oldPromotion.prority;

Class/PrizeExchangeCourierTableViewCell.h

@@ -21,5 +21,8 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *courierNumberLabel;
 
-
+/**
+ 数据源
+ */
+@property (nonatomic,strong) TOPrizeBillEntity *billEntity;
 @end

Class/PrizeExchangeCourierTableViewCell.m

@@ -15,10 +15,10 @@
     // Initialization code
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
+- (void)setBillEntity:(TOPrizeBillEntity *)billEntity
+{
+    _billEntity = billEntity;
+    self.courierCompanyLabel.text = _billEntity.logisticsCompany;
+    self.courierNumberLabel.text = _billEntity.trackingNumber;
 }
-
 @end

Class/PrizeExchangeDetailsViewController.m

@@ -13,6 +13,7 @@
 #import "PrizeExchangeInformationTableViewCell.h"
 #import "PrizeExchangeConsigneeTableViewCell.h"
 #import "PrizeExchangeCourierTableViewCell.h"
+#import "prizeOrderDetailsModel.h"
 
 @interface PrizeExchangeDetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -20,7 +21,7 @@
 /**
  兑奖单详情
  */
-@property (nonatomic,strong) RsPrizeBill *prizeBillResult;
+@property (nonatomic,strong) prizeOrderDetailsModel *prizeBillResult;
 
 /**
  section title Array
@@ -55,7 +56,7 @@
         
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            weakSelf.prizeBillResult = [[RsPrizeBill alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            weakSelf.prizeBillResult = [[prizeOrderDetailsModel alloc]initWithDictionary:returnValue[@"data"] error:nil];
         }else {
             [weakSelf ErrorMBProgressView:returnValue[@"message"]];
         }
@@ -88,12 +89,14 @@
         case RewardInformation:
         {
             PrizeExchangeInformationTableViewCell *rewardCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeInformationTableViewCell" forIndexPath:indexPath];
+            rewardCell.giftDetailsArray = self.prizeBillResult.details;
             return rewardCell;
         }
             break;
         case LogisticsInformation:
         {
             PrizeExchangeCourierTableViewCell *logisticsCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeCourierTableViewCell" forIndexPath:indexPath];
+            logisticsCell.billEntity = self.prizeBillResult.bill;
             return logisticsCell;
         }
             break;
@@ -120,6 +123,29 @@
     return headerView;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    switch (indexPath.section) {
+        case ExchangeBillInformation:
+        case ReceivingInformation:
+            return 100;
+            break;
+        case RewardInformation:
+        {
+            return self.prizeBillResult.giftHeight;
+        }
+            break;
+        case LogisticsInformation:
+        {
+            return 60;
+        }
+            break;
+        default:
+            break;
+    }
+    return 0;
+}
+
 #pragma mark - lazy
 - (NSMutableArray *)sectionTitleArray
 {

Class/PrizeExchangeInformationTableViewCell.h

@@ -10,4 +10,6 @@
 
 @interface PrizeExchangeInformationTableViewCell : UITableViewCell
 
+
+@property (nonatomic,strong) NSArray<TOPrizeBillDetailsEntity> *giftDetailsArray;
 @end

Class/PrizeExchangeInformationTableViewCell.m

@@ -7,18 +7,31 @@
 //
 
 #import "PrizeExchangeInformationTableViewCell.h"
+#import "GiftInformationView.h"
 
 @implementation PrizeExchangeInformationTableViewCell
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    // Initialization code
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
 
-    // Configure the view for the selected state
+- (void)setGiftDetailsArray:(NSArray<TOPrizeBillDetailsEntity> *)giftDetailsArray
+{
+    for (UIView *view in self.contentView.subviews) {
+        [view removeFromSuperview];
+    }
+    _giftDetailsArray = giftDetailsArray;
+    CGFloat itemHeight = 100;
+    CGFloat tandemInterval = 20;
+    CGFloat horizontalInterval = 300;
+    for (int i=0; i<_giftDetailsArray.count; i++) {
+        TOPrizeBillDetailsEntity *entity = _giftDetailsArray[i];
+        GiftInformationView *giftView = [[GiftInformationView alloc] initWithializeGiftView:entity.prize.picture withGiftName:entity.prize.name];
+        giftView.frame = CGRectMake((i%2)*(itemHeight+horizontalInterval)+itemHeight/2, (i/2)*(itemHeight+tandemInterval)+tandemInterval, horizontalInterval, itemHeight);
+        [self.contentView addSubview:giftView];
+    }
 }
 
+
 @end

Class/prizeOrderDetailsModel.h

+//
+//  prizeOrderDetailsModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/29.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "opple_objc_json_client.h"
+
+@interface prizeOrderDetailsModel : RsPrizeBill
+
+
+/**
+ 礼品高度
+ */
+@property (nonatomic,assign) CGFloat giftHeight;
+
+
+@end

Class/prizeOrderDetailsModel.m

+//
+//  prizeOrderDetailsModel.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/29.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "prizeOrderDetailsModel.h"
+
+@implementation prizeOrderDetailsModel
+
+
+- (CGFloat)giftHeight
+{
+    if (!_giftHeight) {
+        _giftHeight = [self calculateGiftNeedHeight:self.details];
+    }
+    return _giftHeight;
+}
+
+#pragma mark - 计算礼品显示需要高度
+- (CGFloat)calculateGiftNeedHeight:(NSArray<TOPrizeBillDetailsEntity *>*)gifts
+{
+    CGFloat height = 0;
+    NSInteger count = gifts.count;
+    CGFloat itemHeight = 100;
+    CGFloat interval = 20;
+    if (count <= 2) {
+        height += itemHeight+interval *2;
+    }else if (count %2 == 0 || count%2 == 1){
+        if (count %2 == 1) {
+            count += 1;
+        }
+        height += (count/2)*itemHeight + ((count/2)+1)*interval;
+    }
+    return height;
+}
+
+@end

Lighting.xcodeproj/project.pbxproj

@@ -171,6 +171,8 @@
 		2999B12F1DE6CD730031F79E /* ForumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2999B12E1DE6CD730031F79E /* ForumViewController.m */; };
 		299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299C7F581CE21FA800E7D7CB /* AddressViewController.m */; };
 		299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */; };
+		29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A6981DED154F00B04272 /* GiftInformationView.m */; };
+		29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */; };
 		29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */; };
 		29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938211CDADE4700F21E54 /* ProductDetailsTableViewCell.m */; };
 		29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */; };
@@ -568,6 +570,10 @@
 		299C7F571CE21FA800E7D7CB /* AddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressViewController.h; sourceTree = "<group>"; };
 		299C7F581CE21FA800E7D7CB /* AddressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressViewController.m; sourceTree = "<group>"; };
 		299C7F591CE21FA800E7D7CB /* AddressViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressViewController.xib; sourceTree = "<group>"; };
+		29A7A6971DED154F00B04272 /* GiftInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftInformationView.h; sourceTree = "<group>"; };
+		29A7A6981DED154F00B04272 /* GiftInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftInformationView.m; sourceTree = "<group>"; };
+		29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeOrderDetailsModel.h; sourceTree = "<group>"; };
+		29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeOrderDetailsModel.m; sourceTree = "<group>"; };
 		29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientdetailsViewController.h; sourceTree = "<group>"; };
 		29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientdetailsViewController.m; sourceTree = "<group>"; };
 		29A938201CDADE4700F21E54 /* ProductDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsTableViewCell.h; sourceTree = "<group>"; };
@@ -2038,6 +2044,8 @@
 				29E9445E1DE455AC007CD26C /* PrizeExchangeInformationTableViewCell.m */,
 				29837B4E1DE58BAD009CF614 /* PrizeExchangeCourierTableViewCell.h */,
 				29837B4F1DE58BAE009CF614 /* PrizeExchangeCourierTableViewCell.m */,
+				29A7A6971DED154F00B04272 /* GiftInformationView.h */,
+				29A7A6981DED154F00B04272 /* GiftInformationView.m */,
 			);
 			name = Cells;
 			sourceTree = "<group>";
@@ -2047,6 +2055,8 @@
 			children = (
 				29E9444B1DE40D5F007CD26C /* PrizeListModel.h */,
 				29E9444C1DE40D5F007CD26C /* PrizeListModel.m */,
+				29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */,
+				29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */,
 			);
 			name = Models;
 			sourceTree = "<group>";
@@ -2478,6 +2488,7 @@
 				29B3EE711DCE16130065FCCF /* LuckyDrawViewController.m in Sources */,
 				293164031DCE3F780075129D /* UsedDrawTableViewCell.m in Sources */,
 				29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
+				29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */,
 				2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */,
 				29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */,
 				29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
@@ -2539,6 +2550,7 @@
 				298534601DD4B0290023BBAE /* AirPrintManager.m in Sources */,
 				29ABA6EA1DE686D5007D8012 /* WkWebViewViewController.m in Sources */,
 				2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
+				29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */,
 				295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */,
 				29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */,
 				2940AE891DE7FCE4001164B0 /* VideoDetailViewController.m in Sources */,

Lighting/GuideIntegral.storyboard

@@ -68,13 +68,13 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Eh-Eu-GWV">
-                                        <frame key="frameInset" minX="28.52%" minY="64.71%" width="14.03%" height="22"/>
+                                        <frame key="frameInset" minX="28.47%" minY="64.71%" width="14.08%" height="22"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zzy-VB-gpq">
-                                        <frame key="frameInset" minX="28.52%" minY="30.07%" width="9.32%" height="18.5"/>
+                                        <frame key="frameInset" minX="28.47%" minY="30.07%" width="9.37%" height="18.5"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -242,7 +242,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="106" sectionHeaderHeight="28" sectionFooterHeight="28" id="6OB-63-x5H">
-                                <frame key="frameInset" minX="-0.5" minY="63" maxX="1" maxY="0.5"/>
+                                <frame key="frameInset" minX="-1" minY="62.5" maxX="1.5" maxY="1"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
@@ -396,7 +396,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell">
                                         <rect key="frame" x="0.0" y="414" width="1023.5" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NIn-Su-84l" id="slW-As-u76">

Tools/BaseViewController.h

@@ -161,6 +161,12 @@
  */
 + (BOOL)isBlankString:(NSString *)string;
 
+/**
+ *  获取当前时间之前或者之后的时间（之前传入负数）
+ */
++ (NSString *)getTimeby:(NSInteger)day;
+
+
 /**
  选择框
 

Tools/BaseViewController.m

@@ -203,6 +203,24 @@
     [hud hide:YES afterDelay:3.0f];
 }
 
+#pragma mark - 获取当前时间之前或者之后的时间（之前传入负数）
++ (NSString *)getTimeby:(NSInteger)day
+{
+    NSDate*nowDate = [NSDate date];
+    NSDate* theDate;
+    if(day!=0){
+        NSTimeInterval  oneDay = 24*60*60*1;  //1天的长度
+        theDate = [nowDate initWithTimeIntervalSinceNow: oneDay*day];
+    }else{
+        theDate = nowDate;
+    }
+    NSDateFormatter *date_formatter = [[NSDateFormatter alloc] init];
+    [date_formatter setDateFormat:@"yyyy-MM-dd 00:00:00"];
+    NSString *the_date_str = [date_formatter stringFromDate:theDate];
+    return the_date_str;
+}
+
+
 
 #pragma mark -渐隐提示框
 - (void)SHOWPrompttext:(NSString *)Text

Tools/opple_objc_json_client.m

@@ -302,6 +302,22 @@
 }
 
 
+@end
+
+@implementation PassLevelCondition
+@synthesize titleLike;
+@synthesize beginDateFrom;
+@synthesize endDateTo;
+@synthesize validEquals;
+@synthesize employeeIdEquals;
+@synthesize page;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation PrizeCondition
@@ -439,6 +455,7 @@
 @synthesize thumbnailUrl;
 @synthesize entityType;
 @synthesize entityId;
+@synthesize playTime;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -662,13 +679,28 @@
 
 @end
 
-@implementation TOPositionEntity
+NSString * const GRADEMETHOD_AUTO = @"auto";
+NSString * const GRADEMETHOD_MANUL = @"manul";
+
+
+@implementation TOPassLevelEntity
 @synthesize fid;
-@synthesize code;
-@synthesize name;
-@synthesize commission;
-@synthesize lowestDiscount;
-@synthesize resellerCode;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize beginDate;
+@synthesize endDate;
+@synthesize passGrade;
+@synthesize title;
+@synthesize gradeMethod;
+@synthesize score;
+@synthesize valid;
+@synthesize passResult;
+@synthesize topics;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -686,22 +718,12 @@
 
 @end
 
-@implementation TOPrizeBillEntity
+@implementation TOPassLevelTopicOptionEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
-@synthesize createDate;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize updateDate;
-@synthesize billnumber;
-@synthesize state;
-@synthesize receiver;
-@synthesize mobilephone;
-@synthesize receiveAddress;
-@synthesize employee;
-@synthesize logisticsCompany;
-@synthesize trackingNumber;
+@synthesize findex;
+@synthesize value;
+@synthesize name;
+@synthesize topicId;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -719,17 +741,10 @@
 
 @end
 
-@implementation TOPrizeEntity
+@implementation TOPrizeBillDetailsEntity
 @synthesize fid;
-@synthesize picture;
-@synthesize createName;
-@synthesize createBy;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize code;
-@synthesize name;
-@synthesize createDate;
-@synthesize updateDate;
+@synthesize bill;
+@synthesize prize;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -747,14 +762,19 @@
 
 @end
 
-@implementation TOScoreRecordEntity
+NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED = @"requested";
+NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED = @"shipped";
+NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
+
+
+@implementation TOSceneEntity
 @synthesize fid;
-@synthesize createDate;
-@synthesize employeeId;
-@synthesize score;
-@synthesize sourceId;
-@synthesize sourceType;
-@synthesize sourceReason;
+@synthesize sceneCode;
+@synthesize name;
+@synthesize pricure;
+@synthesize category;
+@synthesize style;
+@synthesize space;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -772,20 +792,17 @@
 
 @end
 
-@implementation TOShopcartEntity
-@synthesize goods;
+@implementation TOShippingAddrEntity
 @synthesize fid;
-@synthesize createName;
-@synthesize createBy;
 @synthesize createDate;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize updateDate;
-@synthesize goodsId;
-@synthesize goodsNum;
+@synthesize sysOrgCode;
+@synthesize name;
+@synthesize miblephone;
+@synthesize province;
+@synthesize city;
+@synthesize country;
+@synthesize address;
 @synthesize consumerId;
-@synthesize resellerId;
-@synthesize costPrice;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -803,10 +820,11 @@
 
 @end
 
-@implementation UCN
-@synthesize uuid;
-@synthesize code;
+@implementation TOStudyTypeEntity
+@synthesize fid;
 @synthesize name;
+@synthesize attachmentId;
+@synthesize attachment;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -814,6 +832,14 @@
 }
 
 
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
+
 @end
 
 @implementation Action
@@ -824,14 +850,58 @@
 }
 
 
+@end
+
+@implementation IdEntity
+@synthesize fid;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
+
 @end
 
 NSString * const SORTDIRECTION_ASC = @"asc";
 NSString * const SORTDIRECTION_DESC = @"desc";
 
 
-@implementation IdEntity
+@implementation UCN
+@synthesize uuid;
+@synthesize code;
+@synthesize name;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
+@end
+
+@implementation TOShopcartEntity
+@synthesize goods;
 @synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize goodsId;
+@synthesize goodsNum;
+@synthesize consumerId;
+@synthesize resellerId;
+@synthesize costPrice;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -849,11 +919,14 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOStudyTypeEntity
+@implementation TOScoreRecordEntity
 @synthesize fid;
-@synthesize name;
-@synthesize attachmentId;
-@synthesize attachment;
+@synthesize createDate;
+@synthesize employeeId;
+@synthesize score;
+@synthesize sourceId;
+@synthesize sourceType;
+@synthesize sourceReason;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -871,17 +944,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOShippingAddrEntity
+@implementation TOPrizeEntity
 @synthesize fid;
-@synthesize createDate;
-@synthesize sysOrgCode;
+@synthesize picture;
+@synthesize createName;
+@synthesize createBy;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize code;
 @synthesize name;
-@synthesize miblephone;
-@synthesize province;
-@synthesize city;
-@synthesize country;
-@synthesize address;
-@synthesize consumerId;
+@synthesize createDate;
+@synthesize updateDate;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -899,14 +972,22 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOSceneEntity
+@implementation TOPrizeBillEntity
 @synthesize fid;
-@synthesize sceneCode;
-@synthesize name;
-@synthesize pricure;
-@synthesize category;
-@synthesize style;
-@synthesize space;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize billnumber;
+@synthesize state;
+@synthesize receiver;
+@synthesize mobilephone;
+@synthesize receiveAddress;
+@synthesize employee;
+@synthesize logisticsCompany;
+@synthesize trackingNumber;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -924,15 +1005,39 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED = @"requested";
-NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED = @"shipped";
-NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
+@implementation TOPositionEntity
+@synthesize fid;
+@synthesize code;
+@synthesize name;
+@synthesize commission;
+@synthesize lowestDiscount;
+@synthesize resellerCode;
 
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
 
-@implementation TOPrizeBillDetailsEntity
+
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
+
+@end
+
+@implementation TOPassLevelTopicEntity
 @synthesize fid;
-@synthesize bill;
-@synthesize prize;
+@synthesize topicType;
+@synthesize lineNo;
+@synthesize title;
+@synthesize answer;
+@synthesize grade;
+@synthesize passLevelId;
+@synthesize options;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -950,6 +1055,13 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
 
 @end
 
+NSString * const PASSLEVELTOPICTYPE_SINGLE = @"single";
+NSString * const PASSLEVELTOPICTYPE_MULTIPLE = @"multiple";
+NSString * const PASSLEVELTOPICTYPE_TRUEORFALSE = @"trueorfalse";
+NSString * const PASSLEVELTOPICTYPE_GAPFILLING = @"gapFilling";
+NSString * const PASSLEVELTOPICTYPE_SHORTANSWER = @"shortAnswer";
+
+
 @implementation TOOrderPromotionEntity
 @synthesize fid;
 @synthesize createName;
@@ -970,7 +1082,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
 @synthesize wxcardNumber;
 @synthesize wxcardDenomation;
 @synthesize wxcardRealDeduction;
-@synthesize JDEcardDenomation;
+@synthesize jdEcardDenomation;
 @synthesize redPackageNumber;
 @synthesize redPackageCount;
 @synthesize prority;
@@ -1649,8 +1761,8 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
 
 @end
 
-@implementation SceneResponse
-@synthesize list;
+@implementation PassLevelResponse
+@synthesize passLevelEntity;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1669,6 +1781,17 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
 }
 
 
+@end
+
+@implementation SceneResponse
+@synthesize list;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation PrizeResponse
@@ -1760,6 +1883,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
 @synthesize updateBy;
 @synthesize updateName;
 @synthesize position;
+@synthesize note;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {