Skip to content

Commit b51712a

Browse files
author
何天从
committed
add iPheone 8 name; fix logo.
1 parent abd58a5 commit b51712a

File tree

4 files changed

+52
-37
lines changed

4 files changed

+52
-37
lines changed

‎SecurityNote/DHDeviceUtil.m‎

Lines changed: 48 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ +(NSString *)deviceModelName
4040
return @"iPhone 7";
4141
if ([deviceModel isEqualToString:@"iPhone9,2"] || [deviceModel isEqualToString:@"iPhone9,4"])
4242
return @"iPhone 7 Plus";
43+
if ([deviceModel isEqualToString:@"iPhone10,1"] || [deviceModel isEqualToString:@"iPhone10,4"])
44+
return @"iPhone 8";
45+
if ([deviceModel isEqualToString:@"iPhone10,2"] || [deviceModel isEqualToString:@"iPhone10,5"])
46+
return @"iPhone 8 Plus";
47+
if ([deviceModel isEqualToString:@"iPhone10,3"] || [deviceModel isEqualToString:@"iPhone10,6"])
48+
return @"iPhone X";
4349

4450
//iPod 系列
4551
if ([deviceModel isEqualToString:@"iPod1,1"]) return @"iPod Touch 1G";
@@ -51,45 +57,52 @@ +(NSString *)deviceModelName
5157

5258

5359
//iPad 系列
54-
if ([deviceModel isEqualToString:@"iPad1,1"]) return @"iPad";
55-
if ([deviceModel isEqualToString:@"iPad2,1"]) return @"iPad 2 (WiFi)";
56-
if ([deviceModel isEqualToString:@"iPad2,2"]) return @"iPad 2 (GSM)";
57-
if ([deviceModel isEqualToString:@"iPad2,3"]) return @"iPad 2 (CDMA)";
58-
if ([deviceModel isEqualToString:@"iPad2,4"]) return @"iPad 2 (32nm)";
59-
if ([deviceModel isEqualToString:@"iPad2,5"]) return @"iPad mini (WiFi)";
60-
if ([deviceModel isEqualToString:@"iPad2,6"]) return @"iPad mini (GSM)";
61-
if ([deviceModel isEqualToString:@"iPad2,7"]) return @"iPad mini (CDMA)";
60+
if ([deviceModel isEqualToString:@"iPad1,1"]) return @"iPad";
61+
if ([deviceModel isEqualToString:@"iPad1,2"]) return @"iPad 3G";
62+
if ([deviceModel isEqualToString:@"iPad2,1"]) return @"iPad 2 (WiFi)";
63+
if ([deviceModel isEqualToString:@"iPad2,2"]) return @"iPad 2";
64+
if ([deviceModel isEqualToString:@"iPad2,3"]) return @"iPad 2 (CDMA)";
65+
if ([deviceModel isEqualToString:@"iPad2,4"]) return @"iPad 2";
66+
if ([deviceModel isEqualToString:@"iPad2,5"]) return @"iPad Mini (WiFi)";
67+
if ([deviceModel isEqualToString:@"iPad2,6"]) return @"iPad Mini";
68+
if ([deviceModel isEqualToString:@"iPad2,7"]) return @"iPad Mini (GSM+CDMA)";
69+
if ([deviceModel isEqualToString:@"iPad3,1"]) return @"iPad 3 (WiFi)";
70+
if ([deviceModel isEqualToString:@"iPad3,2"]) return @"iPad 3 (GSM+CDMA)";
71+
if ([deviceModel isEqualToString:@"iPad3,3"]) return @"iPad 3";
72+
if ([deviceModel isEqualToString:@"iPad3,4"]) return @"iPad 4 (WiFi)";
73+
if ([deviceModel isEqualToString:@"iPad3,5"]) return @"iPad 4";
74+
if ([deviceModel isEqualToString:@"iPad3,6"]) return @"iPad 4 (GSM+CDMA)";
75+
if ([deviceModel isEqualToString:@"iPad4,1"]) return @"iPad Air (WiFi)";
76+
if ([deviceModel isEqualToString:@"iPad4,2"]) return @"iPad Air (Cellular)";
77+
if ([deviceModel isEqualToString:@"iPad4,4"]) return @"iPad Mini 2 (WiFi)";
78+
if ([deviceModel isEqualToString:@"iPad4,5"]) return @"iPad Mini 2 (Cellular)";
79+
if ([deviceModel isEqualToString:@"iPad4,6"]) return @"iPad Mini 2";
80+
if ([deviceModel isEqualToString:@"iPad4,7"]) return @"iPad Mini 3";
81+
if ([deviceModel isEqualToString:@"iPad4,8"]) return @"iPad Mini 3";
82+
if ([deviceModel isEqualToString:@"iPad4,9"]) return @"iPad Mini 3";
83+
if ([deviceModel isEqualToString:@"iPad5,1"]) return @"iPad Mini 4 (WiFi)";
84+
if ([deviceModel isEqualToString:@"iPad5,2"]) return @"iPad Mini 4 (LTE)";
85+
if ([deviceModel isEqualToString:@"iPad5,3"]) return @"iPad Air 2";
86+
if ([deviceModel isEqualToString:@"iPad5,4"]) return @"iPad Air 2";
87+
if ([deviceModel isEqualToString:@"iPad6,3"]) return @"iPad Pro 9.7";
88+
if ([deviceModel isEqualToString:@"iPad6,4"]) return @"iPad Pro 9.7";
89+
if ([deviceModel isEqualToString:@"iPad6,7"]) return @"iPad Pro 12.9";
90+
if ([deviceModel isEqualToString:@"iPad6,8"]) return @"iPad Pro 12.9";
6291

63-
if ([deviceModel isEqualToString:@"iPad3,1"]) return @"iPad 3(WiFi)";
64-
if ([deviceModel isEqualToString:@"iPad3,2"]) return @"iPad 3(CDMA)";
65-
if ([deviceModel isEqualToString:@"iPad3,3"]) return @"iPad 3(4G)";
66-
if ([deviceModel isEqualToString:@"iPad3,4"]) return @"iPad 4 (WiFi)";
67-
if ([deviceModel isEqualToString:@"iPad3,5"]) return @"iPad 4 (4G)";
68-
if ([deviceModel isEqualToString:@"iPad3,6"]) return @"iPad 4 (CDMA)";
92+
if ([deviceModel isEqualToString:@"iPad6,11"]) return @"iPad (5th Gen)";
93+
if ([deviceModel isEqualToString:@"iPad6,12"]) return @"iPad (5th Gen)";
94+
if ([deviceModel isEqualToString:@"iPad7,1"]) return @"iPad Pro 12.9 (2nd Gen)";
95+
if ([deviceModel isEqualToString:@"iPad7,2"]) return @"iPad Pro 12.9 (2nd Gen)";
96+
if ([deviceModel isEqualToString:@"iPad7,3"]) return @"iPad Pro 10.5";
97+
if ([deviceModel isEqualToString:@"iPad7,4"]) return @"iPad Pro 10.5";
6998

70-
if ([deviceModel isEqualToString:@"iPad4,1"]) return @"iPad Air";
71-
if ([deviceModel isEqualToString:@"iPad4,2"]) return @"iPad Air";
72-
if ([deviceModel isEqualToString:@"iPad4,3"]) return @"iPad Air";
73-
if ([deviceModel isEqualToString:@"iPad5,3"]) return @"iPad Air 2";
74-
if ([deviceModel isEqualToString:@"iPad5,4"]) return @"iPad Air 2";
75-
if ([deviceModel isEqualToString:@"i386"]) return @"Simulator";
76-
if ([deviceModel isEqualToString:@"x86_64"]) return @"Simulator";
7799

78-
if ([deviceModel isEqualToString:@"iPad4,4"]
79-
||[deviceModel isEqualToString:@"iPad4,5"]
80-
||[deviceModel isEqualToString:@"iPad4,6"]) return @"iPad mini 2";
100+
if ([deviceModel isEqualToString:@"AppleTV2,1"]) return @"Apple TV 2G";
101+
if ([deviceModel isEqualToString:@"AppleTV3,1"]) return @"Apple TV 3";
102+
if ([deviceModel isEqualToString:@"AppleTV3,2"]) return @"Apple TV 3 (2013)";
81103

82-
if ([deviceModel isEqualToString:@"iPad4,7"]
83-
||[deviceModel isEqualToString:@"iPad4,8"]
84-
||[deviceModel isEqualToString:@"iPad4,9"]) return @"iPad mini 3";
85-
86-
if ([deviceModel isEqualToString:@"iPad5,1"]
87-
||[deviceModel isEqualToString:@"iPad5,2"]) return @"iPad mini 4";
88-
89-
if ([deviceModel isEqualToString:@"iPad6,3"]
90-
||[deviceModel isEqualToString:@"iPad6,4"]
91-
||[deviceModel isEqualToString:@"iPad6,7"]
92-
||[deviceModel isEqualToString:@"iPad6,8"]) return @"iPad Pro";
104+
if ([deviceModel isEqualToString:@"i386"]) return @"Simulator";
105+
if ([deviceModel isEqualToString:@"x86_64"]) return @"Simulator";
93106

94107
return deviceModel;
95108
}

‎SecurityNote/TCAbutSNoteViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ - (void)viewDidLoad
2727
UIImageView * logoV = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"logoabout.png"]];
2828
logoV.center = CGPointMake(self.view.frame.size.width * 0.5, self.view.frame.size.height * 0.3);
2929
logoV.bounds = CGRectMake(0, 0, 120, 120);
30-
logoV.layer.cornerRadius = 30;
30+
logoV.layer.cornerRadius = 25;
3131
logoV.layer.masksToBounds = YES;
3232
[self.view addSubview:logoV];
3333

‎SecurityNote/TCHelpViewController.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ - (void)viewDidLoad {
2626

2727
UIImageView * logoV = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"logoabout.png"]];
2828
logoV.center = CGPointMake(self.view.frame.size.width * 0.5, self.view.frame.size.height * 0.21);
29-
logoV.bounds = CGRectMake(0, 0, 100, 100);
29+
logoV.bounds = CGRectMake(0, 0, 120, 120);
30+
logoV.layer.cornerRadius = 25;
31+
logoV.layer.masksToBounds = YES;
3032
[self.view addSubview:logoV];
3133

3234

‎SecurityNote/logoabout@2x.png‎

93.7 KB
Loading

0 commit comments

Comments
 (0)