0.0.8

liushiyu
1 parent 93a42607
Showing 10 changed files with 38 additions and 26 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteAnnouListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetaiListlViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskListViewController.m
CNLiveCMineModule/Classes/inte/Model/CNLiveCMineInteModel.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderSignView.m
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.h
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.m
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.0.7'
+  s.version          = '0.0.8'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -88,9 +88,9 @@
 {
     CNLiveCMineInteListSubModel * annouModel = self.annouModel.list[indexPath.row];
     if ([annouModel.model isEqualToString:@"3"] || [annouModel.model isEqualToString:@"3_roof"]) {
-        BOOL isCont = [annouModel.shareUrl cn_containsString:@"?"];
-        NSString * shreUrl = [NSString stringWithFormat:@"%@%@contentId=%@",annouModel.shareUrl,isCont?@"&":@"?",annouModel.contentId];
-        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:shreUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
+//        BOOL isCont = [annouModel.shareUrl cn_containsString:@"?"];
+        NSString * shreUrl = [NSString stringWithFormat:@"/cnPointsAnnouncement.html?contentId=%@&isShowTitle=true",annouModel.contentId];
+        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:cn_WjjH5_Host(shreUrl) statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
     }
 }
 -(UIStatusBarStyle)preferredStatusBarStyle
@@ -11,6 +11,7 @@
 @property (nonatomic, weak) CNLiveCMineInteDetailViewController * detailVC;
 @property (nonatomic, strong) CNLiveCMineInteDetailModel * listModel;//数据源
 @property (nonatomic, strong) CNLiveRefreshFooter * footerView;//加载
+@property (nonatomic, strong) NSMutableArray * dataArray;
 @property (nonatomic, assign) NSInteger pageNo;
 @end
@@ -23,6 +24,7 @@
 {
     self = [super init];
     if (self) {
+        _dataArray = [[NSMutableArray alloc] init];
         _currentMonth = currentMonth;
         _currentInte = currentInte;
         _currentType = currentType;
@@ -46,11 +48,13 @@
     self.pageNo = pageNo;
     self.currentType = currentType;
     self.currentMonth = currentMonth;
-    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSError * _Nonnull error) {
+    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSArray * _Nonnull dataArray, NSError * _Nonnull error) {
         [self addMainRefreshView];
         if (!error && listModel) {
             listModel.currentInte = weakSelf.currentInte;
             weakSelf.listModel = listModel;
+            if (pageNo == 1) weakSelf.dataArray = dataArray.mutableCopy;
+            if (pageNo > 1) [weakSelf.dataArray addObjectsFromArray:dataArray];
             weakSelf.detailVC.headerView.detailModel = listModel;
             [weakSelf.tableView reloadData];
             [weakSelf.tableView.mj_footer endRefreshing];
@@ -101,7 +105,7 @@
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.height = kScreenHeight - kNavigationBarHeight - 44;
+    self.tableView.height = kScreenHeight - kNavigationBarHeight - kVerticalBottomSafeHeight - 44;
 }
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -146,7 +150,7 @@
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return self.listModel.integralList.count;
+    return self.dataArray.count;
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -155,7 +159,7 @@
     if (!cell) {
         cell = [[CNLiveCMineDetailTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cell"];
     }
-    cell.listModel = self.listModel.integralList[indexPath.row];
+    cell.listModel = self.dataArray[indexPath.row];
     return cell;
 }
@@ -166,9 +170,11 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CNLiveCMineInteDetailListModel * listModel = self.listModel.integralList[indexPath.row];
+    CNLiveCMineInteDetailListModel * listModel = self.dataArray[indexPath.row];
     if ([listModel.state isEqualToString:@"1"]) {
-        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:cn_API_Managemall(@"/html/select_good/1/#/pointsExchangeRecords?type=3") statue:CNLiveCMineIntePushWebViewStatueTask];
+        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:@"" statue:CNLiveCMineIntePushWebViewStatueCoupons];
+    } else if ([listModel.state isEqualToString:@"2"]) {
+        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:@"" statue:CNLiveCMineIntePushWebViewStatueOrderList];
     }
 }
@@ -69,7 +69,7 @@
 -(void)layoutTableView
 {
     [super layoutTableView];
-    self.tableView.height = kScreenHeight - kNavigationBarHeight - 184;
+    self.tableView.height = kScreenHeight - kNavigationBarHeight - kVerticalBottomSafeHeight - 184;
 }
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *currentInte;
 @end
 @interface CNLiveCMineInteDetailListModel : NSObject<NSCoding>
-/**1-跳转  2-不跳转*/
+/**1-跳转优惠券  2-跳订单列表 3-不跳转*/
 @property (nonatomic, copy) NSString *state;
 /**积分*/
 @property (nonatomic, copy) NSString *integral;
@@ -169,8 +169,8 @@
     self.dateLabel.text = listModel.exchangeTime;
     self.coinsLabel.text = listModel.integral;
     self.coinsLabel.textColor = [listModel.integral cn_containsString:@"-"]?UIColorHex(0x00C657):UIColorHex(0xF5A623);
-    self.lookButton.hidden = [listModel.state isEqualToString:@"2"];
-    if ([listModel.state isEqualToString:@"1"]) {
+    self.lookButton.hidden = [listModel.state isEqualToString:@"3"];
+    if ([listModel.state isEqualToString:@"1"] || [listModel.state isEqualToString:@"2"]) {
         __weak typeof(self) weakSelf = self;
         [self.coinsLabel mas_updateConstraints:^(MASConstraintMaker *make) {
             make.centerY.mas_equalTo(weakSelf.contentView).offset(-10);
@@ -56,7 +56,7 @@
     [self.topView addSubview:coinsView];
     CGFloat item_w = (SCREEN_WIDTH - 60)/7;
-    CGFloat item_h = item_w * 1.33;
+    CGFloat item_h = 60.0f;//item_w * 1.33;
     for (int i = 0; i < 7; i++) {
         UIView * temp_v = [[UIView alloc] initWithFrame:CGRectMake(i * (item_w + 5), 0, item_w, 90)];
         temp_v.backgroundColor = [UIColor clearColor];
@@ -69,12 +69,12 @@
         [temp_v addSubview:coinsV];
         [self.coinsViews addObject:coinsV];
-        UIImageView * coins = [[UIImageView alloc] initWithFrame:CGRectMake((item_w - 30)/2, 10, 30, 30)];
+        UIImageView * coins = [[UIImageView alloc] initWithFrame:CGRectMake((item_w - 30)/2, 5, 30, 30)];
         coins.image = [CNLiveCMineService imageWithMineName:@"c_mine_content_gold_coins"];
         coins.backgroundColor = [UIColor clearColor];
         [coinsV addSubview:coins];
-        UILabel * numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 40, item_w, 20)];
+        UILabel * numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 35, item_w, 20)];
         numberLabel.backgroundColor = [UIColor clearColor];
         numberLabel.textColor = [UIColor whiteColor];
         numberLabel.textAlignment = NSTextAlignmentCenter;
@@ -114,15 +114,18 @@
     }];
     [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(weakSelf.bottemView).offset(5);
-        make.left.mas_equalTo(weakSelf.bottemView.mas_left).offset(30);
+        make.left.mas_equalTo(weakSelf.bottemView.mas_left).offset(10);
+        make.height.mas_equalTo(30);
+        make.width.mas_equalTo(40);
     }];
     [self.moreView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(weakSelf.iconView);
         make.right.mas_equalTo(weakSelf.bottemView.mas_right).offset(-20);
+        make.size.mas_equalTo(20);
     }];
     [self.annouLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(weakSelf.iconView);
-        make.left.mas_equalTo(weakSelf.iconView.mas_right).offset(20);
+        make.left.mas_equalTo(weakSelf.iconView.mas_right).offset(10);
         make.right.mas_equalTo(weakSelf.moreView.mas_left).offset(-10);
     }];
     [self.clearButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -232,7 +235,7 @@
 {
     if (!_iconView) {
         _iconView = [[UIImageView alloc] initWithFrame:CGRectZero];
-        _iconView.contentMode = UIViewContentModeScaleAspectFill;
+        _iconView.contentMode = UIViewContentModeScaleAspectFit;
         _iconView.backgroundColor = [UIColor whiteColor];
         _iconView.image = [CNLiveCMineService imageWithMineName:@"c_mine_content_announ"];
     }
@@ -242,7 +245,7 @@
 {
     if (!_moreView) {
         _moreView = [[UIImageView alloc] initWithFrame:CGRectZero];
-        _moreView.contentMode = UIViewContentModeScaleAspectFill;
+        _moreView.contentMode = UIViewContentModeScaleAspectFit;
         _moreView.backgroundColor = [UIColor whiteColor];
         _moreView.image = [CNLiveCMineService imageWithMineName:@"c_mine_skip_more"];
     }
@@ -23,7 +23,9 @@ typedef enum : NSUInteger {
 typedef enum : NSUInteger {
     CNLiveCMineIntePushWebViewStatueMall,//商城 调主工程
     CNLiveCMineIntePushWebViewStatueRule,//积分规则 调主工程
-    CNLiveCMineIntePushWebViewStatueTask,//积分乐园 调主工程
+    CNLiveCMineIntePushWebViewStatueTask,//积分任务 调主工程
+    CNLiveCMineIntePushWebViewStatueCoupons,//优惠券 调主工程
+    CNLiveCMineIntePushWebViewStatueOrderList,//订单列表 调主工程
     CNLiveCMineIntePushWebViewStatueExchange,//积分兑换 调主工程
     CNLiveCMineIntePushWebViewStatueAnnotationDetail,//公告详情页 调主工程
 } CNLiveCMineIntePushWebViewStatue;
@@ -45,7 +47,7 @@ typedef void(^ClickActionBlock)(CNLiveCMineInteScoreModel * scoreModel,
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSError *error))completerBlock;
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSArray * dataArray,NSError *error))completerBlock;
 @end
@@ -148,7 +148,7 @@
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSError *))completerBlock
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSArray *,NSError *))completerBlock
 {
     NSDictionary * paramDict = @{
         @"sid":[CNUserInfoManager manager].userInfoModel.uid,
@@ -162,7 +162,8 @@
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:cn_API_Host(@"/Daren/integral/integralRecordNew.action") Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         CNLiveCMineInteDetailModel * listModel = [CNLiveCMineInteDetailModel mj_objectWithKeyValues:responseObject];
         listModel.date_string = currentMonth;
-        if (completerBlock) completerBlock(listModel,error);
+        NSMutableArray * tempArray = listModel.integralList.mutableCopy;
+        if (completerBlock) completerBlock(listModel,tempArray,error);
     }];
 }
@@ -28,7 +28,7 @@
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-    [CNUserInfoManager manager].userInfoModel.uid = @"353001";
+    [CNUserInfoManager manager].userInfoModel.uid = @"10510277";//@"353001";
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];