no message

iOS-Xiaowen
1 parent 37b62239
Showing 16 changed files with 117 additions and 169 deletions
CNLiveBMineModule/Classes/Controller/CNLiveBMineController.h → CNLiveBMineModule/Classes/Controller/CNLiveMineController.h
CNLiveBMineModule/Classes/Controller/CNLiveBMineController.m → CNLiveBMineModule/Classes/Controller/CNLiveMineController.m
CNLiveBMineModule/Classes/Model/CNLiveBMineModel.h → CNLiveBMineModule/Classes/Model/CNLiveMineModel.h
CNLiveBMineModule/Classes/Model/CNLiveBMineModel.m → CNLiveBMineModule/Classes/Model/CNLiveMineModel.m
CNLiveBMineModule/Classes/Model/CNLiveBMineRequest.h → CNLiveBMineModule/Classes/Model/CNLiveMineRequest.h
CNLiveBMineModule/Classes/Model/CNLiveBMineRequest.m → CNLiveBMineModule/Classes/Model/CNLiveMineRequest.m
CNLiveBMineModule/Classes/Module/CNLiveBMineService.m
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveBMineModule/Classes/UserInfo/CNLiveUserInfoModel.m
CNLiveBMineModule/Classes/View/CNLiveBMineCell.h → CNLiveBMineModule/Classes/View/CNLiveMineCell.h
CNLiveBMineModule/Classes/View/CNLiveBMineCell.m → CNLiveBMineModule/Classes/View/CNLiveMineCell.m
CNLiveBMineModule/Classes/View/CNLiveBMineHeaderView.h → CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.h
CNLiveBMineModule/Classes/View/CNLiveBMineHeaderView.m → CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.m
Example/CNLiveBMineModule.xcodeproj/project.pbxproj
Example/CNLiveBMineModule/CNLIVEAppDelegate.m
 //
-//  CNLiveBMineController.h
+//  CNLiveMineController.h
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -14,7 +14,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBMineController : CNCommonViewController
+@interface CNLiveMineController : CNCommonViewController
 @end
@@ -6,7 +6,7 @@
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveBMineController.h"
+#import "CNLiveMineController.h"
 #import "MJExtension.h"
 #import "QMUIKit.h"
@@ -17,22 +17,22 @@
 //#import "CNLiveEnvironment.h"
 #import "CNLiveCategory.h"
-#import "CNLiveBMineHeaderView.h"
-#import "CNLiveBMineCell.h"
-#import "CNLiveBMineModel.h"
-#import "CNLiveBMineRequest.h"
+#import "CNLiveMineHeaderView.h"
+#import "CNLiveMineCell.h"
+#import "CNLiveMineModel.h"
+#import "CNLiveMineRequest.h"
 #import "CNLiveUserInfoController.h"
 #import "CNLiveSettingController.h"
-@interface CNLiveBMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveBMineHeaderViewDelegate, CNLiveBMineCellDelegate>
+@interface CNLiveMineController()<UITableViewDelegate, UITableViewDataSource, CNLiveMineHeaderViewDelegate, CNLiveMineCellDelegate>
 @property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, weak) CNLiveBMineHeaderView *headerView;
+@property (nonatomic, weak) CNLiveMineHeaderView *headerView;
 @property (nonatomic, strong) NSMutableArray *data;
 @end
-@implementation CNLiveBMineController
+@implementation CNLiveMineController
 static const NSInteger kHEIGHT = 253;
 static const CGFloat timeValue = 1.5;
@@ -53,7 +53,7 @@ static const CGFloat timeValue = 1.5;
                       }
                       ];
     for(NSDictionary *dic in data){
-        CNLiveBMineModel *model = [CNLiveBMineModel mj_objectWithKeyValues:dic];
+        CNLiveMineModel *model = [CNLiveMineModel mj_objectWithKeyValues:dic];
         [self.data addObject:model];
     }
     [self.tableView reloadData];
@@ -65,7 +65,7 @@ static const CGFloat timeValue = 1.5;
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
-    [self requestCertification];
+//    [self requestCertification];
     if(self.headerView){
         self.headerView.frame = CGRectMake(0, -kHEIGHT, SCREEN_WIDTH, kHEIGHT);
     }
@@ -88,7 +88,7 @@ static const CGFloat timeValue = 1.5;
 - (void)createSubViews {
     [self.view addSubview:self.tableView];
-    CNLiveBMineHeaderView *headerView = [[CNLiveBMineHeaderView alloc]initWithFrame:CGRectMake(0, -kHEIGHT, SCREEN_WIDTH, kHEIGHT)];
+    CNLiveMineHeaderView *headerView = [[CNLiveMineHeaderView alloc]initWithFrame:CGRectMake(0, -kHEIGHT, SCREEN_WIDTH, kHEIGHT)];
     headerView.delegate = self;
     headerView.tag = 666;
     [self.tableView addSubview:headerView];
@@ -116,7 +116,7 @@ static const CGFloat timeValue = 1.5;
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    CNLiveBMineCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBMineCell];
+    CNLiveMineCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveMineCell];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.delegate = self;
     cell.model = self.data[indexPath.row];
@@ -129,15 +129,15 @@ static const CGFloat timeValue = 1.5;
 }
 #pragma mark - CNLiveBMineHeaderViewDelegate
-- (void)headerView:(CNLiveBMineHeaderView *)headerView pushToController:(CNLiveBMineHeaderViewType)type{
+- (void)headerView:(CNLiveMineHeaderView *)headerView pushToController:(CNLiveMineHeaderViewType)type{
     switch (type) {
-        case CNLiveBMineHeaderViewTypeUerInfo:
+        case CNLiveMineHeaderViewTypeUerInfo:
         {
             CNLiveUserInfoController *vc = [[CNLiveUserInfoController alloc]init];
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
-        case CNLiveBMineHeaderViewTypeHome:
+        case CNLiveMineHeaderViewTypeHome:
         {
         }
@@ -146,34 +146,9 @@ static const CGFloat timeValue = 1.5;
 }
 #pragma mark - 请求方法
-// 请求签到赚积分
-- (void)requestSignIn{
-    self.headerView.interactionEnabled = NO;
-    [CNLiveBMineRequest signIn:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError * _Nonnull error) {
-        if (error.code == -1001 || error.code == -1009) {
-            [QMUITips showError:@"网络连接已断开" inView:self.view hideAfterDelay:timeValue];
-            return ;
-        }
-        if (isSuccess) {
-            id<CNLiveIntegralServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveIntegralServiceProtocol)];
-            NSInteger status = [data[@"status"] integerValue];
-            if (status == 1) {
-                [service showGoldWhereaboutsViewWithDic:data];
-            }else{
-                [service showSignInViewWithDic:data];
-            }
-
-        }else{
-            [QMUITips showError:@"签到失败" inView:self.view hideAfterDelay:timeValue];
-
-        }
-        self.headerView.interactionEnabled = YES;
-    }];
-}
-
 // 请求用户认证
 - (void)requestCertification{
-    [CNLiveBMineRequest certification:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError * _Nonnull error) {
+    [CNLiveMineRequest certification:^(BOOL isSuccess, NSDictionary * _Nonnull data, NSError * _Nonnull error) {
         if (error.code == -1001 || error.code == -1009) {
             [QMUITips showError:@"网络连接已断开" inView:self.view hideAfterDelay:timeValue];
             return ;
@@ -193,8 +168,8 @@ static const CGFloat timeValue = 1.5;
     }];
 }
-#pragma mark - CNLiveBMineCellDelegate
-- (void)cell:(CNLiveBMineCell *)cell didSelectItemAtItem:(NSInteger)item{
+#pragma mark - CNLiveMineCellDelegate
+- (void)cell:(CNLiveMineCell *)cell didSelectItemAtItem:(NSInteger)item{
 //    switch (cell.model.type) {
 //        case CNLiveBMineCellTypeOrder:
 //        {
@@ -316,7 +291,7 @@ static const CGFloat timeValue = 1.5;
         _tableView.estimatedRowHeight = 0;
         _tableView.estimatedSectionHeaderHeight = 0;
         _tableView.estimatedSectionFooterHeight = 0;
-        [_tableView registerClass:[CNLiveBMineCell class] forCellReuseIdentifier:kCNLiveBMineCell];
+        [_tableView registerClass:[CNLiveMineCell class] forCellReuseIdentifier:kCNLiveMineCell];
         _tableView.contentInset = UIEdgeInsetsMake(kHEIGHT, 0, 0, 0);
     }
     return _tableView;
 //
-//  CNLiveBMineModel.h
+//  CNLiveMineModel.h
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLiveBMineModel : NSObject
+@interface CNLiveMineModel : NSObject
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *image;
 //
-//  CNLiveBMineModel.m
+//  CNLiveMineModel.m
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveBMineModel.h"
+#import "CNLiveMineModel.h"
-@implementation CNLiveBMineModel
+@implementation CNLiveMineModel
 @end
 //
-//  CNLiveBMineRequest.h
+//  CNLiveMineRequest.h
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -10,17 +10,12 @@
 NS_ASSUME_NONNULL_BEGIN
 typedef void(^CertificationBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
-typedef void(^SignInBlock)(BOOL isSuccess, NSDictionary *data, NSError *error);
-@interface CNLiveBMineRequest : NSObject
+@interface CNLiveMineRequest : NSObject
 // 请求用户认证
 + (void)certification:(CertificationBlock)block;
-
-// 签到
-+ (void)signIn:(SignInBlock)block;
-
 @end
 NS_ASSUME_NONNULL_END
 //
-//  CNLiveBMineRequest.m
+//  CNLiveMineRequest.m
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveBMineRequest.h"
+#import "CNLiveMineRequest.h"
 #import "CNLiveCategory.h"
 #import "CNLiveNetworking.h"
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
-@implementation CNLiveBMineRequest
+@implementation CNLiveMineRequest
 // 请求用户认证
 + (void)certification:(CertificationBlock)block {
     NSDictionary *params = @{
@@ -33,20 +33,4 @@
 }
-+ (void)signIn:(SignInBlock)block {
-    NSDictionary *params = @{@"sid":CNUserShareModel.uid};
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNIntegralSignInUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        if (responseObject && [responseObject isKindOfClass:[NSDictionary class]] && responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
-            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
-            NSDictionary *data = responseObject[@"data"];
-            block?block([errorCode isEqualToString:@"0"], data, error):@"";
-        }else{
-            block?block(NO, @{}, error):@"";
-
-        }
-
-    }];
-}
-
 @end
@@ -10,7 +10,7 @@
 #import "CNLiveServices.h"
 #import "CNLivePageJumpManager.h"
-#import "CNLiveBMineController.h"
+#import "CNLiveMineController.h"
 #import "CNLiveUserInfoController.h"
 //@BeeHiveService(CNLiveBMineServiceProtocol,CNLiveBMineService)
@@ -23,11 +23,11 @@
 // 我的
 - (UIViewController *)getMineViewController {
-    return [CNLiveBMineController new];
+    return [CNLiveMineController new];
 }
 - (void)pushToMineViewController {
-    CNLiveBMineController *vc = [[CNLiveBMineController alloc]init];
+    CNLiveMineController *vc = [[CNLiveMineController alloc]init];
     [CNLivePageJumpManager pushViewController:vc];
 }
@@ -49,14 +49,9 @@ static const NSInteger margin = 12;
 - (void)setModel:(CNLiveUserInfoModel *)model{
     _model = model;
     _title.text = model.title;
-    
     _content.text = model.info;
     if(model.dataType == CNLiveUserInfoDataTypeHeader){
-        _pic.backgroundColor = [UIColor whiteColor];
-        _pic.contentMode = UIViewContentModeScaleToFill;
-        _pic.layer.masksToBounds = YES;
-        _pic.layer.cornerRadius = 5.0;
         UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[self class]];
         [_pic sd_setImageWithURL:[NSURL URLWithString:model.info] placeholderImage:xw_image];
@@ -71,13 +66,6 @@ static const NSInteger margin = 12;
         }else{
             _content.text = @"未知";
         }
-        
-    }else if (model.dataType == CNLiveUserInfoDataTypeCode){
-        
-    }else if (model.dataType == CNLiveUserInfoDataTypeAddress){
-        
-    }else if (model.dataType == CNLiveUserInfoDataTypeIntroduction){
-        
     }
     [self xw_layoutSubviews];
@@ -120,7 +108,6 @@ static const NSInteger margin = 12;
                 make.left.equalTo(self.title.mas_right).with.offset(margin);
                 make.right.equalTo(self.front.mas_left).with.offset(-margin);
                 make.height.equalTo(self.title.mas_height);
-                
             }];
         }
             break;
@@ -133,9 +120,10 @@ static const NSInteger margin = 12;
                 make.top.equalTo(self.contentView.mas_top).with.offset(margin);
                 make.right.equalTo(self.front.mas_left).with.offset(-margin);
                 make.width.height.offset(height);
-
             }];
-            
+            _pic.contentMode = UIViewContentModeScaleToFill;
+            _pic.layer.masksToBounds = YES;
+            _pic.layer.cornerRadius = height/2.0;
         }
             break;
@@ -58,7 +58,7 @@
                           },
                       @{
                           @"layout":@"1",
-                          @"data":@"4",
+                          @"data":@"3",
                           @"title":@"地区",
                           @"info":CNUserShareModel.location?CNUserShareModel.location:@"",
                           @"height":@"60",
@@ -37,17 +37,9 @@
     }
     else if([self.data isEqualToString:@"3"]){
-        return CNLiveUserInfoDataTypeCode;
-
-    }
-    else if([self.data isEqualToString:@"4"]){
         return CNLiveUserInfoDataTypeAddress;
     }
-    else if([self.data isEqualToString:@"5"]){
-        return CNLiveUserInfoDataTypeIntroduction;
-
-    }
     return CNLiveUserInfoDataTypeNickname;
 }
 //
-//  CNLiveBMineCell.h
+//  CNLiveMineCell.h
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -7,21 +7,21 @@
 //
 #import <UIKit/UIKit.h>
-#import "CNLiveBMineModel.h"
+#import "CNLiveMineModel.h"
 NS_ASSUME_NONNULL_BEGIN
-@class CNLiveBMineCell;
+@class CNLiveMineCell;
-static NSString * const kCNLiveBMineCell = @"CNLiveBMineCell";
-@protocol CNLiveBMineCellDelegate <NSObject>
+static NSString * const kCNLiveMineCell = @"CNLiveMineCell";
+@protocol CNLiveMineCellDelegate <NSObject>
 @optional
-- (void)cell:(CNLiveBMineCell *)cell didSelectItemAtItem:(NSInteger)item;
+- (void)cell:(CNLiveMineCell *)cell didSelectItemAtItem:(NSInteger)item;
 @end
-@interface CNLiveBMineCell : UITableViewCell
-@property (nonatomic, strong) CNLiveBMineModel *model;
-@property (nonatomic, weak) id<CNLiveBMineCellDelegate> delegate;
+@interface CNLiveMineCell : UITableViewCell
+@property (nonatomic, strong) CNLiveMineModel *model;
+@property (nonatomic, weak) id<CNLiveMineCellDelegate> delegate;
 @end
 //
-//  CNLiveBMineCell.m
+//  CNLiveMineCell.m
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveBMineCell.h"
+#import "CNLiveMineCell.h"
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
-@interface CNLiveBMineCell()
+@interface CNLiveMineCell()
 @property (nonatomic, strong) UIImageView *leftImage;
 @property (nonatomic, strong) UILabel *title;
 @property (nonatomic, strong) UIImageView *rightImage;
@@ -20,7 +20,7 @@
 @end
-@implementation CNLiveBMineCell
+@implementation CNLiveMineCell
 static const CGFloat margin = 10;
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
@@ -39,10 +39,10 @@ static const CGFloat margin = 10;
     [self.contentView addSubview:self.line];
 }
-- (void)setModel:(CNLiveBMineModel *)model{
+- (void)setModel:(CNLiveMineModel *)model{
     _model = model;
-    UIImage *xw_image = [self getImageWithImageName:model.image bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineCell class]];
+    UIImage *xw_image = [self getImageWithImageName:model.image bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineCell class]];
     _leftImage.image = xw_image;
     _title.text = model.name;
@@ -120,7 +120,7 @@ static const CGFloat margin = 10;
         _rightImage.backgroundColor = [UIColor whiteColor];
         _rightImage.layer.masksToBounds = NO;
         _rightImage.layer.shadowColor = [UIColor blackColor].CGColor;
-        UIImage *xw_image = [self getImageWithImageName:@"mine_into" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineCell class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_into" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineCell class]];
         _rightImage.image = xw_image;
         _rightImage.contentMode = UIViewContentModeCenter;
     }
 //
-//  CNLiveBMineHeaderView.h
+//  CNLiveMineHeaderView.h
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
@@ -9,19 +9,19 @@
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
-typedef NS_ENUM(NSInteger, CNLiveBMineHeaderViewType) {
-    CNLiveBMineHeaderViewTypeUerInfo        = 0,
-    CNLiveBMineHeaderViewTypeHome        = 1
+typedef NS_ENUM(NSInteger, CNLiveMineHeaderViewType) {
+    CNLiveMineHeaderViewTypeUerInfo        = 0,
+    CNLiveMineHeaderViewTypeHome        = 1
 };
-@class CNLiveBMineHeaderView;
+@class CNLiveMineHeaderView;
-@protocol CNLiveBMineHeaderViewDelegate <NSObject>
+@protocol CNLiveMineHeaderViewDelegate <NSObject>
 @optional
-- (void)headerView:(CNLiveBMineHeaderView *)headerView pushToController:(CNLiveBMineHeaderViewType)type;
+- (void)headerView:(CNLiveMineHeaderView *)headerView pushToController:(CNLiveMineHeaderViewType)type;
 @end
-@interface CNLiveBMineHeaderView : UIView
-@property (nonatomic, weak) id<CNLiveBMineHeaderViewDelegate> delegate;
+@interface CNLiveMineHeaderView : UIView
+@property (nonatomic, weak) id<CNLiveMineHeaderViewDelegate> delegate;
 @property (nonatomic, assign) BOOL interactionEnabled;
 @property (nonatomic, assign) BOOL isRefresh;
 //
-//  CNLiveBMineHeaderView.m
+//  CNLiveMineHeaderView.m
 //  CNLiveBMineModule
 //
 //  Created by 153993236@qq.com on 11/12/2019.
 //  Copyright © 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveBMineHeaderView.h"
+#import "CNLiveMineHeaderView.h"
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
@@ -16,7 +16,7 @@
 #import "CNUserInfoManager.h"
 #import "CNLiveUserInfoNotification.h"
-@interface CNLiveBMineHeaderView ()
+@interface CNLiveMineHeaderView ()
 @property (nonatomic, strong) UIImageView *bgView;
 @property (nonatomic, strong) UIImageView *bgTopView;
@@ -29,7 +29,7 @@
 @end
-@implementation CNLiveBMineHeaderView
+@implementation CNLiveMineHeaderView
 static const NSInteger margin = 20;
 - (instancetype)initWithFrame:(CGRect)frame{
@@ -48,7 +48,7 @@ static const NSInteger margin = 20;
     CNLiveUserInfoDataType type = [[dic objectForKey:@"dataType"] integerValue];
     NSString *info = [dic objectForKey:@"info"];
     if(type == CNLiveUserInfoDataTypeHeader){
-        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineHeaderView class]];
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:info] placeholderImage:xw_image];
     }else if(type == CNLiveUserInfoDataTypeNickname){
@@ -218,20 +218,20 @@ static const NSInteger margin = 20;
 #pragma mark - 响应方法
 - (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        [self.delegate headerView:self pushToController:CNLiveBMineHeaderViewTypeUerInfo];
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
     }
 }
 - (void)nameTapDidClicked:(UITapGestureRecognizer *)tap{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        [self.delegate headerView:self pushToController:CNLiveBMineHeaderViewTypeUerInfo];
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
     }
 }
 - (void)homeDidClicked:(UIButton *)btn{
     if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
         btn.userInteractionEnabled = NO;
-        [self.delegate headerView:self pushToController:CNLiveBMineHeaderViewTypeHome];
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeHome];
     }
 }
@@ -239,7 +239,7 @@ static const NSInteger margin = 20;
 - (UIButton *)home {
     if (!_home) {
         _home = [UIButton buttonWithType:UIButtonTypeCustom];
-        UIImage *xw_image = [self getImageWithImageName:@"mine_zy" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineHeaderView class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_zy" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
         _home.imageView.contentMode = UIViewContentModeScaleAspectFit;
         [_home setBackgroundImage:xw_image forState:UIControlStateNormal];
         _home.adjustsImageWhenHighlighted = NO;
@@ -251,7 +251,7 @@ static const NSInteger margin = 20;
     if (!_bgView) {
         _bgView = [[UIImageView alloc] init];
         _bgView.userInteractionEnabled = YES;
-        UIImage *xw_image = [self getImageWithImageName:@"mine_bg" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineHeaderView class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_bg" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
         _bgView.image = xw_image;
     }
     return _bgView;
@@ -261,7 +261,7 @@ static const NSInteger margin = 20;
     if (!_bgTopView) {
         _bgTopView = [[UIImageView alloc] init];
         _bgTopView.userInteractionEnabled = YES;
-        UIImage *xw_image = [self getImageWithImageName:@"mine_bg_top" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineHeaderView class]];
+        UIImage *xw_image = [self getImageWithImageName:@"mine_bg_top" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
         _bgTopView.image = xw_image;
     }
     return _bgTopView;
@@ -272,7 +272,7 @@ static const NSInteger margin = 20;
         _header.userInteractionEnabled = YES;
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 28;
-        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveBMineHeaderView class]];
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
         [_header addGestureRecognizer:tap];
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				7F2868A8838A138BFAEF325B /* [CP] Embed Pods Frameworks */,
-				A802B5426A66E6F7713552F1 /* [CP] Copy Pods Resources */,
+				AFC35ACF88EE06568BFA31DA /* [CP] Embed Pods Frameworks */,
+				327AC9F7FC5C7A4913A86E4A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -321,7 +321,27 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7F2868A8838A138BFAEF325B /* [CP] Embed Pods Frameworks */ = {
+		327AC9F7FC5C7A4913A86E4A /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		AFC35ACF88EE06568BFA31DA /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -334,7 +354,6 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
@@ -369,7 +388,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
@@ -401,26 +419,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A802B5426A66E6F7713552F1 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveBMineModule/CNLiveBMineModule.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveBMineModule.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveUserAgreementManager.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveBMineModule_Example/Pods-CNLiveBMineModule_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		C07FCC71144256C0D7D38641 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -7,14 +7,30 @@
 //
 #import "CNLIVEAppDelegate.h"
-#import "CNLiveBMineController.h"
+#import "CNLiveMineController.h"
 #import "CNUserInfoManager.h"
 #import "CNLiveEnvironment.h"
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 @implementation CNLIVEAppDelegate
+- (void)networkParamAction{
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:@"10514405" forKey:@"loginSid"];
+    [mDict setValue:BundleId forKey:@"platform_id"];
+
+    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:@"1.7.8.19.10.30.15"forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+    
+}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
@@ -25,7 +41,7 @@
     if ([CNUserShareManager isLogin]) {
         [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];
     }
-//       [self networkParamAction];
+    [self networkParamAction];
    [CNUserInfoManager saveUserinfoDic:@{
        @"bigFaceUrl":@"http://yweb0.cnliveimg.com/images/headImg/2019/1030/1572439148697.jpg",
@@ -48,7 +64,7 @@
        @"wxUid":@""
    }];
    [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"];
-    CNLiveBMineController *vc = [[CNLiveBMineController alloc] init];
+    CNLiveMineController *vc = [[CNLiveMineController alloc] init];
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
     self.window.rootViewController = nav;//设置根视图控制器
     [self.window makeKeyAndVisible];