0.0.3修改外部数据传输失败

yinqiaojuan
1 parent 64362e47
Showing 6 changed files with 60 additions and 34 deletions
CNLiveWitnessVideoModule.podspec
CNLiveWitnessVideoModule/Classes/Controller/CNBWitnessListController.m
CNLiveWitnessVideoModule/Classes/ViewModel/CNBWitnessListViewModel.m
Example/CNLiveWitnessVideoModule/CNLIVEAppDelegate.m
Example/CNLiveWitnessVideoModule/CNLIVEViewController.m
Example/CNLiveWitnessVideoModule/main.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveWitnessVideoModule'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = '目击者视频播放功能'
 # This description is used to generate tags and improve search results.
@@ -56,23 +56,42 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
     if (self = [super init]) {
         _dataSource = [NSMutableArray array];
         _type = type;
-        _isHaveNext = @"1";
-        _pageIndex = pageNum + 1;
-        NSArray *list = data[@"witnessBeans"];
-        if ([type isEqualToString:@"0"]) {
-            _pageSize = 10;
-                _currentPlayIndex = currentIndex;
-            for (NSDictionary *dic in list) {
-                CNBWitnessListModel *witnessModel = [CNBWitnessListModel mj_objectWithKeyValues:dic];
-                [_dataSource addObject:witnessModel];
+        _pageSize = 10;
+        if (data && [data isKindOfClass:[NSDictionary class]] && data.count > 0) { //如果上一个页面传的有数据,且数据上传证据
+            if ([[data allKeys] containsObject:@"witnessBeans"] && data[@"witnessBeans"] && [data[@"witnessBeans"] isKindOfClass:[NSArray class]]) {
+                NSArray *list = data[@"witnessBeans"];
+                if (list.count > 0) {
+                    
+                    if ([type isEqualToString:@"0"]) {
+                        if (currentIndex > list.count) {
+                            _currentPlayIndex = 0;
+                        }else {
+                            _currentPlayIndex = currentIndex;
+                        }
+                        for (NSDictionary *dic in list) {
+                            CNBWitnessListModel *witnessModel = [CNBWitnessListModel mj_objectWithKeyValues:dic];
+                            [_dataSource addObject:witnessModel];
+                        }
+                    }else {
+                        NSDictionary *dic = list[currentIndex];
+                        CNBWitnessListModel *witnessModel = [CNBWitnessListModel mj_objectWithKeyValues:dic];
+                        [_dataSource addObject:witnessModel];
+                        _currentPlayIndex = 0;
+                    }
+                    _pageIndex = pageNum + 1;
+                    _isHaveNext = @"1";
+                }else {
+                    _isRefreshHeader = YES;
+                    _pageIndex = pageNum;
+                }
+            }else {
+                _isRefreshHeader = YES;
+                _pageIndex = pageNum;
             }
         }else {
-            NSDictionary *dic = list[currentIndex];
-            CNBWitnessListModel *witnessModel = [CNBWitnessListModel mj_objectWithKeyValues:dic];
-            [_dataSource addObject:witnessModel];
-            _currentPlayIndex = 0;
+            _isRefreshHeader = YES;
+            _pageIndex = pageNum;
         }
-        
     }
     return self;
 }
@@ -95,28 +114,29 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-    if (self.dataSource.count > 0) {
-        if ([self.type isEqualToString:@"0"]) {
-            self.toSid = ((CNBWitnessListModel *)[self.dataSource objectAtIndex:self.currentPlayIndex]).icon.sid;
-        }else {
-            self.toSid = ((CNBWitnessListModel *)self.dataSource[self.currentPlayIndex]).contentSid;
-        }
-        
-    }
     [self setLeftButton];
     [self setBackgroundImage];
     [self.view addSubview:self.tableView];
     _isLightContentStatusBar = YES;
     if (self.dataSource.count> 0) {
+        if ([self.type isEqualToString:@"0"]) {
+            self.toSid = ((CNBWitnessListModel *)[self.dataSource objectAtIndex:self.currentPlayIndex]).icon.sid;
+            self.tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshVideoList)];
+            self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(getMoreVideoList)];
+        }else {
+            self.toSid = ((CNBWitnessListModel *)self.dataSource[self.currentPlayIndex]).contentSid;
+        }
         [_tableView reloadData];
         [_tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:self.currentPlayIndex inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:NO];
         [self playIndex:self.currentPlayIndex isAutoPlay:YES];
+    }else {
+        if ([self.type isEqualToString:@"0"]) {
+            self.pageIndex = 1;
+            self.currentPlayIndex = 0;
+           [self loadWitnessData:self.pageIndex];
+        }
+        
     }
-    if ([self.type isEqualToString:@"0"]) {
-        self.tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshVideoList)];
-        self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(getMoreVideoList)];
-    }
-    
 }
 #pragma mark -添加关闭按钮
 - (void)setLeftButton {
@@ -213,8 +233,8 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
         if (!strongSelf) {
             return ;
         }
-        [strongSelf.tableView.mj_footer isRefreshing];
-        [strongSelf.tableView.mj_header isRefreshing];
+        [strongSelf.tableView.mj_footer endRefreshing];
+        [strongSelf.tableView.mj_header endRefreshing];
         strongSelf.isHaveNext = isHaveNext;
         if ([isHaveNext isEqualToString:@"1"]) {
             strongSelf.pageIndex ++;
@@ -12,6 +12,7 @@
 #import "CNBWitnessListModel.h"
 #import "MJExtension.h"
 #import <QMUIKit/QMUIKit.h>
+#import "CNUserInfoManager.h"
 #define CNBWitnessAppKeyWindow ([UIApplication sharedApplication].delegate).window
 @implementation CNBWitnessListViewModel
 + (void)getWitnessListDataTosid:(NSString *)toSid page:(NSInteger)page pageSize:(NSInteger)pageSize successBlock:(void(^)(NSMutableArray *dataArray,NSString *isHaveNext))successBlock failureBlock:(void (^)(NSError *error))failureBlock {
@@ -19,13 +20,13 @@
     NSString *url = @"";
     NSDictionary *param = [NSDictionary dictionary];
         param = @{
-                  @"toSid" :CNLiveStringIsEmpty(toSid)? @"":toSid,
+                  @"toSid" :CNLiveStringIsEmpty(toSid)?CNUserShareModelUid:toSid,
                   @"pageNo" :[NSString stringWithFormat:@"%ld",page],
                   @"pageSize" :[NSString stringWithFormat:@"%ld",pageSize],
                   @"type":@"0",
                   @"reviewStatus":@"1"
                   };
-        https://apiwjjtest.cnlive.com/Daren/bWitness/getBWitnessList.action
+    https://apiwjjtest.cnlive.com/Daren/bWitness/getBWitnessList.action
         url = cn_API_Host(@"/Daren/bWitness/getBWitnessList.action");
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
@@ -33,6 +33,7 @@ static NSString * uuid;
     [mDict setValue:@"i" forKey:@"plat"];
     [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
     [mDict setObject:AppId forKey:@"appId"];
+    [mDict setObject:@"10511059" forKey:@"sid"];
     [CNLiveNetworking setupDefaultParam:mDict];
     [CNLiveNetworking setupShowResult:NO];
     [CNLiveNetworking setupSignKey:APPKey];
@@ -74,7 +74,7 @@
 //    CNBWitnessListController *vc = [[CNBWitnessListController alloc]initControllerWithData:self.data currentIndex:indexPath.row pageNum:1 type:@"0"];
 //    [self.navigationController pushViewController:vc animated:YES];
     id <CNBWitnessVideoPlayProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNBWitnessVideoPlayProtocol)];
-    [service pushToWitnessVideoController:self.data currentIndex:indexPath.row pageNum:1 type:@"0"];
+    [service pushToWitnessVideoController:self.data currentIndex:12 pageNum:1 type:@"0"];
 }
 - (void)getWitnessListDataTosid:(NSString *)toSid page:(NSInteger)page pageSize:(NSInteger)pageSize type:(NSString *)type {
     NSString *url = @"";
@@ -83,7 +83,9 @@
         param = @{
             @"toSid" :CNLiveStringIsEmpty(toSid)? @"":toSid,
             @"pageNo" :[NSString stringWithFormat:@"%ld",page],
-            @"pageSize" :[NSString stringWithFormat:@"%ld",pageSize]
+            @"pageSize" :[NSString stringWithFormat:@"%ld",pageSize],
+            @"type":@"0",
+            @"reviewStatus":@"1"
         };
        url = cn_API_Host(@"/Daren/bWitness/getBWitnessList.action");
@@ -7,11 +7,13 @@
 //
 @import UIKit;
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import "CNLIVEAppDelegate.h"
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
+         [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveDebugAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }