From fb2f48b9f924e184bc9f6c1a4a31e02b06197ba9 Mon Sep 17 00:00:00 2001 From: Cash Date: Tue, 5 May 2015 17:16:16 +0800 Subject: [PATCH 01/12] Created spec files. --- UIDevice-HardwareModel.podspec | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 UIDevice-HardwareModel.podspec diff --git a/UIDevice-HardwareModel.podspec b/UIDevice-HardwareModel.podspec new file mode 100644 index 0000000..b5dd5ac --- /dev/null +++ b/UIDevice-HardwareModel.podspec @@ -0,0 +1,13 @@ +Pod::Spec.new do |s| + + s.name = "UIDevice+HardwareModel" + s.version = "1.3" + s.summary = "Check iOS hardware model" + s.homepage = "https://github.com/HighMa/UIDevice-HardwareModel.git" + s.license = { :type => 'MIT', :file => 'LICENSE' } + s.author = { "Wang" => "wangwei@high.ma" } + s.platform = :ios + s.source = { :git => "https://github.com/HighMa/UIDevice-HardwareModel.git" } + s.source_files = '*.{h,m}' + +end From 7a174d3ba62f1f3c49e4537f4ef67708ba2723e8 Mon Sep 17 00:00:00 2001 From: Cash Date: Tue, 5 May 2015 17:17:28 +0800 Subject: [PATCH 02/12] Rename UIDevice-HardwareModel.podspec to UIDevice+HardwareModel.podspec --- UIDevice-HardwareModel.podspec => UIDevice+HardwareModel.podspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename UIDevice-HardwareModel.podspec => UIDevice+HardwareModel.podspec (100%) diff --git a/UIDevice-HardwareModel.podspec b/UIDevice+HardwareModel.podspec similarity index 100% rename from UIDevice-HardwareModel.podspec rename to UIDevice+HardwareModel.podspec From 7e899b2809aea4f348ece060f029ff825de37038 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 11 May 2015 13:02:07 +0800 Subject: [PATCH 03/12] Update UIDevice+HardwareModel.h --- UIDevice+HardwareModel.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index b519f13..07b7345 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -58,7 +58,10 @@ enum UIHardwareModel }; typedef NSUInteger UIHardwareModel; @interface UIDevice (HardwareModel) - +/** + * Returns hardware name of device instance + */ +- (NSString *)hardwareName; /** * Returns hardware id of device instance */ From 0ff06aec4f661f444483b096a75bc046bdad27b4 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 11 May 2015 13:06:13 +0800 Subject: [PATCH 04/12] Update UIDevice+HardwareModel.m --- UIDevice+HardwareModel.m | 112 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 1 deletion(-) diff --git a/UIDevice+HardwareModel.m b/UIDevice+HardwareModel.m index 06e86b5..55bced4 100644 --- a/UIDevice+HardwareModel.m +++ b/UIDevice+HardwareModel.m @@ -9,7 +9,117 @@ #include @implementation UIDevice (HardwareModel) - +- (NSString *)hardwareName +{ + NSString *name = @"Unknown"; + + switch ([self hardwareModel]) { + case UIHardwareModeliPad: + name = @"iPad 1G"; + break; + case UIHardwareModeliPad2CDMA: + name = @"iPad 2 CDMA"; + break; + case UIHardwareModeliPad2GSM: + name = @"iPad 2 GSM"; + break; + case UIHardwareModeliPad2Wifi: + name = @"iPad 2 Wifi"; + break; + case UIHardwareModeliPad3CDMA: + name = @"iPad 3 CDMA"; + break; + case UIHardwareModeliPad3GSM: + name = @"iPad 3 GSM"; + break; + case UIHardwareModeliPad3Wifi: + name = @"iPad 3 Wifi"; + break; + case UIHardwareModeliPad4CDMA: + name = @"iPad 4 CDMA"; + break; + case UIHardwareModeliPad4GSM: + name = @"iPad 4 GSM"; + break; + case UIHardwareModeliPad4Wifi: + name = @"iPad 4 Wifi"; + break; + case UIHardwareModeliPadMiniCDMA: + name = @"iPad mini CDMA"; + break; + case UIHardwareModeliPadMiniGSM: + name = @"iPad mini GSM"; + break; + case UIHardwareModeliPadMiniWifi: + name = @"iPad mini Wifi"; + break; + case UIHardwareModeliPhone1G: + name = @"iPhone 1G"; + break; + case UIHardwareModeliPhone3G: + name = @"iPhone 3G"; + break; + case UIHardwareModeliPhone3GS: + name = @"iPhone 3Gs"; + break; + case UIHardwareModeliPhone4: + name = @"iPhone 4"; + break; + case UIHardwareModeliPhone4S: + name = @"iPhone 4s"; + break; + case UIHardwareModeliPhone4Verizon: + name = @"iPhone 4 Verizon"; + break; + case UIHardwareModeliPhone5: + name = @"iPhone 5"; + break; + case UIHardwareModeliPhone5c: + name = @"iPhone 5c"; + break; + case UIHardwareModeliPhone5cGlobal: + name = @"iPhone 5c Global"; + break; + case UIHardwareModeliPhone5Global: + name = @"iPhone 5 Global"; + break; + case UIHardwareModeliPhone5s: + name = @"iPhone 5s"; + break; + case UIHardwareModeliPhone5sGlobal: + name = @"iPhone 5s Global"; + break; + case UIHardwareModeliPodTouch1G: + name = @"iPod 1G"; + break; + case UIHardwareModeliPodTouch2G: + name = @"iPod 2G"; + break; + case UIHardwareModeliPodTouch3G: + name = @"iPod 3G"; + break; + case UIHardwareModeliPodTouch4G: + name = @"iPod 4G"; + break; + case UIHardwareModeliPodTouch5G: + name = @"iPod 5G"; + break; + case UIHardwareModelSimulator: + name = @"Simulator"; + break; + case UIHardwareModeliPhone6Plus: + name = @"iPhone 6 Plus"; + break; + case UIHardwareModeliPhone6: + name = @"iPhone 6"; + break; + default: + name = @"Unknown"; + break; + } + + return name; +} -(UIHardwareModel)hardwareModel { static UIHardwareModel _hardwareModel; From cb17ed8a335bde10dc06a9cb515838941c37bb99 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 8 Jun 2015 14:41:03 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9model=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=B8=BAhigh=E4=B8=93=E7=94=A8=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=85=B6=E5=AE=83framework=E4=B9=9F=E5=BC=95=E5=85=A5=E8=AF=A5?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E8=87=B4=E5=91=BD=E5=90=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UIDevice+HardwareModel.m | 146 +++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/UIDevice+HardwareModel.m b/UIDevice+HardwareModel.m index 55bced4..41a9c54 100644 --- a/UIDevice+HardwareModel.m +++ b/UIDevice+HardwareModel.m @@ -8,109 +8,109 @@ #import "UIDevice+HardwareModel.h" #include -@implementation UIDevice (HardwareModel) -- (NSString *)hardwareName +@implementation UIDevice (HighHardwareModel) +- (NSString *)highHardwareName { NSString *name = @"Unknown"; - switch ([self hardwareModel]) { - case UIHardwareModeliPad: + switch ([self HighHardwareModel]) { + case UIHighHardwareModeliPad: name = @"iPad 1G"; break; - case UIHardwareModeliPad2CDMA: + case UIHighHardwareModeliPad2CDMA: name = @"iPad 2 CDMA"; break; - case UIHardwareModeliPad2GSM: + case UIHighHardwareModeliPad2GSM: name = @"iPad 2 GSM"; break; - case UIHardwareModeliPad2Wifi: + case UIHighHardwareModeliPad2Wifi: name = @"iPad 2 Wifi"; break; - case UIHardwareModeliPad3CDMA: + case UIHighHardwareModeliPad3CDMA: name = @"iPad 3 CDMA"; break; - case UIHardwareModeliPad3GSM: + case UIHighHardwareModeliPad3GSM: name = @"iPad 3 GSM"; break; - case UIHardwareModeliPad3Wifi: + case UIHighHardwareModeliPad3Wifi: name = @"iPad 3 Wifi"; break; - case UIHardwareModeliPad4CDMA: + case UIHighHardwareModeliPad4CDMA: name = @"iPad 4 CDMA"; break; - case UIHardwareModeliPad4GSM: + case UIHighHardwareModeliPad4GSM: name = @"iPad 4 GSM"; break; - case UIHardwareModeliPad4Wifi: + case UIHighHardwareModeliPad4Wifi: name = @"iPad 4 Wifi"; break; - case UIHardwareModeliPadMiniCDMA: + case UIHighHardwareModeliPadMiniCDMA: name = @"iPad mini CDMA"; break; - case UIHardwareModeliPadMiniGSM: + case UIHighHardwareModeliPadMiniGSM: name = @"iPad mini GSM"; break; - case UIHardwareModeliPadMiniWifi: + case UIHighHardwareModeliPadMiniWifi: name = @"iPad mini Wifi"; break; - case UIHardwareModeliPhone1G: + case UIHighHardwareModeliPhone1G: name = @"iPhone 1G"; break; - case UIHardwareModeliPhone3G: + case UIHighHardwareModeliPhone3G: name = @"iPhone 3G"; break; - case UIHardwareModeliPhone3GS: + case UIHighHardwareModeliPhone3GS: name = @"iPhone 3Gs"; break; - case UIHardwareModeliPhone4: + case UIHighHardwareModeliPhone4: name = @"iPhone 4"; break; - case UIHardwareModeliPhone4S: + case UIHighHardwareModeliPhone4S: name = @"iPhone 4s"; break; - case UIHardwareModeliPhone4Verizon: + case UIHighHardwareModeliPhone4Verizon: name = @"iPhone 4 Verizon"; break; - case UIHardwareModeliPhone5: + case UIHighHardwareModeliPhone5: name = @"iPhone 5"; break; - case UIHardwareModeliPhone5c: + case UIHighHardwareModeliPhone5c: name = @"iPhone 5c"; break; - case UIHardwareModeliPhone5cGlobal: + case UIHighHardwareModeliPhone5cGlobal: name = @"iPhone 5c Global"; break; - case UIHardwareModeliPhone5Global: + case UIHighHardwareModeliPhone5Global: name = @"iPhone 5 Global"; break; - case UIHardwareModeliPhone5s: + case UIHighHardwareModeliPhone5s: name = @"iPhone 5s"; break; - case UIHardwareModeliPhone5sGlobal: + case UIHighHardwareModeliPhone5sGlobal: name = @"iPhone 5s Global"; break; - case UIHardwareModeliPodTouch1G: + case UIHighHardwareModeliPodTouch1G: name = @"iPod 1G"; break; - case UIHardwareModeliPodTouch2G: + case UIHighHardwareModeliPodTouch2G: name = @"iPod 2G"; break; - case UIHardwareModeliPodTouch3G: + case UIHighHardwareModeliPodTouch3G: name = @"iPod 3G"; break; - case UIHardwareModeliPodTouch4G: + case UIHighHardwareModeliPodTouch4G: name = @"iPod 4G"; break; - case UIHardwareModeliPodTouch5G: + case UIHighHardwareModeliPodTouch5G: name = @"iPod 5G"; break; - case UIHardwareModelSimulator: + case UIHighHardwareModelSimulator: name = @"Simulator"; break; - case UIHardwareModeliPhone6Plus: + case UIHighHardwareModeliPhone6Plus: name = @"iPhone 6 Plus"; break; - case UIHardwareModeliPhone6: + case UIHighHardwareModeliPhone6: name = @"iPhone 6"; break; default: @@ -120,9 +120,9 @@ - (NSString *)hardwareName return name; } --(UIHardwareModel)hardwareModel +-(UIHighHardwareModel)highHardwareModel { - static UIHardwareModel _hardwareModel; + static UIHighHardwareModel _hardwareModel; if(!_hardwareModel) { @@ -136,109 +136,109 @@ -(UIHardwareModel)hardwareModel NSString *hwString = [NSString stringWithCString: model encoding: NSUTF8StringEncoding]; free(model); - _hardwareModel = UIHardwareModelUnknown; // Unknown by default + _hardwareModel = UIHighHardwareModelUnknown; // Unknown by default if([hwString isEqualToString: @"i386"] || [hwString isEqualToString:@"x86_64"]) - _hardwareModel = UIHardwareModelSimulator; + _hardwareModel = UIHighHardwareModelSimulator; if([hwString isEqualToString: @"iPhone1,1"]) - _hardwareModel = UIHardwareModeliPhone1G; + _hardwareModel = UIHighHardwareModeliPhone1G; if([hwString isEqualToString: @"iPhone1,2"]) - _hardwareModel = UIHardwareModeliPhone3G; + _hardwareModel = UIHighHardwareModeliPhone3G; if([hwString isEqualToString: @"iPhone2,1"]) - _hardwareModel = UIHardwareModeliPhone3GS; + _hardwareModel = UIHighHardwareModeliPhone3GS; if([hwString isEqualToString: @"iPhone3,1"]) - _hardwareModel = UIHardwareModeliPhone4; + _hardwareModel = UIHighHardwareModeliPhone4; if([hwString isEqualToString: @"iPhone3,2"]) - _hardwareModel = UIHardwareModeliPhone4Verizon; + _hardwareModel = UIHighHardwareModeliPhone4Verizon; if([hwString isEqualToString: @"iPhone4,1"]) - _hardwareModel = UIHardwareModeliPhone4S; + _hardwareModel = UIHighHardwareModeliPhone4S; if([hwString isEqualToString: @"iPod1,1"]) - _hardwareModel = UIHardwareModeliPodTouch1G; + _hardwareModel = UIHighHardwareModeliPodTouch1G; if([hwString isEqualToString: @"iPod2,1"]) - _hardwareModel = UIHardwareModeliPodTouch2G; + _hardwareModel = UIHighHardwareModeliPodTouch2G; if([hwString isEqualToString: @"iPod3,1"]) - _hardwareModel = UIHardwareModeliPodTouch3G; + _hardwareModel = UIHighHardwareModeliPodTouch3G; if([hwString isEqualToString: @"iPod4,1"]) - _hardwareModel = UIHardwareModeliPodTouch4G; + _hardwareModel = UIHighHardwareModeliPodTouch4G; if([hwString isEqualToString: @"iPad1,1"]) - _hardwareModel = UIHardwareModeliPad; + _hardwareModel = UIHighHardwareModeliPad; if([hwString isEqualToString: @"iPad2,1"]) - _hardwareModel = UIHardwareModeliPad2Wifi; + _hardwareModel = UIHighHardwareModeliPad2Wifi; if([hwString isEqualToString: @"iPad2,2"]) - _hardwareModel = UIHardwareModeliPad2GSM; + _hardwareModel = UIHighHardwareModeliPad2GSM; if([hwString isEqualToString: @"iPad2,3"]) - _hardwareModel = UIHardwareModeliPad2CDMA; + _hardwareModel = UIHighHardwareModeliPad2CDMA; if([hwString isEqualToString: @"iPad2,4"]) - _hardwareModel = UIHardwareModeliPad2Wifi; + _hardwareModel = UIHighHardwareModeliPad2Wifi; if([hwString isEqualToString: @"iPad3,1"]) - _hardwareModel = UIHardwareModeliPad3Wifi; + _hardwareModel = UIHighHardwareModeliPad3Wifi; if([hwString isEqualToString: @"iPad3,2"]) - _hardwareModel = UIHardwareModeliPad3GSM; + _hardwareModel = UIHighHardwareModeliPad3GSM; if([hwString isEqualToString: @"iPad3,3"]) - _hardwareModel = UIHardwareModeliPad3CDMA; + _hardwareModel = UIHighHardwareModeliPad3CDMA; if([hwString isEqualToString: @"iPhone5,1"]) - _hardwareModel = UIHardwareModeliPhone5; + _hardwareModel = UIHighHardwareModeliPhone5; if([hwString isEqualToString: @"iPhone5,2"]) - _hardwareModel = UIHardwareModeliPhone5Global; + _hardwareModel = UIHighHardwareModeliPhone5Global; if([hwString isEqualToString: @"iPhone5,3"]) - _hardwareModel = UIHardwareModeliPhone5c; + _hardwareModel = UIHighHardwareModeliPhone5c; if([hwString isEqualToString: @"iPhone5,4"]) - _hardwareModel = UIHardwareModeliPhone5cGlobal; + _hardwareModel = UIHighHardwareModeliPhone5cGlobal; if([hwString isEqualToString: @"iPhone6,1"]) - _hardwareModel = UIHardwareModeliPhone5s; + _hardwareModel = UIHighHardwareModeliPhone5s; if([hwString isEqualToString: @"iPhone6,2"]) - _hardwareModel = UIHardwareModeliPhone5sGlobal; + _hardwareModel = UIHighHardwareModeliPhone5sGlobal; if([hwString isEqualToString: @"iPod5,1"]) - _hardwareModel = UIHardwareModeliPodTouch5G; + _hardwareModel = UIHighHardwareModeliPodTouch5G; if([hwString isEqualToString: @"iPad2,5"]) - _hardwareModel = UIHardwareModeliPadMiniWifi; + _hardwareModel = UIHighHardwareModeliPadMiniWifi; if([hwString isEqualToString: @"iPad2,6"]) - _hardwareModel = UIHardwareModeliPadMiniGSM; + _hardwareModel = UIHighHardwareModeliPadMiniGSM; if([hwString isEqualToString: @"iPad2,7"]) - _hardwareModel = UIHardwareModeliPadMiniCDMA; + _hardwareModel = UIHighHardwareModeliPadMiniCDMA; if([hwString isEqualToString: @"iPad3,4"]) - _hardwareModel = UIHardwareModeliPad4Wifi; + _hardwareModel = UIHighHardwareModeliPad4Wifi; if([hwString isEqualToString: @"iPad3,5"]) - _hardwareModel = UIHardwareModeliPad4GSM; + _hardwareModel = UIHighHardwareModeliPad4GSM; if([hwString isEqualToString: @"iPad3,6"]) - _hardwareModel = UIHardwareModeliPad4CDMA; + _hardwareModel = UIHighHardwareModeliPad4CDMA; if([hwString isEqualToString: @"iPhone7,1"]) - _hardwareModel = UIHardwareModeliPhone6Plus; + _hardwareModel = UIHighHardwareModeliPhone6Plus; if([hwString isEqualToString: @"iPhone7,2"]) - _hardwareModel = UIHardwareModeliPhone6; + _hardwareModel = UIHighHardwareModeliPhone6; } return _hardwareModel; From 863adbb801edf05fa6ea6a00a33fbbc2bf4d3f10 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 8 Jun 2015 14:45:39 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9model=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=B8=BAhigh=E4=B8=93=E7=94=A8=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=85=B6=E5=AE=83framework=E4=B9=9F=E5=BC=95=E5=85=A5=E8=AF=A5?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E8=87=B4=E5=91=BD=E5=90=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UIDevice+HardwareModel.h | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index 07b7345..e989ff8 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -7,64 +7,64 @@ #import -enum UIHardwareModel +enum UIHighHardwareModel { - UIHardwareModelUnknown = 0, - UIHardwareModelSimulator = 1, + UIHighHardwareModelUnknown = 0, + UIHighHardwareModelSimulator = 1, - UIHardwareModeliPhone1G = 2, - UIHardwareModeliPhone3G = 3, - UIHardwareModeliPhone3GS = 4, - UIHardwareModeliPhone4 = 5, - UIHardwareModeliPhone4Verizon = 6, + UIHighHardwareModeliPhone1G = 2, + UIHighHardwareModeliPhone3G = 3, + UIHighHardwareModeliPhone3GS = 4, + UIHighHardwareModeliPhone4 = 5, + UIHighHardwareModeliPhone4Verizon = 6, - UIHardwareModeliPodTouch1G = 7, - UIHardwareModeliPodTouch2G = 8, - UIHardwareModeliPodTouch3G = 9, - UIHardwareModeliPodTouch4G = 10, + UIHighHardwareModeliPodTouch1G = 7, + UIHighHardwareModeliPodTouch2G = 8, + UIHighHardwareModeliPodTouch3G = 9, + UIHighHardwareModeliPodTouch4G = 10, - UIHardwareModeliPad = 11, - UIHardwareModeliPad2Wifi = 12, - UIHardwareModeliPad2GSM = 13, - UIHardwareModeliPad2CDMA = 14, + UIHighHardwareModeliPad = 11, + UIHighHardwareModeliPad2Wifi = 12, + UIHighHardwareModeliPad2GSM = 13, + UIHighHardwareModeliPad2CDMA = 14, - UIHardwareModeliPhone4S = 15, + UIHighHardwareModeliPhone4S = 15, - UIHardwareModeliPad3Wifi = 16, - UIHardwareModeliPad3GSM = 17, - UIHardwareModeliPad3CDMA = 18, + UIHighHardwareModeliPad3Wifi = 16, + UIHighHardwareModeliPad3GSM = 17, + UIHighHardwareModeliPad3CDMA = 18, - UIHardwareModeliPhone5 = 19, - UIHardwareModeliPhone5Global = 20, + UIHighHardwareModeliPhone5 = 19, + UIHighHardwareModeliPhone5Global = 20, - UIHardwareModeliPodTouch5G = 21, + UIHighHardwareModeliPodTouch5G = 21, - UIHardwareModeliPadMiniWifi = 22, - UIHardwareModeliPadMiniGSM = 23, - UIHardwareModeliPadMiniCDMA = 24, - UIHardwareModeliPad4Wifi = 25, - UIHardwareModeliPad4GSM = 26, - UIHardwareModeliPad4CDMA = 27, + UIHighHardwareModeliPadMiniWifi = 22, + UIHighHardwareModeliPadMiniGSM = 23, + UIHighHardwareModeliPadMiniCDMA = 24, + UIHighHardwareModeliPad4Wifi = 25, + UIHighHardwareModeliPad4GSM = 26, + UIHighHardwareModeliPad4CDMA = 27, - UIHardwareModeliPhone5c = 28, - UIHardwareModeliPhone5cGlobal = 29, + UIHighHardwareModeliPhone5c = 28, + UIHighHardwareModeliPhone5cGlobal = 29, - UIHardwareModeliPhone5s = 30, - UIHardwareModeliPhone5sGlobal = 31, + UIHighHardwareModeliPhone5s = 30, + UIHighHardwareModeliPhone5sGlobal = 31, - UIHardwareModeliPhone6 = 32, - UIHardwareModeliPhone6Plus = 33 + UIHighHardwareModeliPhone6 = 32, + UIHighHardwareModeliPhone6Plus = 33 -}; typedef NSUInteger UIHardwareModel; +}; typedef NSUInteger UIHighHardwareModel; @interface UIDevice (HardwareModel) /** * Returns hardware name of device instance */ -- (NSString *)hardwareName; +- (NSString *)highHardwareName; /** * Returns hardware id of device instance */ --(UIHardwareModel)hardwareModel; +-(UIHighHardwareModel)highHardwareModel; @end From 8fcf877420bad4d06dbb5b59fcf0f2b7ffc98436 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 8 Jun 2015 14:55:30 +0800 Subject: [PATCH 07/12] Update UIDevice+HardwareModel.m --- UIDevice+HardwareModel.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UIDevice+HardwareModel.m b/UIDevice+HardwareModel.m index 41a9c54..b01fb47 100644 --- a/UIDevice+HardwareModel.m +++ b/UIDevice+HardwareModel.m @@ -13,7 +13,7 @@ - (NSString *)highHardwareName { NSString *name = @"Unknown"; - switch ([self HighHardwareModel]) { + switch ([self highHardwareModel]) { case UIHighHardwareModeliPad: name = @"iPad 1G"; break; From bf0a9b38635665f052f77a6f8baccdecfd487d32 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 8 Jun 2015 15:03:51 +0800 Subject: [PATCH 08/12] Update UIDevice+HardwareModel.h --- UIDevice+HardwareModel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index e989ff8..a47fb1e 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -57,7 +57,7 @@ enum UIHighHardwareModel }; typedef NSUInteger UIHighHardwareModel; -@interface UIDevice (HardwareModel) +@interface UIDevice (HighHardwareModel) /** * Returns hardware name of device instance */ From f0279cb29a780de246d6b041be2237654c6d6884 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 8 Jun 2015 15:26:50 +0800 Subject: [PATCH 09/12] Update UIDevice+HardwareModel.h --- UIDevice+HardwareModel.h | 57 +++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index a47fb1e..0678e78 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -7,56 +7,53 @@ #import -enum UIHighHardwareModel -{ +typedef NS_ENUM(NSInteger, UIHighHardwareModel) { UIHighHardwareModelUnknown = 0, - UIHighHardwareModelSimulator = 1, + UIHighHardwareModelSimulator = 1, - UIHighHardwareModeliPhone1G = 2, - UIHighHardwareModeliPhone3G = 3, - UIHighHardwareModeliPhone3GS = 4, - UIHighHardwareModeliPhone4 = 5, - UIHighHardwareModeliPhone4Verizon = 6, + UIHighHardwareModeliPhone1G = 2, + UIHighHardwareModeliPhone3G = 3, + UIHighHardwareModeliPhone3GS = 4, + UIHighHardwareModeliPhone4 = 5, + UIHighHardwareModeliPhone4Verizon = 6, - UIHighHardwareModeliPodTouch1G = 7, - UIHighHardwareModeliPodTouch2G = 8, - UIHighHardwareModeliPodTouch3G = 9, - UIHighHardwareModeliPodTouch4G = 10, + UIHighHardwareModeliPodTouch1G = 7, + UIHighHardwareModeliPodTouch2G = 8, + UIHighHardwareModeliPodTouch3G = 9, + UIHighHardwareModeliPodTouch4G = 10, - UIHighHardwareModeliPad = 11, - UIHighHardwareModeliPad2Wifi = 12, - UIHighHardwareModeliPad2GSM = 13, - UIHighHardwareModeliPad2CDMA = 14, + UIHighHardwareModeliPad = 11, + UIHighHardwareModeliPad2Wifi = 12, + UIHighHardwareModeliPad2GSM = 13, + UIHighHardwareModeliPad2CDMA = 14, UIHighHardwareModeliPhone4S = 15, - UIHighHardwareModeliPad3Wifi = 16, - UIHighHardwareModeliPad3GSM = 17, - UIHighHardwareModeliPad3CDMA = 18, + UIHighHardwareModeliPad3Wifi = 16, + UIHighHardwareModeliPad3GSM = 17, + UIHighHardwareModeliPad3CDMA = 18, - UIHighHardwareModeliPhone5 = 19, + UIHighHardwareModeliPhone5 = 19, UIHighHardwareModeliPhone5Global = 20, - UIHighHardwareModeliPodTouch5G = 21, + UIHighHardwareModeliPodTouch5G = 21, - UIHighHardwareModeliPadMiniWifi = 22, - UIHighHardwareModeliPadMiniGSM = 23, - UIHighHardwareModeliPadMiniCDMA = 24, - UIHighHardwareModeliPad4Wifi = 25, + UIHighHardwareModeliPadMiniWifi = 22, + UIHighHardwareModeliPadMiniGSM = 23, + UIHighHardwareModeliPadMiniCDMA = 24, + UIHighHardwareModeliPad4Wifi = 25, UIHighHardwareModeliPad4GSM = 26, UIHighHardwareModeliPad4CDMA = 27, - UIHighHardwareModeliPhone5c = 28, + UIHighHardwareModeliPhone5c = 28, UIHighHardwareModeliPhone5cGlobal = 29, - UIHighHardwareModeliPhone5s = 30, + UIHighHardwareModeliPhone5s = 30, UIHighHardwareModeliPhone5sGlobal = 31, UIHighHardwareModeliPhone6 = 32, UIHighHardwareModeliPhone6Plus = 33 - -}; typedef NSUInteger UIHighHardwareModel; - +}; @interface UIDevice (HighHardwareModel) /** * Returns hardware name of device instance From 7cf58dfe10aae6e3ca014c153ce4ca4ddef8336b Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 15 Feb 2016 14:49:22 +0800 Subject: [PATCH 10/12] Update UIDevice+HardwareModel.h add iPhone6S and iPhone6SPlus description --- UIDevice+HardwareModel.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index 0678e78..37e8341 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -52,7 +52,10 @@ typedef NS_ENUM(NSInteger, UIHighHardwareModel) { UIHighHardwareModeliPhone5sGlobal = 31, UIHighHardwareModeliPhone6 = 32, - UIHighHardwareModeliPhone6Plus = 33 + UIHighHardwareModeliPhone6Plus = 33, + + UIHighHardwareModeliPhone6S = 33, + UIHighHardwareModeliPhone6SPlus = 34 }; @interface UIDevice (HighHardwareModel) /** From f8168de8f7585986a86335c932bdc0916e700fd1 Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 15 Feb 2016 15:14:29 +0800 Subject: [PATCH 11/12] Update UIDevice+HardwareModel.m add iPhone6S and iPhone6SPlus description and name --- UIDevice+HardwareModel.m | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/UIDevice+HardwareModel.m b/UIDevice+HardwareModel.m index b01fb47..6b293c8 100644 --- a/UIDevice+HardwareModel.m +++ b/UIDevice+HardwareModel.m @@ -113,6 +113,12 @@ - (NSString *)highHardwareName case UIHighHardwareModeliPhone6: name = @"iPhone 6"; break; + case UIHighHardwareModeliPhone6S: + name = @"iPhone 6S"; + break; + case UIHighHardwareModeliPhone6SPlus: + name = @"iPhone 6S Plus"; + break; default: name = @"Unknown"; break; @@ -234,13 +240,19 @@ -(UIHighHardwareModel)highHardwareModel if([hwString isEqualToString: @"iPad3,6"]) _hardwareModel = UIHighHardwareModeliPad4CDMA; - if([hwString isEqualToString: @"iPhone7,1"]) - _hardwareModel = UIHighHardwareModeliPhone6Plus; + if([hwString isEqualToString: @"iPhone7,1"]) + _hardwareModel = UIHighHardwareModeliPhone6Plus; + if([hwString isEqualToString: @"iPhone7,2"]) + _hardwareModel = UIHighHardwareModeliPhone6; + if([hwString isEqualToString: @"iPhone8,1"]) + _hardwareModel = UIHighHardwareModeliPhone6S; + if([hwString isEqualToString: @"iPhone8,2"]) + _hardwareModel = UIHighHardwareModeliPhone6SPlus; + - if([hwString isEqualToString: @"iPhone7,2"]) - _hardwareModel = UIHighHardwareModeliPhone6; } + return _hardwareModel; } From 0bdcccf030a4bbb10c8e27328df8bb614883dabf Mon Sep 17 00:00:00 2001 From: Crazysiri <511121933@qq.com> Date: Mon, 15 Feb 2016 15:35:51 +0800 Subject: [PATCH 12/12] Update UIDevice+HardwareModel.h fix bug --- UIDevice+HardwareModel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UIDevice+HardwareModel.h b/UIDevice+HardwareModel.h index 37e8341..c9fe91b 100644 --- a/UIDevice+HardwareModel.h +++ b/UIDevice+HardwareModel.h @@ -54,8 +54,8 @@ typedef NS_ENUM(NSInteger, UIHighHardwareModel) { UIHighHardwareModeliPhone6 = 32, UIHighHardwareModeliPhone6Plus = 33, - UIHighHardwareModeliPhone6S = 33, - UIHighHardwareModeliPhone6SPlus = 34 + UIHighHardwareModeliPhone6S = 34, + UIHighHardwareModeliPhone6SPlus = 35 }; @interface UIDevice (HighHardwareModel) /**