0.1.0

liushiyu
1 parent d8e681e9
Showing 15 changed files with 76 additions and 23 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNLiveCMineModule.h
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteAnnouListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetaiListlViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetailViewController.h
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetailViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteViewController.m
CNLiveCMineModule/Classes/inte/Model/CNLiveCMineInteModel.h
CNLiveCMineModule/Classes/inte/Model/CNLiveCMineInteModel.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteDetailHeaderView.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderCustomView.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderCustomView.m
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.0.9'
+  s.version          = '0.1.0'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -3,7 +3,7 @@
 //  CNLiveCMineModule
 //
 //  Created by open on 2021/12/28.
-//
+//  0.1.0
 #import <Foundation/Foundation.h>
@@ -17,14 +17,17 @@
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+//    self.navigationController.navigationBarHidden = YES;
 }
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    self.navigationController.navigationBarHidden = NO;
+//    self.navigationController.navigationBarHidden = NO;
+}
+-(BOOL)preferredNavigationBarHidden
+{
+    return YES;
 }
-
 - (instancetype)initWithAnnouModel:(CNLiveCMineInteListModel *)annouModel
 {
     self = [super init];
@@ -84,7 +84,7 @@
     if (self.detailVC.pagingView.mainTableView.mj_header) return;
     CNLiveRefreshHeader * headerRefresh = [CNLiveRefreshHeader headerWithRefreshingBlock:^{
         weakSelf.pageNo = 1;
-        [weakSelf requestDataSourceWithPageNo:weakSelf.pageNo CurrentMonth:weakSelf.currentMonth CurrentType:weakSelf.currentType];
+        [(CNLiveCMineInteDetaiListlViewController *)[weakSelf.detailVC setupWithCurrentDetailVC] requestDataSourceWithPageNo:weakSelf.pageNo CurrentMonth:weakSelf.currentMonth CurrentType:[weakSelf.detailVC setupWithCurrentDetailType]];
     }];
     headerRefresh.isShowWhite = YES;
     self.detailVC.pagingView.mainTableView.mj_header = headerRefresh;
@@ -19,6 +19,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param inte 积分
 - (instancetype)initWithInte:(NSString *)inte;
+/// 获取列表界面
+-(UIViewController *)setupWithCurrentDetailVC;
+
+/// 获取类型
+-(NSInteger)setupWithCurrentDetailType;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -12,6 +12,7 @@ static NSInteger const kCNLiveSectionTitleHeight = 44;//标题显示
 static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
 @interface CNLiveCMineInteDetailViewController ()<JXCategoryViewDelegate,JXPagerViewDelegate>
+/// 界面集合
 @property (nonatomic, strong) NSMutableArray<CNLiveCMineInteDetaiListlViewController *> *viewControllers;
 @property (nonatomic, strong) CNLiveNavigationBar * navigationBar;//导航栏
 @property (nonatomic, strong) JXCategoryTitleView *categoryView;
@@ -21,6 +22,7 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
 @property (nonatomic, assign) NSInteger currentType;//1-全部 2-获取 3-支出
 @property (nonatomic, copy) NSString * inte;//总积分
 @property (nonatomic, copy) NSString * currentMonth;//时间
+@property (nonatomic, strong) NSDate * currentDate;//时间
 @end
 @implementation CNLiveCMineInteDetailViewController
@@ -28,14 +30,17 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+//    self.navigationController.navigationBarHidden = YES;
 }
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    self.navigationController.navigationBarHidden = NO;
+//    self.navigationController.navigationBarHidden = NO;
+}
+-(BOOL)preferredNavigationBarHidden
+{
+    return YES;
 }
-
 - (instancetype)initWithInte:(NSString *)inte
 {
     self = [super init];
@@ -54,6 +59,7 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM"];
     self.currentMonth = [dateFormatter stringFromDate:[NSDate date]];
+    self.currentDate = [NSDate date];
     [self.view addSubview:self.backView];
     [self.view addSubview:self.pagingView];
@@ -67,7 +73,7 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
     self.headerView = [[CNLiveCMineInteDetailHeaderView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kCNLiveSectionHeaderHeight)];
     self.headerView.backgroundColor = [UIColor clearColor];
     self.headerView.selectWithDateBlock = ^{
-        [CNLiveCMineInteHeaderCustomView showWithSelectMonthDateForCurrentVC:weakSelf];
+        [CNLiveCMineInteHeaderCustomView showWithSelectMonthDateForCurrentTime:weakSelf.currentDate CurrentVC:weakSelf];
     };
     return self.headerView;
 }
@@ -112,6 +118,7 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
     [dateFormatter setLocale:[NSLocale currentLocale]];
     [dateFormatter setDateFormat:@"yyyy-MM"];
     self.currentMonth = [dateFormatter stringFromDate:date];
+    self.currentDate = date;
     CNLiveCMineInteDetaiListlViewController * listView01 = self.viewControllers[0];
     [listView01 requestDataSourceWithPageNo:1 CurrentMonth:self.currentMonth CurrentType:1];
@@ -133,6 +140,17 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
     return _viewControllers;
 }
+/// 获取列表界面
+-(UIViewController *)setupWithCurrentDetailVC
+{
+    CNLiveCMineInteDetaiListlViewController * listView = self.viewControllers[self.categoryView.selectedIndex];
+    return listView;
+}
+/// 获取类型
+-(NSInteger)setupWithCurrentDetailType
+{
+    return self.categoryView.selectedIndex + 1;
+}
 #pragma mark = getter
 -(JXPagerView *)pagingView
 {
@@ -26,14 +26,17 @@ static NSInteger const kCNLiveSectionHeaderHeight = 140;//头视图高度
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+//    self.navigationController.navigationBarHidden = YES;
 }
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    self.navigationController.navigationBarHidden = NO;
+//    self.navigationController.navigationBarHidden = NO;
+}
+-(BOOL)preferredNavigationBarHidden
+{
+    return YES;
 }
-
 - (instancetype)initWithTaskModel:(CNLiveCMineInteTaskListModel *)taskModel
 {
     self = [super init];
@@ -29,12 +29,17 @@
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
+//    self.navigationController.navigationBarHidden = YES;
+    [self reloadDataSource];
 }
 -(void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
-    self.navigationController.navigationBarHidden = NO;
+//    self.navigationController.navigationBarHidden = NO;
+}
+-(BOOL)preferredNavigationBarHidden
+{
+    return YES;
 }
 -(void)reloadDataSource
 {
@@ -64,7 +69,6 @@
     [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.backView];
     [self.view addSubview:self.mainCollectionView];
-    [self reloadDataSource];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(successAddScoreNotification:) name:kCNLiveCMineInteTaskAddScoreRequestSuccessNotification object:nil];
 }
@@ -180,6 +180,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *date_string;
 /**当前的总积分 自定义的*/
 @property (nonatomic, copy) NSString *currentInte;
+/**当前时间 自定义的*/
+@property (nonatomic, copy) NSDate *currentDate;
 @end
 @interface CNLiveCMineInteDetailListModel : NSObject<NSCoding>
 /**1-跳转优惠券  2-跳订单列表 3-不跳转*/
@@ -43,6 +43,18 @@ MJCodingImplementation
 @implementation CNLiveCMineInteListSubModel
 MJCodingImplementation
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+    if ([property.name isEqualToString:@"publishTime"]) {
+        NSString * publishTime = [NSString stringWithFormat:@"%@",oldValue];
+        NSArray * array00 = [publishTime componentsSeparatedByString:@" "];
+        NSArray * array01 = [array00.lastObject componentsSeparatedByString:@":"];
+        NSString * newTime = [NSString stringWithFormat:@"%@ %@:%@",array00.firstObject,array01.firstObject,[array01 objectAtIndex:1]];
+        return newTime;
+    }
+    return oldValue;
+}
+
 @end
 @implementation CNLiveCMineInteListProductModel
@@ -286,12 +286,12 @@
         make.width.offset(70);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(weakSelf.mainView.mas_top).with.offset(15);
+        make.top.equalTo(weakSelf.mainView.mas_top).with.offset(10);
         make.left.equalTo(weakSelf.leftImage.mas_right).with.offset(10);
         make.right.equalTo(weakSelf.completeBtn.mas_left).with.offset(-10);
     }];
     [self.pointLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.equalTo(weakSelf.mainView.mas_bottom).with.offset(-15);
+        make.bottom.equalTo(weakSelf.mainView.mas_bottom).with.offset(-10);
         make.left.equalTo(weakSelf.leftImage.mas_right).with.offset(10);
     }];
     [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -36,12 +36,13 @@
     [coin_string addAttribute:NSFontAttributeName value:UIFontBoldCNMake(35) range:NSMakeRange(0, [coin_string.string rangeOfString:@"积分"].location)];
     self.inteLabel.attributedText = coin_string;
-    NSMutableAttributedString * spend_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"获取:%@",[detailModel.payIntegral isNotBlank]?detailModel.payIntegral:@"0"]];
+
+    NSMutableAttributedString * spend_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"获取:%@",[detailModel.obtainIntegral isNotBlank]?detailModel.obtainIntegral:@"0"]];
     [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[spend_string.string rangeOfString:@"获取:"]];
     [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [spend_string.string rangeOfString:@"获取:"].location)];
     self.spendLabel.attributedText = spend_string;
-    NSMutableAttributedString * obta_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"支出:%@",[detailModel.obtainIntegral isNotBlank]?detailModel.obtainIntegral:@"0"]];
+    NSMutableAttributedString * obta_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"支出:%@",[detailModel.payIntegral isNotBlank]?detailModel.payIntegral:@"0"]];
     [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[obta_string.string rangeOfString:@"支出:"]];
     [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [obta_string.string rangeOfString:@"支出:"].location)];
     self.obtaLabel.attributedText = obta_string;
@@ -23,8 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)showWithScoreViewForScoreIntergal:(NSString *)scoreIntergal Statue:(BOOL)statue;
 /// 显示选择样式
+/// @param currentTime 当前时间
 /// @param currentVC 当前界面
-+(void)showWithSelectMonthDateForCurrentVC:(CNLiveCMineInteDetailViewController *)currentVC;
++(void)showWithSelectMonthDateForCurrentTime:(NSDate *)currentTime CurrentVC:(CNLiveCMineInteDetailViewController *)currentVC;
 @end
@@ -177,7 +177,7 @@
 /// 显示选择样式
 /// @param currentVC 当前界面
-+(void)showWithSelectMonthDateForCurrentVC:(CNLiveCMineInteDetailViewController *)currentVC
++(void)showWithSelectMonthDateForCurrentTime:(NSDate *)currentTime CurrentVC:(CNLiveCMineInteDetailViewController *)currentVC
 {
     PGDatePickManager *datePickManager = [[PGDatePickManager alloc] init];
     datePickManager.style = PGDatePickManagerStyleSheet;
@@ -192,6 +192,9 @@
     datePicker.lineBackgroundColor = RGB(232, 232, 232);
     datePicker.textColorOfSelectedRow = KBlack51Color;
     datePicker.textColorOfOtherRow = RGB(169, 169, 169);
+    [datePicker setDate:currentTime];
+    
+    
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
     dateFormatter.dateFormat = @"yyyy-MM";
@@ -28,7 +28,7 @@
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-    [CNUserInfoManager manager].userInfoModel.uid = @"10510277";//@"353001";
+    [CNUserInfoManager manager].userInfoModel.uid = @"353001";//@"10510277";//
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];