0.1.4

yanglingyu
1 parent 478ad848
Showing 27 changed files with 329 additions and 601 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_bg@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_bg@3x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_close@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_close@3x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_label@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/add_score_label@3x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/gold_whereabouts1.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/gold_whereabouts2.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/gold_whereabouts3.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/gold_whereabouts4.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/sign_day_select@2x.png
CNLiveCMineModule/Assets/CNLiveCMineModule.bundle/sign_day_select@3x.png
CNLiveCMineModule/Classes/CNCSubMine/View/CNBindingManageHeaderView.m
CNLiveCMineModule/Classes/CNGold/View/CNAddScoreView.m
CNLiveCMineModule/Classes/CNGold/View/CNGoldWhereaboutsView.h
CNLiveCMineModule/Classes/CNGold/View/CNGoldWhereaboutsView.m
CNLiveCMineModule/Classes/CNGold/View/CNSignInButtonSelectView.m
CNLiveCMineModule/Classes/CNGold/View/CNSignInButtonView.h
CNLiveCMineModule/Classes/CNGold/View/CNSignInButtonView.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.1.3'
+  s.version          = '0.1.4'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
-//
-//  CNBindingManageHeaderView.m
-//  CNLiveNetAdd
-//
-//  Created by CNLive-zxw on 2019/9/10.
-//  Copyright © 2019 cnlive. All rights reserved.
-//
-
-#import "CNBindingManageHeaderView.h"
-@interface CNBindingManageHeaderView()
-@property (nonatomic, strong) UILabel *title;
-
-@end
-@implementation CNBindingManageHeaderView
-static NSInteger const margin = 15;
-
-- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier {
-    if (self = [super initWithReuseIdentifier:reuseIdentifier]) {
-        //在这里向contentView添加控件
-        self.backgroundColor = RGBOF(0xf4f4f4);
-        [self createSubviews];
-        [self xw_layoutSubviews];
-
-    }
-    return self;
-}
-- (void)setText:(NSString *)text{
-    _text = text;
-    _title.text = text;
-}
-
-#pragma mark - setupUI
-- (void)createSubviews {
-    [self.contentView addSubview:self.title];
-    
-}
-
-- (void)xw_layoutSubviews {
-    [self.title mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.contentView);
-        make.left.equalTo(self.contentView.mas_left).offset(margin);
-        make.right.equalTo(self.contentView.mas_right).offset(-margin);
-        make.bottom.equalTo(self.contentView.mas_bottom);
-
-    }];
-    
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-#pragma mark - Lazy Loading
-- (UILabel *)title {
-    if (!_title) {
-        _title = [[UILabel alloc] init];
-        _title.textColor = RGBOF(0x999999);
-        _title.font = UIFontCNMake(14);
-        _title.numberOfLines = 0;
-    }
-    return _title;
-}
-
-@end
@@ -255,7 +255,7 @@
     if (!_midImage) {
         _midImage = [[UIImageView alloc] init];
         _midImage.userInteractionEnabled = YES;
-        _midImage.image = [UIImage imageNamed:@"add_score_bg"];
+        _midImage.image = [CNLiveCMineService imageWithMineName:@"add_score_bg"];
         _midImage.contentMode = UIViewContentModeCenter;
     }
     return _midImage;
@@ -264,7 +264,7 @@
     if (!_scoreBtn) {
         _scoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         _scoreBtn.adjustsImageWhenHighlighted = NO;
-        [_scoreBtn setImage:[UIImage imageNamed:@"add_score_label"] forState:UIControlStateNormal];
+        [_scoreBtn setImage:[CNLiveCMineService imageWithMineName:@"add_score_label"] forState:UIControlStateNormal];
         [_scoreBtn addTarget:self action:@selector(clickedCloseBtn:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -286,7 +286,7 @@
     if(!_colseBtn){
         _colseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_colseBtn addTarget:self action:@selector(clickedClose) forControlEvents:UIControlEventTouchUpInside];
-        [_colseBtn setImage:[UIImage imageNamed:@"add_score_close"] forState:UIControlStateNormal];
+        [_colseBtn setImage:[CNLiveCMineService imageWithMineName:@"add_score_close"] forState:UIControlStateNormal];
     }
     return _colseBtn;
@@ -7,7 +7,6 @@
 //
 #import "CAEmitterLayerView.h"
-#import "CNSignInView.h"
 NS_ASSUME_NONNULL_BEGIN
 @class CNScoreModel;
@@ -32,8 +31,6 @@ typedef NS_ENUM(NSUInteger, CNGoldWhereaboutsViewType) {
 // 默认展示添加积分视图
 + (void)showGoldWhereaboutsViewWithDesc:(NSString *)desc score:(NSString *)score;
-// 默认签到
-+ (void)showGoldWhereaboutsViewModel:(CNScoreModel *)model controller:(id<CNSignInViewDelegate>)controller;
 + (void)hide;
 @end
@@ -8,7 +8,6 @@
 #import "CNGoldWhereaboutsView.h"
 #import "CNAddScoreView.h"
-#import "CNSignInView.h"
 #import "CNScoreModel.h"
 #define CNRemenberShow  @"CNRemenberShow"
@@ -17,7 +16,6 @@
 @property (nonatomic, copy) NSString *desc;
 @property (nonatomic, copy) NSString *score;
-@property (nonatomic, weak) id<CNSignInViewDelegate> controller;
 @property (nonatomic, strong) CNScoreModel *model;
 @end
@@ -43,13 +41,6 @@
     [sView show:CNGoldWhereaboutsViewTypeDefault];
 }
-+ (void)showGoldWhereaboutsViewModel:(CNScoreModel *)model controller:(id<CNSignInViewDelegate>)controller{
-    CNGoldWhereaboutsView *sView = [[CNGoldWhereaboutsView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)];
-    sView.model = model;
-    sView.controller = controller;
-    [AppKeyWindow addSubview:sView];
-    [sView show:CNGoldWhereaboutsViewTypeSignIn];
-}
 #pragma mark - Init
 - (instancetype)initWithFrame:(CGRect)frame {
@@ -84,7 +75,7 @@
         snowFlake.yAcceleration = 2500.f;
         snowFlake.emissionRange = 0.5 * M_PI;
         snowFlake.spinRange = 0.25 * M_PI;
-        snowFlake.contents = (__bridge id _Nullable)([UIImage imageNamed:[NSString stringWithFormat:@"gold_whereabouts%d",i]].CGImage);
+        snowFlake.contents = (__bridge id _Nullable)([CNLiveCMineService imageWithMineName:[NSString stringWithFormat:@"gold_whereabouts%d",i]].CGImage);
         snowFlake.lifetime = 100.f;
         snowFlake.scale = 0.08;
@@ -143,12 +134,6 @@
                 }
             }
                 break;
-                
-            case CNGoldWhereaboutsViewTypeSignIn:
-            {
-                [CNSignInView showSignInView:_model.score scores:_model.scores.count>0?_model.scores[0]:@"1000,2000,3000,4000,5000,6000,7000" day:_model.times url:_model.url delegate:_controller];
-            }
-                break;
             case CNGoldWhereaboutsViewTypeLogin:
             {
                 if(self.desc && ![self.desc isEqualToString:@""]){
@@ -39,7 +39,7 @@
         _selectView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 27, 27)];
         _selectView.center = self.center;
         _selectView.userInteractionEnabled = YES;
-        _selectView.image = [UIImage imageNamed:@"sign_day_select"];
+        _selectView.image = [CNLiveCMineService imageWithMineName:@"sign_day_select"];
     }
     return _selectView;
 }
-//
-//  CNSignInButtonView.h
-//  CNLiveNetAdd
-//
-//  Created by CNLive-zxw on 2019/3/1.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-@class CNSignInButtonView;
-@protocol CNSignInButtonViewDelegate <NSObject>
-- (void)clickedSignInButton:(CNSignInButtonView *)view day:(NSString *)day;
-
-@end
-@interface CNSignInButtonView : UIView
-
-@property (nonatomic, assign) NSInteger day;
-@property (nonatomic, copy) NSString *scores;
-@property (nonatomic, weak) id<CNSignInButtonViewDelegate> delegate;
-
-- (instancetype)initWithFrame:(CGRect)frame;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNSignInButtonView.m
-//  CNLiveNetAdd
-//
-//  Created by CNLive-zxw on 2019/3/1.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import "CNSignInButtonView.h"
-#import "CNSignInButtonSelectView.h"
-
-@interface CNSignInButtonView()
-@property (nonatomic, strong) NSMutableArray *btnsArr;
-
-@end
-@implementation CNSignInButtonView
-static const NSInteger margin = 6;
-#pragma mark - Init
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setup];
-    }
-    return self;
-}
-
-#pragma mark - UI
-- (void)setup {
-    CGFloat width = 70*(KScreenWidth/375.0);
-    CGFloat height = 80*(KScreenWidth/375.0);
-
-    for(int i = 0; i < 7; i++){
-        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-        btn.frame = CGRectMake(i<4?i*(width+margin):(i-4)*(width+margin), i<4?0:(margin+height), width, height);
-        
-        [btn addTarget:self action:@selector(clickBtn:) forControlEvents:UIControlEventTouchUpInside];
-        [btn setImage:[UIImage imageNamed:@"sign_day_bg"] forState:UIControlStateNormal];
-        btn.adjustsImageWhenHighlighted = NO;
-        btn.userInteractionEnabled = NO;
-        [self.btnsArr addObject:btn];
-        [self addSubview:btn];
-        
-        if(i == 6){
-            btn.width = 2*width+margin;
-            [btn setImage:[UIImage imageNamed:@"sign_day_bg7"] forState:UIControlStateNormal];
-
-        }
-        
-        CNSignInButtonSelectView *view = [[CNSignInButtonSelectView alloc]initWithFrame:btn.bounds];
-        view.hidden = !btn.selected;
-        [btn addSubview:view];
-
-    }
-    
-}
-
-#pragma mark - Setter
-- (void)setScores:(NSString *)scores{
-    _scores = scores;
-    NSArray *arr = scores?[scores componentsSeparatedByString:@","]:@[@"1000",@"2000",@"3000",@"4000",@"5000",@"6000",@"7000"];
-    arr = arr.count == 7?arr:@[@"1000",@"2000",@"3000",@"4000",@"5000",@"6000",@"7000"];
-
-    CGFloat width = 70*(KScreenWidth/375.0);
-    CGFloat height = 80*(KScreenWidth/375.0);
-    
-    for(int i = 0; i < self.btnsArr.count; i++){
-        UIButton *btn = self.btnsArr[i];
-        CGFloat day_height =  30*(KScreenWidth/375.0);
-        CGFloat score_height =  25*(KScreenWidth/375.0);
-        
-        UILabel *day = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, width, day_height)];
-        day.textColor = [UIColor whiteColor];
-        day.font = [UIFont fontWithName:@"PingFangSC-Medium" size:12];
-        day.textAlignment = NSTextAlignmentCenter;
-        day.text = [NSString stringWithFormat:@"第%d天",i+1];
-        [btn addSubview:day];
-        
-        UILabel *score = [[UILabel alloc] initWithFrame:CGRectMake(0, height-score_height, width, score_height)];
-        score.textColor = [UIColor whiteColor];
-        score.font = [UIFont fontWithName:@"PingFangSC-Medium" size:11];
-        score.textAlignment = NSTextAlignmentCenter;
-        score.text = [NSString stringWithFormat:@"+%@",arr[i]];
-        [btn addSubview:score];
-        
-        if(i == 6){
-            day.frame = CGRectMake(2*margin, 0, width, day_height);
-            day.textAlignment = NSTextAlignmentLeft;
-
-            score.frame = CGRectMake(2*margin, height-score_height, width, score_height);
-            score.textAlignment = NSTextAlignmentLeft;
-            
-        }
-    }
-}
-
-- (void)setDay:(NSInteger)day{
-    _day = day;
-    for(int i = 0; i < self.btnsArr.count; i++){
-        if(i >= day) break;
-        UIButton *btn = self.btnsArr[i];
-        for (UIView *view in btn.subviews) {
-            if([view isKindOfClass:[CNSignInButtonSelectView class]]){
-                view.hidden = NO;
-                btn.userInteractionEnabled = NO;
-            }
-        }
-    }
-}
-
-/*
- // Only override drawRect: if you perform custom drawing.
- // An empty implementation adversely affects performance during animation.
- - (void)drawRect:(CGRect)rect {
- // Drawing code
- }
- */
-#pragma mark - Action
-- (void)clickBtn:(UIButton *)btn{
-//    btn.selected = !btn.selected;
-    for (UIView *view in btn.subviews) {
-        if([view isKindOfClass:[CNSignInButtonSelectView class]]){
-            view.hidden = NO;
-            btn.userInteractionEnabled = NO;
-        }
-    }
-    if (self.delegate && [self.delegate respondsToSelector:@selector(clickedSignInButton:day:)]) {
-        [self.delegate clickedSignInButton:self day:@"1"];
-        
-    }
-    
-}
-#pragma mark - Lazy loading
-- (NSMutableArray *)btnsArr{
-    if (!_btnsArr) {
-        _btnsArr = [[NSMutableArray alloc] init];
-       
-    }
-    return _btnsArr;
-}
-
-@end
-//
-//  CNSignInView.h
-//  CNLiveNetAdd
-//
-//  Created by CNLive-zxw on 2019/3/1.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-@class CNSignInView;
-@protocol CNSignInViewDelegate <NSObject>
-- (void)clickedrRulesButton:(CNSignInView *)view;
-
-@end
-@interface CNSignInView : UIView
-@property (nonatomic, weak) id<CNSignInViewDelegate> delegate;
-@property (nonatomic, copy) NSString *url;
-
-//+ (void)showSignInView:(NSString *)score;
-//+ (void)showSignInViewDelegate:(id<CNSignInViewDelegate>)delegate;
-//+ (void)showSignInView:(NSString *)score delegate:(id<CNSignInViewDelegate>)delegate;
-//+ (void)showSignInView:(NSString *)score day:(NSInteger)day delegate:(id<CNSignInViewDelegate>)delegate;
-//+ (void)showSignInView:(NSString *)score day:(NSInteger)day url:(NSString *)url delegate:(id<CNSignInViewDelegate>)delegate;
-/**
- *  显示签到视图
- *
- *  @param score 1000
- *  @param scores "1000,2000,3000,4000,5000,6000,7000"
- *  @param day 第几天
- *  @param url 签到规则url
- *  @param delegate 代理
- *
- */
-+ (void)showSignInView:(NSString *)score scores:(NSString *)scores day:(NSInteger)day url:(NSString *)url delegate:(id<CNSignInViewDelegate>)delegate;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNSignInView.m
-//  CNLiveNetAdd
-//
-//  Created by CNLive-zxw on 2019/3/1.
-//  Copyright © 2019年 cnlive. All rights reserved.
-//
-
-#import "CNSignInView.h"
-#import "UIColor+CNLiveExtension.h"
-#import "CNSignInButtonView.h"
-
-@interface CNSignInView()
-@property (nonatomic, strong) UIImageView *bgView;
-@property (nonatomic, strong) QMUIButton *scoreBtn;
-@property (nonatomic, strong) UIButton *rulesBtn;
-@property (nonatomic, strong) CNSignInButtonView *signInButtonView;
-@property (nonatomic, strong) UIButton *closeBtn;
-
-@property (nonatomic, copy) NSString *score;
-@property (nonatomic, copy) NSString *scores;
-@property (nonatomic, assign) NSInteger day;
-
-@end
-
-@implementation CNSignInView
-static const NSInteger margin = 15;
-+ (void)showSignInView:(NSString *)score scores:(NSString *)scores day:(NSInteger)day url:(NSString *)url delegate:(id<CNSignInViewDelegate>)delegate{
-    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
-    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-    view.score = score;
-    view.scores = scores;
-    view.day = day;
-    view.url = url;
-    view.delegate = delegate;
-    [AppKeyWindow addSubview:view];
-}
-//+ (void)showSignInView:(NSString *)score day:(NSInteger)day url:(NSString *)url delegate:(id<CNSignInViewDelegate>)delegate{
-//    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0,KScreenWidth, KScreenHeight)];
-//    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-//    view.score = score;
-//    view.day = day;
-//    view.url = url;
-//    view.delegate = delegate;
-//    [AppKeyWindow addSubview:view];
-//}
-//
-//+ (void)showSignInView:(NSString *)score day:(NSInteger)day delegate:(id<CNSignInViewDelegate>)delegate{
-//    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0,KScreenWidth, KScreenHeight)];
-//    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-//    view.score = score;
-//    view.day = day;
-//    view.delegate = delegate;
-//    [AppKeyWindow addSubview:view];
-//
-//}
-//
-//+ (void)showSignInView:(NSString *)score delegate:(id<CNSignInViewDelegate>)delegate{
-//    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0,KScreenWidth, KScreenHeight)];
-//    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-//    view.score = score;
-//    view.delegate = delegate;
-//    [AppKeyWindow addSubview:view];
-//
-//}
-//
-//+ (void)showSignInViewDelegate:(id<CNSignInViewDelegate>)delegate{
-//    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
-//    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-//    view.delegate = delegate;
-//    [AppKeyWindow addSubview:view];
-//
-//}
-//
-//+ (void)showSignInView:(NSString *)score{
-//    CNSignInView *view = [[CNSignInView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
-//    view.backgroundColor = [UIColor colorWithWhite:0.2f alpha:0.4f];
-//    view.score = score;
-//    [AppKeyWindow addSubview:view];
-//
-//}
-#pragma mark - Init
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setup];
-        [self xw_layoutSubviews];
-        [self addAnimation];
-
-    }
-    return self;
-}
-
-#pragma mark - UI
-- (void)setup {
-    [self addSubview:self.bgView];
-    [self.bgView addSubview:self.scoreBtn];
-    [self.bgView addSubview:self.signInButtonView];
-    [self.bgView addSubview:self.rulesBtn];
-    [self addSubview:self.closeBtn];
-    
-}
-- (void)xw_layoutSubviews{
-    [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(self.mas_centerX).with.offset(0);
-        make.centerY.equalTo(self.mas_centerY).with.offset(-20*(KScreenWidth/375.0));
-        make.width.offset(335*(KScreenWidth/375.0));
-        make.height.offset(335*(KScreenWidth/375.0)*370/335.0);
-
-    }];
-    
-    [_scoreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(_bgView.mas_centerX).with.offset(0);
-        make.top.equalTo(_bgView.mas_top).with.offset(45*(KScreenWidth/375.0));
-        make.width.offset(120*(KScreenWidth/375.0));
-        make.height.offset(40*(KScreenWidth/375.0));
-        
-    }];
-    
-    [_signInButtonView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(_bgView.mas_centerX).with.offset(0);
-        make.top.equalTo(_scoreBtn.mas_bottom).with.offset(65*(KScreenWidth/375.0));
-        make.width.offset(280*(KScreenWidth/375.0)+18);
-        make.height.offset(160*(KScreenWidth/375.0)+5);
-
-    }];
-    
-    [_rulesBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(_bgView.mas_centerX).with.offset(0);
-        make.top.equalTo(_signInButtonView.mas_bottom).with.offset(0);
-        make.bottom.equalTo(_bgView.mas_bottom).with.offset(-0);
-        make.width.offset(100*(KScreenWidth/375.0));
-        
-    }];
-    
-    [_closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(_bgView.mas_centerX).with.offset(0);
-        make.top.equalTo(_bgView.mas_bottom).with.offset(margin*(KScreenWidth/375.0));
-        make.width.offset(35*(KScreenWidth/375.0));
-        make.height.offset(35*(KScreenWidth/375.0));
-        
-    }];
-    
-}
-
-#pragma mark - Private Methods
-- (void)addAnimation{
-    _bgView.transform = CGAffineTransformMake(0.01, 0, 0, 0.01, _bgView.x, _bgView.y);
-    _closeBtn.transform = CGAffineTransformMake(0.01, 0, 0, 0.01, _closeBtn.x, _closeBtn.y);
-
-    [UIView animateWithDuration:0.3f animations:^{
-        _bgView.transform = CGAffineTransformMake(1.05f, 0, 0, 1.0f, 0, 0);
-        _closeBtn.transform = CGAffineTransformMake(1.05f, 0, 0, 1.0f, 0, 0);
-
-    } completion:^(BOOL finished) {
-        [UIView animateWithDuration:0.1f animations:^{
-            _bgView.transform = CGAffineTransformMake(1, 0, 0, 1, 0, 0);
-            _closeBtn.transform = CGAffineTransformMake(1, 0, 0, 1, 0, 0);
-
-        } completion:^(BOOL finished) {
-            //  恢复原位
-            _bgView.transform = CGAffineTransformIdentity;
-            _closeBtn.transform = CGAffineTransformIdentity;
-
-        }];
-        
-    }];
-    
-}
-- (void)hiddenAction{
-    _bgView.layer.transform = CATransform3DMakeScale(1, 1, 1);
-    _closeBtn.layer.transform = CATransform3DMakeScale(1, 1, 1);
-
-    [UIView animateWithDuration:0.3f animations:^{
-        // 按照比例scalex=0.001,y=0.001进行缩小
-        _bgView.layer.transform = CATransform3DMakeScale(0.001, 0.001, 1);
-        _closeBtn.layer.transform = CATransform3DMakeScale(0.001, 0.001, 1);
-
-    } completion:^(BOOL finished) {
-        [self removeFromSuperview];
-        
-    }];
-    for (UIView *view in AppKeyWindow.subviews) {
-        if([view isKindOfClass:NSClassFromString(@"CNGoldWhereaboutsView")]){
-            [view removeFromSuperview];
-            
-        }
-    }
-}
-
-#pragma mark - Data
-- (void)setUrl:(NSString *)url{
-    _url = url;
-    
-}
-- (void)setScore:(NSString *)score{
-    _score = score;
-    [_scoreBtn setTitle:[NSString stringWithFormat:@"+%@",score] forState:UIControlStateNormal];
-
-}
-- (void)setDay:(NSInteger)day{
-    _day = day;
-    _signInButtonView.day = day;
-}
-- (void)setScores:(NSString *)scores{
-    _scores = scores;
-    _signInButtonView.scores = scores;
-
-}
-
-/*
- // Only override drawRect: if you perform custom drawing.
- // An empty implementation adversely affects performance during animation.
- - (void)drawRect:(CGRect)rect {
- // Drawing code
- }
- */
-
-#pragma mark - Action
-- (void)clickRulesBtn:(UIButton *)btn{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(clickedrRulesButton:)]) {
-        [self.delegate clickedrRulesButton:self];
-        [self removeFromSuperview];
-
-    }
-    
-}
-- (void)clickCloseBtn:(UIButton *)btn{
-    [self hiddenAction];
-
-}
-#pragma mark - Lazy loading
-- (UIImageView *)bgView{
-    if (!_bgView) {
-        _bgView = [[UIImageView alloc] init];
-        _bgView.userInteractionEnabled = YES;
-        _bgView.image = [UIImage imageNamed:@"sign_allday_bg"];
-    }
-    return _bgView;
-}
-- (QMUIButton *)scoreBtn{
-    if(_scoreBtn == nil){
-        _scoreBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
-        _scoreBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:20];
-//        [_scoreBtn addTarget:self action:@selector(clickScoreBtn:) forControlEvents:UIControlEventTouchUpInside];
-        [_scoreBtn setTitle:@"+0" forState:UIControlStateNormal];
-        [_scoreBtn setImage:[UIImage imageNamed:@"sign_in_soccer"] forState:UIControlStateNormal];
-        [_scoreBtn setTitleColor:CNLiveColorWithHexString(@"FFFFFF") forState:UIControlStateNormal];
-        _scoreBtn.adjustsImageWhenHighlighted = NO;
-        _scoreBtn.userInteractionEnabled = NO;
-        _scoreBtn.spacingBetweenImageAndTitle = 5;
-        _scoreBtn.imagePosition = QMUIButtonImagePositionRight;
-    }
-    return _scoreBtn;
-    
-}
-- (CNSignInButtonView *)signInButtonView{
-    if(_signInButtonView == nil){
-        _signInButtonView = [[CNSignInButtonView alloc]initWithFrame:CGRectMake(0, 0, 280*(KScreenWidth/375.0)+50, 160*(KScreenWidth/375.0)+30)];
-
-    }
-    return _signInButtonView;
-    
-}
-
-- (UIButton *)rulesBtn{
-    if(_rulesBtn == nil){
-        _rulesBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _rulesBtn.titleLabel.font = UIFontCNMake(14);
-        [_rulesBtn addTarget:self action:@selector(clickRulesBtn:) forControlEvents:UIControlEventTouchUpInside];
-        [_rulesBtn setTitle:@"签到规则" forState:UIControlStateNormal];
-        [_rulesBtn setTitleColor:CNLiveColorWithHexString(@"B5B5B5") forState:UIControlStateNormal];
-        _rulesBtn.adjustsImageWhenHighlighted = NO;
-    }
-    return _rulesBtn;
-    
-}
-- (UIButton *)closeBtn{
-    if(_closeBtn == nil){
-        _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _closeBtn.titleLabel.font = UIFontCNMake(12);
-        [_closeBtn addTarget:self action:@selector(clickCloseBtn:) forControlEvents:UIControlEventTouchUpInside];
-        [_closeBtn setImage:[UIImage imageNamed:@"sign_day_close"] forState:UIControlStateNormal];
-        _closeBtn.adjustsImageWhenHighlighted = NO;
-
-    }
-    return _closeBtn;
-    
-}
-
-@end
@@ -49,10 +49,10 @@
     _nickLabel.text = [user showTitle];
     if (!_selectBtn.enabled) {
-        [_selectBtn setBackgroundImage:[UIImage imageNamed:@"privacy_edit_no"] forState:UIControlStateNormal];
+        [_selectBtn setBackgroundImage:[CNLiveCMineService imageWithMineName:@"privacy_edit_no"] forState:UIControlStateNormal];
     }
     else{
-        [_selectBtn setBackgroundImage:[UIImage imageNamed:@"privacy_sel_no"] forState:UIControlStateNormal];
+        [_selectBtn setBackgroundImage:[CNLiveCMineService imageWithMineName:@"privacy_sel_no"] forState:UIControlStateNormal];
     }
@@ -99,8 +99,8 @@
 - (UIButton *)selectBtn {
     if (!_selectBtn) {
         _selectBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_selectBtn setBackgroundImage:[UIImage imageNamed:@"privacy_sel_no"] forState:UIControlStateNormal];
-        [_selectBtn setBackgroundImage:[UIImage imageNamed:@"privacy_sel_yes"] forState:UIControlStateSelected];
+        [_selectBtn setBackgroundImage:[CNLiveCMineService imageWithMineName:@"privacy_sel_no"] forState:UIControlStateNormal];
+        [_selectBtn setBackgroundImage:[CNLiveCMineService imageWithMineName:@"privacy_sel_yes"] forState:UIControlStateSelected];
         [_selectBtn addTarget:self action:@selector(onPicked:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _selectBtn;
@@ -192,7 +192,7 @@
 - (UIImageView *)moreImage {
     if (!_moreImage) {
-        _moreImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"xx_gengduo"]];
+        _moreImage = [[UIImageView alloc] initWithImage:[CNLiveCMineService imageWithMineName:@"mine_more"]];
     }
     return _moreImage;
 }
 //
-//  CNBindingManageHeaderView.h
+//  CNLiveBoxNoticeTipView.h
 //  CNLiveNetAdd
 //
-//  Created by CNLive-zxw on 2019/9/10.
+//  Created by 梁星国 on 2019/10/22.
 //  Copyright © 2019 cnlive. All rights reserved.
 //
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
-#define kCNBindingManageHeaderView @"CNBindingManageHeaderView"
-@interface CNBindingManageHeaderView : UITableViewHeaderFooterView
-@property (nonatomic, copy) NSString *text;
+@interface CNLiveBoxNoticeTipView : UIView
+
+@property (strong, nonatomic) UILabel *contentL;
+
+@property (strong, nonatomic) UIButton *cancelBtn;
+
+
+@property (strong, nonatomic) NSDictionary *dic;
+
+
++ (CNLiveBoxNoticeTipView *)showAlertAddedTo:(UIView *)view dic:(NSDictionary *)dic;
+
+- (void)showAlerView;
+- (void)hiddenAlerView;
 @end
+//
+//  CNLiveBoxNoticeTipView.m
+//  CNLiveNetAdd
+//
+//  Created by 梁星国 on 2019/10/22.
+//  Copyright © 2019 cnlive. All rights reserved.
+//
+
+#import "CNLiveBoxNoticeTipView.h"
+
+@implementation CNLiveBoxNoticeTipView
+
++ (CNLiveBoxNoticeTipView *)showAlertAddedTo:(UIView *)view dic:(NSDictionary *)dic{
+    
+    CNLiveBoxNoticeTipView *noticeView = [[CNLiveBoxNoticeTipView alloc] initWithFrame:CGRectMake(10, KScreenHeight, KScreenWidth - 20, 45)];
+    [view addSubview:noticeView];
+    noticeView.dic = dic;
+    if ([noticeView.dic containsObjectForKey:@"text"]) {
+        noticeView.contentL.text = [NSString stringWithFormat:@"%@",noticeView.dic[@"text"]];
+    }
+ 
+    return noticeView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = RGBA(51, 51, 51,0.7);
+        self.layer.masksToBounds = YES;
+        self.layer.cornerRadius = 7.5;
+        [self setupUI];
+        [self layoutUI];
+        [self showAlerView];
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf hiddenAlerView];
+        });
+    }
+    return self;
+}
+
+- (void)showAlerView {
+    
+
+    [UIView animateWithDuration:0.3 animations:^{
+        self.frame = CGRectMake(10, KScreenHeight - 55, KScreenWidth - 20, 45);
+    }];
+    
+    
+}
+
+- (void)hiddenAlerView {
+    
+    [UIView animateWithDuration:0.3 animations:^{
+        self.alpha = 0.3;
+        if (self) {
+            [self removeFromSuperview];
+        }
+        
+    }];
+}
+
+- (void)setupUI {
+    [self addSubview:self.contentL];
+    [self addSubview:self.cancelBtn];
+}
+
+- (void)layoutUI {
+    
+    self.cancelBtn.frame = CGRectMake(KScreenWidth - 20 - 44, 0, 44, 44);
+
+    self.contentL.frame = CGRectMake(10, 10, self.cancelBtn.left - 20, 24);
+}
+
+#pragma mark - 事件实现
+
+- (void)checkBtnAction:(UIButton *)btn {
+    [self hiddenAlerView];
+    
+    
+}
+
+
+#pragma mark - 属性
+
+- (UILabel *)contentL {
+    if (!_contentL) {
+        _contentL = [[UILabel alloc]initWithFrame:CGRectZero];
+        _contentL.text = @"您被好友解除绑定亲情关系";
+        _contentL.textColor = [UIColor whiteColor];
+        _contentL.font = [UIFont systemFontOfSize:15];
+        
+    }
+    return _contentL;
+}
+
+- (UIButton *)cancelBtn {
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_cancelBtn setImage:[CNLiveCMineService imageWithMineName:@"device_header_cancle"] forState:UIControlStateNormal];
+        _cancelBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_cancelBtn addTarget:self action:@selector(checkBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _cancelBtn;
+    
+}
+
+
+@end
+//
+//  CNLiveBoxNoticeView.h
+//  CNLiveNetAdd
+//
+//  Created by 梁星国 on 2019/10/18.
+//  Copyright © 2019 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBoxNoticeView : UIView
+
+
+@property (strong, nonatomic) UILabel *contentL;
+
+@property (strong, nonatomic) UIButton *ignoreBtn;
+
+@property (strong, nonatomic) UIButton *checkBtn;
+
+@property (strong, nonatomic) UIView *lineV;
+
+@property (strong, nonatomic) NSDictionary *dic;
+
+
++ (CNLiveBoxNoticeView *)showAlertAddedTo:(UIView *)view dic:(NSDictionary *)dic;
+
+- (void)showAlerView;
+- (void)hiddenAlerView;
+
+/*** 切换 ***/
+@property (nonatomic, copy) void(^clickCheckBtnBlock)(CNLiveBoxNoticeView *view,UIButton *checkBtn);
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveBoxNoticeView.m
+//  CNLiveNetAdd
+//
+//  Created by 梁星国 on 2019/10/18.
+//  Copyright © 2019 cnlive. All rights reserved.
+//
+
+#import "CNLiveBoxNoticeView.h"
+#import "CNBoxUserManagerController.h"
+
+@interface CNLiveBoxNoticeView ()
+
+@end
+
+
+@implementation CNLiveBoxNoticeView
+
++ (CNLiveBoxNoticeView *)showAlertAddedTo:(UIView *)view dic:(NSDictionary *)dic{
+    
+    CNLiveBoxNoticeView *noticeView = [[CNLiveBoxNoticeView alloc] initWithFrame:CGRectMake(10, KScreenHeight, KScreenWidth - 20, 45)];
+    [view addSubview:noticeView];
+    noticeView.dic = dic;
+    if ([noticeView.dic containsObjectForKey:@"text"]) {
+        noticeView.contentL.text = [NSString stringWithFormat:@"%@",noticeView.dic[@"text"]];
+    }
+ 
+    return noticeView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = RGBA(51, 51, 51,0.7);
+        self.layer.masksToBounds = YES;
+        self.layer.cornerRadius = 7.5;
+        [self setupUI];
+        [self layoutUI];
+        [self showAlerView];
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf hiddenAlerView];
+        });
+    }
+    return self;
+}
+
+- (void)showAlerView {
+    
+
+    [UIView animateWithDuration:0.3 animations:^{
+        self.frame = CGRectMake(10, KScreenHeight - 55, KScreenWidth - 20, 45);
+    }];
+    
+    
+}
+
+- (void)hiddenAlerView {
+    
+    [UIView animateWithDuration:0.3 animations:^{
+        self.alpha = 0.3;
+        if (self) {
+            [self removeFromSuperview];
+        }
+        
+    }];
+}
+
+- (void)setupUI {
+    [self addSubview:self.contentL];
+    [self addSubview:self.ignoreBtn];
+    [self addSubview:self.lineV];
+    [self addSubview:self.checkBtn];
+}
+
+- (void)layoutUI {
+    
+    self.checkBtn.frame = CGRectMake(KScreenWidth - 20 - 44, 0, 44, 44);
+    
+    self.lineV.frame = CGRectMake(self.checkBtn.left - 1, 10, 1, 25);
+    self.ignoreBtn.frame = CGRectMake(self.lineV.left - 44, 0, 44, 44);
+    self.contentL.frame = CGRectMake(10, 10, self.ignoreBtn.left - 20, 24);
+}
+
+#pragma mark - 事件实现
+- (void)ignoreBtnAction:(UIButton *)btn {
+    [self hiddenAlerView];
+}
+
+- (void)checkBtnAction:(UIButton *)btn {
+    [self hiddenAlerView];
+    NSLog(@"去查看");
+    if (!self.dic) {
+        [QMUITips showWithText:@"参数不全" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+//    if ([self.dic containsObjectForKey:@"familyId"]) {
+//        self.contentL.text = [NSString stringWithFormat:@"%@",self.dic[@"familyId"]];
+//    }
+    
+    if (self.clickCheckBtnBlock) {
+        self.clickCheckBtnBlock(self, btn);
+    }
+    
+    
+}
+
+
+#pragma mark - 属性
+
+- (UILabel *)contentL {
+    if (!_contentL) {
+        _contentL = [[UILabel alloc]initWithFrame:CGRectZero];
+        _contentL.text = @"您被好友绑定成为了亲情关系";
+        _contentL.textColor = [UIColor whiteColor];
+        _contentL.font = [UIFont systemFontOfSize:15];
+        
+    }
+    return _contentL;
+}
+
+- (UIView *)lineV {
+    if (!_lineV) {
+        _lineV = [[UIView alloc]initWithFrame:CGRectZero];
+        [_lineV setBackgroundColor:[UIColor whiteColor]];
+    }
+    return _lineV;
+    
+}
+
+- (UIButton *)ignoreBtn {
+    if (!_ignoreBtn) {
+        _ignoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_ignoreBtn setTitle:@"忽略" forState:UIControlStateNormal];
+        _ignoreBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_ignoreBtn addTarget:self action:@selector(ignoreBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _ignoreBtn;
+    
+}
+
+- (UIButton *)checkBtn {
+    if (!_checkBtn) {
+        _checkBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_checkBtn setTitle:@"查看" forState:UIControlStateNormal];
+        _checkBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_checkBtn addTarget:self action:@selector(checkBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _checkBtn;
+    
+}
+
+@end