调整页面-授权相关

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/login_logo.imageset/Contents.json

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

ios/JianYuIOS/JianYuIOS/Base.lproj/LaunchScreen.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina5_5" orientation="portrait" appearance="light"/>
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
@@ -16,11 +16,11 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qidongye.png" translatesAutoresizingMaskIntoConstraints="NO" id="cnp-0C-3lp">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qidongye" translatesAutoresizingMaskIntoConstraints="NO" id="cnp-0C-3lp">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -38,6 +38,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="qidongye.png" width="375" height="667"/>
+        <image name="qidongye" width="375" height="667"/>
     </resources>
 </document>

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -184,7 +184,7 @@ _Pragma("clang diagnostic pop")\
 
 
 //正式
-//#define kHost @"https://ios.jianyu360.cn/"   //正式版
+//#define kHost @"https://ios-i2.jianyu360.cn/"   //正式版
 
 
 /*

ios/JianYuIOS/JianYuIOS/Classes(新模块)/JYBaseViewController.m

@@ -1285,37 +1285,51 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     };
     model.navTitle = [[NSAttributedString alloc] initWithString:@"" attributes:attributes];
     model.navBackImage = [UIImage imageNamed:@"arrowLeft"];
-    
+    model.logoIsHidden = YES;
     //logo配置
-    model.logoImage = [UIImage imageNamed:@"logo"];
-    model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        return CGRectMake((WIDTH-80)*0.5, 30, 80, 80);
+//    model.logoImage = [UIImage imageNamed:@"logo"];
+//    model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+//        return CGRectMake((WIDTH-80)*0.5, 30, 80, 80);
+//    };
+    
+    //添加自定义控件并对自定义控件进行布局
+    __block UIImageView *cusImageView = [ZKControl createImageViewFrame:CGRectMake(0, 0, WIDTH, 180) imageName:@"login_logo"];
+    model.customViewBlock = ^(UIView * _Nonnull superCustomView) {
+        [superCustomView addSubview:cusImageView];
     };
+    
+
+    
     model.numberColor = UIColorFromRGB(0x171826);
     model.numberFont = [UIFont systemFontOfSize:24.0];
     model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        frame.origin.y = 110+30;
+        frame.origin.y = 180+30;
         return frame;
     };
     model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        frame.origin.y = 150+30;
+        frame.origin.y = 220+30;
         return frame;
     };
     
     model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录/注册" attributes:@{NSForegroundColorAttributeName : UIColor.whiteColor,NSFontAttributeName : [UIFont systemFontOfSize:18.0]}];
     NSArray *BtnBgImgs = [NSArray arrayWithObjects:[UIImage imageNamed:@"authbtn_nor"],[UIImage imageNamed:@"authbtn_dis"],[UIImage imageNamed:@"authbtn_nor"], nil];
     model.loginBtnBgImgs = BtnBgImgs;
-    
+    model.loginBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 260+50;
+        return CGRectMake(30, frame.origin.y, WIDTH - 60, 45);
+    };
     
     model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"其他手机号登录/注册" attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0x2ABED1),NSFontAttributeName : [UIFont systemFontOfSize:16.0]}];
     model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        return CGRectMake(10, frame.origin.y, WIDTH - 20, 30);
+        frame.origin.y = 260+50+45+10;
+        return CGRectMake(30, frame.origin.y, WIDTH - 60, 45);
     };
     model.preferredStatusBarStyle = UIStatusBarStyleLightContent;
     model.privacyNavBackImage = [UIImage imageNamed:@"arrowLeft"];
     NSArray *boxImages = [NSArray arrayWithObjects:[UIImage imageNamed:@"unchoose"],[UIImage imageNamed:@"choose"], nil];
     model.checkBoxImages = boxImages;
     
+    
     model.privacyColors = @[UIColor.blackColor, UIColorFromRGB(0x2ABED1)];
     model.privacyAlignment = NSTextAlignmentCenter;
     model.privacyFont = [UIFont fontWithName:@"PingFangSC-Regular" size:13.0];
@@ -1390,25 +1404,28 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     model.numberColor = UIColorFromRGB(0x171826);
     model.numberFont = [UIFont systemFontOfSize:24.0];
     model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        frame.origin.y = 110+30;
+        frame.origin.y = 50;
         return frame;
     };
     model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        frame.origin.y = 150+30;
+        frame.origin.y = 50+40;
         return frame;
     };
     
     model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键绑定手机号" attributes:@{NSForegroundColorAttributeName : UIColor.whiteColor,NSFontAttributeName : [UIFont systemFontOfSize:18.0]}];
     NSArray *BtnBgImgs = [NSArray arrayWithObjects:[UIImage imageNamed:@"authbtn_nor"],[UIImage imageNamed:@"authbtn_dis"],[UIImage imageNamed:@"authbtn_nor"], nil];
     model.loginBtnBgImgs = BtnBgImgs;
-    
+    model.loginBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
+        frame.origin.y = 150;
+        return CGRectMake(30, frame.origin.y, WIDTH - 60, 45);
+    };
     
     model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"绑定其他手机号" attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0x2ABED1),NSFontAttributeName : [UIFont systemFontOfSize:16.0]}];
     model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
-        return CGRectMake(10, frame.origin.y, WIDTH - 20, 30);
+        frame.origin.y = 150+45+10;
+        return CGRectMake(30, frame.origin.y, WIDTH - 60, 45);
     };
     
-
     model.preferredStatusBarStyle = UIStatusBarStyleLightContent;
     model.privacyNavBackImage = [UIImage imageNamed:@"arrowLeft"];
     NSArray *boxImages = [NSArray arrayWithObjects:[UIImage imageNamed:@"unchoose"],[UIImage imageNamed:@"choose"], nil];