V4.9.9测试版第一次提交 构建版本9.9.1

Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishKanKanListViewController.m

@@ -12,7 +12,6 @@
 #import "IfishKankanListModel.h"
 
 #import "LXAdScrollView.h"
-#import "WoDeKanKanViewController.h"
 
 #define TABBAR_H self.tabBarController.tabBar.frame.size.height
 
@@ -76,7 +75,6 @@
     self.navigationItem.rightBarButtonItem = rightItem;
     [self creatUI];
     [self creatReatRefreshView];
-    //[self loadBannerData];
     [self loadNewBannerData];
     
 }
@@ -127,42 +125,11 @@
 -(void)pushMyKankan{
     
     self.hidesBottomBarWhenPushed = YES;
-    // WoDeKanKanViewController *wodeKakanVC=[[WoDeKanKanViewController alloc] init];
     MineKankanEditViewController *editVC = [[MineKankanEditViewController alloc] init];
     _isPushEdit = YES;
     [self.navigationController pushViewController:editVC animated:YES];
     
 }
-
-#pragma mark -v4.1 前 看看banner
--(void)loadBannerData{
-    __weak typeof (self)weskSelf=self;
-  [AFHttpTool getLiveBannerSuccess:^(id response) {
-      
-      NSDictionary *reDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
-      if ([reDic[@"result"] isEqualToString:@"100"]){
-        NSArray*bannerArr=reDic[@"data"];
-          
-        for (NSDictionary *bannerDic in bannerArr) {
-            KanKanBanner *banner=[[KanKanBanner alloc] init];
-            banner.appShow = bannerDic[@"appShow"];
-            banner.bannerId = bannerDic[@"bannerId"];
-            banner.bannerImg = bannerDic[@"bannerImg"];
-            banner.bannerLink = bannerDic[@"bannerLink"];
-            banner.bannerType = bannerDic[@"bannerType"];
-            [_bannerImgArr addObject:banner.bannerImg];
-            [_bannerArray addObject:banner];
-        }
-         [weskSelf setingBannerViewData];
-      }
-      
-  } failure:^(NSError *err) {
-      
-      NSLog(@"loadBannererr%@",err);
-  }];
-    
-}
-
 #pragma mark -v4.1 后看看banner
 -(void)loadNewBannerData{
     
@@ -194,7 +161,6 @@
     _tableView.delegate=self;
     _tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
     _tableView.backgroundColor= TABLE_BACKGROUD_COLOR;
-    //_tableView.backgroundColor= [UIColor redColor];
     UIView *footerView=[[UIView alloc] initWithFrame:CGRectMake(0,0, kScreenSize.width, 0.1)];
     footerView.backgroundColor = [UIColor clearColor];
     _tableView.tableFooterView = footerView;
@@ -370,7 +336,7 @@
 
     
 }
-
+//跳转进入直播详情页面
 -(void)pushShareP2pView:(IfishKankanListModel *)listModel
 {
     KanHuListModel *kanHuCamera =[[KanHuListModel alloc] init];

Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m

@@ -7,7 +7,6 @@
 //
 
 #import "IfishP2PLivePlayViewController.h"
-#import "IfishP2PVideoPlayView.h"
 
 @interface IfishP2PLivePlayViewController ()<P2PShareViewBootomViewDelegate>
 
@@ -53,20 +52,6 @@
     [self.view bringSubviewToFront:self.subHbottomView];
 }
 
-//为用到
--(void)setupVideoPlayView{
-    
-    IfishP2PVideoPlayView *playView=[IfishP2PVideoPlayView videoPlayView];
-    playView.delegate=self;
-    // 播放器显示位置（竖屏时）
-    playView.frame = CGRectMake(0,64, self.view.bounds.size.width, self.view.bounds.size.width * 9 / 16);
-    
-    [self.view addSubview:playView];
-    // 指定一个作为播放的控制器
-    playView.contrainerViewController = self;
-    
-}
-
 - (void)didReceiveMemoryWarning {
     
     [super didReceiveMemoryWarning];
@@ -112,7 +97,6 @@
 //聊天
 -(void)chatBtnClickAction
 {
-
 }
 
 #pragma mark- 暂停 挂断
@@ -125,9 +109,7 @@
         while (self.isPlaying) {
             usleep(50*1000);
         }
-        [[P2PClient sharedClient] p2pHungUp];
-        
-        self.remoteView.isQuitMonitorInterface = NO;//rtsp监控界面弹出修改
+        [self.player p2pStop];
     }
     
 }
@@ -151,7 +133,6 @@
     
     ///[self.remoteView getLastImgGoback];
     [AppDelegate sharedDefault].canFullScreen = NO;
-    [self.remoteView releseromotViewSet];
     
     [self.navigationController popViewControllerAnimated:YES];