Skip to content

Commit 5449d2e

Browse files
wanghenghengwanghengheng
committed
启动页面
1 parent 8e34d00 commit 5449d2e

10 files changed

Lines changed: 29 additions & 57 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
4E07D3151A4D3CA6009EDDF2 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E07D3121A4D3CA6009EDDF2 /* [email protected] */; };
1616
4E07D3161A4D3CA6009EDDF2 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E07D3131A4D3CA6009EDDF2 /* [email protected] */; };
1717
4E07D3171A4D3CA6009EDDF2 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E07D3141A4D3CA6009EDDF2 /* [email protected] */; };
18-
4E07D3231A4D66B7009EDDF2 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4E07D3221A4D66B7009EDDF2 /* LaunchScreen.xib */; };
1918
4E15C7D01A26D2F000FB8DAD /* FolderToMoveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E15C7CF1A26D2F000FB8DAD /* FolderToMoveViewController.m */; };
2019
4E15C7D61A271A6300FB8DAD /* EaseToolBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E15C7D51A271A6300FB8DAD /* EaseToolBar.m */; };
2120
4E2906A21A403B7D008A5B97 /* FileDownloadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E2906A11A403B7D008A5B97 /* FileDownloadView.m */; };
@@ -501,7 +500,6 @@
501500
4E07D3121A4D3CA6009EDDF2 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
502501
4E07D3131A4D3CA6009EDDF2 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
503502
4E07D3141A4D3CA6009EDDF2 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "[email protected]"; sourceTree = "<group>"; };
504-
4E07D3221A4D66B7009EDDF2 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
505503
4E15C7CE1A26D2F000FB8DAD /* FolderToMoveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FolderToMoveViewController.h; sourceTree = "<group>"; };
506504
4E15C7CF1A26D2F000FB8DAD /* FolderToMoveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FolderToMoveViewController.m; sourceTree = "<group>"; };
507505
4E15C7D41A271A6300FB8DAD /* EaseToolBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EaseToolBar.h; sourceTree = "<group>"; };
@@ -1867,7 +1865,6 @@
18671865
8EA6CF1819E240C40076D59C /* Coding_iOS-Prefix.pch */,
18681866
8EA6CF1919E240C40076D59C /* Coding_iOS.xcdatamodeld */,
18691867
8EA6CFC519E240C40076D59C /* Images.xcassets */,
1870-
4E07D3221A4D66B7009EDDF2 /* LaunchScreen.xib */,
18711868
8EA6CF5B19E240C40076D59C /* InfoPlist.strings */,
18721869
8EA6CFC719E240C40076D59C /* Models */,
18731870
8EA6D0CD19E240C40076D59C /* Views */,
@@ -2771,7 +2768,6 @@
27712768
8EA6D19119E240C40076D59C /* [email protected] in Resources */,
27722769
8E97CEB21A0C7E26006F9AD7 /* [email protected] in Resources */,
27732770
8E97CEAF1A0C7E26006F9AD7 /* [email protected] in Resources */,
2774-
4E07D3231A4D66B7009EDDF2 /* LaunchScreen.xib in Resources */,
27752771
8E97CEA11A0C7E26006F9AD7 /* [email protected] in Resources */,
27762772
8E97CEB81A0C7E26006F9AD7 /* [email protected] in Resources */,
27772773
8E97CEAE1A0C7E26006F9AD7 /* [email protected] in Resources */,

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<true/>
2727
<key>UIFileSharingEnabled</key>
2828
<false/>
29-
<key>UILaunchStoryboardName</key>
30-
<string>LaunchScreen</string>
3129
<key>UIRequiredDeviceCapabilities</key>
3230
<array>
3331
<string>armv7</string>

‎Coding_iOS/Coding_iOS-Prefix.pch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
#define kHigher_iOS_6_1_DIS(_X_) ([[NSNumber numberWithBool:kHigher_iOS_6_1] intValue] * _X_)
7171
#define kNotHigher_iOS_6_1_DIS(_X_) (-([[NSNumber numberWithBool:kHigher_iOS_6_1] intValue]-1) * _X_)
7272

73+
#define kDevice_Is_iPhone6 ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(750, 1334), [[UIScreen mainScreen] currentMode].size) : NO)
74+
#define kDevice_Is_iPhone6Plus ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2208), [[UIScreen mainScreen] currentMode].size) : NO)
75+
7376
#define kScreen_Bounds [UIScreen mainScreen].bounds
7477
#define kScreen_Height [UIScreen mainScreen].bounds.size.height
7578
#define kScreen_Width [UIScreen mainScreen].bounds.size.width

‎Coding_iOS/Images.xcassets/LaunchImage.launchimage/1080x1920.png‎

148 KB
Loading

‎Coding_iOS/Images.xcassets/LaunchImage.launchimage/640x1136.png‎

77 KB
Loading

‎Coding_iOS/Images.xcassets/LaunchImage.launchimage/640x960.png‎

76.1 KB
Loading

‎Coding_iOS/Images.xcassets/LaunchImage.launchimage/750x1334.png‎

102 KB
Loading

‎Coding_iOS/Images.xcassets/LaunchImage.launchimage/Contents.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
{
22
"images" : [
33
{
4-
"orientation" : "portrait",
5-
"idiom" : "iphone",
64
"extent" : "full-screen",
7-
"minimum-system-version" : "8.0",
5+
"idiom" : "iphone",
86
"subtype" : "736h",
7+
"filename" : "1080x1920.png",
8+
"minimum-system-version" : "8.0",
9+
"orientation" : "portrait",
910
"scale" : "3x"
1011
},
1112
{
12-
"orientation" : "portrait",
13-
"idiom" : "iphone",
1413
"extent" : "full-screen",
15-
"minimum-system-version" : "8.0",
14+
"idiom" : "iphone",
1615
"subtype" : "667h",
16+
"filename" : "750x1334.png",
17+
"minimum-system-version" : "8.0",
18+
"orientation" : "portrait",
1719
"scale" : "2x"
1820
},
1921
{
2022
"orientation" : "portrait",
2123
"idiom" : "iphone",
2224
"extent" : "full-screen",
2325
"minimum-system-version" : "7.0",
24-
"filename" : "Default@2x.png",
26+
"filename" : "640x960.png",
2527
"scale" : "2x"
2628
},
2729
{
2830
"extent" : "full-screen",
2931
"idiom" : "iphone",
3032
"subtype" : "retina4",
31-
"filename" : "Default-568h@2x.png",
33+
"filename" : "640x1136.png",
3234
"minimum-system-version" : "7.0",
3335
"orientation" : "portrait",
3436
"scale" : "2x"

‎Coding_iOS/LaunchScreen.xib‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎Coding_iOS/Views/EaseStartView.m‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (instancetype)initWithBgImage:(UIImage *)bgImage logoIcon:(UIImage *)logoIcon
2626
self = [super initWithFrame:kScreen_Bounds];
2727
if (self) {
2828
//add custom code
29-
self.backgroundColor = [UIColor blackColor];
29+
self.backgroundColor = [UIColor colorWithHexString:@"0x131313"];
3030
UIColor *blackColor = [UIColor blackColor];
3131

3232
_bgImageView = [[UIImageView alloc] initWithFrame:kScreen_Bounds];
@@ -56,11 +56,22 @@ - (instancetype)initWithBgImage:(UIImage *)bgImage logoIcon:(UIImage *)logoIcon
5656
}];
5757

5858
[_logoIconView mas_makeConstraints:^(MASConstraintMaker *make) {
59-
make.bottom.equalTo(_descriptionStrLabel.mas_top).offset(-25);
59+
if (kDevice_Is_iPhone6Plus) {
60+
CGFloat scalePhysical = 414.0/1080;
61+
make.bottom.equalTo(self.mas_bottom).offset(-200*scalePhysical);
62+
make.left.equalTo(self.mas_left).offset(204*scalePhysical);
63+
make.right.equalTo(self.mas_right).offset(-204*scalePhysical);
64+
}else if (kDevice_Is_iPhone6){
65+
make.bottom.equalTo(self.mas_bottom).offset(-65);
66+
make.left.equalTo(self.mas_left).offset(69);
67+
make.right.equalTo(self.mas_right).offset(-69);
68+
}else{
69+
make.bottom.equalTo(self.mas_bottom).offset(-56);
70+
make.left.equalTo(self.mas_left).offset(60);
71+
make.right.equalTo(self.mas_right).offset(-60);
72+
}
6073
make.size.mas_lessThanOrEqualTo(CGSizeMake(255, 60));
61-
make.left.equalTo(self.mas_left).offset(60);
62-
make.right.equalTo(self.mas_right).offset(-60);
63-
74+
make.height.equalTo(_logoIconView.mas_width).multipliedBy(60.0/255.0);
6475
}];
6576
[self configWithBgImage:bgImage logoIcon:logoIcon descriptionStr:descriptionStr];
6677
}

0 commit comments

Comments
 (0)