Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UIDevice modelName #551

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UIDevice modelName #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Framework/YYKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
41 changes: 38 additions & 3 deletions YYKit/Base/UIKit/UIDevice+YYAdd.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ - (NSString *)machineModelName {
@"iPod4,1" : @"iPod touch 4",
@"iPod5,1" : @"iPod touch 5",
@"iPod7,1" : @"iPod touch 6",

@"iPod9,1" : @"iPod touch 7",

@"iPhone1,1" : @"iPhone 1G",
@"iPhone1,2" : @"iPhone 3G",
@"iPhone2,1" : @"iPhone 3GS",
Expand All @@ -282,7 +283,19 @@ - (NSString *)machineModelName {
@"iPhone9,2" : @"iPhone 7 Plus",
@"iPhone9,3" : @"iPhone 7",
@"iPhone9,4" : @"iPhone 7 Plus",

@"iPhone10,1" : @"iPhone 8",
@"iPhone10,2" : @"iPhone 8 Plus",
@"iPhone10,3" : @"iPhone X",
@"iPhone10,4" : @"iPhone 8",
@"iPhone10,5" : @"iPhone 8 Plus",
@"iPhone10,6" : @"iPhone X",
@"iPhone11,2" : @"iPhone XS",
@"iPhone11,6" : @"iPhone XS Max",
@"iPhone11,8" : @"iPhone XR",
@"iPhone12,1" : @"iPhone 11",
@"iPhone12,3" : @"iPhone 11 Pro",
@"iPhone12,5" : @"iPhone 11 Pro Max",

@"iPad1,1" : @"iPad 1",
@"iPad2,1" : @"iPad 2 (WiFi)",
@"iPad2,2" : @"iPad 2 (GSM)",
Expand Down Expand Up @@ -314,7 +327,29 @@ - (NSString *)machineModelName {
@"iPad6,4" : @"iPad Pro (9.7 inch)",
@"iPad6,7" : @"iPad Pro (12.9 inch)",
@"iPad6,8" : @"iPad Pro (12.9 inch)",

@"iPad6,11" : @"iPad (5th generation)",
@"iPad6,12" : @"iPad (5th generation)",
@"iPad7,1" : @"iPad Pro (12.9 inch)(2nd generation)",
@"iPad7,2" : @"iPad Pro (12.9 inch)(2nd generation)",
@"iPad7,3" : @"iPad Pro (10.5 inch)",
@"iPad7,4" : @"iPad Pro (10.5 inch)",
@"iPad7,5" : @"iPad (6th generation)",
@"iPad7,6" : @"iPad (6th generation)",
@"iPad7,11" : @"iPad (7th generation)",
@"iPad7,12" : @"iPad (7th generation)",
@"iPad8,1" : @"iPad Pro (11 inch)",
@"iPad8,2" : @"iPad Pro (11 inch)",
@"iPad8,3" : @"iPad Pro (11 inch)",
@"iPad8,4" : @"iPad Pro (11 inch)",
@"iPad8,5" : @"iPad Pro (12.9 inch) (3rd generation)",
@"iPad8,6" : @"iPad Pro (12.9 inch) (3rd generation)",
@"iPad8,7" : @"iPad Pro (12.9 inch) (3rd generation)",
@"iPad8,8" : @"iPad Pro (12.9 inch) (3rd generation)",
@"iPad11,1" : @"iPad mini (5th generation)",
@"iPad11,2" : @"iPad mini (5th generation)",
@"iPad11,3" : @"iPad Air (3rd generation)",
@"iPad11,4" : @"iPad Air (3rd generation)",

@"AppleTV2,1" : @"Apple TV 2",
@"AppleTV3,1" : @"Apple TV 3",
@"AppleTV3,2" : @"Apple TV 3",
Expand Down