0.0.3

liushiyu
1 parent c85a2c39
Showing 14 changed files with 91 additions and 16 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNLiveCMineModule.h
CNLiveCMineModule/Classes/CNLiveCMineModule.m
CNLiveCMineModule/Classes/CNLiveCMineProtocol.h
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteAnnouListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskListViewController.h
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteViewController.h
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteViewController.m
CNLiveCMineModule/Classes/inte/Model/CNLiveCMineInteModel.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.h
Example/CNLiveCMineModule/CNLiveCMineViewModuleImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -11,8 +11,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCMineModule : NSObject
-/// 跳转工程中的我的积分界面
-+(void)pushVCWithInteView;
+/// 跳转积分界面
+/// @param from 来源标识符
+/// @param feedback 是不是从反馈意见成功界面过来的,如果是 则直接从当前页面返回回到指定界面
++(void)pushVCWithInteViewToFrom:(NSString *)from Feedback:(BOOL)feedback;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -9,10 +9,16 @@
 @implementation CNLiveCMineModule
-/// 跳转工程中的我的积分界面
-+(void)pushVCWithInteView
+/// 跳转积分界面
+/// @param from 来源标识符
+/// @param feedback 是不是从反馈意见成功界面过来的,如果是 则直接从当前页面返回回到指定界面
++(void)pushVCWithInteViewToFrom:(NSString *)from Feedback:(BOOL)feedback;
 {
-    [[CNLiveCMineModule navigationViewController] pushViewController:[CNLiveCMineInteViewController new] animated:YES];
+    CNLiveCMineInteViewController * inteView = [[CNLiveCMineInteViewController alloc] init];
+    inteView.isFrom = from;
+    inteView.isFeedback = feedback;
+    inteView.hidesBottomBarWhenPushed = YES;
+    [[CNLiveCMineModule navigationViewController] pushViewController:inteView animated:YES];
 }
@@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param url 链接地址
 -(void)pushCMineInteContentForCMainWebViewWithURL:(NSString *)url statue:(CNLiveCMineIntePushWebViewStatue)statue;
+/// 积分任务跳转到不同界面去完成
+/// @param param 参数
+/// @param currentVC 当前控制器
+-(void)pushCMineInteContentForCMainCustomFunctionVCParam:(NSDictionary *)param CurrentVC:(UIViewController *)currentVC;
+
 /// 我的积分跳转主工程我的客服界面
 -(void)pushCMineInteContentForCMainPlatFromCustomerMedthod;
@@ -87,7 +87,9 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CNLiveCMineInteListSubModel * annouModel = self.annouModel.list[indexPath.row];
-    [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:annouModel.shareUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
+    BOOL isCont = [annouModel.shareUrl cn_containsString:@"?"];
+    NSString * shreUrl = [NSString stringWithFormat:@"%@%@contentId=%@",annouModel.shareUrl,isCont?@"&":@"?",annouModel.contentId];
+    [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:shreUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
 }
 #pragma mark = getter
 - (CNLiveNavigationBar *)navigationBar {
@@ -6,14 +6,16 @@
 //
 #import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
-
+#import "CNLiveCMineInteTaskViewController.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCMineInteTaskListViewController : CNCommonListViewController<JXPagerViewListViewDelegate>
 /// 初始化任务列表
 /// @param taskArray 数据源
-- (instancetype)initWithTaskArray:(NSArray *)taskArray;
+/// @param taskVC 控制器
+- (instancetype)initWithTaskArray:(NSArray *)taskArray
+                           TaskVC:(CNLiveCMineInteTaskViewController *)taskVC;
 /// 滚动回调
 @property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView);
@@ -7,8 +7,9 @@
 #import "CNLiveCMineInteTaskListViewController.h"
 #import "CNLiveCMineInteCollectionViewCell.h"
-@interface CNLiveCMineInteTaskListViewController ()
+@interface CNLiveCMineInteTaskListViewController ()
+@property (nonatomic, weak) CNLiveCMineInteTaskViewController * taskVC;
 @property (nonatomic, strong) NSArray * taskArray;//数据源
 @end
@@ -17,18 +18,40 @@
 /// 初始化任务列表
 /// @param taskArray 数据源
-- (instancetype)initWithTaskArray:(NSArray *)taskArray;
+- (instancetype)initWithTaskArray:(NSArray *)taskArray TaskVC:(CNLiveCMineInteTaskViewController *)taskVC
 {
     self = [super init];
     if (self) {
+        _taskVC = taskVC;
         _taskArray = taskArray;
     }
     return self;
 }
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveCMineInteTaskAddScoreRequestSuccessNotification object:nil];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = UIColorHex(0xf9f9f9);
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(successAddScoreNotification:) name:kCNLiveCMineInteTaskAddScoreRequestSuccessNotification object:nil];
+}
+-(void)successAddScoreNotification:(NSNotification *)note
+{
+    NSString *taskId = note.userInfo[@"taskId"];
+    //改变任务次数
+    NSArray *arr = [self.tableView indexPathsForVisibleRows];
+    for (NSIndexPath *indexPath in arr) {
+        CNLiveCMineTaskTableViewCell *cell = (CNLiveCMineTaskTableViewCell *)[self.tableView cellForRowAtIndexPath:indexPath];
+        if ([taskId isEqualToString:cell.taskModel.taskId]) {
+            CNLiveCMineInteTaskListItemModel * taskModel = self.taskArray[indexPath.row];
+            taskModel.times += 1;
+            [self.tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationAutomatic];
+            return;
+        }
+    }
 }
 - (void)initTableView
 {
@@ -77,7 +100,7 @@
 {
     CNLiveCMineInteTaskListItemModel * taskModel = self.taskArray[indexPath.row];
     if(taskModel.times < taskModel.totalCount) {
-        NSLog(@"可以点击");
+        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainCustomFunctionVCParam:[taskModel mj_JSONObject] CurrentVC:self.taskVC];
     }
 }
@@ -97,8 +97,8 @@ static NSInteger const kCNLiveSectionHeaderHeight = 140;//头视图高度
 {
     if (!_viewControllers) {
         _viewControllers = [[NSMutableArray alloc] initWithArray:@[
-            [[CNLiveCMineInteTaskListViewController alloc] initWithTaskArray:self.taskModel.dailyTask],
-            [[CNLiveCMineInteTaskListViewController alloc] initWithTaskArray:self.taskModel.firstTask]
+            [[CNLiveCMineInteTaskListViewController alloc] initWithTaskArray:self.taskModel.dailyTask TaskVC:self],
+            [[CNLiveCMineInteTaskListViewController alloc] initWithTaskArray:self.taskModel.firstTask TaskVC:self]
         ]];
     }
     return _viewControllers;
@@ -11,6 +11,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCMineInteViewController : CNCommonViewController
+@property (nonatomic, copy) NSString *isFrom;
+/// 是不是从反馈意见成功界面过来的,如果是 则直接从当前页面返回回到指定界面
+@property (nonatomic, assign) BOOL isFeedback;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -18,6 +18,7 @@
 @property (nonatomic, strong) CNLiveCMineInteListModel * announModel;  //公告数据
 @property (nonatomic, strong) CNLiveCMineInteListModel * activModel;   //活动数据
+@property (nonatomic, strong) CNLiveCMineInteHeaderView *headerView;//头视图
 @property (nonatomic, strong) CNLiveNavigationBar * navigationBar;//导航栏
 @property (nonatomic, strong) UICollectionView * mainCollectionView;//主界面
 @property (nonatomic, strong) UIImageView * backView;
@@ -46,9 +47,16 @@
         weakSelf.taskModel   = ![dataArray[1] isKindOfClass:NSString.class]?dataArray[1]:nil;
         weakSelf.announModel = ![dataArray[2] isKindOfClass:NSString.class]?dataArray[2]:nil;
         weakSelf.activModel  = ![dataArray[3] isKindOfClass:NSString.class]?dataArray[3]:nil;
+        
+        weakSelf.taskModel.from = weakSelf.isFrom;
+        weakSelf.taskModel.feedback = weakSelf.isFeedback;
         [weakSelf.mainCollectionView reloadData];
     }];
 }
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveCMineInteTaskAddScoreRequestSuccessNotification object:nil];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -57,6 +65,16 @@
     [self.view addSubview:self.backView];
     [self.view addSubview:self.mainCollectionView];
     [self reloadDataSource];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(successAddScoreNotification:) name:kCNLiveCMineInteTaskAddScoreRequestSuccessNotification object:nil];
+}
+
+-(void)successAddScoreNotification:(NSNotification *)note
+{
+    NSInteger addScore = [note.userInfo[@"score"] integerValue];
+    NSInteger scored = [self.taskModel.integral integerValue];
+    self.taskModel.integral = [NSString stringWithFormat:@"%ld",scored + addScore];
+    [self.headerView setupWithScoreModel:self.scoreModel taskModel:self.taskModel announModel:self.announModel];
 }
 #pragma mark - UICollectionViewDelegate,UICollectionViewDataSource
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
@@ -98,9 +116,10 @@
                 [weakSelf.navigationController pushViewController:annouView animated:YES];
             } else {
                 NSString * url = cn_API_Managemall(@"/html/select_good/1/#/pointsMall");
-                [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:url statue:CNLiveCMineIntePushWebViewStatueRule];
+                [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:url statue:CNLiveCMineIntePushWebViewStatueMall];
             }
         }];
+        self.headerView = headerView;
         return headerView;
     }
     return nil;
@@ -42,6 +42,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *integral;
 @property (nonatomic, strong) NSArray *dailyTask;
 @property (nonatomic, strong) NSArray *firstTask;
+
+@property (nonatomic, copy) NSString *from;//自定义
+@property (nonatomic, assign) BOOL feedback;//自定义
 @end
 @interface CNLiveCMineInteTaskListItemModel : NSObject<NSCoding>
@@ -317,7 +317,7 @@
     [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x23D41E) range:range];
     self.progressLabel.attributedText = str;
-    if(taskModel.times >= taskModel.totalCount) {
+    if (taskModel.times >= taskModel.totalCount) {
         [self.completeBtn setTitle:@"已完成" forState:UIControlStateNormal];
         [self.completeBtn setImage:nil forState:UIControlStateNormal];
         self.completeBtn.backgroundColor = UIColorHex(0xF0F0F0);
@@ -9,6 +9,8 @@
 #import "CNLiveCMineInteModel.h"
 NS_ASSUME_NONNULL_BEGIN
+/**任务完成增加积分通知*/
+static NSString * const kCNLiveCMineInteTaskAddScoreRequestSuccessNotification = @"AddScoreRequestSuccess";
 typedef enum : NSUInteger {
     CNLiveCMineInteHeaderClickDetail = 1,//积分明细
@@ -28,5 +28,11 @@
 }
+/// 积分任务跳转到不同界面去完成
+/// @param param 参数
+-(void)pushCMineInteContentForCMainCustomFunctionVCParam:(NSDictionary *)param
+{
+    NSLog(@"跳转不同积分任务=>%@",param);
+}
 @end