微信登陆，bug修改

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m

@@ -12,21 +12,28 @@
 
 +(void)readSocketDataWithBackMsgModel:(Xuanduo2Model*)xuanduoModel addWithBackData:(NSData*)data{
     NSString *dataString = [dataContorl dataToHexString:data];// 转十六进制
-    xuanduoModel.gasPump = [dataString substringWithRange:NSMakeRange(30, 4)];
-    xuanduoModel.light1 = [dataString substringWithRange:NSMakeRange(34, 4)];
-    xuanduoModel.light2 = [dataString substringWithRange:NSMakeRange(38, 4)];
-    xuanduoModel.waterPump = [dataString substringWithRange:NSMakeRange(42, 4)];
-    xuanduoModel.uvLamp = [dataString substringWithRange:NSMakeRange(46, 4)];
-    xuanduoModel.waveMakingPump = [dataString substringWithRange:NSMakeRange(50, 4)];
-    xuanduoModel.status = [dataString substringWithRange:NSMakeRange(54, 4)];
-    xuanduoModel.heatStatus = [dataString substringWithRange:NSMakeRange(58, 2)];
-    xuanduoModel.waterTemperature = [dataString substringWithRange:NSMakeRange(60, 4)];
-    xuanduoModel.heatingTemperature = [dataString substringWithRange:NSMakeRange(64, 4)];
-    xuanduoModel.huliLight = [dataString substringWithRange:NSMakeRange(68, 2)];
-    xuanduoModel.electricity = [dataString substringWithRange:NSMakeRange(70, 4)];
-    xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(74, 2)];
-    xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(76, 4)];
-    xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(80, 4)];
+    @try {
+        xuanduoModel.gasPump = [dataString substringWithRange:NSMakeRange(30, 4)];
+           xuanduoModel.light1 = [dataString substringWithRange:NSMakeRange(34, 4)];
+           xuanduoModel.light2 = [dataString substringWithRange:NSMakeRange(38, 4)];
+           xuanduoModel.waterPump = [dataString substringWithRange:NSMakeRange(42, 4)];
+           xuanduoModel.uvLamp = [dataString substringWithRange:NSMakeRange(46, 4)];
+           xuanduoModel.waveMakingPump = [dataString substringWithRange:NSMakeRange(50, 4)];
+           xuanduoModel.status = [dataString substringWithRange:NSMakeRange(54, 4)];
+           xuanduoModel.heatStatus = [dataString substringWithRange:NSMakeRange(58, 2)];
+           xuanduoModel.waterTemperature = [dataString substringWithRange:NSMakeRange(60, 4)];
+           xuanduoModel.heatingTemperature = [dataString substringWithRange:NSMakeRange(64, 4)];
+           xuanduoModel.huliLight = [dataString substringWithRange:NSMakeRange(68, 2)];
+           xuanduoModel.electricity = [dataString substringWithRange:NSMakeRange(70, 4)];
+           xuanduoModel.alarmSwitch = [dataString substringWithRange:NSMakeRange(74, 2)];
+           xuanduoModel.miniTemp = [dataString substringWithRange:NSMakeRange(76, 4)];
+           xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(80, 4)];
+    } @catch (NSException *exception) {
+        
+    } @finally {
+        
+    }
+   
 }
 
 +(void)resetNewXuanduoButtonState:(UIButton*)uvLightBtn gasPumpLight:(UIButton*)gasLightBtn light1:(UIButton*)light1Btn light2:(UIButton*)light2Btn waveLight:(UIButton*)waveLightBtn huliLight:(UIButton*)huliLightBtn waterLight:(UIButton*)waterLightBtn heatLight:(UIButton*)heatLightBtn withModel:(Xuanduo2Model*)backModel{

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m

@@ -99,7 +99,7 @@
     [self initCHNames];
     [Socketsingleton sharedInstance].communiteDelegate = self;
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tempSwitch)];
-    [self.tempLabel addGestureRecognizer:tap];
+   // [self.tempLabel addGestureRecognizer:tap];
     [self creatRefreshView];
 }
 

Ifish/controllers/IfishTabControllers/IfishADTimerViewController.m

@@ -12,6 +12,7 @@
 #import "IfishMianTabViewController.h"
 #import "IfishAlibcWebViewController.h"
 #import <AlibcTradeSDK/AlibcTradeSDK.h>
+#import "RegistViewController.h"
 @interface IfishADTimerViewController ()
 @property(nonatomic)UIActivityIndicatorView*indicatorView;
 @property(nonatomic,strong) NSString *adUrl;
@@ -166,8 +167,23 @@
 //设置根视图
 -(void)setAppTabRoot{
     
-    IfishMianTabViewController *mianVC=[[IfishMianTabViewController alloc] init];
-    [UIApplication sharedApplication].delegate.window.rootViewController=mianVC;
+    UserModel*model=[dataContorl getUserInfo];
+   NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
+    BOOL  skiped =[userdefult boolForKey:[CommonUtils getNotNilStr:model.unionId]];
+    if (!skiped&&[CommonUtils getNotNilStr:model.phoneNumber].length==0&&[CommonUtils getNotNilStr:model.unionId].length)
+    {
+    
+        RegistViewController*revv=[[RegistViewController alloc]init];
+        revv.isBind=YES;
+        revv.isFromLogin=YES;
+        [self.navigationController pushViewController:revv animated:YES];
+    }
+    else
+    {
+        IfishMianTabViewController *mianVC=[[IfishMianTabViewController alloc] init];
+        [UIApplication sharedApplication].delegate.window.rootViewController=mianVC;
+    }
+   
     
 }
 

Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m

@@ -238,7 +238,9 @@
 
 -(void)initImageView{
    
+     
     UserModel*userModel=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
+    NSString*wechatImgUrl=[[NSUserDefaults standardUserDefaults] stringForKey:@"wechatImgUrl"];
     NSString*fullpath=[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"]stringByAppendingPathComponent:@"avatar.png"];
     UIImage*saveImage=[[UIImage alloc]initWithContentsOfFile:fullpath];
     if (saveImage==nil) {
@@ -260,14 +262,28 @@
                 //    [_iconImageButton setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:@"userIcon%d.png",i]] forState:UIControlStateNormal];
                 
                 NSString*str=[NSString stringWithFormat:@"%@%@",kGetIconUrl,userModel.userImg];
+                if (wechatImgUrl.length)
+                {
+                    str=wechatImgUrl;
+                }
+                
+                
+                [self.userImg sd_setImageWithURL:[NSURL URLWithString:str] completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) {
+                    NSLog(@"error=%@,%@",error,image);
+                }];
+                
+                
                 
-                [self.userImg sd_setImageWithURL:[NSURL URLWithString:str]];
             }
         }
         
     }else{
         
         NSString*str=[NSString stringWithFormat:@"%@%@",kGetIconUrl,userModel.userImg];
+        if (wechatImgUrl.length)
+        {
+            str=wechatImgUrl;
+        }
         if ([str isEqualToString:kGetIconUrl]) {
             //int i = (arc4random()%7) + 1;// 设置随机头像
             int i =  1;

Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m

@@ -14,7 +14,7 @@
 #define TUICHUAlertTAg 4100
 #import "IfishUserDefaultHelper.h"
 #import "SettingResetViewController.h"
-
+#import "RegistViewController.h"
 @interface IfishSetViewController ()<UITableViewDelegate,UITableViewDataSource,UIAlertViewDelegate>
 
 @property(nonatomic,strong)UITableView *tableView;
@@ -34,9 +34,23 @@ extern BOOL firstLogIn;
 }
 
 -(void)loadData{
-    self.titles=@[@[@"更换手机",@"修改密码",@"恢复出厂模式"],@[@"切换账号"]];
-    self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-reset"],@[@"personal_iocn_switch"]];
     
+   
+    self.titles=@[@[@"更换手机",@"修改密码",@"恢复出厂模式"],@[@"切换账号",@"绑定手机"]];
+    self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-reset"],@[@"personal_iocn_switch",@"renyuan"]];
+    UserModel*model=[dataContorl getUserInfo];
+    if ([CommonUtils getNotNilStr:model.phoneNumber].length)
+    {
+        self.titles=@[@[@"更换手机",@"修改密码",@"恢复出厂模式"],@[@"切换账号"]];
+        self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-reset"],@[@"personal_iocn_switch"]];
+    }
+    
+}
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self loadData];
+    [self.tableView reloadData];
 }
 -(void)creatTab{
     
@@ -130,6 +144,15 @@ extern BOOL firstLogIn;
         [alert show];
 
     }
+    else if (indexPath.section==1&&indexPath.row==1){
+        
+        RegistViewController*revc=[[RegistViewController alloc]init];
+        revc.hidesBottomBarWhenPushed=YES;
+        revc.isBind=YES;
+        [self.navigationController pushViewController:revc animated:YES];
+        
+        
+    }
     
 }
 

Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m

@@ -25,6 +25,7 @@
    // CFShow((__bridge CFTypeRef)(infoDic));
     NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
     NSLog(@"app_Version%@",app_Version);
+    app_Version=@"4.7.4";
     NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
     NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
     if (buildVersion.length > 0) {

Ifish/controllers/IfishTabControllers/探索/IfishTanSuoViewCell.m

@@ -37,8 +37,12 @@
         attch.image = [UIImage imageNamed:@"explore_iocn_authentication"];
         attch.bounds = CGRectMake(0,0, 12, 10);
     }
-    NSAttributedString *str=[NSAttributedString attributedStringWithAttachment:attch];
-    [attri appendAttributedString:str];
+    if (attch.image)
+    {
+        NSAttributedString *str=[NSAttributedString attributedStringWithAttachment:attch];
+           [attri appendAttributedString:str];
+    }
+   
     self.tanSuoTitle.attributedText = attri;
     
 }

Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m

@@ -108,6 +108,7 @@ Assign BOOL isPush;
     [self creatReatRefreshView];//上拉加载更多
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deleteCurDevice) name:@"DeleteCurDevice" object:nil];
      [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDevice) name:@"updateDevice" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateUserInfobyValidation) name:@"updateUserInfobyValidation" object:nil];
 }
 
 -(void)updateDevice{
@@ -117,8 +118,45 @@ Assign BOOL isPush;
 -(void)dealloc{
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"DeleteCurDevice" object:nil];
      [[NSNotificationCenter defaultCenter] removeObserver:self name:@"updateDevice" object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"updateUserInfobyValidation" object:nil];
+}
+-(void)updateUserInfobyValidation
+{
+    [self addDataRequestQueue];
+    UserModel*model=[dataContorl getUserInfo];
+    if (model.unionId)
+    {
+        [AFHttpTool requestWihtMethod:RequestMethodTypePost
+                                  url:kUserWechatValidation
+                               params:@{@"unionId":[CommonUtils getNotNilStr:model.unionId]}
+                              success:^(id response) {
+                                  if (!response) {
+                                      return ;
+                                  }
+                                  NSDictionary*dict=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
+                                  NSString *result=dict[@"result"];
+                                 
+                                  if ([result isEqualToString:@"100"]) {
+                                      
+                                      // 登录成功
+                                      NSDictionary*dataDic=dict[@"data"];
+                                     
+                                      NSDictionary *userDic=dataDic[@"userInfo"];
+                                      UserModel *model=[[UserModel alloc] initWithDict:userDic];
+                                      [[DataCenter defaultDtacenter]setValue:model forKey:@"UserLogIn"];
+                                      NSDictionary *userAssetDic=dataDic[@"userAsset"];
+                                      IfishUserAsset *userAsset =[[IfishUserAsset alloc] initWithDict:userAssetDic];
+                                      [[DataCenter defaultDtacenter]setValue:userAsset forKey:@"IfishUserAsset"];
+                                      [self getUsernameAddImg];
+                                  }
+                                  
+                              } failure:^(NSError *err) {
+                                  
+                              }];
+    }
+    
+    
 }
-
 -(void)addDataRequestQueue
 {
     //创建异步任务队列 避免UI更新受影响
@@ -518,11 +556,12 @@ Assign BOOL isPush;
 }
 
 -(void)getUsernameAddImg{
+   
     IfishUserAsset *userAsset = [dataContorl getAllIfishUserAsset];
     UserModel*umodel=[dataContorl getUserInfo];
+    NSString*wechatImgUrl=[[NSUserDefaults standardUserDefaults] stringForKey:@"wechatImgUrl"];
     _userNameLabel.text = umodel.nickName;
     [_userNameLabel sizeToFit];
-    
     CGFloat btnH = 40*KWidth_Scale;
     CGFloat btnW =100*KWidth_Scale;
     _levelBtn.frame = CGRectMake(CGRectGetMaxX(_userNameLabel.frame) + 2, CGRectGetMaxY(_userNameLabel.frame) - btnH,btnW, btnH);
@@ -545,7 +584,13 @@ Assign BOOL isPush;
         
         [_userImgView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"userIcon%d.png",i]]];
         
-    }else{
+    }else if (wechatImgUrl.length){
+        
+        
+        [_userImgView sd_setImageWithURL:[NSURL URLWithString:wechatImgUrl]];
+        
+    }
+    else{
         
         NSLog(@"%@",[NSString stringWithFormat:@"%@%@",kGetIconUrl,umodel.userImg]);
         [_userImgView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",kGetIconUrl,umodel.userImg]]];

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm

@@ -313,7 +313,11 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像
     [self.navigationController pushViewController:vc animated:YES];
 }
 -(void)sBtn:(UIButton*)btn{
-    NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
+    NSString *ssidName =@"";
+    if (self.wifiName.length>2) {
+       ssidName= [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
+    }
+    
     if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
         UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
         [alert show];

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m

@@ -1436,19 +1436,19 @@
     }else if ([self.device.type isEqualToString:DECICE_TYPE_SONGNEWBD]){
         //self.btnNameArr = @[@"灯1",@"灯2",@"水泵",@"氧泵",@"加热棒"];
         SongNuo86Name* songNuo = [UserExtendataArchaver currentSongNuo86:self.device.macAddress];
-        self.btnNameArr = @[songNuo.light1,songNuo.light2,songNuo.waterPump,songNuo.airPump,songNuo.guideng,songNuo.jiaRe];
+        self.btnNameArr = @[songNuo.light1,songNuo.light2,songNuo.waterPump,songNuo.airPump,songNuo.guideng,songNuo.jiaRe,songNuo.jiaRe];
         
         self.btnImgArr =  @[LXImageWithImageName(@"bootview_light_off"),
                             LXImageWithImageName(@"bootview_light_off"),
                             LXImageWithImageName(@"bootview_pump_off"),
                              LXImageWithImageName(@"bootview_022_off"),
-                            LXImageWithImageName(@"bootview_heat_off")];
+                            LXImageWithImageName(@"bootview_heat_off"),LXImageWithImageName(@"bootview_heat_off")];
         
         self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"),
                              LXImageWithImageName(@"bootview_light_on"),
                              LXImageWithImageName(@"bootview_pump_on"),
                              LXImageWithImageName(@"bootview_022_on"),
-                             LXImageWithImageName(@"bootview_heat_on")];
+                             LXImageWithImageName(@"bootview_heat_on"),LXImageWithImageName(@"bootview_heat_on")];
         
     } else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
         //self.btnNameArr = @[@"灯1",@"灯2",@"水泵",@"氧泵",@"加热棒"];

Ifish/controllers/leftcontrollers/SecondConnectWifiController.h

@@ -21,6 +21,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *attentionLabel;
 
 @property(nonatomic,strong)NSString*ssid;
+@property(nonatomic,strong)NSString*wifiPass;
 @property(nonatomic,strong)NSString*bssid;
 @property(nonatomic,strong)NSString*deviceBssid;
 @property (weak, nonatomic) IBOutlet UIButton *shareButton;

Ifish/controllers/leftcontrollers/SecondConnectWifiController.m

@@ -395,8 +395,21 @@ extern BOOL isfromCameraView;
 - (IBAction)makeSureButton:(id)sender {
     
     
+    if (!_ssid.length)
+    {
+         [self.view makeToast:@"未能获取到WiFi名称，请确认地理位置权限是否打开"];
+        return;
+    }
+    if (!_wifiTextFiled.text.length)
+    {
+         [self.view makeToast:@"请输入WiFi密码！"];
+        return;
+    }
     [_wifiTextFiled resignFirstResponder];
-    NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    NSString *ssidName = @"";
+    if (_ssid.length>2) {
+        ssidName= [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    }
     if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
         UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
         [alert show];
@@ -527,6 +540,7 @@ extern BOOL isfromCameraView;
     NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
     
     [userdefult setObject:self.wifiTextFiled.text forKey:@"wifiPass"];
+    self.wifiPass=self.wifiTextFiled.text;
     [userdefult synchronize];
 }
 

Ifish/controllers/logAddRegistController/LogInViewController.m

@@ -34,7 +34,8 @@
 #import "AccountResult.h"
 #import "LoginResult.h"
 #import "RegisterResult.h"
-
+#import "WXApi.h"
+#import "WXApiManager.h"
 #import "UIView+Toast.h"
 #import "IfishNewsModel.h"
 //#import <BaiduMapAPI_Location/BMKLocationService.h>
@@ -42,7 +43,7 @@
 //#import <BaiduMapAPI_Utils/BMKUtilsComponent.h>
 #import <CoreLocation/CoreLocation.h>
 #import "IfishUserDataUnity.h"
-@interface LogInViewController ()<UITextFieldDelegate,CLLocationManagerDelegate>
+@interface LogInViewController ()<UITextFieldDelegate,CLLocationManagerDelegate,WXApiManagerDelegate>
 @property (weak, nonatomic) IBOutlet UIButton *logInButton;
 @property(nonatomic,strong)UIActivityIndicatorView*indicatorView;
 //@property(nonatomic)BMKLocationService*locService;
@@ -51,6 +52,10 @@
 @property(nonatomic,copy) NSString *adderss;
 @property (nonatomic,strong ) CLLocationManager *locationManager;//定位服务
 @property (nonatomic,copy)    NSString *currentCity;//城市
+@property (nonatomic,copy)    NSDictionary *expara;//城市
+@property (weak, nonatomic) IBOutlet UIView *styleView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *wechatCons;
+
 @end
  extern BOOL firstLogIn;
  BOOL  formLogIn;// //连接页面是否来自登录界面初始化
@@ -112,6 +117,14 @@
         self.loginPhoneNumberTextField.text = name;
         
     }
+    if ([WXApi isWXAppInstalled])
+    {
+        self.styleView.hidden=NO;
+        if ([CommonUtils isIphoneX])
+        {
+            //self.wechatCons.constant=-30;
+        }
+    }
     
 }
 
@@ -255,8 +268,12 @@
     btn.userInteractionEnabled = NO;
     btn.backgroundColor = [UIColor lightGrayColor];
     [_indicatorView startAnimating];
-    
-    NSString*tokenStr=[MyMD5 md5:self.loginPasswordTextField.text ];
+    NSString*tokenStr;
+    if (self.loginPasswordTextField.text.length)
+    {
+        tokenStr=[MyMD5 md5:self.loginPasswordTextField.text ];
+    }
+  
         if (!self.adderss) {
             NSLog(@"addressnil");
             self.adderss = @"暂时未获取到地址信息";
@@ -272,7 +289,7 @@
         }
         
          __weak typeof (self) weakSelf=self;
-        [AFHttpTool userLogInWithPhoneNumber:self.loginPhoneNumberTextField.text password:tokenStr phoneType:@"ios"   address:self.adderss
+        [AFHttpTool userLogInWithPhoneNumber:[CommonUtils getNotNilStr:self.loginPhoneNumberTextField.text] password:tokenStr phoneType:@"ios"   address:self.adderss
                                    longitude:self.longitude
                                     latitude:self.latitude
          success:^(id response) {
@@ -326,9 +343,19 @@
             NSString *errstr = [NSString stringWithFormat:@"%@",err];
             BLYLog(BuglyLogLevelWarn, errstr);
         
-        }];
+        } expara:self.expara];
         
 }
+- (IBAction)wechatAuthority:(UIButton *)sender {
+    AppDelegate*del=(AppDelegate*)[UIApplication sharedApplication].delegate;
+    del.isWechatLogin=YES;
+    [WXApiManager sharedManager].delegate=self;
+    SendAuthReq* req =[[SendAuthReq alloc]init];
+    req.scope = @"snsapi_userinfo";
+    req.state = @"ifish7";
+   
+    [WXApi sendReq:req];
+}
 
 - (void)tagsAliasCallback:(int)iResCode tags:(NSSet*)tags alias:(NSString*)alias {
     
@@ -336,6 +363,17 @@
     
 }
 
+#pragma mark - WXApiManagerDelegate
+- (void)managerDidRecvAuthResponse:(SendAuthResp *)response
+{
+    if (response.errCode==0)
+    {
+        self.expara=@{@"code":response.code};
+        [self LogIn:nil];
+    }
+    AppDelegate*del=(AppDelegate*)[UIApplication sharedApplication].delegate;
+    del.isWechatLogin=NO;
+}
 #pragma mark - 注册摄像头成功后 登陆摄像头服务器 已去
 
 -(void)logInYooseeServerWith:(NSString*)email addpassword:(NSString*)password{
@@ -444,7 +482,7 @@
     
     //视图下沉恢复原状
     [UIView animateWithDuration:duration animations:^{
-        self.view.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
+        self.view.frame = CGRectMake(0, NavigationBarHeight, self.view.frame.size.width, self.view.frame.size.height);
     }];
 }
 

Ifish/controllers/logAddRegistController/LogInViewController.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,23 +12,25 @@
                 <outlet property="logInButton" destination="zvp-5f-hP6" id="kvm-8x-kbT"/>
                 <outlet property="loginPasswordTextField" destination="09y-SO-yq2" id="1PZ-Pq-9FF"/>
                 <outlet property="loginPhoneNumberTextField" destination="kgb-uB-ZOY" id="D0I-Sg-nfj"/>
+                <outlet property="styleView" destination="cHS-1T-imm" id="feR-JP-kEM"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="wangJiBtn" destination="Ckf-mu-FkR" id="sqO-FC-gwi"/>
+                <outlet property="wechatCons" destination="Y7q-Ea-UVn" id="cHK-eL-Hic"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="enter_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="Uda-6x-kdh">
-                    <rect key="frame" x="161.5" y="96" width="52" height="52"/>
+                    <rect key="frame" x="107.5" y="80" width="105" height="105"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="Uda-6x-kdh" secondAttribute="height" multiplier="1:1" id="Uhy-nv-vfv"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 爱鱼奇" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pee-cm-j3l">
-                    <rect key="frame" x="157.5" y="167" width="60" height="21"/>
+                    <rect key="frame" x="130" y="204" width="60" height="21"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="JWX-yY-DRi"/>
                     </constraints>
@@ -39,10 +39,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nvl-4w-l5s">
-                    <rect key="frame" x="21" y="210" width="333" height="240"/>
+                    <rect key="frame" x="21" y="247" width="278" height="200.5"/>
                     <subviews>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kgb-uB-ZOY">
-                            <rect key="frame" x="16" y="21" width="301" height="42"/>
+                            <rect key="frame" x="16" y="17" width="246" height="34"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
@@ -54,14 +54,14 @@
                             </userDefinedRuntimeAttributes>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="09y-SO-yq2">
-                            <rect key="frame" x="16" y="71" width="301" height="42"/>
+                            <rect key="frame" x="16" y="59" width="246" height="35"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                             <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvp-5f-hP6">
-                            <rect key="frame" x="16" y="141" width="301" height="43"/>
+                            <rect key="frame" x="16" y="117" width="246" height="36"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.0" green="0.72156862745098038" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <state key="normal" title="登录">
@@ -72,7 +72,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ckf-mu-FkR">
-                            <rect key="frame" x="123" y="192" width="86" height="31"/>
+                            <rect key="frame" x="96" y="155" width="86" height="31"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
                             <state key="normal" title="忘记密码？">
@@ -85,8 +85,8 @@
                         <constraint firstAttribute="width" secondItem="nvl-4w-l5s" secondAttribute="height" multiplier="111:80" id="RkC-qN-0qd"/>
                     </constraints>
                 </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" www.ifish7.com" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T1G-Eq-r75">
-                    <rect key="frame" x="107.5" y="632.5" width="160" height="14.5"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" www.ifish7.com" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T1G-Eq-r75">
+                    <rect key="frame" x="80" y="533.5" width="160" height="14.5"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="160" id="Jpf-Ew-HRc"/>
                     </constraints>
@@ -94,24 +94,82 @@
                     <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cHS-1T-imm" userLabel="styleView">
+                    <rect key="frame" x="41" y="473" width="238" height="65"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多登陆方式" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XTZ-lP-GeY">
+                            <rect key="frame" x="69" y="0.0" width="100" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="Nra-T0-iRa"/>
+                                <constraint firstAttribute="height" constant="21" id="c77-kq-MAC"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <color key="textColor" red="0.80148818997371063" green="0.81775635480880737" blue="0.81158418568019608" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ni2-Se-sNP" userLabel="line1">
+                            <rect key="frame" x="14" y="9" width="45" height="0.5"/>
+                            <color key="backgroundColor" red="0.80000000000000004" green="0.81960784313725488" blue="0.87450980392156863" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="iX4-zl-9UX"/>
+                                <constraint firstAttribute="width" constant="45" id="kjv-5x-bBB"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zhJ-2Y-scP" userLabel="line2">
+                            <rect key="frame" x="179" y="9" width="45" height="0.5"/>
+                            <color key="backgroundColor" red="0.80000000000000004" green="0.81960784313725488" blue="0.87450980392156863" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="Bey-79-5Zp"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zck-yl-gON">
+                            <rect key="frame" x="99" y="21" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="Kcl-xx-LDP"/>
+                                <constraint firstAttribute="width" constant="40" id="Usx-Iu-X2y"/>
+                            </constraints>
+                            <state key="normal" title="Button" image="wechatlogin.png"/>
+                            <connections>
+                                <action selector="wechatAuthority:" destination="-1" eventType="touchUpInside" id="tfp-YT-2He"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="XTZ-lP-GeY" firstAttribute="top" secondItem="cHS-1T-imm" secondAttribute="top" id="Aod-6u-8sW"/>
+                        <constraint firstItem="zhJ-2Y-scP" firstAttribute="top" secondItem="cHS-1T-imm" secondAttribute="top" constant="9" id="H0y-OL-tzl"/>
+                        <constraint firstItem="XTZ-lP-GeY" firstAttribute="centerX" secondItem="cHS-1T-imm" secondAttribute="centerX" id="IV8-dM-se1"/>
+                        <constraint firstItem="zck-yl-gON" firstAttribute="centerX" secondItem="cHS-1T-imm" secondAttribute="centerX" id="JyN-bO-OFb"/>
+                        <constraint firstItem="Ni2-Se-sNP" firstAttribute="top" secondItem="cHS-1T-imm" secondAttribute="top" constant="9" id="Ynd-rF-Cki"/>
+                        <constraint firstItem="zck-yl-gON" firstAttribute="top" secondItem="XTZ-lP-GeY" secondAttribute="bottom" id="bRk-ac-vXW"/>
+                        <constraint firstItem="zhJ-2Y-scP" firstAttribute="width" secondItem="Ni2-Se-sNP" secondAttribute="width" id="eib-8T-4m3"/>
+                        <constraint firstItem="zhJ-2Y-scP" firstAttribute="leading" secondItem="XTZ-lP-GeY" secondAttribute="trailing" constant="10" id="mr1-sQ-lfb"/>
+                        <constraint firstItem="Ni2-Se-sNP" firstAttribute="trailing" secondItem="XTZ-lP-GeY" secondAttribute="leading" constant="-10" id="mvO-U4-eyL"/>
+                        <constraint firstAttribute="height" constant="65" id="xBI-rH-Rqm"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
                 <constraint firstItem="pee-cm-j3l" firstAttribute="top" secondItem="Uda-6x-kdh" secondAttribute="bottom" constant="19" id="4bi-Ds-pAV"/>
-                <constraint firstItem="Uda-6x-kdh" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="96" id="AbK-ny-OJZ"/>
+                <constraint firstItem="Uda-6x-kdh" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="80" id="AbK-ny-OJZ"/>
                 <constraint firstItem="Uda-6x-kdh" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="GZt-9f-uyE"/>
                 <constraint firstItem="nvl-4w-l5s" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="21" id="HeI-4j-0Ju"/>
                 <constraint firstItem="nvl-4w-l5s" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="HxM-iG-8fE"/>
+                <constraint firstItem="cHS-1T-imm" firstAttribute="bottom" secondItem="i5M-Pr-FkT" secondAttribute="bottom" constant="-30" id="Y7q-Ea-UVn"/>
+                <constraint firstItem="cHS-1T-imm" firstAttribute="leading" secondItem="nvl-4w-l5s" secondAttribute="leading" constant="20" id="a0c-5E-tBH"/>
                 <constraint firstItem="nvl-4w-l5s" firstAttribute="top" secondItem="pee-cm-j3l" secondAttribute="bottom" constant="22" id="db6-mE-nRJ"/>
                 <constraint firstAttribute="bottom" secondItem="T1G-Eq-r75" secondAttribute="bottom" constant="20" id="gcY-4k-5Vo"/>
                 <constraint firstItem="pee-cm-j3l" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="iYG-ef-KPA"/>
+                <constraint firstItem="cHS-1T-imm" firstAttribute="trailing" secondItem="nvl-4w-l5s" secondAttribute="trailing" constant="-20" id="kfG-qM-Vvj"/>
                 <constraint firstAttribute="trailing" secondItem="nvl-4w-l5s" secondAttribute="trailing" constant="21" id="rYO-yl-ZTZ"/>
                 <constraint firstItem="T1G-Eq-r75" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="whX-W5-ucD"/>
             </constraints>
-            <point key="canvasLocation" x="555.5" y="108.5"/>
+            <point key="canvasLocation" x="554.39999999999998" y="108.39580209895054"/>
         </view>
     </objects>
     <resources>
-        <image name="enter_logo.png" width="52" height="52"/>
+        <image name="enter_logo.png" width="52.5" height="52.5"/>
+        <image name="wechatlogin.png" width="150" height="150"/>
     </resources>
 </document>

Ifish/controllers/logAddRegistController/RegistViewController.h

@@ -28,5 +28,8 @@
 - (IBAction)verifyBtn:(id)sender;
 
 @property (weak, nonatomic) IBOutlet UIButton *countrySelectBtn;
+@property (assign, nonatomic)  BOOL isBind;
+@property (assign, nonatomic)  BOOL isFromLogin;
+
 
 @end

Ifish/controllers/logAddRegistController/RegistViewController.mm

@@ -17,7 +17,8 @@
 #import "AgreementViewController.h"
 #import "MyIntroductionViewController.h"
 #import "ConnectWifiViewController.h"
-
+#import "WXApi.h"
+#import "WXApiManager.h"
 #import "ChatroomModel.h"
 //#import <RongIMKit/RongIMKit.h>
 //#import <RongIMLib/RongIMLib.h>
@@ -36,7 +37,7 @@
 #import <SMS_SDK/Extend/SMSSDK+ExtexdMethods.h>
 #import "XWCountryCodeController.h"
 #import <CoreLocation/CoreLocation.h>
-@interface RegistViewController ()<UITextFieldDelegate,UIAlertViewDelegate,MBProgressHUDDelegate,CLLocationManagerDelegate>
+@interface RegistViewController ()<UITextFieldDelegate,UIAlertViewDelegate,MBProgressHUDDelegate,CLLocationManagerDelegate,WXApiManagerDelegate>
 {
     
     BOOL _showed;//显示过了
@@ -48,6 +49,7 @@
 @property (weak, nonatomic) IBOutlet UIButton *timeBtn;
 @property(nonatomic,copy)NSString*verifyData;
 @property(nonatomic,copy) NSString *areaCode;
+@property (weak, nonatomic) IBOutlet UIButton *resignBtn;
 
 @property (weak, nonatomic) IBOutlet UIButton *registBtn;
 - (IBAction)agreementBtn:(id)sender;
@@ -63,7 +65,9 @@
 @property(nonatomic,copy) NSString *adderss;
 
 @property (weak, nonatomic) IBOutlet UILabel *qrcodeSwitchLbl;
-
+@property (nonatomic,copy)    NSDictionary *expara;//城市
+@property (weak, nonatomic) IBOutlet UIView *styleView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *wechatConstraints;
 @end
 
 extern BOOL formLogIn;
@@ -73,7 +77,8 @@ extern BOOL formLogIn;
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
-        
+        self.isBind=NO;
+        self.isFromLogin=NO;
     }
     return self;
     
@@ -104,6 +109,15 @@ extern BOOL formLogIn;
     self.passwordTextField.delegate=self;
     self.navigationItem.hidesBackButton=YES;
     [self getLocation];
+    if ([WXApi isWXAppInstalled]&&!self.isBind)
+    {
+        self.styleView.hidden=NO;
+        
+        if ([CommonUtils isIphoneX])
+        {
+            //self.wechatConstraints.constant=-30;
+        }
+    }
     
 }
 #pragma mark 定位
@@ -284,14 +298,25 @@ extern BOOL formLogIn;
 }
 #pragma mark-设置导航按钮
 -(void)addNaviItem{
-    UILabel*labe=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, 60, 44)];
+    UILabel*labe=[[UILabel alloc]initWithFrame:CGRectMake((SCREEN_WIDTH-200)/2.0, 0, 200, 44)];
     labe.text=@"注册";
+   
     labe.textAlignment=NSTextAlignmentCenter;
     labe.textColor=[UIColor whiteColor];
+   
     self.navigationItem.titleView=labe;
-    
+
+    BOOL skiped=NO;
+    NSUserDefaults*userDefsult=[NSUserDefaults standardUserDefaults];
+    UserModel*model=[dataContorl getUserInfo];
+    if (model.unionId)
+    {
+        skiped =[userDefsult boolForKey:model.unionId];
+    }
+   
     UIButton*rightButton = [[UIButton alloc]initWithFrame:CGRectMake(25,0,60,60)];
     [rightButton setTitle:@"登录" forState:UIControlStateNormal];
+    
     rightButton.backgroundColor=[UIColor clearColor];
     [rightButton.titleLabel setFont:[UIFont systemFontOfSize:14]];
     [rightButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -300,13 +325,59 @@ extern BOOL formLogIn;
     UIBarButtonItem*rightItem= [[UIBarButtonItem alloc] initWithCustomView:rightButton];
 //    rightItem.tintColor=[UIColor whiteColor];
 //    [rightItem setTintColor:[UIColor whiteColor]];
-    self.navigationItem.rightBarButtonItem= rightItem;
+    
+    if (self.isBind)
+    {
+        labe.text=@"绑定手机";
+        [self.resignBtn setTitle:@"确定" forState:UIControlStateNormal];
+        if (!skiped&&self.isFromLogin)
+        {
+            [rightButton setTitle:@"跳过" forState:UIControlStateNormal];
+            self.navigationItem.rightBarButtonItem= rightItem;
+        }
+        else
+        {
+           UIButton* _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom];
+            _bakbutton.frame = CGRectMake(0,0,48,44);
+            [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
+            _bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
+            [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside];
+            //    [_bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)];
+            UIBarButtonItem*_back =[[UIBarButtonItem alloc] initWithCustomView:_bakbutton];
+            UIBarButtonItem *fixedButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+            fixedButtonItem.width = -kSizeFrom750(30);
+            self.navigationItem.leftBarButtonItems = @[fixedButtonItem, _back];
+        }
+        
+        
+    }
+    else
+    {
+         self.navigationItem.rightBarButtonItem= rightItem;
+    }
+    [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
 //    [self.navigationItem.rightBarButtonItem setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:14],UITextAttributeFont, [UIColor whiteColor], UITextAttributeTextColor, nil] forState:UIControlStateNormal];
 
 }
 -(void)rightButtonClick:(UIButton *)sender{
-    LogInViewController *login=[[LogInViewController alloc]init];
-    [self.navigationController pushViewController:login animated:YES];
+    if (self.isBind)
+    {
+        [[IfishUserDataUnity shareDataInstance] setAppTabRoot];
+        NSUserDefaults*userDefsult=[NSUserDefaults standardUserDefaults];
+        UserModel*model=[dataContorl getUserInfo];
+        if (model.unionId)
+        {
+            [userDefsult setBool:YES forKey:model.unionId];
+            [userDefsult synchronize];
+        }
+    }
+    
+    else
+    {
+        LogInViewController *login=[[LogInViewController alloc]init];
+        [self.navigationController pushViewController:login animated:YES];
+    }
+    
     
 }
 
@@ -380,7 +451,15 @@ extern BOOL formLogIn;
             {
                 
                NSLog(@"验证成功");
-                [self ifishAddUser];
+                if (self.isBind)
+                {
+                    [self bindPhone];
+                }
+                else
+                {
+                    [self ifishAddUser];
+                }
+               
                 
            }
            else
@@ -462,6 +541,73 @@ extern BOOL formLogIn;
 
 }
 
+-(void)bindPhone
+{
+    UserModel*user=[dataContorl getUserInfo];
+    if (user.unionId)
+    {
+        NSMutableDictionary*para=[[NSMutableDictionary alloc]initWithDictionary:@{@"unionId":user.unionId,@"phoneNum":self.phoneNumberTextField.text}];
+        if (self.passwordTextField.text.length)
+        {
+            para[@"password"]=[MyMD5 md5:self.passwordTextField.text];
+        }
+        [AFHttpTool requestWihtMethod:RequestMethodTypePost
+                                  url:kUserBindPhone
+                               params:para
+                              success:^(id response) {
+                                  if (response) {
+                                      NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
+                                      NSLog(@"resultDic:%@",resultDic);
+                                      [[NSNotificationCenter defaultCenter] postNotificationName:@"updateUserInfobyValidation" object:nil];
+                                      if ([resultDic[@"result"] isEqualToString:@"100"])
+                                      {
+                                          
+                                          NSUserDefaults*userdefult=[NSUserDefaults standardUserDefaults];
+                                          NSString*userName=self.phoneNumberTextField.text;
+                                          NSString*password=self.passwordTextField.text;
+                                          
+                                          [userdefult setObject:password forKey:@"password"];
+                                          [userdefult setObject:userName forKey:@"name"];
+                                          //是否退出登陆
+                                          [userdefult setObject:@"0" forKey:@"isExit"];
+                                          [userdefult synchronize];
+                                          user.phoneNumber=self.phoneNumberTextField.text;
+                                          [[DataCenter defaultDtacenter]setValue:user forKey:@"UserLogIn"];
+                                          [self.view makeToast:@"绑定成功"];
+                                          
+                                          if (self.isFromLogin)
+                                          {
+                                               [[IfishUserDataUnity shareDataInstance] setAppTabRoot];
+                                          }
+                                          else
+                                          {
+                                              
+                                            [self.navigationController popViewControllerAnimated:YES];
+                                          }
+                                          
+                                         
+                                          
+                                      }else if ([resultDic[@"result"] isEqualToString:@"204"]){
+                                          
+                                          [self.view makeToast:@"验证码错误"];
+                                          
+                                      }else{
+                                          
+                                          [self.view makeToast:@"修改失败"];
+                                          
+                                      }
+                                  }
+                                  
+                              } failure:^(NSError *err) {
+                                  
+                              }];
+    }
+   
+}
+-(void)goBackAction{
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
 #pragma mark-  极光别名注册
 
 - (void)tagsAliasCallback:(int)iResCode tags:(NSSet*)tags alias:(NSString*)alias {
@@ -497,7 +643,7 @@ extern BOOL formLogIn;
     
     //视图下沉恢复原状
     [UIView animateWithDuration:duration animations:^{
-        self.view.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
+        self.view.frame = CGRectMake(0, NavigationBarHeight, self.view.frame.size.width, self.view.frame.size.height);
     }];
 }
 
@@ -673,8 +819,11 @@ extern BOOL formLogIn;
     NSUserDefaults*userDefsult=[NSUserDefaults standardUserDefaults];
     NSString*name=[userDefsult objectForKey:@"name"];
     NSString*password=[userDefsult objectForKey:@"password"];
-    NSString*tokenStr=[MyMD5 md5:password];
-    
+    NSString*tokenStr=@"";
+    if (password.length)
+    {
+        tokenStr=[MyMD5 md5:password];
+    }
     [AFHttpTool userLogInWithPhoneNumber:name password:tokenStr phoneType:@"ios" address:self.adderss
                                longitude:self.longitude
                                 latitude:self.latitude  success:^(id response) {
@@ -717,10 +866,31 @@ extern BOOL formLogIn;
         NSString *erstr =[NSString stringWithFormat:@"%@",err];
         BLYLog(BuglyLogLevelError, erstr);
         
-    }];
+    } expara:self.expara];
     
 }
 
+- (IBAction)wechatAuthority:(id)sender {
+    AppDelegate*del=(AppDelegate*)[UIApplication sharedApplication].delegate;
+    del.isWechatLogin=YES;
+    [WXApiManager sharedManager].delegate=self;
+    SendAuthReq* req =[[SendAuthReq alloc]init];
+    req.scope = @"snsapi_userinfo";
+    req.state = @"ifish7";
+    
+    [WXApi sendReq:req];
+}
+#pragma mark - WXApiManagerDelegate
+- (void)managerDidRecvAuthResponse:(SendAuthResp *)response
+{
+    if (response.errCode==0)
+    {
+        self.expara=@{@"code":response.code};
+        [self logIn];
+    }
+    AppDelegate*del=(AppDelegate*)[UIApplication sharedApplication].delegate;
+    del.isWechatLogin=NO;
+}
 
 -(void)creatMyindicaterView{
     _indicatorView=[[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];

Ifish/controllers/logAddRegistController/RegistViewController.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,18 +15,21 @@
                 <outlet property="phoneNumberTextField" destination="iE3-ny-LX2" id="kOJ-c7-cq8"/>
                 <outlet property="qrcodeSwitchLbl" destination="hT6-V3-AAb" id="np4-Ek-9LA"/>
                 <outlet property="registBtn" destination="I52-cD-mf7" id="Kam-09-yMp"/>
+                <outlet property="resignBtn" destination="I52-cD-mf7" id="HIf-ea-a8m"/>
+                <outlet property="styleView" destination="Dl8-My-eSl" id="mTv-gz-dUQ"/>
                 <outlet property="timeBtn" destination="JFw-B7-IwK" id="6a6-Xs-pmB"/>
                 <outlet property="verifyTextField" destination="nOn-jr-IQE" id="ijZ-Xl-BiV"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="wechatConstraints" destination="ezf-mv-Ekj" id="ihW-bN-o3z"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="爱鱼奇" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hYY-oA-nHl">
-                    <rect key="frame" x="123.5" y="500.5" width="73" height="21"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="爱鱼奇" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hYY-oA-nHl">
+                    <rect key="frame" x="170.5" y="838.5" width="73" height="21"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="YMB-XW-gtX"/>
                     </constraints>
@@ -36,23 +37,26 @@
                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" www.ifish7.com" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ur3-Na-90E">
-                    <rect key="frame" x="114.5" y="523.5" width="91" height="14.5"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" www.ifish7.com" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ur3-Na-90E">
+                    <rect key="frame" x="161.5" y="861.5" width="91" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="enter_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="O0L-5W-OS6">
-                    <rect key="frame" x="134" y="438.5" width="52" height="52"/>
+                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="enter_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="O0L-5W-OS6">
+                    <rect key="frame" x="154.5" y="733.5" width="105" height="105"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
+                    </accessibility>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="O0L-5W-OS6" secondAttribute="height" multiplier="1:1" id="fSV-46-RYD"/>
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SR2-Pu-ao5">
-                    <rect key="frame" x="21" y="73" width="278" height="292"/>
+                    <rect key="frame" x="21" y="40" width="372" height="374"/>
                     <subviews>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的手机号" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="iE3-ny-LX2">
-                            <rect key="frame" x="25" y="63" width="228" height="33.5"/>
+                            <rect key="frame" x="25" y="77" width="322" height="47.5"/>
                             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="iE3-ny-LX2" secondAttribute="height" multiplier="283:42" id="lT9-zT-aKL"/>
@@ -61,7 +65,7 @@
                             <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                         </textField>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="nOn-jr-IQE">
-                            <rect key="frame" x="25" y="104.5" width="228" height="34"/>
+                            <rect key="frame" x="25" y="132.5" width="322" height="48"/>
                             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="nOn-jr-IQE" secondAttribute="height" multiplier="283:42" id="n5r-mc-jar"/>
@@ -70,7 +74,7 @@
                             <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JFw-B7-IwK">
-                            <rect key="frame" x="173" y="104.5" width="80" height="34"/>
+                            <rect key="frame" x="267" y="132.5" width="80" height="48"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="80" id="N1G-p8-Udv"/>
                             </constraints>
@@ -83,7 +87,7 @@
                             </connections>
                         </button>
                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="7xd-HS-1kK">
-                            <rect key="frame" x="25" y="146.5" width="228" height="34"/>
+                            <rect key="frame" x="25" y="188.5" width="322" height="47.5"/>
                             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="7xd-HS-1kK" secondAttribute="height" multiplier="283:42" id="lla-8H-DoS"/>
@@ -92,7 +96,7 @@
                             <textInputTraits key="textInputTraits"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I52-cD-mf7">
-                            <rect key="frame" x="25" y="208.5" width="228" height="34.5"/>
+                            <rect key="frame" x="25" y="264" width="322" height="49"/>
                             <color key="backgroundColor" red="0.0" green="0.71764705882352942" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="I52-cD-mf7" secondAttribute="height" multiplier="283:43" id="cSL-5y-1oN"/>
@@ -105,7 +109,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LoQ-C1-iph">
-                            <rect key="frame" x="25" y="252" width="16" height="16"/>
+                            <rect key="frame" x="25" y="322" width="16" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="16" id="RBU-vl-U55"/>
                                 <constraint firstAttribute="height" constant="16" id="aik-Sp-SHV"/>
@@ -116,7 +120,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pnt-Um-Tap">
-                            <rect key="frame" x="49" y="246" width="146" height="28"/>
+                            <rect key="frame" x="49" y="316" width="146" height="28"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <state key="normal" title="我已同意爱鱼奇使用协议">
                                 <color key="titleColor" red="0.70980392156862748" green="0.70980392156862748" blue="0.70980392156862748" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -126,10 +130,10 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="42g-iR-QpF">
-                            <rect key="frame" x="25" y="21" width="228" height="34"/>
+                            <rect key="frame" x="25" y="21" width="322" height="48"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n5p-Vd-ZyI">
-                                    <rect key="frame" x="73" y="2" width="147" height="30"/>
+                                    <rect key="frame" x="167" y="9" width="147" height="30"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="147" id="bST-Mi-MC4"/>
                                     </constraints>
@@ -139,7 +143,7 @@
                                     </state>
                                 </button>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="国家/地区" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D0R-l5-Uoe">
-                                    <rect key="frame" x="10" y="6.5" width="73" height="21"/>
+                                    <rect key="frame" x="10" y="13.5" width="73" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="73" id="ETL-6a-81N"/>
                                         <constraint firstAttribute="height" constant="21" id="FPM-9d-hDt"/>
@@ -159,14 +163,14 @@
                             </constraints>
                         </view>
                         <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="短信验证码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hT6-V3-AAb">
-                            <rect key="frame" x="195" y="252.5" width="61.5" height="14.5"/>
+                            <rect key="frame" x="195" y="322.5" width="61.5" height="15"/>
                             <gestureRecognizers/>
                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JIR-jc-I5O" userLabel="QRSwitchBtn">
-                            <rect key="frame" x="196" y="243" width="58" height="49"/>
+                            <rect key="frame" x="196" y="313" width="152" height="61"/>
                             <connections>
                                 <action selector="qrcodeSwithBtnClicked:" destination="-1" eventType="touchUpInside" id="pyz-qc-Ryt"/>
                             </connections>
@@ -210,26 +214,85 @@
                         <constraint firstAttribute="bottom" secondItem="JIR-jc-I5O" secondAttribute="bottom" id="xku-8I-uiZ"/>
                     </constraints>
                 </view>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dl8-My-eSl" userLabel="styleView">
+                    <rect key="frame" x="21" y="801" width="372" height="65"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多登陆方式" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DJf-I8-Sss">
+                            <rect key="frame" x="136" y="0.0" width="100" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="J4w-6X-28m"/>
+                                <constraint firstAttribute="height" constant="21" id="PyO-LR-Ea3"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <color key="textColor" red="0.80148819000000004" green="0.81775635479999997" blue="0.81158418570000002" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hKP-db-5yh" userLabel="line1">
+                            <rect key="frame" x="81" y="9" width="45" height="0.5"/>
+                            <color key="backgroundColor" red="0.80000000000000004" green="0.81960784310000001" blue="0.87450980389999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="6oO-VY-0uR"/>
+                                <constraint firstAttribute="width" constant="45" id="lhf-vo-JHb"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qy5-T6-hiZ" userLabel="line2">
+                            <rect key="frame" x="246" y="9" width="45" height="0.5"/>
+                            <color key="backgroundColor" red="0.80000000000000004" green="0.81960784310000001" blue="0.87450980389999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="Zcf-Mk-NfF"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v38-vU-lfs">
+                            <rect key="frame" x="166" y="21" width="40" height="40"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="PgM-Ij-5Sd"/>
+                                <constraint firstAttribute="width" constant="40" id="Tet-JG-UBp"/>
+                            </constraints>
+                            <state key="normal" image="wechatlogin.png"/>
+                            <connections>
+                                <action selector="wechatAuthority:" destination="-1" eventType="touchUpInside" id="ScL-xU-Wwf"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="DJf-I8-Sss" firstAttribute="top" secondItem="Dl8-My-eSl" secondAttribute="top" id="6Y2-JK-BbP"/>
+                        <constraint firstItem="Qy5-T6-hiZ" firstAttribute="width" secondItem="hKP-db-5yh" secondAttribute="width" id="7lA-Fr-Scs"/>
+                        <constraint firstItem="Qy5-T6-hiZ" firstAttribute="leading" secondItem="DJf-I8-Sss" secondAttribute="trailing" constant="10" id="DCT-pU-rTZ"/>
+                        <constraint firstItem="Qy5-T6-hiZ" firstAttribute="top" secondItem="Dl8-My-eSl" secondAttribute="top" constant="9" id="NI6-49-5UT"/>
+                        <constraint firstItem="v38-vU-lfs" firstAttribute="top" secondItem="DJf-I8-Sss" secondAttribute="bottom" id="Ovd-z5-Sv7"/>
+                        <constraint firstItem="DJf-I8-Sss" firstAttribute="centerX" secondItem="Dl8-My-eSl" secondAttribute="centerX" id="QR7-he-Ejn"/>
+                        <constraint firstItem="v38-vU-lfs" firstAttribute="centerX" secondItem="Dl8-My-eSl" secondAttribute="centerX" id="izM-GO-xXP"/>
+                        <constraint firstAttribute="height" constant="65" id="mWL-mz-uM3"/>
+                        <constraint firstItem="hKP-db-5yh" firstAttribute="trailing" secondItem="DJf-I8-Sss" secondAttribute="leading" constant="-10" id="pMs-IP-3bp"/>
+                        <constraint firstItem="hKP-db-5yh" firstAttribute="top" secondItem="Dl8-My-eSl" secondAttribute="top" constant="9" id="sQv-HB-6bK"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
                 <constraint firstItem="SR2-Pu-ao5" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="82b-ax-1QC"/>
-                <constraint firstItem="hYY-oA-nHl" firstAttribute="top" secondItem="O0L-5W-OS6" secondAttribute="bottom" constant="10" id="C7p-nT-vPL"/>
+                <constraint firstItem="hYY-oA-nHl" firstAttribute="top" secondItem="O0L-5W-OS6" secondAttribute="bottom" id="C7p-nT-vPL"/>
+                <constraint firstItem="Dl8-My-eSl" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="CMw-n5-yqY"/>
                 <constraint firstItem="O0L-5W-OS6" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Gq0-DU-jkK"/>
                 <constraint firstAttribute="trailing" secondItem="SR2-Pu-ao5" secondAttribute="trailing" constant="21" id="QNp-Yy-Bg8"/>
+                <constraint firstItem="Dl8-My-eSl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="21" id="T5g-jS-xSB"/>
                 <constraint firstItem="hYY-oA-nHl" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="eSa-a3-a4g"/>
-                <constraint firstAttribute="bottom" secondItem="Ur3-Na-90E" secondAttribute="bottom" constant="30" id="gJB-ua-pHI"/>
+                <constraint firstItem="Dl8-My-eSl" firstAttribute="bottom" secondItem="i5M-Pr-FkT" secondAttribute="bottom" constant="-30" id="ezf-mv-Ekj"/>
+                <constraint firstAttribute="bottom" secondItem="Ur3-Na-90E" secondAttribute="bottom" constant="20" id="gJB-ua-pHI"/>
                 <constraint firstItem="Ur3-Na-90E" firstAttribute="top" secondItem="hYY-oA-nHl" secondAttribute="bottom" constant="2" id="ikP-76-AfN"/>
-                <constraint firstItem="SR2-Pu-ao5" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="73" id="oqG-Fy-gWM"/>
+                <constraint firstItem="SR2-Pu-ao5" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="40" id="oqG-Fy-gWM"/>
                 <constraint firstItem="SR2-Pu-ao5" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="21" id="qmu-s8-j7c"/>
                 <constraint firstItem="Ur3-Na-90E" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="yZr-tw-zcf"/>
             </constraints>
-            <point key="canvasLocation" x="-68.5" y="86.5"/>
+            <point key="canvasLocation" x="-69.375" y="85.563380281690144"/>
         </view>
     </objects>
     <resources>
-        <image name="enter_logo.png" width="52" height="52"/>
-        <image name="registered_icon_tick_uncheck.png" width="14" height="14"/>
+        <image name="enter_logo.png" width="52.5" height="52.5"/>
+        <image name="registered_icon_tick_uncheck.png" width="14.5" height="14.5"/>
         <image name="registered_icon_validation.png" width="146" height="88"/>
+        <image name="wechatlogin.png" width="150" height="150"/>
     </resources>
 </document>