Skip to content

Commit 863adbb

Browse files
committed
修改model名字为high专用,防止其它framework也引入该库导致命名冲突
1 parent cb17ed8 commit 863adbb

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

UIDevice+HardwareModel.h

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,64 @@
77

88
#import <UIKit/UIKit.h>
99

10-
enum UIHardwareModel
10+
enum UIHighHardwareModel
1111
{
12-
UIHardwareModelUnknown = 0,
13-
UIHardwareModelSimulator = 1,
12+
UIHighHardwareModelUnknown = 0,
13+
UIHighHardwareModelSimulator = 1,
1414

15-
UIHardwareModeliPhone1G = 2,
16-
UIHardwareModeliPhone3G = 3,
17-
UIHardwareModeliPhone3GS = 4,
18-
UIHardwareModeliPhone4 = 5,
19-
UIHardwareModeliPhone4Verizon = 6,
15+
UIHighHardwareModeliPhone1G = 2,
16+
UIHighHardwareModeliPhone3G = 3,
17+
UIHighHardwareModeliPhone3GS = 4,
18+
UIHighHardwareModeliPhone4 = 5,
19+
UIHighHardwareModeliPhone4Verizon = 6,
2020

21-
UIHardwareModeliPodTouch1G = 7,
22-
UIHardwareModeliPodTouch2G = 8,
23-
UIHardwareModeliPodTouch3G = 9,
24-
UIHardwareModeliPodTouch4G = 10,
21+
UIHighHardwareModeliPodTouch1G = 7,
22+
UIHighHardwareModeliPodTouch2G = 8,
23+
UIHighHardwareModeliPodTouch3G = 9,
24+
UIHighHardwareModeliPodTouch4G = 10,
2525

26-
UIHardwareModeliPad = 11,
27-
UIHardwareModeliPad2Wifi = 12,
28-
UIHardwareModeliPad2GSM = 13,
29-
UIHardwareModeliPad2CDMA = 14,
26+
UIHighHardwareModeliPad = 11,
27+
UIHighHardwareModeliPad2Wifi = 12,
28+
UIHighHardwareModeliPad2GSM = 13,
29+
UIHighHardwareModeliPad2CDMA = 14,
3030

31-
UIHardwareModeliPhone4S = 15,
31+
UIHighHardwareModeliPhone4S = 15,
3232

33-
UIHardwareModeliPad3Wifi = 16,
34-
UIHardwareModeliPad3GSM = 17,
35-
UIHardwareModeliPad3CDMA = 18,
33+
UIHighHardwareModeliPad3Wifi = 16,
34+
UIHighHardwareModeliPad3GSM = 17,
35+
UIHighHardwareModeliPad3CDMA = 18,
3636

37-
UIHardwareModeliPhone5 = 19,
38-
UIHardwareModeliPhone5Global = 20,
37+
UIHighHardwareModeliPhone5 = 19,
38+
UIHighHardwareModeliPhone5Global = 20,
3939

40-
UIHardwareModeliPodTouch5G = 21,
40+
UIHighHardwareModeliPodTouch5G = 21,
4141

42-
UIHardwareModeliPadMiniWifi = 22,
43-
UIHardwareModeliPadMiniGSM = 23,
44-
UIHardwareModeliPadMiniCDMA = 24,
45-
UIHardwareModeliPad4Wifi = 25,
46-
UIHardwareModeliPad4GSM = 26,
47-
UIHardwareModeliPad4CDMA = 27,
42+
UIHighHardwareModeliPadMiniWifi = 22,
43+
UIHighHardwareModeliPadMiniGSM = 23,
44+
UIHighHardwareModeliPadMiniCDMA = 24,
45+
UIHighHardwareModeliPad4Wifi = 25,
46+
UIHighHardwareModeliPad4GSM = 26,
47+
UIHighHardwareModeliPad4CDMA = 27,
4848

49-
UIHardwareModeliPhone5c = 28,
50-
UIHardwareModeliPhone5cGlobal = 29,
49+
UIHighHardwareModeliPhone5c = 28,
50+
UIHighHardwareModeliPhone5cGlobal = 29,
5151

52-
UIHardwareModeliPhone5s = 30,
53-
UIHardwareModeliPhone5sGlobal = 31,
52+
UIHighHardwareModeliPhone5s = 30,
53+
UIHighHardwareModeliPhone5sGlobal = 31,
5454

55-
UIHardwareModeliPhone6 = 32,
56-
UIHardwareModeliPhone6Plus = 33
55+
UIHighHardwareModeliPhone6 = 32,
56+
UIHighHardwareModeliPhone6Plus = 33
5757

58-
}; typedef NSUInteger UIHardwareModel;
58+
}; typedef NSUInteger UIHighHardwareModel;
5959

6060
@interface UIDevice (HardwareModel)
6161
/**
6262
* Returns hardware name of device instance
6363
*/
64-
- (NSString *)hardwareName;
64+
- (NSString *)highHardwareName;
6565
/**
6666
* Returns hardware id of device instance
6767
*/
68-
-(UIHardwareModel)hardwareModel;
68+
-(UIHighHardwareModel)highHardwareModel;
6969

7070
@end

0 commit comments

Comments
 (0)