no message

zhangxiaowen
1 parent 836baaad
Showing 4 changed files with 25 additions and 54 deletions
CNLiveLoginModule.podspec
CNLiveLoginModule/Classes/Controller/CNLiveCompleteInfoController.m
CNLiveLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveLoginModule/Classes/View/CNLiveCompleteInfoView.h
@@ -59,6 +59,7 @@ TODO: 网家家-登录模块.
   s.subspec 'ThreeLogin' do |ss|
       ss.source_files = 'CNLiveLoginModule/Classes/ThreeLogin/*.{h,m}'
+      ss.dependency 'CNLiveLoginModule/View'
   end
   s.resource_bundles = {
@@ -12,66 +12,27 @@
 #import "QMUIKit.h"
 #import "YYKit.h"
-#import "CNLiveThreeLoginType.h"
-#import "CNLiveBindingTelView.h"
+#import "CNLiveCompleteInfoView.h"
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
-@interface CNLiveCompleteInfoController()<CNLiveBindingTelViewDelegate>
-@property (nonatomic, assign) CNLiveThreeLoginType type;
-@property (nonatomic, weak) CNLiveBindingTelView *bindingTelView;
-@property (nonatomic, weak) YYLabel *protocol;
+@interface CNLiveCompleteInfoController()<CNLiveCompleteInfoViewDelegate>
+@property (nonatomic, strong) CNLiveCompleteInfoView *infoView;
 @end
 @implementation CNLiveCompleteInfoController
-- (instancetype)initWithType:(CNLiveThreeLoginType)type{
-    self = [super init];
-    if (self) {
-        self.type = type;
-
-    }
-    return self;
-    
-}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.automaticallyAdjustsScrollViewInsets = NO;
-    self.navigationController.navigationBar.translucent = NO;
-    self.extendedLayoutIncludesOpaqueBars = YES;
-    self.edgesForExtendedLayout = UIRectEdgeBottom;
     self.view.backgroundColor = [UIColor whiteColor];
-    self.title = @"绑定手机号";
-
-    CNLiveBindingTelView *bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 400) type:self.type];
-    bindingTelView.delegate = self;
-    [self.view addSubview:bindingTelView];
-    self.bindingTelView = bindingTelView;
+    self.title = @"完善信息";
+    [self createUI];
-    YYLabel *protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-30-NavigationContentTop-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
-    protocol.textAlignment = NSTextAlignmentCenter;
-    protocol.textColor = HexColor(0xadadad);
-    protocol.font = [UIFont systemFontOfSize:14.0];
-    NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"已阅读并同意《账户绑定确认书(网家家)》"];
-    NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-    style.alignment = NSTextAlignmentCenter;//对齐方式
-    [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)];
-    text.color = HexColor(0xadadad);
-    text.font = [UIFont systemFontOfSize:14.0];
-    __weak typeof(self) weakSelf = self;
-    [text setTextHighlightRange:NSMakeRange(7, 12) color:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if(!strongSelf) return;
-        [strongSelf.view endEditing:YES];
-//        [XWAgreementManager jumpToAgreementH5WithType:XWAgreementTypeBindingLogin];
+}
-    }];
-    protocol.attributedText = text;
-    [self.view addSubview:protocol];
-    self.protocol = protocol;
-    
+- (void)createUI{
+    [self.view addSubview:self.infoView];
 }
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
@@ -79,9 +40,13 @@
 }
-#pragma mark - CNLiveBindingTelViewDelegate
-- (void)bindingSuccess:(CNLiveBindingTelView *)view type:(CNLiveThreeLoginType)type{
-
+#pragma mark - CNLiveCompleteInfoViewDelegate
+- (void)loginSuccess:(CNLiveCompleteInfoView *)view result:(id _Nonnull)result{
+    // 新用户 -> home
+//    [XWAlertView alertSucceedViewWithTextMessage:@"登录成功" block:^{
+//        [XWLoginNotification postUserLoginNotification:result];
+//    }];
+    
 }
 /*
@@ -95,6 +60,13 @@
 */
 #pragma mark - 懒加载
+- (CNLiveCompleteInfoView *)infoView{
+    if(!_infoView){
+        _infoView = [[CNLiveCompleteInfoView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 250)];
+        _infoView.delegate = self;
+    }
+    return _infoView;
+}
 /**
  *  创建图片
@@ -19,8 +19,6 @@
 #import "CNLiveBindingTelController.h"//绑定手机号
 #import "CNLiveCompleteInfoController.h"//修改昵称
-#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
 @interface CNLiveLoginController()<CNLiveLoginViewDelegate, CNLiveThreeLoginViewDelegate>
 @property (nonatomic, weak) CNLiveLoginView *loginView;
 @property (nonatomic, weak) CNLiveThreeLoginView *threeLoginView;
@@ -10,12 +10,12 @@
 NS_ASSUME_NONNULL_BEGIN
 @class CNLiveCompleteInfoView;
-@protocol CNLiveUserInfoViewDelegate <NSObject>
+@protocol CNLiveCompleteInfoViewDelegate <NSObject>
 - (void)loginSuccess:(CNLiveCompleteInfoView *)view result:(id _Nonnull)result;
 @end
 @interface CNLiveCompleteInfoView : UIView
-@property (nonatomic, weak) id<CNLiveUserInfoViewDelegate> delegate;
+@property (nonatomic, weak) id<CNLiveCompleteInfoViewDelegate> delegate;
 @end