登陆页面UI修改

BuguLive/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,62 +1,120 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "images" : [
     {
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "filename" : "icon_1024.png",
-      "size" : "1024x1024"
+      "filename" : "icon-20@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "icon-20@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "icon-29@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
-      "idiom" : "iphone",
-      "filename" : "icon_40.png"
+      "size" : "29x29"
     },
     {
+      "filename" : "icon-29@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "filename" : "icon_60.png"
+      "size" : "29x29"
     },
     {
+      "filename" : "icon-38@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
-      "size" : "29x29",
-      "filename" : "icon_58.png",
-      "idiom" : "iphone"
+      "size" : "38x38"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon_87.png",
-      "scale" : "3x"
+      "filename" : "icon-38@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon_80.png",
-      "scale" : "2x"
+      "filename" : "icon-40@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
-      "filename" : "icon_120.png",
+      "filename" : "icon-40@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
-      "idiom" : "iphone"
+      "size" : "40x40"
     },
     {
-      "filename" : "icon_120.png",
-      "size" : "60x60",
+      "filename" : "icon-60@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
-      "idiom" : "iphone"
+      "size" : "60x60"
     },
     {
+      "filename" : "icon-60@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
-      "idiom" : "iphone",
-      "filename" : "icon_180.png",
       "size" : "60x60"
+    },
+    {
+      "filename" : "icon-64@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
+    },
+    {
+      "filename" : "icon-64@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
+    },
+    {
+      "filename" : "icon-68@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
+    },
+    {
+      "filename" : "icon-76@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "icon-83.5@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "icon-1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BuguLive/Assets.xcassets/BogoLogin(新版9.24/bogo_regiset_normal.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "椭圆 611.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "椭圆 611@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "椭圆 611@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/BogoLogin(新版9.24/bogo_regiset_select.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "图层 26.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "图层 26@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "图层 26@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/common（公共 前缀：com）/com_preload_head_img.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "logo11.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/dy_content.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dy_content.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/dy_icon.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dy_icon.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/guanggao.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "guanggao.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/login（登录 前缀：lg）/lg_radio_no_selected.imageset/Contents.json → BuguLive/Assets.xcassets/login（登录 前缀：lg）/bogo_regiset_normal.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "lg_radio_no_selected@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "lg_radio_no_selected@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BuguLive/Assets.xcassets/login（登录 前缀：lg）/lg_radio_selected.imageset/Contents.json → BuguLive/Assets.xcassets/login（登录 前缀：lg）/bogo_regiset_select.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "lg_radio_selected@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "lg_radio_selected@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BuguLive/Assets.xcassets/03919/login.imageset/Contents.json → BuguLive/Assets.xcassets/login（登录 前缀：lg）/com_preload_head_img.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login@3x.png",
+      "filename" : "login_logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "login_logo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/dy_bg.imageset/Contents.json → BuguLive/Assets.xcassets/login（登录 前缀：lg）/icon_login_apple.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "dy_bg.jpg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "icon_login_apple@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "icon_login_apple@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BuguLive/Assets.xcassets/login（登录 前缀：lg）/lg_bg.imageset/Contents.json

@@ -1,12 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "lg_bg.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "大背景@2x.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BuguLive/Assets.xcassets/test.imageset/Contents.json → BuguLive/Assets.xcassets/login（登录 前缀：lg）/wel.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "test.png",
+      "filename" : "wel.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

BuguLive/Assets.xcassets/wb_bg.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wb_bg.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/wb_find.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wb_find.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/wb_icon.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wb_icon.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/wb_more.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wb_more.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wb_more@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wb_more@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/wel.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "711 live启动页.jpg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/wy_bg.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wy_bg.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/开发/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Assets.xcassets/开发/背景.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "背景@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BuguLive/Class/General/AppleIDManager.h

@@ -18,8 +18,6 @@ typedef void(^failureBlock)(NSString *errorMsg);
 
 @interface AppleIDManager : NSObject
 
-@property(nonatomic, strong) ASAuthorizationAppleIDButton *loginBtn;
-
 @property(nonatomic, strong) UIWindow *window;
 
 @property(nonatomic, copy) successBlock successBlock;

BuguLive/Class/General/AppleIDManager.m

@@ -116,16 +116,4 @@
     return self.window;
 }
 
-- (ASAuthorizationAppleIDButton *)loginBtn API_AVAILABLE(ios(13.0)){
-    if (!_loginBtn) {
-        if (@available(iOS 13.2, *)) {
-            _loginBtn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeSignUp style:ASAuthorizationAppleIDButtonStyleBlack];
-        } else {
-            // Fallback on earlier versions
-        }
-//        [_loginBtn addTarget:self action:@selector(loginBtnAction:) forControlEvents:UIControlEventTouchDown];
-    }
-    return _loginBtn;
-}
-
 @end

BuguLive/Class/Sections/Login/BogoLogin/BogoJHLogin.m

@@ -351,19 +351,16 @@
         self.wxBtn.hidden = NO;
     }
     
-    if (@available(iOS 13.0, *) && self.thirdView) {
-
+    if (!self.AppleLabel) {
+        
+        UIImageView *appleLogin = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_login_apple"]];
         manager = [AppleIDManager defaultManager];
         manager.window = [AppDelegate sharedAppDelegate].window;
-        [self.thirdView addSubview:manager.loginBtn];
-        manager.loginBtn.layer.cornerRadius = 15;
-        manager.loginBtn.clipsToBounds = YES;
-//        manager.loginBtn.backgroundColor = kgrar
+        [self.thirdView addSubview:appleLogin];
         
-        
-        [manager.loginBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        [appleLogin mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(self.thirdView).offset(30);
-            make.height.width.mas_equalTo(@30);
+            make.height.width.mas_equalTo(@35);
             make.centerY.equalTo(self.thirdView);
         }];
         
@@ -373,25 +370,22 @@
         self.AppleLabel.textColor = UIColor.blackColor;
         [self.thirdView addSubview:self.AppleLabel];
         [self.AppleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerX.equalTo(self.thirdView);
+            make.left.equalTo(appleLogin.mas_right).mas_offset(50);
             make.centerY.equalTo(self.thirdView);
         }];
-//            .frame = button.frame;
-        [self.thirdView addSubview:manager.loginBtn];
+    //            .frame = button.frame;
+    //        [self.thirdView addSubview:manager.loginBtn];
         UITapGestureRecognizer *tap  = [[UITapGestureRecognizer alloc] init];
         [tap addTarget:self action:@selector(appleLogin)];
         [self.thirdView addGestureRecognizer:tap];
-        [thirdArr addObject:@"3"];
-        self.wxBtn.hidden = NO;
-
-
+        
         [AppleIDManager defaultManager].successBlock = ^(NSString * _Nonnull authorizationCode, NSString * _Nonnull identityToken, NSString * _Nonnull user) {
             
-//            if (self.isSelect == NO) {
-//                [FanweMessage alertHUD:ASLocalizedString(@"请先阅读并勾选协议")];
-//                return;
-//            }
-//        http://livev2020.bogokj.com/mapi/index.php?ctl=login&act=apple_login&user_id=001872.a22fc8cc2d0a4d0bacaf109007e19351.0650&verify_token=&nickname=
+    //            if (self.isSelect == NO) {
+    //                [FanweMessage alertHUD:ASLocalizedString(@"请先阅读并勾选协议")];
+    //                return;
+    //            }
+    //        http://livev2020.bogokj.com/mapi/index.php?ctl=login&act=apple_login&user_id=001872.a22fc8cc2d0a4d0bacaf109007e19351.0650&verify_token=&nickname=
             FWWeakify(self)
             NSMutableDictionary *parmDict = [NSMutableDictionary dictionary];
             [parmDict setObject:@"login" forKey:@"ctl"];
@@ -409,14 +403,14 @@
                  {
                      UserModel *model = [UserModel modelWithDictionary:responseJson[@"user_info"]];
                      model.need_bind_mobile = [responseJson[@"need_bind_mobile"] integerValue];
-//                     model.access_token = resp.accessToken;
-//                     if (model.need_bind_mobile == 0) {
+    //                     model.access_token = resp.accessToken;
+    //                     if (model.need_bind_mobile == 0) {
                          [BGIMLoginManager sharedInstance].loginParam.identifier = [responseJson toString:@"user_id"];
                          [BGIMLoginManager sharedInstance].loginParam.isAgree = [responseJson toInt:@"is_agree"];
                          
                          self.BuguLive.appModel.first_login = [responseJson toString:@"first_login"];
-//                         self.BuguLive.appModel.new_level = [responseJson toInt:@"new_level"];
-//                         self.BuguLive.appModel.login_send_score = [responseJson toString:@"login_send_score"];
+    //                         self.BuguLive.appModel.new_level = [responseJson toInt:@"new_level"];
+    //                         self.BuguLive.appModel.login_send_score = [responseJson toString:@"login_send_score"];
                          [GlobalVariables sharedInstance].token = [responseJson toString:@"token"];
                          [[BGIMLoginManager sharedInstance] getUserSig:^{
                              
@@ -429,9 +423,9 @@
                              
                          }];
                      }
-//                 }else{
-//                     [FanweMessage alertHUD:[responseJson toString:@"error"]];
-//                 }
+    //                 }else{
+    //                     [FanweMessage alertHUD:[responseJson toString:@"error"]];
+    //                 }
              } FailureBlock:^(NSError *error) {
         //         FWStrongify(self)
                  [self showMyHud];
@@ -439,15 +433,13 @@
              }];
         };
         [AppleIDManager defaultManager].failureBlock = ^(NSString * _Nonnull errorMsg) {
-//            [[HUDHelper sharedInstance] tipMessage:errorMsg];
+    //            [[HUDHelper sharedInstance] tipMessage:errorMsg];
             [FanweMessage alertHUD:errorMsg];
         };
-
     }
     
-   
-    
-    
+    [thirdArr addObject:@"3"];
+    self.wxBtn.hidden = NO;
     
     if (thirdArr.count == 1) {
         self.wxConstraint.constant = 0;
@@ -1619,7 +1611,7 @@
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.lineSpacing = 4;// 字体的行间距
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont systemFontOfSize:12.0],
-                                 NSForegroundColorAttributeName:[UIColor colorWithHexString:@"#FFFFFF"],
+                                 NSForegroundColorAttributeName:[UIColor colorWithHexString:@"#3D3D3D"],
                                  NSParagraphStyleAttributeName:paragraphStyle};
     [attributedString setAttributes:attributes range:NSMakeRange(0, attributedString.length)];
     
@@ -1630,7 +1622,7 @@
                              value:@"action2://"
                              range:[[attributedString string] rangeOfString:ASLocalizedString(@"《隐私政策》")]];
     
-    NSDictionary *linkAttributes = @{NSForegroundColorAttributeName:[UIColor colorWithHexString:@"#FFFFFF"]};
+    NSDictionary *linkAttributes = @{NSForegroundColorAttributeName:[UIColor colorWithHexString:@"#01F2F1"]};
     self.agreeT.backgroundColor = [UIColor clearColor];
     self.agreeT.linkTextAttributes = linkAttributes;
     self.agreeT.attributedText = attributedString;

BuguLive/Class/Sections/Login/BogoLogin/BogoJHLogin.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina5_9" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,14 +23,14 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login" translatesAutoresizingMaskIntoConstraints="NO" id="g9K-dj-bil">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lg_bg" translatesAutoresizingMaskIntoConstraints="NO" id="g9K-dj-bil">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bgW-hc-8Xe" userLabel="[layout]login_button">
-                    <rect key="frame" x="55" y="393" width="265" height="329"/>
+                    <rect key="frame" x="55" y="248" width="265" height="329"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aan-Sr-KAH" customClass="QMUIFillButton">
                             <rect key="frame" x="0.0" y="148" width="265" height="44"/>
@@ -132,36 +132,32 @@
                     </constraints>
                 </view>
                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="已阅读并同意《用户服务协议》和《隐私政策》          " textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="DVl-t1-YcX">
-                    <rect key="frame" x="50" y="729.66666666666663" width="275" height="30"/>
+                    <rect key="frame" x="50" y="584.5" width="275" height="30"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="275" id="OM6-Js-bo4"/>
                         <constraint firstAttribute="height" constant="30" id="bek-EY-bdh"/>
                     </constraints>
-                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.23921568627450979" green="0.23921568627450979" blue="0.23921568627450979" alpha="1" colorSpace="calibratedRGB"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                 </textView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AmA-tY-ukJ">
-                    <rect key="frame" x="16" y="722.66666666666663" width="44" height="44"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="44" id="LUL-3Q-Rtq"/>
-                        <constraint firstAttribute="height" constant="44" id="saZ-DA-RhO"/>
-                    </constraints>
+                    <rect key="frame" x="44" y="588.5" width="16" height="22"/>
                     <state key="normal" image="bogo_regiset_normal"/>
                     <connections>
                         <action selector="clickSelectBtn:" destination="-1" eventType="touchUpInside" id="j2Y-jC-LSA"/>
                     </connections>
                 </button>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Eku-Mu-RZL">
-                    <rect key="frame" x="147.66666666666666" y="109" width="80" height="80"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="com_preload_head_img" translatesAutoresizingMaskIntoConstraints="NO" id="Eku-Mu-RZL">
+                    <rect key="frame" x="137.5" y="100" width="100" height="100"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="80" id="S3P-os-eOu"/>
-                        <constraint firstAttribute="height" constant="80" id="ZiW-uy-UTu"/>
+                        <constraint firstAttribute="width" constant="100" id="S3P-os-eOu"/>
+                        <constraint firstAttribute="height" constant="100" id="ZiW-uy-UTu"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="711live" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVt-1N-C9l">
-                    <rect key="frame" x="154.66666666666666" y="207" width="66" height="24"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVt-1N-C9l">
+                    <rect key="frame" x="187.5" y="218" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="20"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
@@ -175,7 +171,7 @@
                 <constraint firstItem="DVl-t1-YcX" firstAttribute="leading" secondItem="AmA-tY-ukJ" secondAttribute="trailing" constant="-10" id="Ede-U6-Xtc"/>
                 <constraint firstItem="QVt-1N-C9l" firstAttribute="centerX" secondItem="Eku-Mu-RZL" secondAttribute="centerX" id="KKO-im-m6T"/>
                 <constraint firstItem="DVl-t1-YcX" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Nj5-JH-i0l"/>
-                <constraint firstItem="Eku-Mu-RZL" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="109" id="Sgu-g3-kx2"/>
+                <constraint firstItem="Eku-Mu-RZL" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="100" id="Sgu-g3-kx2"/>
                 <constraint firstItem="DVl-t1-YcX" firstAttribute="top" secondItem="bgW-hc-8Xe" secondAttribute="bottom" constant="7.5" id="UOJ-pb-ibm"/>
                 <constraint firstItem="g9K-dj-bil" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="aWj-jZ-NhK"/>
                 <constraint firstAttribute="trailing" secondItem="g9K-dj-bil" secondAttribute="trailing" id="hzQ-BJ-Cl2"/>
@@ -189,10 +185,11 @@
         </view>
     </objects>
     <resources>
-        <image name="bogo_regiset_normal" width="11" height="11"/>
+        <image name="bogo_regiset_normal" width="16" height="16"/>
+        <image name="com_preload_head_img" width="112" height="112"/>
         <image name="facebook" width="20" height="20"/>
         <image name="google" width="30" height="30"/>
-        <image name="login" width="562.5" height="1000.5"/>
+        <image name="lg_bg" width="375" height="812"/>
         <image name="mobile" width="30" height="30"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

BuguLive/Launch Screen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,12 +19,21 @@
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wel" translatesAutoresizingMaskIntoConstraints="NO" id="G0v-By-0kA">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_logo" translatesAutoresizingMaskIntoConstraints="NO" id="IEE-Nj-nbi">
+                                <rect key="frame" x="157" y="241" width="100" height="100"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="100" id="AsY-f8-rJM"/>
+                                    <constraint firstAttribute="height" constant="100" id="MgN-dY-1VA"/>
+                                </constraints>
+                            </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="IEE-Nj-nbi" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="145" id="3ap-HE-31x"/>
                             <constraint firstItem="G0v-By-0kA" firstAttribute="trailing" secondItem="Bcu-3y-fUS" secondAttribute="trailing" id="FPS-O2-U1v"/>
                             <constraint firstItem="G0v-By-0kA" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="FWL-Hq-wlr"/>
+                            <constraint firstItem="IEE-Nj-nbi" firstAttribute="centerX" secondItem="G0v-By-0kA" secondAttribute="centerX" id="bVx-rz-PTr"/>
                             <constraint firstItem="G0v-By-0kA" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="jEd-Dt-3LB"/>
                             <constraint firstAttribute="bottom" secondItem="G0v-By-0kA" secondAttribute="bottom" id="qdQ-KL-uLh"/>
                         </constraints>
@@ -36,6 +45,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="wel" width="540" height="960"/>
+        <image name="login_logo" width="112" height="112"/>
+        <image name="wel" width="375" height="812"/>
     </resources>
 </document>