Skip to content

pidan / FuSiLive

Go to a project
Commit 5a92caa7 by ludi
Options

完成对登录页第一页的修改

parent 96e710f7
Inline Side-by-side
Showing with 192 additions and 271 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Config/ConfigModels/FUSDevConfig.h
......@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
/// APP状态改变的通知
@property (nonatomic, copy, readonly) NSString *appStatusUpdateNotificationKey;
/// APP状态
/// APP状态 sh：（0：关、1：开）
@property (nonatomic, assign, readonly) BOOL appStatus;
/// APP 第三方 z(i) f(u)开关
......
FuSiLive/Assets.xcassets/Login/start_page_phone_normal.imageset/Contents.json~HEAD deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "start_page_phone_normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_phone_normal@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Login/start_page_phone_normal.imageset/Contents.json~feature_优化包体 deleted 100644 → 0
{
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "start_page_phone_normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_phone_normal@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Login/start_page_phone_normal_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "phone-阿语-normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "phone-阿语-normal@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Login/start_page_phone_pressed.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "phone-preesed@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "phone-preesed@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Login/start_page_phone_pressed_rtl.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "phone-preesed阿语@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "phone-preesed阿语@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/login/Contents.json 0 → 100644
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Login/start_page_facebook_normal.imageset/Contents.json → FuSiLive/Assets.xcassets/fusiPart/login/fus_login_loginBtn_apple_icon.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "start_page_facebook_normal@2x.png",
"filename" : "fus_login_loginBtn_apple_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_facebook_normal@3x.png",
"filename" : "fus_login_loginBtn_apple_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Login/start_page_facebook_normal_rtl.imageset/Contents.json → FuSiLive/Assets.xcassets/fusiPart/login/fus_login_loginBtn_faceBook_icon.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "start_page_facebook_normal_rtl@2x.png",
"filename" : "fus_login_loginBtn_faceBook_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_facebook_normal_rtl@3x.png",
"filename" : "fus_login_loginBtn_faceBook_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Login/start_page_facebook_pressed.imageset/Contents.json → FuSiLive/Assets.xcassets/fusiPart/login/fus_login_loginBtn_google_icon.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "start_page_facebook_pressed@2x.png",
"filename" : "fus_login_loginBtn_google_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_facebook_pressed@3x.png",
"filename" : "fus_login_loginBtn_google_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Login/start_page_facebook_pressed_rtl.imageset/Contents.json → FuSiLive/Assets.xcassets/fusiPart/login/fus_login_loginBtn_line_icon.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "start_page_facebook_pressed_rtl@2x.png",
"filename" : "fus_login_loginBtn_line_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "start_page_facebook_pressed_rtl@3x.png",
"filename" : "fus_login_loginBtn_line_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/Login/start_page_phone_normal.imageset/Contents.json → FuSiLive/Assets.xcassets/fusiPart/login/fus_login_loginBtn_phone_icon.imageset/Contents.json
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "phone-normal@2x.png",
"filename" : "fus_login_loginBtn_phone_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "phone-normal@3x.png",
"filename" : "fus_login_loginBtn_phone_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Classes/Common/Other/FUSCommonHttpRequest.h
......@@ -58,7 +58,7 @@ typedef enum : NSUInteger {
/**
* 检测是否在AppStore审核状态
* 检测是否在AppStore sh 状态
*
* @param success 成功回调
* @param failure 失败回调
......
FuSiLive/Classes/Common/Other/FUSCommonHttpRequest.m
......@@ -76,7 +76,7 @@
}
/**
* 检测是否在AppStore审核状态
* 检测是否在AppStore sh状态
*
* @param success 成功回调
* @param failure 失败回调
......
FuSiLive/Classes/Login/Controller/FUSStartPageViewController.m
......@@ -79,8 +79,10 @@
*/
@property (strong, nonatomic) IBOutlet UIButton *agreementBtn;
@property (weak, nonatomic) IBOutlet UIButton *phoneBtn;
@property (weak, nonatomic) IBOutlet UIButton *facebookBtn;
@property (weak, nonatomic) IBOutlet UIButton *facebookLoginBtn;
@property (weak, nonatomic) IBOutlet UIButton *googleLoginBtn;
@property (weak, nonatomic) IBOutlet UIButton *appleLoginBtn;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *protocalBottomMarginConstrant;
// 绑定类型
......@@ -93,7 +95,7 @@
@property (nonatomic, strong) FUSUpdateModel *model;
@property (weak, nonatomic) IBOutlet UIView *appleLoginBgView;
//@property (weak, nonatomic) IBOutlet UIView *appleLoginBgView;
@property (nonatomic, strong) UIButton *skipBtn;
@property (nonatomic, strong) NSTimer *skipTimer;
......@@ -103,7 +105,7 @@
@property (nonatomic, assign) NSInteger waitTime;
@property (nonatomic, strong) ASAuthorizationAppleIDButton *appleIDBtn;
//@property (nonatomic, strong) ASAuthorizationAppleIDButton *appleIDBtn;
@property (strong, nonatomic) IBOutlet UIView *loginFaildReportView;
@property (strong, nonatomic) IBOutlet UILabel *loginFailReportTitleLabel;
......@@ -170,23 +172,27 @@
[self.navigationController setNavigationBarHidden:YES animated:YES];
[self fus_checkStateDidUpdate];
if (@available(iOS 13.0, *)) {
_appleLoginBgView.layer.cornerRadius = _appleLoginBgView.height/2.0;
_appleLoginBgView.clipsToBounds = YES;
_appleLoginBgView.hidden = NO;
// Sign In With Apple Button
_appleIDBtn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleWhite];
_appleIDBtn.frame = _appleLoginBgView.bounds;
[_appleIDBtn addTarget:self action:@selector(handleAuthorizationAppleIDButtonPress) forControlEvents:UIControlEventTouchUpInside];
[self.appleLoginBgView addSubview:_appleIDBtn];
}else{
_appleLoginBgView.hidden = YES;
}
if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
_appleLoginBgView.hidden = YES;
// if (@available(iOS 13.0, *)) {
// _appleLoginBgView.layer.cornerRadius = _appleLoginBgView.height/2.0;
// _appleLoginBgView.clipsToBounds = YES;
//
// _appleLoginBgView.hidden = NO;
// // Sign In With Apple Button
// _appleIDBtn = [ASAuthorizationAppleIDButton buttonWithType:ASAuthorizationAppleIDButtonTypeDefault style:ASAuthorizationAppleIDButtonStyleWhite];
// _appleIDBtn.frame = _appleLoginBgView.bounds;
// [_appleIDBtn addTarget:self action:@selector(handleAuthorizationAppleIDButtonPress) forControlEvents:UIControlEventTouchUpInside];
// [self.appleLoginBgView addSubview:_appleIDBtn];
// }else{
//
// _appleLoginBgView.hidden = YES;
// }
//
// if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
// _appleLoginBgView.hidden = YES;
// }
if (!@available(iOS 13.0, *)) {
self.appleLoginBtn.hidden = YES;
}
[self.videoPlayer fus_resumePlayer];
......@@ -331,12 +337,12 @@
// 初始化View
- (void)initView {
[self.phoneBtn setTitle:FUSLocalizationHelper.localString(@"手机号登陆/注册") forState:UIControlStateNormal];
[self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_normal"]] forState:UIControlStateNormal];
[self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_pressed"]] forState:UIControlStateHighlighted];
[self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_normal"]] forState:UIControlStateNormal];
[self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_pressed"]] forState:UIControlStateHighlighted];
self.facebookLoginBtn.layer.cornerRadius = 25;
self.facebookLoginBtn.layer.masksToBounds = YES;
self.googleLoginBtn.layer.cornerRadius = 25;
self.googleLoginBtn.layer.masksToBounds = YES;
self.appleLoginBtn.layer.cornerRadius = 25;
self.appleLoginBtn.layer.masksToBounds = YES;
if (_waitTime > 0) {
[FUSCacheDataShare shareStore].isLoadedLaunch = YES;
......@@ -401,18 +407,18 @@
- (void)fus_checkStateDidUpdate {
[self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_normal"]] forState:UIControlStateNormal];
[self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_pressed"]] forState:UIControlStateHighlighted];
[self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_normal"]] forState:UIControlStateNormal];
[self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_pressed"]] forState:UIControlStateHighlighted];
[self.phoneBtn setTitle:FUSLocalizationHelper.localString(@"手机号登陆/注册") forState:UIControlStateNormal];
// [self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_normal"]] forState:UIControlStateNormal];
// [self.phoneBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_phone_pressed"]] forState:UIControlStateHighlighted];
//
// [self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_normal"]] forState:UIControlStateNormal];
// [self.facebookBtn setBackgroundImage:[UIImage imageNamed:[FUSRTL RTLImageName:@"start_page_facebook_pressed"]] forState:UIControlStateHighlighted];
// [self.phoneBtn setTitle:FUSLocalizationHelper.localString(@"手机号登陆/注册") forState:UIControlStateNormal];
[super fus_checkStateDidUpdate];
[self fus_setupProtocolLabel];
if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
_appleLoginBgView.hidden = YES;
}
// if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
// _appleLoginBgView.hidden = YES;
// }
}
- (void)fus_setupProtocolLabel {
......@@ -473,6 +479,7 @@
NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"startPageVideo" ofType:@"mp4"]];
self.videoPlayer = [[FUSVideoPlayer alloc] initWithPlayView:self.bgImageView];
[self.videoPlayer fus_setPlayerViewFrame:self.view.bounds];
self.videoPlayer.isReplayWhenfinish = YES;
self.videoPlayer.cancelBecomeActiveNotification = YES;
self.videoPlayer.cancelResignActiveNotification = YES;
......@@ -577,6 +584,11 @@
[self fus_hideLoginFailView];
}
/// 点击苹果登录
- (IBAction)onClickAppleLogin:(UIButton *)sender {
[self handleAuthorizationAppleIDButtonPress];
}
/**
点击协议按钮
*/
......@@ -660,10 +672,10 @@
__weak typeof(self) weakSelf = self;
[self showLoginViewFinished:^{
[UIView animateWithDuration:1 animations:^{
weakSelf.startSplashView.alpha = 0;
// weakSelf.startSplashView.alpha = 0;
weakSelf.skipBtn.hidden = YES;
} completion:^(BOOL finished) {
[weakSelf.startSplashView removeFromSuperview];
// [weakSelf.startSplashView removeFromSuperview];
if (weakSelf.model) {
[weakSelf fus_showUpdateViewWith:weakSelf.model];
......@@ -697,16 +709,27 @@
[weakSelf setupVideoView];
}
[UIView animateWithDuration:1 animations:^{
[UIView animateWithDuration:0.5 delay:1 options:UIViewAnimationOptionCurveEaseInOut animations:^{
weakSelf.startSplashView.alpha = 0;
} completion:^(BOOL finished) {
[weakSelf.startSplashView removeFromSuperview];
if (weakSelf.model) {
[weakSelf fus_showUpdateViewWith:_model];
[weakSelf fus_showUpdateViewWith:weakSelf.model];
weakSelf.model = nil;
}
}];
// [UIView animateWithDuration:1 animations:^{
// weakSelf.startSplashView.alpha = 0;
// } completion:^(BOOL finished) {
// [weakSelf.startSplashView removeFromSuperview];
//
// if (weakSelf.model) {
// [weakSelf fus_showUpdateViewWith:_model];
// weakSelf.model = nil;
// }
// }];
});
}
......
FuSiLive/Classes/Login/Controller/FUSStartPageViewController.xib
......@@ -3,20 +3,20 @@
<device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSStartPageViewController">
<connections>
<outlet property="agreementBtn" destination="qTr-e3-gD2" id="avo-Vk-9qT"/>
<outlet property="appleLoginBgView" destination="dcu-zk-udc" id="lNe-xM-BCq"/>
<outlet property="appleLoginBtn" destination="q6U-26-eHf" id="4G9-qI-Jxz"/>
<outlet property="bgImageView" destination="pvx-eB-2ck" id="xF9-mr-nie"/>
<outlet property="facebookBtn" destination="FMg-dD-IbL" id="CNC-bU-TBx"/>
<outlet property="facebookLoginBtn" destination="xsu-jg-Zmy" id="pVO-kH-5EM"/>
<outlet property="googleLoginBtn" destination="uXi-X7-nYp" id="2DG-j0-Ch6"/>
<outlet property="loginFailReportSubtitleLabel" destination="L26-sF-a79" id="uWm-5e-87B"/>
<outlet property="loginFailReportTitleLabel" destination="cuu-ox-MOW" id="Nde-9I-aUA"/>
<outlet property="loginFaildReportView" destination="kUp-xF-NS0" id="4Gu-UD-jVf"/>
<outlet property="phoneBtn" destination="Wj7-W5-3BE" id="6rp-HE-QxL"/>
<outlet property="protocalBottomMarginConstrant" destination="RUE-fL-Bt4" id="oiK-Aq-gWZ"/>
<outlet property="readmeLabel" destination="m7f-da-Ehu" id="NMP-jt-G1R"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
......@@ -27,9 +27,31 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_pk_background_image_v6000.png" translatesAutoresizingMaskIntoConstraints="NO" id="pvx-eB-2ck">
<imageView clipsSubviews="YES" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="pvx-eB-2ck">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uXi-X7-nYp">
<rect key="frame" x="58.666666666666657" y="479" width="297" height="50"/>
<color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="ebK-co-XWY"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="15"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="用 Google 登入">
<color key="titleColor" red="0.0" green="0.1333333333" blue="0.16862745100000001" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickGoogleLogin:" destination="-1" eventType="touchUpInside" id="B0s-Z1-pgg"/>
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_login_loginBtn_google_icon" translatesAutoresizingMaskIntoConstraints="NO" id="dPn-tm-zWL">
<rect key="frame" x="69.666666666666671" y="488" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="cuQ-ca-pH7"/>
<constraint firstAttribute="height" constant="32" id="eSX-78-srR"/>
</constraints>
</imageView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qTr-e3-gD2">
<rect key="frame" x="228.66666666666663" y="696.66666666666663" width="70" height="20"/>
<constraints>
......@@ -50,13 +72,6 @@
<color key="textColor" systemColor="lightTextColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dcu-zk-udc">
<rect key="frame" x="86" y="389.66666666666669" width="242" height="49.333333333333314"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="dcu-zk-udc" secondAttribute="height" multiplier="240:49" id="OOr-aR-t9O"/>
</constraints>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kUp-xF-NS0">
<rect key="frame" x="0.0" y="676" width="414" height="60"/>
<subviews>
......@@ -96,143 +111,131 @@
<constraint firstItem="L26-sF-a79" firstAttribute="centerY" secondItem="kUp-xF-NS0" secondAttribute="centerY" id="meX-Fc-mwb"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wNF-l3-wo2">
<rect key="frame" x="86" y="607.66666666666663" width="242" height="44"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hcU-4M-876">
<rect key="frame" x="133" y="625" width="148" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fyh-SU-k1e">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x3l-Oi-DQ4">
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" secondItem="Fyh-SU-k1e" secondAttribute="height" id="kGt-6T-S9v"/>
<constraint firstAttribute="width" constant="50" id="fZS-3H-3rL"/>
</constraints>
<state key="normal" backgroundImage="start_page_line_normal"/>
<state key="highlighted" backgroundImage="start_page_line_pressed"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" backgroundImage="fus_login_loginBtn_line_icon"/>
<connections>
<action selector="onClickLineLogin:" destination="-1" eventType="touchUpInside" id="pJj-TT-rNc"/>
<action selector="onClickLineLogin:" destination="-1" eventType="touchUpInside" id="fVX-PU-eP2"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HQH-Tg-dGf">
<rect key="frame" x="198" y="0.0" width="44" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x1a-J8-Ftd">
<rect key="frame" x="98" y="0.0" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" secondItem="HQH-Tg-dGf" secondAttribute="height" id="7bn-95-18B"/>
<constraint firstAttribute="width" constant="50" id="e6A-Ex-MVt"/>
</constraints>
<state key="normal" backgroundImage="start_page_twitter_normal"/>
<state key="highlighted" backgroundImage="start_page_twitter_pressed"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" backgroundImage="fus_login_loginBtn_phone_icon"/>
<connections>
<action selector="onClickTwitterLogin:" destination="-1" eventType="touchUpInside" id="dtZ-Cz-bFp"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XDi-wO-Uo2">
<rect key="frame" x="66" y="0.0" width="44" height="44"/>
<constraints>
<constraint firstAttribute="width" secondItem="XDi-wO-Uo2" secondAttribute="height" id="ZcW-Ew-rHc"/>
<constraint firstAttribute="width" constant="44" id="eY2-8x-tql"/>
</constraints>
<state key="normal" backgroundImage="start_page_wechat_normal"/>
<state key="highlighted" backgroundImage="start_page_wechat_pressed"/>
<connections>
<action selector="onClickWeChatLoginButtonAction:" destination="-1" eventType="touchUpInside" id="Uzb-2J-PTG"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="igA-95-mpq">
<rect key="frame" x="132" y="0.0" width="44" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="9Py-WK-wVc"/>
<constraint firstAttribute="width" secondItem="igA-95-mpq" secondAttribute="height" id="xEt-5f-eVr"/>
</constraints>
<state key="normal" backgroundImage="start_page_google_normal"/>
<state key="highlighted" backgroundImage="start_page_google_pressed"/>
<connections>
<action selector="onClickGoogleLogin:" destination="-1" eventType="touchUpInside" id="9I4-dZ-4fm"/>
<action selector="onClickPhoneLogin:" destination="-1" eventType="touchUpInside" id="7pZ-vG-NpI"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="HQH-Tg-dGf" secondAttribute="trailing" id="0s4-un-ub5"/>
<constraint firstAttribute="bottom" secondItem="Fyh-SU-k1e" secondAttribute="bottom" id="BuF-42-aAO"/>
<constraint firstAttribute="height" constant="44" id="Ddv-YH-GSc"/>
<constraint firstItem="Fyh-SU-k1e" firstAttribute="top" secondItem="wNF-l3-wo2" secondAttribute="top" id="K2L-5V-VjU"/>
<constraint firstAttribute="bottom" secondItem="XDi-wO-Uo2" secondAttribute="bottom" id="LBh-1N-Hae"/>
<constraint firstItem="XDi-wO-Uo2" firstAttribute="top" secondItem="wNF-l3-wo2" secondAttribute="top" id="MAo-ur-lbS"/>
<constraint firstAttribute="bottom" secondItem="HQH-Tg-dGf" secondAttribute="bottom" id="OIF-6H-vwx"/>
<constraint firstItem="igA-95-mpq" firstAttribute="leading" secondItem="XDi-wO-Uo2" secondAttribute="trailing" constant="22" id="bne-Li-KfS"/>
<constraint firstItem="HQH-Tg-dGf" firstAttribute="leading" secondItem="igA-95-mpq" secondAttribute="trailing" constant="22" id="cCG-qe-yxb"/>
<constraint firstItem="Fyh-SU-k1e" firstAttribute="leading" secondItem="wNF-l3-wo2" secondAttribute="leading" id="d0v-ku-zcq"/>
<constraint firstAttribute="bottom" secondItem="igA-95-mpq" secondAttribute="bottom" id="il6-nE-Y7y"/>
<constraint firstItem="HQH-Tg-dGf" firstAttribute="top" secondItem="wNF-l3-wo2" secondAttribute="top" id="nBh-uc-S9e"/>
<constraint firstItem="XDi-wO-Uo2" firstAttribute="leading" secondItem="Fyh-SU-k1e" secondAttribute="trailing" constant="22" id="p1q-aG-96j"/>
<constraint firstItem="igA-95-mpq" firstAttribute="top" secondItem="wNF-l3-wo2" secondAttribute="top" id="ryL-Ey-jSs"/>
<constraint firstItem="x3l-Oi-DQ4" firstAttribute="top" secondItem="hcU-4M-876" secondAttribute="top" id="4p6-d3-NAN"/>
<constraint firstAttribute="bottom" secondItem="x1a-J8-Ftd" secondAttribute="bottom" id="4ta-w2-jv6"/>
<constraint firstItem="x3l-Oi-DQ4" firstAttribute="leading" secondItem="hcU-4M-876" secondAttribute="leading" id="UK1-pT-KV6"/>
<constraint firstItem="x1a-J8-Ftd" firstAttribute="leading" secondItem="x3l-Oi-DQ4" secondAttribute="trailing" constant="48" id="hUS-SQ-xXM"/>
<constraint firstAttribute="height" constant="50" id="lTR-Nx-9Xp"/>
<constraint firstAttribute="trailing" secondItem="x1a-J8-Ftd" secondAttribute="trailing" id="mYf-fA-0Fm"/>
<constraint firstAttribute="bottom" secondItem="x3l-Oi-DQ4" secondAttribute="bottom" id="ow5-KW-l2O"/>
<constraint firstItem="x1a-J8-Ftd" firstAttribute="top" secondItem="hcU-4M-876" secondAttribute="top" id="owk-jJ-EZM"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FMg-dD-IbL">
<rect key="frame" x="86" y="526.33333333333337" width="242" height="49.333333333333371"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xsu-jg-Zmy">
<rect key="frame" x="58.666666666666657" y="543" width="297" height="50"/>
<color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="FMg-dD-IbL" secondAttribute="height" multiplier="240:49" id="isG-J8-DdQ"/>
<constraint firstAttribute="height" constant="50" id="fgH-Xa-LOW"/>
</constraints>
<state key="normal" backgroundImage="start_page_facebook_normal"/>
<state key="highlighted" backgroundImage="start_page_facebook_pressed"/>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="15"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="用 Facebook 登入">
<color key="titleColor" red="0.0" green="0.1333333333" blue="0.16862745100000001" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickFacebookLogin:" destination="-1" eventType="touchUpInside" id="a18-bC-OaY"/>
<action selector="onClickFacebookLogin:" destination="-1" eventType="touchUpInside" id="68a-vm-7gJ"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wj7-W5-3BE">
<rect key="frame" x="86" y="458" width="242" height="49.333333333333314"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_login_loginBtn_faceBook_icon" translatesAutoresizingMaskIntoConstraints="NO" id="NRV-h2-AbK">
<rect key="frame" x="69.666666666666671" y="552" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" secondItem="Wj7-W5-3BE" secondAttribute="height" multiplier="240:49" id="299-Nf-3Xa"/>
<constraint firstAttribute="height" constant="32" id="Ldq-37-wrU"/>
<constraint firstAttribute="width" constant="32" id="pku-cj-oOO"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<state key="normal" title="手机登陆/注册" backgroundImage="start_page_phone_normal"/>
<state key="highlighted" backgroundImage="start_page_phone_pressed"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q6U-26-eHf">
<rect key="frame" x="58.666666666666657" y="415" width="297" height="50"/>
<color key="backgroundColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="AG8-wR-T97"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="15"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="用 Apple ID 登入">
<color key="titleColor" red="0.0" green="0.1333333333" blue="0.16862745100000001" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onClickPhoneLogin:" destination="-1" eventType="touchUpInside" id="oMu-oN-z9l"/>
<action selector="onClickAppleLogin:" destination="-1" eventType="touchUpInside" id="Nrb-NG-DYg"/>
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_login_loginBtn_apple_icon" translatesAutoresizingMaskIntoConstraints="NO" id="saR-iT-17B">
<rect key="frame" x="68.666666666666671" y="424" width="32" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="7Ij-zz-pD7"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="32" id="PRr-KK-afh"/>
<constraint firstAttribute="width" constant="32" id="d6g-0p-ICw"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="32" id="iwm-Pd-MoS"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="pvx-eB-2ck" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="0uk-pM-kv4"/>
<constraint firstItem="FMg-dD-IbL" firstAttribute="top" secondItem="Wj7-W5-3BE" secondAttribute="bottom" constant="19" id="9jv-lb-b30"/>
<constraint firstItem="q6U-26-eHf" firstAttribute="width" secondItem="pvx-eB-2ck" secondAttribute="width" multiplier="297:414" id="137-1u-uIc"/>
<constraint firstItem="NRV-h2-AbK" firstAttribute="centerY" secondItem="xsu-jg-Zmy" secondAttribute="centerY" id="5GL-4o-bEJ"/>
<constraint firstItem="xsu-jg-Zmy" firstAttribute="bottom" secondItem="x3l-Oi-DQ4" secondAttribute="top" constant="-32" id="70J-PZ-9kO"/>
<constraint firstItem="xsu-jg-Zmy" firstAttribute="width" secondItem="pvx-eB-2ck" secondAttribute="width" multiplier="297:414" id="8kU-y4-EMC"/>
<constraint firstItem="hcU-4M-876" firstAttribute="bottom" secondItem="m7f-da-Ehu" secondAttribute="top" constant="-25" id="9pV-CQ-zoF"/>
<constraint firstItem="kUp-xF-NS0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="DUE-uQ-rLg"/>
<constraint firstItem="dcu-zk-udc" firstAttribute="trailing" secondItem="FMg-dD-IbL" secondAttribute="trailing" id="Ds0-uw-wvy"/>
<constraint firstAttribute="bottom" secondItem="kUp-xF-NS0" secondAttribute="bottom" id="Eej-Sm-7vm"/>
<constraint firstItem="m7f-da-Ehu" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" constant="-45" id="FaA-b3-XNe"/>
<constraint firstItem="qTr-e3-gD2" firstAttribute="centerY" secondItem="m7f-da-Ehu" secondAttribute="centerY" constant="-0.25" id="Gjg-3f-3T9"/>
<constraint firstItem="uXi-X7-nYp" firstAttribute="centerX" secondItem="pvx-eB-2ck" secondAttribute="centerX" id="HXr-dK-S1z"/>
<constraint firstItem="hcU-4M-876" firstAttribute="centerX" secondItem="pvx-eB-2ck" secondAttribute="centerX" id="IKu-XU-QdI"/>
<constraint firstItem="pvx-eB-2ck" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="LJJ-9f-DH8"/>
<constraint firstItem="q6U-26-eHf" firstAttribute="leading" secondItem="saR-iT-17B" secondAttribute="trailing" constant="-42" id="LZJ-bj-lqH"/>
<constraint firstItem="q6U-26-eHf" firstAttribute="centerX" secondItem="pvx-eB-2ck" secondAttribute="centerX" id="Qb6-BO-YEK"/>
<constraint firstAttribute="bottom" secondItem="m7f-da-Ehu" secondAttribute="bottom" constant="22" id="RUE-fL-Bt4"/>
<constraint firstItem="uXi-X7-nYp" firstAttribute="top" secondItem="q6U-26-eHf" secondAttribute="bottom" constant="14" id="S4l-qT-hgq"/>
<constraint firstItem="qTr-e3-gD2" firstAttribute="leading" secondItem="m7f-da-Ehu" secondAttribute="trailing" constant="4.5" id="S7y-zj-1Te"/>
<constraint firstAttribute="trailing" secondItem="pvx-eB-2ck" secondAttribute="trailing" id="Up6-gt-5W0"/>
<constraint firstItem="dcu-zk-udc" firstAttribute="leading" secondItem="FMg-dD-IbL" secondAttribute="leading" id="WI2-V5-OI0"/>
<constraint firstItem="qTr-e3-gD2" firstAttribute="top" secondItem="wNF-l3-wo2" secondAttribute="bottom" constant="45" id="jTo-L5-slA"/>
<constraint firstItem="wNF-l3-wo2" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="jYh-5A-Ffr"/>
<constraint firstItem="uXi-X7-nYp" firstAttribute="leading" secondItem="dPn-tm-zWL" secondAttribute="leading" constant="-11" id="dMR-CW-Ko5"/>
<constraint firstItem="xsu-jg-Zmy" firstAttribute="top" secondItem="uXi-X7-nYp" secondAttribute="bottom" constant="14" id="dpB-ft-W4y"/>
<constraint firstItem="xsu-jg-Zmy" firstAttribute="leading" secondItem="NRV-h2-AbK" secondAttribute="leading" constant="-11" id="hZ5-yw-s1n"/>
<constraint firstAttribute="trailing" secondItem="kUp-xF-NS0" secondAttribute="trailing" id="l3l-MS-GYh"/>
<constraint firstItem="Wj7-W5-3BE" firstAttribute="leading" secondItem="FMg-dD-IbL" secondAttribute="leading" id="lCi-9z-Lcq"/>
<constraint firstItem="wNF-l3-wo2" firstAttribute="top" secondItem="FMg-dD-IbL" secondAttribute="bottom" constant="32" id="mcF-ID-bJL"/>
<constraint firstItem="FMg-dD-IbL" firstAttribute="leading" secondItem="wNF-l3-wo2" secondAttribute="leading" id="oeX-IU-Rjq"/>
<constraint firstItem="Wj7-W5-3BE" firstAttribute="trailing" secondItem="FMg-dD-IbL" secondAttribute="trailing" id="qN5-Mb-6Er"/>
<constraint firstItem="uXi-X7-nYp" firstAttribute="width" secondItem="pvx-eB-2ck" secondAttribute="width" multiplier="297:414" id="mTG-z1-caZ"/>
<constraint firstItem="saR-iT-17B" firstAttribute="centerY" secondItem="q6U-26-eHf" secondAttribute="centerY" id="qO2-jr-JfH"/>
<constraint firstItem="dPn-tm-zWL" firstAttribute="centerY" secondItem="uXi-X7-nYp" secondAttribute="centerY" id="tIi-Gd-ev4"/>
<constraint firstAttribute="bottom" secondItem="pvx-eB-2ck" secondAttribute="bottom" id="wcr-CS-HiY"/>
<constraint firstItem="FMg-dD-IbL" firstAttribute="trailing" secondItem="wNF-l3-wo2" secondAttribute="trailing" id="xLv-KR-Ki3"/>
<constraint firstItem="Wj7-W5-3BE" firstAttribute="top" secondItem="dcu-zk-udc" secondAttribute="bottom" constant="19" id="xSS-7C-LBl"/>
<constraint firstItem="xsu-jg-Zmy" firstAttribute="centerX" secondItem="pvx-eB-2ck" secondAttribute="centerX" id="z1c-Kv-hD4"/>
</constraints>
<point key="canvasLocation" x="-1110.144927536232" y="124.72826086956523"/>
</view>
</objects>
<resources>
<image name="live_pk_background_image_v6000.png" width="750" height="1334"/>
<image name="start_page_facebook_normal" width="240" height="49"/>
<image name="start_page_facebook_pressed" width="240" height="49"/>
<image name="start_page_google_normal" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_google_pressed" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_line_normal" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_line_pressed" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_phone_normal" width="240" height="49"/>
<image name="start_page_phone_pressed" width="240" height="49"/>
<image name="start_page_twitter_normal" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_twitter_pressed" width="44.666667938232422" height="44.666667938232422"/>
<image name="start_page_wechat_normal" width="45" height="44.666667938232422"/>
<image name="start_page_wechat_pressed" width="45" height="44.666667938232422"/>
<image name="fus_login_loginBtn_apple_icon" width="29.666666030883789" height="29.666666030883789"/>
<image name="fus_login_loginBtn_faceBook_icon" width="29" height="29"/>
<image name="fus_login_loginBtn_google_icon" width="28.666666030883789" height="28.666666030883789"/>
<image name="fus_login_loginBtn_line_icon" width="45" height="45.666667938232422"/>
<image name="fus_login_loginBtn_phone_icon" width="44.666667938232422" height="44.666667938232422"/>
<systemColor name="lightTextColor">
<color white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
......
FuSiLive/Classes/Login/View/FUSStartPageSplashView.m
......@@ -43,7 +43,7 @@
[self addSubview:self.logoImgView];
[self.logoImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.left.inset(10);
make.centerY.offset(-80);
make.centerY.offset(-68);
make.width.equalTo(self.logoImgView.mas_height).multipliedBy(393/293.f);
}];
......
FuSiLive/Launch Screen.storyboard
......@@ -23,7 +23,7 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_v1.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<rect key="frame" x="10" y="219.33333333333334" width="373" height="278.33333333333326"/>
<rect key="frame" x="10" y="219" width="373" height="278"/>
<constraints>
<constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/>
</constraints>
......@@ -37,7 +37,7 @@
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="24" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
<constraint firstItem="gnB-ZF-qMi" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="10" id="tiE-pg-OM4"/>
<constraint firstItem="gnB-ZF-qMi" firstAttribute="centerY" secondItem="Bcu-3y-fUS" secondAttribute="centerY" constant="-80" id="tr3-E6-XYB"/>
<constraint firstItem="gnB-ZF-qMi" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-68" id="tr3-E6-XYB"/>
</constraints>
</view>
</viewController>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment