@aks-dev/easyui 1.2.5 → 1.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/RNEasyui.podspec +31 -13
  2. package/dist/components/ant-design/Flex.d.ts +20 -0
  3. package/dist/components/ant-design/Flex.d.ts.map +1 -0
  4. package/dist/components/ant-design/Flex.js +23 -0
  5. package/dist/components/ant-design/WhiteSpace.d.ts +10 -0
  6. package/dist/components/ant-design/WhiteSpace.d.ts.map +1 -0
  7. package/dist/components/ant-design/WhiteSpace.js +17 -0
  8. package/dist/components/ant-design/WingBlank.d.ts +10 -0
  9. package/dist/components/ant-design/WingBlank.d.ts.map +1 -0
  10. package/dist/components/ant-design/WingBlank.js +19 -0
  11. package/dist/components/ant-design/index.d.ts +4 -0
  12. package/dist/components/ant-design/index.d.ts.map +1 -0
  13. package/dist/components/ant-design/index.js +3 -0
  14. package/dist/index.d.ts +1 -0
  15. package/dist/index.d.ts.map +1 -1
  16. package/dist/index.js +1 -0
  17. package/ios/RCTRNEasyui.h +27 -0
  18. package/ios/RCTRNEasyui.mm +161 -0
  19. package/ios/utils/RomUtil.m +230 -168
  20. package/package.json +2 -2
package/RNEasyui.podspec CHANGED
@@ -2,29 +2,47 @@
2
2
  require "json"
3
3
 
4
4
  package = JSON.parse(File.read(File.join(__dir__, "package.json")))
5
-
5
+ fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
6
6
  Pod::Spec.new do |s|
7
- s.name = "RNPermissions"
7
+ s.name = "RNEasyui"
8
8
  s.version = package["version"]
9
9
  s.license = package["license"]
10
10
  s.summary = package["description"]
11
11
  s.author = package["author"]
12
- s.homepage = package["homepage"]
13
-
14
- s.platform = { :ios => "12.4" }
15
- s.source = { :git => "https://gitee.com/the_period_of_the_ten_kingdoms/aks-easyui.git", :tag => "master" }
16
- s.source_files = "**/*.{h,m,mm,swift,xib,c}"
12
+ s.homepage = package["homepage"]
13
+
14
+ s.platform = { :ios => "13.4" }
15
+ s.source = { :git => "https://gitee.com/the_period_of_the_ten_kingdoms/easyui.git", :tag => "master" }
16
+ s.source_files = "ios/**/*.{h,m,mm,swift,xib,c}"
17
17
  s.requires_arc = true
18
- s.resource_bundles = { 'RNEasyui' => ['assets/*'] }
18
+ s.resource_bundles = { 'RNEasyui' => ['ios/assets/**/*'] }
19
+
19
20
 
21
+ if fabric_enabled
22
+ folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
20
23
 
21
- # s.dependency "React"
22
- #s.dependency "others"
23
- if ENV['RCT_NEW_ARCH_ENABLED'] == "1" then
24
- install_modules_dependencies(s)
24
+ s.pod_target_xcconfig = {
25
+ 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
26
+ 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
27
+ }
28
+ s.platforms = { ios: '13.4'}
29
+ s.compiler_flags = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED=1'
30
+
31
+ if respond_to?(:install_modules_dependencies, true)
32
+ install_modules_dependencies(s)
33
+ else
34
+ s.dependency "React-Core"
35
+ s.dependency "React-Codegen"
36
+ s.dependency "RCT-Folly"
37
+ s.dependency "RCTRequired"
38
+ s.dependency "RCTTypeSafety"
39
+ s.dependency "ReactCommon/turbomodule/core"
40
+ end
25
41
  else
42
+ s.platforms = { :ios => "9.0" }
43
+
26
44
  s.dependency "React-Core"
27
45
  end
28
46
  end
29
47
 
30
-
48
+
package/dist/components/ant-design/Flex.d.ts ADDED
@@ -0,0 +1,20 @@
1
+ import { StyleProp, ViewStyle } from "react-native";
2
+ import React from "react";
3
+ export interface FlexPropsType {
4
+ direction?: "row" | "row-reverse" | "column" | "column-reverse";
5
+ wrap?: "nowrap" | "wrap" | "wrap-reverse";
6
+ justify?: "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly";
7
+ align?: "flex-start" | "flex-end" | "center" | "baseline" | "stretch";
8
+ children?: React.ReactNode;
9
+ disabled?: boolean;
10
+ }
11
+ export interface FlexProps extends FlexPropsType {
12
+ onPress?: () => void;
13
+ onLongPress?: () => void;
14
+ onPressIn?: () => void;
15
+ onPressOut?: () => void;
16
+ style?: StyleProp<ViewStyle>;
17
+ activeOpacity?: number | undefined;
18
+ }
19
+ export default function Flex(props: FlexProps): React.JSX.Element;
20
+ //# sourceMappingURL=Flex.d.ts.map
package/dist/components/ant-design/Flex.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Flex.d.ts","sourceRoot":"","sources":["../../../src/components/ant-design/Flex.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,QAAQ,GAAG,gBAAgB,CAAC;IAChE,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,cAAc,CAAC;IAC1C,OAAO,CAAC,EACJ,YAAY,GACZ,UAAU,GACV,QAAQ,GACR,eAAe,GACf,cAAc,GACd,cAAc,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IACtE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AACD,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,SAAS,qBA4B5C"}
package/dist/components/ant-design/Flex.js ADDED
@@ -0,0 +1,23 @@
1
+ import { TouchableOpacity, StyleSheet, } from "react-native";
2
+ import React from "react";
3
+ // 自定义 Flex 组件
4
+ export default function Flex(props) {
5
+ const { direction, justify, align, wrap, style, children, activeOpacity = 1, ...rest } = props;
6
+ return (<TouchableOpacity style={[
7
+ styles.flex,
8
+ {
9
+ flexDirection: direction,
10
+ justifyContent: justify,
11
+ alignItems: align,
12
+ flexWrap: wrap,
13
+ },
14
+ style,
15
+ ]} {...rest}>
16
+ {children}
17
+ </TouchableOpacity>);
18
+ }
19
+ const styles = StyleSheet.create({
20
+ flex: {
21
+ display: "flex", // RN 默认就是 flex，可省略
22
+ },
23
+ });
package/dist/components/ant-design/WhiteSpace.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { ViewStyle, StyleProp } from "react-native";
2
+ type WhiteSpaceSize = "xs" | "sm" | "md" | "lg" | "xl" | "xxl" | number;
3
+ interface WhiteSpaceProps {
4
+ size?: WhiteSpaceSize;
5
+ horizontal?: boolean;
6
+ style?: StyleProp<ViewStyle>;
7
+ }
8
+ export default function WhiteSpace({ size, horizontal, style, }: WhiteSpaceProps): import("react").JSX.Element;
9
+ export {};
10
+ //# sourceMappingURL=WhiteSpace.d.ts.map
package/dist/components/ant-design/WhiteSpace.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"WhiteSpace.d.ts","sourceRoot":"","sources":["../../../src/components/ant-design/WhiteSpace.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,KAAK,cAAc,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAAC;AAExE,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAW,EACX,UAAkB,EAClB,KAAK,GACN,EAAE,eAAe,+BAqBjB"}
package/dist/components/ant-design/WhiteSpace.js ADDED
@@ -0,0 +1,17 @@
1
+ import { View } from "react-native";
2
+ export default function WhiteSpace({ size = "md", horizontal = false, style, }) {
3
+ // 内置间距
4
+ const spaceMap = {
5
+ xs: 4,
6
+ sm: 8,
7
+ md: 12,
8
+ lg: 16,
9
+ xl: 24,
10
+ xxl: 32,
11
+ };
12
+ const space = typeof size === "number" ? size : (spaceMap[size] ?? 12);
13
+ return (<View style={[
14
+ horizontal ? { width: space, height: "100%" } : { height: space },
15
+ style,
16
+ ]}/>);
17
+ }
package/dist/components/ant-design/WingBlank.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { ViewStyle, StyleProp } from "react-native";
2
+ type WingBlankSize = "xs" | "sm" | "md" | "lg" | "xl" | number;
3
+ interface WingBlankProps {
4
+ size?: WingBlankSize;
5
+ style?: StyleProp<ViewStyle>;
6
+ children?: React.ReactNode;
7
+ }
8
+ export default function WingBlank({ size, style, children, }: WingBlankProps): import("react").JSX.Element;
9
+ export {};
10
+ //# sourceMappingURL=WingBlank.d.ts.map
package/dist/components/ant-design/WingBlank.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"WingBlank.d.ts","sourceRoot":"","sources":["../../../src/components/ant-design/WingBlank.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,KAAK,aAAa,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC;AAE/D,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,IAAW,EACX,KAAK,EACL,QAAQ,GACT,EAAE,cAAc,+BAuBhB"}
package/dist/components/ant-design/WingBlank.js ADDED
@@ -0,0 +1,19 @@
1
+ import { View } from "react-native";
2
+ export default function WingBlank({ size = "md", style, children, }) {
3
+ const blankMap = {
4
+ xs: 4,
5
+ sm: 8,
6
+ md: 12,
7
+ lg: 16,
8
+ xl: 20,
9
+ };
10
+ const padding = typeof size === "number" ? size : (blankMap[size] ?? 12);
11
+ return (<View style={[
12
+ {
13
+ paddingHorizontal: padding,
14
+ },
15
+ style,
16
+ ]}>
17
+ {children}
18
+ </View>);
19
+ }
package/dist/components/ant-design/index.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ export * from "./Flex";
2
+ export * from "./WhiteSpace";
3
+ export * from "./WingBlank";
4
+ //# sourceMappingURL=index.d.ts.map
package/dist/components/ant-design/index.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/ant-design/index.tsx"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
package/dist/components/ant-design/index.js ADDED
@@ -0,0 +1,3 @@
1
+ export * from "./Flex";
2
+ export * from "./WhiteSpace";
3
+ export * from "./WingBlank";
package/dist/index.d.ts CHANGED
@@ -12,6 +12,7 @@ export { default as DottedLine } from "./components/DottedLine/DottedLine";
12
12
  export { default as MenuView } from "./components/MenuView/MenuView";
13
13
  export { AnimationModal } from "./components/AnimationModal/AnimationModal";
14
14
  export { Badge } from "./components/Badge/Badge";
15
+ export * from "./components/ant-design";
15
16
  /**全局适配 */
16
17
  export * from "./screen";
17
18
  /**工具 */
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,GAAG,EACH,WAAW,EACX,WAAW,EACX,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,YAAY,EACZ,WAAW,GACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EACL,OAAO,IAAI,oBAAoB,EAC/B,MAAM,GACP,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,UAAU;AACV,cAAc,UAAU,CAAC;AACzB,QAAQ;AACR,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,QAAQ;AACR,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,GAAG,EACH,WAAW,EACX,WAAW,EACX,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,YAAY,EACZ,WAAW,GACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EACL,OAAO,IAAI,oBAAoB,EAC/B,MAAM,GACP,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,cAAc,yBAAyB,CAAC;AACxC,UAAU;AACV,cAAc,UAAU,CAAC;AACzB,QAAQ;AACR,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,QAAQ;AACR,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC"}
package/dist/index.js CHANGED
@@ -23,6 +23,7 @@ export { default as DottedLine } from "./components/DottedLine/DottedLine";
23
23
  export { default as MenuView } from "./components/MenuView/MenuView";
24
24
  export { AnimationModal } from "./components/AnimationModal/AnimationModal";
25
25
  export { Badge } from "./components/Badge/Badge";
26
+ export * from "./components/ant-design";
26
27
  /**全局适配 */
27
28
  export * from "./screen";
28
29
  /**工具 */
package/ios/RCTRNEasyui.h ADDED
@@ -0,0 +1,27 @@
1
+ //
2
+ // RCTRNEasyui.h
3
+ // AwesomeProject260313
4
+ //
5
+ // Created by shiguo on 2026/3/24.
6
+ //
7
+
8
+ #import <Foundation/Foundation.h>
9
+ #import <React/RCTBridgeModule.h>
10
+ #ifdef RCT_NEW_ARCH_ENABLED
11
+ #import <RNEasyuiSpec/RNEasyuiSpec.h>
12
+ #endif
13
+
14
+
15
+ NS_ASSUME_NONNULL_BEGIN
16
+
17
+ #ifdef RCT_NEW_ARCH_ENABLED
18
+
19
+ @interface RCTRNEasyui : NSObject<NativeRNEasyuiSpec>
20
+ #else
21
+ @interface RCTRNEasyui : NSObject<RCTBridgeModule>
22
+ #endif
23
+
24
+
25
+ @end
26
+
27
+ NS_ASSUME_NONNULL_END
package/ios/RCTRNEasyui.mm ADDED
@@ -0,0 +1,161 @@
1
+ //
2
+ // RCTRNEasyui.m
3
+ // AwesomeProject260313
4
+ //
5
+ // Created by shiguo on 2026/3/24.
6
+ //
7
+
8
+ #import "RCTRNEasyui.h"
9
+ #import <UIKit/UIKit.h>
10
+ #import "LEEAlert.h"
11
+ #import "RomUtil.h"
12
+ #import "UpgradeView.h"
13
+
14
+ static dispatch_queue_t RCTGetMethodQueue()
15
+ {
16
+ // We want all instances to share the same queue since they will be reading/writing the same
17
+ // files.
18
+ static dispatch_queue_t queue;
19
+ static dispatch_once_t onceToken;
20
+ dispatch_once(&onceToken, ^{
21
+ queue =
22
+ dispatch_queue_create("com.facebook.react.RNEasyuiQueue", DISPATCH_QUEUE_SERIAL);
23
+ });
24
+ return queue;
25
+ }
26
+
27
+
28
+ @implementation RCTRNEasyui
29
+
30
+ RCT_EXPORT_MODULE(RNEasyui)
31
+
32
+ //- (void)getAppVersion:(RCTPromiseResolveBlock)resolve
33
+ // reject:(RCTPromiseRejectBlock)reject {
34
+ // NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
35
+ // NSString *currentVersion = [infoDict objectForKey:@"CFBundleShortVersionString"];
36
+ // resolve(currentVersion);
37
+ //}
38
+
39
+
40
+ //- (void)getOSVersion:(RCTPromiseResolveBlock)resolve
41
+ // reject:(RCTPromiseRejectBlock)reject {
42
+ // UIDevice *device = [UIDevice currentDevice];
43
+ // NSString *systemVersion = [NSString stringWithFormat:@"%@ %@",device.systemName,device.systemVersion];
44
+ // resolve(systemVersion);
45
+ //}
46
+ //- (void)getDeviceBrand:(RCTPromiseResolveBlock)resolve
47
+ // reject:(RCTPromiseRejectBlock)reject {
48
+ // resolve([RomUtil getCurrentDeviceModel]);
49
+ //}
50
+ - (void)gotoDesktop {}
51
+ - (void)upgrade:(JS::NativeRNEasyui::UpgradeOptions &)options
52
+ resolve:(RCTPromiseResolveBlock)resolve
53
+ reject:(RCTPromiseRejectBlock)reject {
54
+ NSString * version = options.version();
55
+ NSString * title = options.title();
56
+ NSString * downloadUrl = options.downloadUrl();
57
+ NSString * note = options.note();
58
+ BOOL force = options.force();
59
+
60
+ NSString *currentVersion = [self getLocalVersion];
61
+ NSComparisonResult result =[self buildVersion:currentVersion compareWithAppstoreVersion:version];
62
+ if( result== NSOrderedAscending){
63
+ dispatch_async(dispatch_get_main_queue(), ^{
64
+ CGFloat SCREEN_WIDTH = [UIScreen mainScreen].bounds.size.width;
65
+ UpgradeView *view = [[UpgradeView alloc] initWithTitle:title note:note force:force];
66
+ view.closeBlock = ^{
67
+ [LEEAlert closeWithCompletionBlock:nil];
68
+ };
69
+ view.settingBlock = ^{
70
+ [[UIApplication sharedApplication] openURL:[NSURL URLWithString: [downloadUrl stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]] options:@{} completionHandler:nil];
71
+ };
72
+
73
+ [LEEAlert alert].config
74
+ .LeeMaxWidth(SCREEN_WIDTH-40)
75
+ .LeeCustomView(view)
76
+ .LeeHeaderInsets(UIEdgeInsetsMake(0, 0, 0, 0))
77
+ .LeeItemInsets(UIEdgeInsetsMake(0, 0, 0, 0))
78
+ #ifdef __IPHONE_13_0
79
+ .LeeUserInterfaceStyle(UIUserInterfaceStyleLight)
80
+ #endif
81
+ .LeeShow();
82
+
83
+ });
84
+ }
85
+ else if(result == NSOrderedDescending){
86
+ reject(@"error_app_upgrade",@"商城版本低于本地版本",NULL);
87
+ }else if(result == NSOrderedSame){
88
+ reject(@"error_app_upgrade",@"已是最新版本",NULL);
89
+ }else{
90
+ resolve(@"发现新版本");
91
+ }
92
+ }
93
+
94
+
95
+ - (NSString*) getLocalVersion {
96
+ return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
97
+ }
98
+
99
+ /**
100
+ 版本比较
101
+ */
102
+ -(NSComparisonResult)buildVersion:(NSString*)buildVersion compareWithAppstoreVersion:(NSString*)appStoreVersion{
103
+ NSArray* buildVersionNums = [buildVersion componentsSeparatedByString:@"."];
104
+ NSArray* appStoreVersionNums = [appStoreVersion componentsSeparatedByString:@"."];
105
+ for (NSInteger i=0; i<buildVersionNums.count; i++) {
106
+ NSInteger buildNum = [buildVersionNums[i] integerValue];
107
+ if(i<appStoreVersionNums.count){
108
+ NSInteger appStoreNum = [appStoreVersionNums[i] integerValue];
109
+ if(buildNum < appStoreNum){
110
+ return NSOrderedAscending;
111
+ }else if(buildNum>appStoreNum){
112
+ return NSOrderedDescending;
113
+ }
114
+ }
115
+ }
116
+
117
+ if(buildVersionNums.count > appStoreVersionNums.count){
118
+ return NSOrderedDescending;
119
+ }else if(buildVersionNums.count < appStoreVersionNums.count){
120
+ return NSOrderedAscending;
121
+ }
122
+ return NSOrderedSame;
123
+ }
124
+
125
+
126
+ #if RCT_NEW_ARCH_ENABLED
127
+ - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
128
+ return std::make_shared<facebook::react::NativeRNEasyuiSpecJSI>(params);
129
+ }
130
+ #endif
131
+
132
+
133
+ ///
134
+ ///
135
+ ///
136
+ - (dispatch_queue_t)methodQueue
137
+ {
138
+ return RCTGetMethodQueue();
139
+ }
140
+ + (BOOL)requiresMainQueueSetup {
141
+ return YES;
142
+ }
143
+
144
+ RCT_EXPORT_METHOD(getAppVersion:(RCTPromiseResolveBlock)resolve
145
+ reject:(RCTPromiseRejectBlock)reject){
146
+ NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
147
+ NSString *currentVersion = [infoDict objectForKey:@"CFBundleShortVersionString"];
148
+ resolve(currentVersion);
149
+ }
150
+ RCT_EXPORT_METHOD(getOSVersion:(RCTPromiseResolveBlock)resolve
151
+ reject:(RCTPromiseRejectBlock)reject){
152
+ UIDevice *device = [UIDevice currentDevice];
153
+ NSString *systemVersion = [NSString stringWithFormat:@"%@ %@",device.systemName,device.systemVersion];
154
+ resolve(systemVersion);
155
+ }
156
+ RCT_EXPORT_METHOD(getDeviceBrand:(RCTPromiseResolveBlock)resolve
157
+ reject:(RCTPromiseRejectBlock)reject){
158
+ resolve([RomUtil getCurrentDeviceModel]);
159
+ }
160
+
161
+ @end
package/ios/utils/RomUtil.m CHANGED
@@ -3,12 +3,13 @@
3
3
  // officeServiceApp
4
4
  //
5
5
  // Created by mac on 2021/1/19.
6
- //
6
+ // https://blog.csdn.net/qq_19926599/article/details/86747401
7
+ // https://gist.github.com/adamawolf/3048717
7
8
 
8
9
  #import "RomUtil.h"
9
10
  #import <sys/utsname.h>//要导入头文件
10
11
  @implementation RomUtil
11
- //https://blog.csdn.net/qq_19926599/article/details/86747401
12
+
12
13
 
13
14
  + (NSString *)getCurrentDeviceModel{
14
15
  struct utsname systemInfo;
@@ -16,176 +17,237 @@
16
17
 
17
18
  NSString *deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
18
19
 
19
- if ([deviceModel isEqualToString:@"i386"]) return @"Simulator";
20
- if ([deviceModel isEqualToString:@"x86_64"]) return @"Simulator";
21
- if ([deviceModel isEqualToString:@"arm64"]) return @"iPhone Simulator";
22
- if ([deviceModel isEqualToString:@"iPhone1,1"]) return @"iPhone";
23
- if ([deviceModel isEqualToString:@"iPhone1,2"]) return @"iPhone 3G";
24
- if ([deviceModel isEqualToString:@"iPhone2,1"]) return @"iPhone 3GS";
25
- if ([deviceModel isEqualToString:@"iPhone3,1"]) return @"iPhone 4";
26
- if ([deviceModel isEqualToString:@"iPhone3,2"]) return @"iPhone 4 GSM Rev A";
27
- if ([deviceModel isEqualToString:@"iPhone3,3"]) return @"iPhone 4 CDMA";
28
- if ([deviceModel isEqualToString:@"iPhone4,1"]) return @"iPhone 4S";
29
- if ([deviceModel isEqualToString:@"iPhone5,1"]) return @"iPhone 5 (GSM)";
30
- if ([deviceModel isEqualToString:@"iPhone5,2"]) return @"iPhone 5 (GSM+CDMA)";
31
- if ([deviceModel isEqualToString:@"iPhone5,3"]) return @"iPhone 5C (GSM)";
32
- if ([deviceModel isEqualToString:@"iPhone5,4"]) return @"iPhone 5C (Global)";
33
- if ([deviceModel isEqualToString:@"iPhone6,1"]) return @"iPhone 5S (GSM)";
34
- if ([deviceModel isEqualToString:@"iPhone6,2"]) return @"iPhone 5S (Global)";
35
- if ([deviceModel isEqualToString:@"iPhone7,1"]) return @"iPhone 6 Plus";
36
- if ([deviceModel isEqualToString:@"iPhone7,2"]) return @"iPhone 6";
37
- if ([deviceModel isEqualToString:@"iPhone8,1"]) return @"iPhone 6s";
38
- if ([deviceModel isEqualToString:@"iPhone8,2"]) return @"iPhone 6s Plus";
39
- if ([deviceModel isEqualToString:@"iPhone8,3"]) return @"iPhone SE (GSM+CDMA)";
40
- if ([deviceModel isEqualToString:@"iPhone8,4"]) return @"iPhone SE (GSM)";
41
- if ([deviceModel isEqualToString:@"iPhone9,1"]) return @"iPhone 7";
42
- if ([deviceModel isEqualToString:@"iPhone9,2"]) return @"iPhone 7 Plus";
43
- if ([deviceModel isEqualToString:@"iPhone9,3"]) return @"iPhone 7";
44
- if ([deviceModel isEqualToString:@"iPhone9,4"]) return @"iPhone 7 Plus";
45
- if ([deviceModel isEqualToString:@"iPhone10,1"]) return @"iPhone 8";
46
- if ([deviceModel isEqualToString:@"iPhone10,2"]) return @"iPhone 8 Plus";
47
- if ([deviceModel isEqualToString:@"iPhone10,3"]) return @"iPhone X Global";
48
- if ([deviceModel isEqualToString:@"iPhone10,4"]) return @"iPhone 8";
49
- if ([deviceModel isEqualToString:@"iPhone10,5"]) return @"iPhone 8 Plus";
50
- if ([deviceModel isEqualToString:@"iPhone10,6"]) return @"iPhone X GSM";
51
- if ([deviceModel isEqualToString:@"iPhone11,2"]) return @"iPhone XS";
52
- if ([deviceModel isEqualToString:@"iPhone11,4"]) return @"iPhone XS Max China";
53
- if ([deviceModel isEqualToString:@"iPhone11,6"]) return @"iPhone XS Max";
54
- if ([deviceModel isEqualToString:@"iPhone11,8"]) return @"iPhone XR";
55
- if ([deviceModel isEqualToString:@"iPhone12,1"]) return @"iPhone 11";
56
- if ([deviceModel isEqualToString:@"iPhone12,3"]) return @"iPhone 11 Pro";
57
- if ([deviceModel isEqualToString:@"iPhone12,5"]) return @"iPhone 11 Pro Max";
58
- if ([deviceModel isEqualToString:@"iPhone12,8"]) return @"iPhone SE 2nd Gen";
59
- if ([deviceModel isEqualToString:@"iPhone13,1"]) return @"iPhone 12 Mini";
60
- if ([deviceModel isEqualToString:@"iPhone13,2"]) return @"iPhone 12";
61
- if ([deviceModel isEqualToString:@"iPhone13,3"]) return @"iPhone 12 Pro";
62
- if ([deviceModel isEqualToString:@"iPhone13,4"]) return @"iPhone 12 Pro Max";
63
- if ([deviceModel isEqualToString:@"iPhone14,2"]) return @"iPhone 13 Pro";
64
- if ([deviceModel isEqualToString:@"iPhone14,3"]) return @"iPhone 13 Pro Max";
65
- if ([deviceModel isEqualToString:@"iPhone14,4"]) return @"iPhone 13 Mini";
66
- if ([deviceModel isEqualToString:@"iPhone14,5"]) return @"iPhone 13";
67
- if ([deviceModel isEqualToString:@"iPhone14,6"]) return @"iPhone SE (3rd generation)";
20
+ if ([deviceModel isEqualToString:@"i386"]) return @"iPhone Simulator";
21
+ if ([deviceModel isEqualToString:@"x86_64"]) return @"iPhone Simulator";
22
+ if ([deviceModel isEqualToString:@"arm64"]) return @"iPhone Simulator";
23
+ if ([deviceModel isEqualToString:@"iPhone1,1"]) return @"iPhone";
24
+ if ([deviceModel isEqualToString:@"iPhone1,2"]) return @"iPhone 3G";
25
+ if ([deviceModel isEqualToString:@"iPhone2,1"]) return @"iPhone 3GS";
26
+ if ([deviceModel isEqualToString:@"iPhone3,1"]) return @"iPhone 4";
27
+ if ([deviceModel isEqualToString:@"iPhone3,2"]) return @"iPhone 4 GSM Rev A";
28
+ if ([deviceModel isEqualToString:@"iPhone3,3"]) return @"iPhone 4 CDMA";
29
+ if ([deviceModel isEqualToString:@"iPhone4,1"]) return @"iPhone 4S";
30
+ if ([deviceModel isEqualToString:@"iPhone5,1"]) return @"iPhone 5 (GSM)";
31
+ if ([deviceModel isEqualToString:@"iPhone5,2"]) return @"iPhone 5 (GSM+CDMA)";
32
+ if ([deviceModel isEqualToString:@"iPhone5,3"]) return @"iPhone 5C (GSM)";
33
+ if ([deviceModel isEqualToString:@"iPhone5,4"]) return @"iPhone 5C (Global)";
34
+ if ([deviceModel isEqualToString:@"iPhone6,1"]) return @"iPhone 5S (GSM)";
35
+ if ([deviceModel isEqualToString:@"iPhone6,2"]) return @"iPhone 5S (Global)";
36
+ if ([deviceModel isEqualToString:@"iPhone7,1"]) return @"iPhone 6 Plus";
37
+ if ([deviceModel isEqualToString:@"iPhone7,2"]) return @"iPhone 6";
38
+ if ([deviceModel isEqualToString:@"iPhone8,1"]) return @"iPhone 6s";
39
+ if ([deviceModel isEqualToString:@"iPhone8,2"]) return @"iPhone 6s Plus";
40
+ if ([deviceModel isEqualToString:@"iPhone8,4"]) return @"iPhone SE (GSM)";
41
+ if ([deviceModel isEqualToString:@"iPhone9,1"]) return @"iPhone 7";
42
+ if ([deviceModel isEqualToString:@"iPhone9,2"]) return @"iPhone 7 Plus";
43
+ if ([deviceModel isEqualToString:@"iPhone9,3"]) return @"iPhone 7";
44
+ if ([deviceModel isEqualToString:@"iPhone9,4"]) return @"iPhone 7 Plus";
45
+ if ([deviceModel isEqualToString:@"iPhone10,1"]) return @"iPhone 8";
46
+ if ([deviceModel isEqualToString:@"iPhone10,2"]) return @"iPhone 8 Plus";
47
+ if ([deviceModel isEqualToString:@"iPhone10,3"]) return @"iPhone X Global";
48
+ if ([deviceModel isEqualToString:@"iPhone10,4"]) return @"iPhone 8";
49
+ if ([deviceModel isEqualToString:@"iPhone10,5"]) return @"iPhone 8 Plus";
50
+ if ([deviceModel isEqualToString:@"iPhone10,6"]) return @"iPhone X GSM";
51
+ if ([deviceModel isEqualToString:@"iPhone11,2"]) return @"iPhone XS";
52
+ if ([deviceModel isEqualToString:@"iPhone11,4"]) return @"iPhone XS Max";
53
+ if ([deviceModel isEqualToString:@"iPhone11,6"]) return @"iPhone XS Max Global";
54
+ if ([deviceModel isEqualToString:@"iPhone11,8"]) return @"iPhone XR";
55
+ if ([deviceModel isEqualToString:@"iPhone12,1"]) return @"iPhone 11";
56
+ if ([deviceModel isEqualToString:@"iPhone12,3"]) return @"iPhone 11 Pro";
57
+ if ([deviceModel isEqualToString:@"iPhone12,5"]) return @"iPhone 11 Pro Max";
58
+ if ([deviceModel isEqualToString:@"iPhone12,8"]) return @"iPhone SE 2nd Gen";
59
+ if ([deviceModel isEqualToString:@"iPhone13,1"]) return @"iPhone 12 Mini";
60
+ if ([deviceModel isEqualToString:@"iPhone13,2"]) return @"iPhone 12";
61
+ if ([deviceModel isEqualToString:@"iPhone13,3"]) return @"iPhone 12 Pro";
62
+ if ([deviceModel isEqualToString:@"iPhone13,4"]) return @"iPhone 12 Pro Max";
63
+ if ([deviceModel isEqualToString:@"iPhone14,2"]) return @"iPhone 13 Pro";
64
+ if ([deviceModel isEqualToString:@"iPhone14,3"]) return @"iPhone 13 Pro Max";
65
+ if ([deviceModel isEqualToString:@"iPhone14,4"]) return @"iPhone 13 Mini";
66
+ if ([deviceModel isEqualToString:@"iPhone14,5"]) return @"iPhone 13";
67
+ if ([deviceModel isEqualToString:@"iPhone14,6"]) return @"iPhone SE 3rd Gen";
68
+ if ([deviceModel isEqualToString:@"iPhone14,7"]) return @"iPhone 14";
69
+ if ([deviceModel isEqualToString:@"iPhone14,8"]) return @"iPhone 14 Plus";
70
+ if ([deviceModel isEqualToString:@"iPhone15,2"]) return @"iPhone 14 Pro";
71
+ if ([deviceModel isEqualToString:@"iPhone15,3"]) return @"iPhone 14 Pro Max";
72
+ if ([deviceModel isEqualToString:@"iPhone15,4"]) return @"iPhone 15";
73
+ if ([deviceModel isEqualToString:@"iPhone15,5"]) return @"iPhone 15 Plus";
74
+ if ([deviceModel isEqualToString:@"iPhone16,1"]) return @"iPhone 15 Pro";
75
+ if ([deviceModel isEqualToString:@"iPhone16,2"]) return @"iPhone 15 Pro Max";
76
+ if ([deviceModel isEqualToString:@"iPhone17,1"]) return @"iPhone 16 Pro";
77
+ if ([deviceModel isEqualToString:@"iPhone17,2"]) return @"iPhone 16 Pro Max";
78
+ if ([deviceModel isEqualToString:@"iPhone17,3"]) return @"iPhone 16";
79
+ if ([deviceModel isEqualToString:@"iPhone17,4"]) return @"iPhone 16 Plus";
80
+ if ([deviceModel isEqualToString:@"iPhone17,5"]) return @"iPhone 16e";
81
+ if ([deviceModel isEqualToString:@"iPhone18,1"]) return @"iPhone 17 Pro";
82
+ if ([deviceModel isEqualToString:@"iPhone18,2"]) return @"iPhone 17 Pro Max";
83
+ if ([deviceModel isEqualToString:@"iPhone18,3"]) return @"iPhone 17";
84
+ if ([deviceModel isEqualToString:@"iPhone18,4"]) return @"iPhone Air";
68
85
 
69
- //
70
- if ([deviceModel isEqualToString:@"iPod1,1"]) return @"iPod Touch 1G";
71
- if ([deviceModel isEqualToString:@"iPod2,1"]) return @"iPod Touch 2G";
72
- if ([deviceModel isEqualToString:@"iPod3,1"]) return @"iPod Touch 3G";
73
- if ([deviceModel isEqualToString:@"iPod4,1"]) return @"iPod Touch 4G";
74
- if ([deviceModel isEqualToString:@"iPod5,1"]) return @"iPod Touch (5 Gen)";
75
- if ([deviceModel isEqualToString:@"iPod7,1"]) return @"6th Gen iPod";
76
- if ([deviceModel isEqualToString:@"iPod9,1"]) return @"7th Gen iPod";
86
+ if ([deviceModel isEqualToString:@"iPod1,1"]) return @"1st Gen iPod";
87
+ if ([deviceModel isEqualToString:@"iPod2,1"]) return @"2nd Gen iPod";
88
+ if ([deviceModel isEqualToString:@"iPod3,1"]) return @"3rd Gen iPod";
89
+ if ([deviceModel isEqualToString:@"iPod4,1"]) return @"4th Gen iPod";
90
+ if ([deviceModel isEqualToString:@"iPod5,1"]) return @"5th Gen iPod";
91
+ if ([deviceModel isEqualToString:@"iPod7,1"]) return @"6th Gen iPod";
92
+ if ([deviceModel isEqualToString:@"iPod9,1"]) return @"7th Gen iPod";
77
93
 
78
- //
79
- if ([deviceModel isEqualToString:@"iPad1,1"]) return @"iPad";
80
- if ([deviceModel isEqualToString:@"iPad1,2"]) return @"iPad 3G";
81
- if ([deviceModel isEqualToString:@"iPad2,1"]) return @"2nd Gen iPad";
82
- if ([deviceModel isEqualToString:@"iPad2,2"]) return @"2nd Gen iPad GSM";
83
- if ([deviceModel isEqualToString:@"iPad2,3"]) return @"2nd Gen iPad CDMA";
84
- if ([deviceModel isEqualToString:@"iPad2,4"]) return @"2nd Gen iPad New Revision";
85
- if ([deviceModel isEqualToString:@"iPad3,1"]) return @"3rd Gen iPad";
86
- if ([deviceModel isEqualToString:@"iPad3,2"]) return @"3rd Gen iPad CDMA";
87
- if ([deviceModel isEqualToString:@"iPad3,3"]) return @"3rd Gen iPad GSM";
88
- if ([deviceModel isEqualToString:@"iPad2,5"]) return @"iPad mini";
89
- if ([deviceModel isEqualToString:@"iPad2,6"]) return @"iPad mini GSM+LTE";
90
- if ([deviceModel isEqualToString:@"iPad2,7"]) return @"iPad mini CDMA+LTE";
91
- if ([deviceModel isEqualToString:@"iPad3,4"]) return @"4th Gen iPad";
92
- if ([deviceModel isEqualToString:@"iPad3,5"]) return @"4th Gen iPad GSM+LTE";
93
- if ([deviceModel isEqualToString:@"iPad3,6"]) return @"4th Gen iPad CDMA+LTE";
94
- if ([deviceModel isEqualToString:@"iPad4,1"]) return @"iPad Air (WiFi)";
95
- if ([deviceModel isEqualToString:@"iPad4,2"]) return @"iPad Air (GSM+CDMA)";
96
- if ([deviceModel isEqualToString:@"iPad4,3"]) return @"1st Gen iPad Air (China)";
97
- if ([deviceModel isEqualToString:@"iPad4,4"]) return @"iPad mini Retina (WiFi)";
98
- if ([deviceModel isEqualToString:@"iPad4,5"]) return @"iPad mini Retina (GSM+CDMA)";
99
- if ([deviceModel isEqualToString:@"iPad4,6"]) return @"iPad mini Retina (China)";
100
- if ([deviceModel isEqualToString:@"iPad4,7"]) return @"iPad mini 3 (WiFi)";
101
- if ([deviceModel isEqualToString:@"iPad4,8"]) return @"iPad mini 3 (GSM+CDMA)";
102
- if ([deviceModel isEqualToString:@"iPad4,9"]) return @"iPad Mini 3 (China)";
103
- if ([deviceModel isEqualToString:@"iPad5,1"]) return @"iPad mini 4 (WiFi)";
104
- if ([deviceModel isEqualToString:@"iPad5,2"]) return @"4th Gen iPad mini (WiFi+Cellular)";
105
- if ([deviceModel isEqualToString:@"iPad5,3"]) return @"iPad Air 2 (WiFi)";
106
- if ([deviceModel isEqualToString:@"iPad5,4"]) return @"iPad Air 2 (Cellular)";
107
- if ([deviceModel isEqualToString:@"iPad6,3"]) return @"iPad Pro (9.7 inch, WiFi)";
108
- if ([deviceModel isEqualToString:@"iPad6,4"]) return @"iPad Pro (9.7 inch, WiFi+LTE)";
109
- if ([deviceModel isEqualToString:@"iPad6,7"]) return @"iPad Pro (12.9 inch, WiFi)";
110
- if ([deviceModel isEqualToString:@"iPad6,8"]) return @"iPad Pro (12.9 inch, WiFi+LTE)";
111
- if ([deviceModel isEqualToString:@"iPad6,11"]) return @"iPad (2017)";
112
- if ([deviceModel isEqualToString:@"iPad6,12"]) return @"iPad (2017)";
113
- if ([deviceModel isEqualToString:@"iPad7,1"]) return @"iPad Pro 2nd Gen (WiFi)";
114
- if ([deviceModel isEqualToString:@"iPad7,2"]) return @"iPad Pro 2nd Gen (WiFi+Cellular)";
115
- if ([deviceModel isEqualToString:@"iPad7,3"]) return @"iPad Pro 10.5-inch";
116
- if ([deviceModel isEqualToString:@"iPad7,4"]) return @"iPad Pro 10.5-inch";
117
- if ([deviceModel isEqualToString:@"iPad7,5"]) return @"iPad 6th Gen (WiFi)";
118
- if ([deviceModel isEqualToString:@"iPad7,6"]) return @"iPad 6th Gen (WiFi+Cellular)";
119
- if ([deviceModel isEqualToString:@"iPad7,11"]) return @"iPad 7th Gen 10.2-inch (WiFi)";
120
- if ([deviceModel isEqualToString:@"iPad7,12"]) return @"iPad 7th Gen 10.2-inch (WiFi+Cellular)";
121
- if ([deviceModel isEqualToString:@"iPad8,1"]) return @"iPad Pro 11 inch (WiFi)";
122
- if ([deviceModel isEqualToString:@"iPad8,2"]) return @"iPad Pro 11 inch (1TB, WiFi)";
123
- if ([deviceModel isEqualToString:@"iPad8,3"]) return @"iPad Pro 11 inch (WiFi+Cellular)";
124
- if ([deviceModel isEqualToString:@"iPad8,4"]) return @"iPad Pro 11 inch (1TB, WiFi+Cellular)";
125
- if ([deviceModel isEqualToString:@"iPad8,5"]) return @"iPad Pro 12.9 inch 3rd Gen (WiFi)";
126
- if ([deviceModel isEqualToString:@"iPad8,6"]) return @"iPad Pro 12.9 inch 3rd Gen (1TB, WiFi)";
127
- if ([deviceModel isEqualToString:@"iPad8,7"]) return @"iPad Pro 12.9 inch 3rd Gen (WiFi+Cellular)";
128
- if ([deviceModel isEqualToString:@"iPad8,8"]) return @"iPad Pro 12.9 inch 3rd Gen (1TB, WiFi+Cellular)";
129
- if ([deviceModel isEqualToString:@"iPad8,9"]) return @"iPad Pro 11 inch 2nd Gen (WiFi)";
130
- if ([deviceModel isEqualToString:@"iPad8,10"]) return @"iPad Pro 11 inch 2nd Gen (WiFi+Cellular)";
131
- if ([deviceModel isEqualToString:@"iPad8,11"]) return @"iPad Pro 12.9 inch 4th Gen (WiFi)";
132
- if ([deviceModel isEqualToString:@"iPad8,12"]) return @"iPad Pro 12.9 inch 4th Gen (WiFi+Cellular)";
133
- if ([deviceModel isEqualToString:@"iPad11,1"]) return @"iPad mini 5th Gen (WiFi)";
134
- if ([deviceModel isEqualToString:@"iPad11,2"]) return @"iPad mini 5th Gen";
135
- if ([deviceModel isEqualToString:@"iPad11,3"]) return @"iPad Air 3rd Gen (WiFi)";
136
- if ([deviceModel isEqualToString:@"iPad11,4"]) return @"iPad Air 3rd Gen";
137
- if ([deviceModel isEqualToString:@"iPad11,6"]) return @"iPad 8th Gen (WiFi)";
138
- if ([deviceModel isEqualToString:@"iPad11,7"]) return @"iPad 8th Gen (WiFi+Cellular)";
139
- if ([deviceModel isEqualToString:@"iPad12,1"]) return @"iPad (9th generation) Wi-Fi";
140
- if ([deviceModel isEqualToString:@"iPad12,2"]) return @"iPad (9th generation) Wi-Fi + Cellular";
141
- if ([deviceModel isEqualToString:@"iPad13,1"]) return @"iPad air 4th Gen (WiFi)";
142
- if ([deviceModel isEqualToString:@"iPad13,2"]) return @"iPad air 4th Gen (WiFi+Cellular)";
143
- if ([deviceModel isEqualToString:@"iPad13,4"]) return @"iPad Pro 11 inch 3rd Gen";
144
- if ([deviceModel isEqualToString:@"iPad13,5"]) return @"iPad Pro 11 inch 3rd Gen";
145
- if ([deviceModel isEqualToString:@"iPad13,6"]) return @"iPad Pro 11 inch 3rd Gen";
146
- if ([deviceModel isEqualToString:@"iPad13,7"]) return @"iPad Pro 11 inch 3rd Gen";
147
- if ([deviceModel isEqualToString:@"iPad13,8"]) return @"iPad Pro 12.9 inch 5th Gen";
148
- if ([deviceModel isEqualToString:@"iPad13,9"]) return @"iPad Pro 12.9 inch 5th Gen";
149
- if ([deviceModel isEqualToString:@"iPad13,10"]) return @"iPad Pro 12.9 inch 5th Gen";
150
- if ([deviceModel isEqualToString:@"iPad13,11"]) return @"iPad Pro 12.9 inch 5th Gen";
151
- if ([deviceModel isEqualToString:@"iPad13,16"]) return @"iPad Air (5th generation) Wi-Fi";
152
- if ([deviceModel isEqualToString:@"iPad13,17"]) return @"iPad Air (5th generation) Wi-Fi + Cellular";
153
- if ([deviceModel isEqualToString:@"iPad14,1"]) return @"iPad mini (6th generation) Wi-Fi";
154
- if ([deviceModel isEqualToString:@"iPad14,2"]) return @"iPad mini (6th generation) Wi-Fi + Cellular";
94
+ if ([deviceModel isEqualToString:@"iPad1,1"]) return @"iPad";
95
+ if ([deviceModel isEqualToString:@"iPad1,2"]) return @"iPad 3G";
96
+ if ([deviceModel isEqualToString:@"iPad2,1"]) return @"2nd Gen iPad";
97
+ if ([deviceModel isEqualToString:@"iPad2,2"]) return @"2nd Gen iPad GSM";
98
+ if ([deviceModel isEqualToString:@"iPad2,3"]) return @"2nd Gen iPad CDMA";
99
+ if ([deviceModel isEqualToString:@"iPad2,4"]) return @"2nd Gen iPad New Revision";
100
+ if ([deviceModel isEqualToString:@"iPad3,1"]) return @"3rd Gen iPad";
101
+ if ([deviceModel isEqualToString:@"iPad3,2"]) return @"3rd Gen iPad CDMA";
102
+ if ([deviceModel isEqualToString:@"iPad3,3"]) return @"3rd Gen iPad GSM";
103
+ if ([deviceModel isEqualToString:@"iPad2,5"]) return @"iPad mini";
104
+ if ([deviceModel isEqualToString:@"iPad2,6"]) return @"iPad mini GSM+LTE";
105
+ if ([deviceModel isEqualToString:@"iPad2,7"]) return @"iPad mini CDMA+LTE";
106
+ if ([deviceModel isEqualToString:@"iPad3,4"]) return @"4th Gen iPad";
107
+ if ([deviceModel isEqualToString:@"iPad3,5"]) return @"4th Gen iPad GSM+LTE";
108
+ if ([deviceModel isEqualToString:@"iPad3,6"]) return @"4th Gen iPad CDMA+LTE";
109
+ if ([deviceModel isEqualToString:@"iPad4,1"]) return @"iPad Air (WiFi)";
110
+ if ([deviceModel isEqualToString:@"iPad4,2"]) return @"iPad Air (GSM+CDMA)";
111
+ if ([deviceModel isEqualToString:@"iPad4,3"]) return @"1st Gen iPad Air (China)";
112
+ if ([deviceModel isEqualToString:@"iPad4,4"]) return @"iPad mini Retina (WiFi)";
113
+ if ([deviceModel isEqualToString:@"iPad4,5"]) return @"iPad mini Retina (GSM+CDMA)";
114
+ if ([deviceModel isEqualToString:@"iPad4,6"]) return @"iPad mini Retina (China)";
115
+ if ([deviceModel isEqualToString:@"iPad4,7"]) return @"iPad mini 3 (WiFi)";
116
+ if ([deviceModel isEqualToString:@"iPad4,8"]) return @"iPad mini 3 (GSM+CDMA)";
117
+ if ([deviceModel isEqualToString:@"iPad4,9"]) return @"iPad Mini 3 (China)";
118
+ if ([deviceModel isEqualToString:@"iPad5,1"]) return @"iPad mini 4 (WiFi)";
119
+ if ([deviceModel isEqualToString:@"iPad5,2"]) return @"iPad mini 4 (WiFi+Cellular)";
120
+ if ([deviceModel isEqualToString:@"iPad5,3"]) return @"iPad Air 2 (WiFi)";
121
+ if ([deviceModel isEqualToString:@"iPad5,4"]) return @"iPad Air 2 (Cellular)";
122
+ if ([deviceModel isEqualToString:@"iPad6,3"]) return @"iPad Pro (9.7 inch, WiFi)";
123
+ if ([deviceModel isEqualToString:@"iPad6,4"]) return @"iPad Pro (9.7 inch, WiFi+LTE)";
124
+ if ([deviceModel isEqualToString:@"iPad6,7"]) return @"iPad Pro (12.9 inch, WiFi)";
125
+ if ([deviceModel isEqualToString:@"iPad6,8"]) return @"iPad Pro (12.9 inch, WiFi+LTE)";
126
+ if ([deviceModel isEqualToString:@"iPad6,11"]) return @"iPad (2017)";
127
+ if ([deviceModel isEqualToString:@"iPad6,12"]) return @"iPad (2017)";
128
+ if ([deviceModel isEqualToString:@"iPad7,1"]) return @"iPad Pro 2nd Gen (WiFi)";
129
+ if ([deviceModel isEqualToString:@"iPad7,2"]) return @"iPad Pro 2nd Gen (WiFi+Cellular)";
130
+ if ([deviceModel isEqualToString:@"iPad7,3"]) return @"iPad Pro 10.5-inch 2nd Gen (WiFi)";
131
+ if ([deviceModel isEqualToString:@"iPad7,4"]) return @"iPad Pro 10.5-inch 2nd Gen (WiFi+Cellular)";
132
+ if ([deviceModel isEqualToString:@"iPad7,5"]) return @"iPad 6th Gen (WiFi)";
133
+ if ([deviceModel isEqualToString:@"iPad7,6"]) return @"iPad 6th Gen (WiFi+Cellular)";
134
+ if ([deviceModel isEqualToString:@"iPad7,11"]) return @"iPad 7th Gen 10.2-inch (WiFi)";
135
+ if ([deviceModel isEqualToString:@"iPad7,12"]) return @"iPad 7th Gen 10.2-inch (WiFi+Cellular)";
136
+ if ([deviceModel isEqualToString:@"iPad8,1"]) return @"iPad Pro 11 inch 3rd Gen (WiFi)";
137
+ if ([deviceModel isEqualToString:@"iPad8,2"]) return @"iPad Pro 11 inch 3rd Gen (1TB, WiFi)";
138
+ if ([deviceModel isEqualToString:@"iPad8,3"]) return @"iPad Pro 11 inch 3rd Gen (WiFi+Cellular)";
139
+ if ([deviceModel isEqualToString:@"iPad8,4"]) return @"iPad Pro 11 inch 3rd Gen (1TB, WiFi+Cellular)";
140
+ if ([deviceModel isEqualToString:@"iPad8,5"]) return @"iPad Pro 12.9 inch 3rd Gen (WiFi)";
141
+ if ([deviceModel isEqualToString:@"iPad8,6"]) return @"iPad Pro 12.9 inch 3rd Gen (1TB, WiFi)";
142
+ if ([deviceModel isEqualToString:@"iPad8,7"]) return @"iPad Pro 12.9 inch 3rd Gen (WiFi+Cellular)";
143
+ if ([deviceModel isEqualToString:@"iPad8,8"]) return @"iPad Pro 12.9 inch 3rd Gen (1TB, WiFi+Cellular)";
144
+ if ([deviceModel isEqualToString:@"iPad8,9"]) return @"iPad Pro 11 inch 4th Gen (WiFi)";
145
+ if ([deviceModel isEqualToString:@"iPad8,10"]) return @"iPad Pro 11 inch 4th Gen (WiFi+Cellular)";
146
+ if ([deviceModel isEqualToString:@"iPad8,11"]) return @"iPad Pro 12.9 inch 4th Gen (WiFi)";
147
+ if ([deviceModel isEqualToString:@"iPad8,12"]) return @"iPad Pro 12.9 inch 4th Gen (WiFi+Cellular)";
148
+ if ([deviceModel isEqualToString:@"iPad11,1"]) return @"iPad mini 5th Gen (WiFi)";
149
+ if ([deviceModel isEqualToString:@"iPad11,2"]) return @"iPad mini 5th Gen (WiFi+Cellular)";
150
+ if ([deviceModel isEqualToString:@"iPad11,3"]) return @"iPad Air 3rd Gen (WiFi)";
151
+ if ([deviceModel isEqualToString:@"iPad11,4"]) return @"iPad Air 3rd Gen (WiFi+Cellular)";
152
+ if ([deviceModel isEqualToString:@"iPad11,6"]) return @"iPad 8th Gen (WiFi)";
153
+ if ([deviceModel isEqualToString:@"iPad11,7"]) return @"iPad 8th Gen (WiFi+Cellular)";
154
+ if ([deviceModel isEqualToString:@"iPad12,1"]) return @"iPad 9th Gen (WiFi)";
155
+ if ([deviceModel isEqualToString:@"iPad12,2"]) return @"iPad 9th Gen (WiFi+Cellular)";
156
+ if ([deviceModel isEqualToString:@"iPad14,1"]) return @"iPad mini 6th Gen (WiFi)";
157
+ if ([deviceModel isEqualToString:@"iPad14,2"]) return @"iPad mini 6th Gen (WiFi+Cellular)";
158
+ if ([deviceModel isEqualToString:@"iPad13,1"]) return @"iPad Air 4th Gen (WiFi)";
159
+ if ([deviceModel isEqualToString:@"iPad13,2"]) return @"iPad Air 4th Gen (WiFi+Cellular)";
160
+ if ([deviceModel isEqualToString:@"iPad13,4"]) return @"iPad Pro 11 inch 5th Gen";
161
+ if ([deviceModel isEqualToString:@"iPad13,5"]) return @"iPad Pro 11 inch 5th Gen";
162
+ if ([deviceModel isEqualToString:@"iPad13,6"]) return @"iPad Pro 11 inch 5th Gen";
163
+ if ([deviceModel isEqualToString:@"iPad13,7"]) return @"iPad Pro 11 inch 5th Gen";
164
+ if ([deviceModel isEqualToString:@"iPad13,8"]) return @"iPad Pro 12.9 inch 5th Gen";
165
+ if ([deviceModel isEqualToString:@"iPad13,9"]) return @"iPad Pro 12.9 inch 5th Gen";
166
+ if ([deviceModel isEqualToString:@"iPad13,10"]) return @"iPad Pro 12.9 inch 5th Gen";
167
+ if ([deviceModel isEqualToString:@"iPad13,11"]) return @"iPad Pro 12.9 inch 5th Gen";
168
+ if ([deviceModel isEqualToString:@"iPad13,16"]) return @"iPad Air 5th Gen (WiFi)";
169
+ if ([deviceModel isEqualToString:@"iPad13,17"]) return @"iPad Air 5th Gen (WiFi+Cellular)";
170
+ if ([deviceModel isEqualToString:@"iPad13,18"]) return @"iPad 10th Gen (WiFi)";
171
+ if ([deviceModel isEqualToString:@"iPad13,19"]) return @"iPad 10th Gen (WiFi+Cellular)";
172
+ if ([deviceModel isEqualToString:@"iPad14,3"]) return @"iPad Pro 11 inch 4th Gen (WiFi)";
173
+ if ([deviceModel isEqualToString:@"iPad14,4"]) return @"iPad Pro 11 inch 4th Gen (WiFi+Cellular)";
174
+ if ([deviceModel isEqualToString:@"iPad14,5"]) return @"iPad Pro 12.9 inch 6th Gen (WiFi)";
175
+ if ([deviceModel isEqualToString:@"iPad14,6"]) return @"iPad Pro 12.9 inch 6th Gen (WiFi+Cellular)";
176
+ if ([deviceModel isEqualToString:@"iPad14,8"]) return @"iPad Air 11 inch 6th Gen (WiFi)";
177
+ if ([deviceModel isEqualToString:@"iPad14,9"]) return @"iPad Air 11 inch 6th Gen (WiFi+Cellular)";
178
+ if ([deviceModel isEqualToString:@"iPad14,10"]) return @"iPad Air 13 inch 6th Gen (WiFi)";
179
+ if ([deviceModel isEqualToString:@"iPad14,11"]) return @"iPad Air 13 inch 6th Gen (WiFi+Cellular)";
180
+ if ([deviceModel isEqualToString:@"iPad15,3"]) return @"iPad Air 11-inch 7th Gen (WiFi)";
181
+ if ([deviceModel isEqualToString:@"iPad15,4"]) return @"iPad Air 11-inch 7th Gen (WiFi+Cellular)";
182
+ if ([deviceModel isEqualToString:@"iPad15,5"]) return @"iPad Air 13-inch 7th Gen (WiFi)";
183
+ if ([deviceModel isEqualToString:@"iPad15,6"]) return @"iPad Air 13-inch 7th Gen (WiFi+Cellular)";
184
+ if ([deviceModel isEqualToString:@"iPad15,7"]) return @"iPad 11th Gen (WiFi)";
185
+ if ([deviceModel isEqualToString:@"iPad15,8"]) return @"iPad 11th Gen (WiFi+Cellular)";
186
+ if ([deviceModel isEqualToString:@"iPad16,1"]) return @"iPad mini 7th Gen (WiFi)";
187
+ if ([deviceModel isEqualToString:@"iPad16,2"]) return @"iPad mini 7th Gen (WiFi+Cellular)";
188
+ if ([deviceModel isEqualToString:@"iPad16,3"]) return @"iPad Pro 11 inch 5th Gen (WiFi)";
189
+ if ([deviceModel isEqualToString:@"iPad16,4"]) return @"iPad Pro 11 inch 5th Gen (WiFi+Cellular)";
190
+ if ([deviceModel isEqualToString:@"iPad16,5"]) return @"iPad Pro 12.9 inch 7th Gen (WiFi)";
191
+ if ([deviceModel isEqualToString:@"iPad16,6"]) return @"iPad Pro 12.9 inch 7th Gen (WiFi+Cellular)";
155
192
 
156
- //
157
- if ([deviceModel isEqualToString:@"Watch1,1"]) return @"Apple Watch 38mm case";
158
- if ([deviceModel isEqualToString:@"Watch1,2"]) return @"Apple Watch 38mm case";
159
- if ([deviceModel isEqualToString:@"Watch2,6"]) return @"Apple Watch Series 1 38mm case";
160
- if ([deviceModel isEqualToString:@"Watch2,7"]) return @"Apple Watch Series 1 42mm case";
161
- if ([deviceModel isEqualToString:@"Watch2,3"]) return @"Apple Watch Series 2 38mm case";
162
- if ([deviceModel isEqualToString:@"Watch2,4"]) return @"Apple Watch Series 2 42mm case";
163
- if ([deviceModel isEqualToString:@"Watch3,1"]) return @"Apple Watch Series 3 38mm case (GPS+Cellular)";
164
- if ([deviceModel isEqualToString:@"Watch3,2"]) return @"Apple Watch Series 3 42mm case (GPS+Cellular)";
165
- if ([deviceModel isEqualToString:@"Watch3,3"]) return @"Apple Watch Series 3 38mm case (GPS)";
166
- if ([deviceModel isEqualToString:@"Watch3,4"]) return @"Apple Watch Series 3 42mm case (GPS)";
167
- if ([deviceModel isEqualToString:@"Watch4,1"]) return @"Apple Watch Series 4 40mm case (GPS)";
168
- if ([deviceModel isEqualToString:@"Watch4,2"]) return @"Apple Watch Series 4 44mm case (GPS)";
169
- if ([deviceModel isEqualToString:@"Watch4,3"]) return @"Apple Watch Series 4 40mm case (GPS+Cellular)";
170
- if ([deviceModel isEqualToString:@"Watch4,4"]) return @"Apple Watch Series 4 44mm case (GPS+Cellular)";
171
- if ([deviceModel isEqualToString:@"Watch5,1"]) return @"Apple Watch Series 5 40mm case (GPS)";
172
- if ([deviceModel isEqualToString:@"Watch5,2"]) return @"Apple Watch Series 5 44mm case (GPS)";
173
- if ([deviceModel isEqualToString:@"Watch5,3"]) return @"Apple Watch Series 5 40mm case (GPS+Cellular)";
174
- if ([deviceModel isEqualToString:@"Watch5,4"]) return @"Apple Watch Series 5 44mm case (GPS+Cellular)";
175
- if ([deviceModel isEqualToString:@"Watch5,9"]) return @"Apple Watch SE 40mm case (GPS)";
176
- if ([deviceModel isEqualToString:@"Watch5,10"]) return @"Apple Watch SE 44mm case (GPS)";
177
- if ([deviceModel isEqualToString:@"Watch5,11"]) return @"Apple Watch SE 40mm case (GPS+Cellular)";
178
- if ([deviceModel isEqualToString:@"Watch5,12"]) return @"Apple Watch SE 44mm case (GPS+Cellular)";
179
- if ([deviceModel isEqualToString:@"Watch6,1"]) return @"Apple Watch Series 6 40mm case (GPS)";
180
- if ([deviceModel isEqualToString:@"Watch6,2"]) return @"Apple Watch Series 6 44mm case (GPS)";
181
- if ([deviceModel isEqualToString:@"Watch6,3"]) return @"Apple Watch Series 6 40mm case (GPS+Cellular)";
182
- if ([deviceModel isEqualToString:@"Watch6,4"]) return @"Apple Watch Series 6 44mm case (GPS+Cellular)";
193
+ if ([deviceModel isEqualToString:@"Watch1,1"]) return @"Apple Watch 38mm case";
194
+ if ([deviceModel isEqualToString:@"Watch1,2"]) return @"Apple Watch 42mm case";
195
+ if ([deviceModel isEqualToString:@"Watch2,6"]) return @"Apple Watch Series 1 38mm case";
196
+ if ([deviceModel isEqualToString:@"Watch2,7"]) return @"Apple Watch Series 1 42mm case";
197
+ if ([deviceModel isEqualToString:@"Watch2,3"]) return @"Apple Watch Series 2 38mm case";
198
+ if ([deviceModel isEqualToString:@"Watch2,4"]) return @"Apple Watch Series 2 42mm case";
199
+ if ([deviceModel isEqualToString:@"Watch3,1"]) return @"Apple Watch Series 3 38mm case (GPS+Cellular)";
200
+ if ([deviceModel isEqualToString:@"Watch3,2"]) return @"Apple Watch Series 3 42mm case (GPS+Cellular)";
201
+ if ([deviceModel isEqualToString:@"Watch3,3"]) return @"Apple Watch Series 3 38mm case (GPS)";
202
+ if ([deviceModel isEqualToString:@"Watch3,4"]) return @"Apple Watch Series 3 42mm case (GPS)";
203
+ if ([deviceModel isEqualToString:@"Watch4,1"]) return @"Apple Watch Series 4 40mm case (GPS)";
204
+ if ([deviceModel isEqualToString:@"Watch4,2"]) return @"Apple Watch Series 4 44mm case (GPS)";
205
+ if ([deviceModel isEqualToString:@"Watch4,3"]) return @"Apple Watch Series 4 40mm case (GPS+Cellular)";
206
+ if ([deviceModel isEqualToString:@"Watch4,4"]) return @"Apple Watch Series 4 44mm case (GPS+Cellular)";
207
+ if ([deviceModel isEqualToString:@"Watch5,1"]) return @"Apple Watch Series 5 40mm case (GPS)";
208
+ if ([deviceModel isEqualToString:@"Watch5,2"]) return @"Apple Watch Series 5 44mm case (GPS)";
209
+ if ([deviceModel isEqualToString:@"Watch5,3"]) return @"Apple Watch Series 5 40mm case (GPS+Cellular)";
210
+ if ([deviceModel isEqualToString:@"Watch5,4"]) return @"Apple Watch Series 5 44mm case (GPS+Cellular)";
211
+ if ([deviceModel isEqualToString:@"Watch5,9"]) return @"Apple Watch SE 40mm case (GPS)";
212
+ if ([deviceModel isEqualToString:@"Watch5,10"]) return @"Apple Watch SE 44mm case (GPS)";
213
+ if ([deviceModel isEqualToString:@"Watch5,11"]) return @"Apple Watch SE 40mm case (GPS+Cellular)";
214
+ if ([deviceModel isEqualToString:@"Watch5,12"]) return @"Apple Watch SE 44mm case (GPS+Cellular)";
215
+ if ([deviceModel isEqualToString:@"Watch6,1"]) return @"Apple Watch Series 6 40mm case (GPS)";
216
+ if ([deviceModel isEqualToString:@"Watch6,2"]) return @"Apple Watch Series 6 44mm case (GPS)";
217
+ if ([deviceModel isEqualToString:@"Watch6,3"]) return @"Apple Watch Series 6 40mm case (GPS+Cellular)";
218
+ if ([deviceModel isEqualToString:@"Watch6,4"]) return @"Apple Watch Series 6 44mm case (GPS+Cellular)";
219
+ if ([deviceModel isEqualToString:@"Watch6,6"]) return @"Apple Watch Series 7 41mm case (GPS)";
220
+ if ([deviceModel isEqualToString:@"Watch6,7"]) return @"Apple Watch Series 7 45mm case (GPS)";
221
+ if ([deviceModel isEqualToString:@"Watch6,8"]) return @"Apple Watch Series 7 41mm case (GPS+Cellular)";
222
+ if ([deviceModel isEqualToString:@"Watch6,9"]) return @"Apple Watch Series 7 45mm case (GPS+Cellular)";
223
+ if ([deviceModel isEqualToString:@"Watch6,10"]) return @"Apple Watch SE 40mm case (GPS)";
224
+ if ([deviceModel isEqualToString:@"Watch6,11"]) return @"Apple Watch SE 44mm case (GPS)";
225
+ if ([deviceModel isEqualToString:@"Watch6,12"]) return @"Apple Watch SE 40mm case (GPS+Cellular)";
226
+ if ([deviceModel isEqualToString:@"Watch6,13"]) return @"Apple Watch SE 44mm case (GPS+Cellular)";
227
+ if ([deviceModel isEqualToString:@"Watch6,14"]) return @"Apple Watch Series 8 41mm case (GPS)";
228
+ if ([deviceModel isEqualToString:@"Watch6,15"]) return @"Apple Watch Series 8 45mm case (GPS)";
229
+ if ([deviceModel isEqualToString:@"Watch6,16"]) return @"Apple Watch Series 8 41mm case (GPS+Cellular)";
230
+ if ([deviceModel isEqualToString:@"Watch6,17"]) return @"Apple Watch Series 8 45mm case (GPS+Cellular)";
231
+ if ([deviceModel isEqualToString:@"Watch6,18"]) return @"Apple Watch Ultra";
232
+ if ([deviceModel isEqualToString:@"Watch7,1"]) return @"Apple Watch Series 9 41mm case (GPS)";
233
+ if ([deviceModel isEqualToString:@"Watch7,2"]) return @"Apple Watch Series 9 45mm case (GPS)";
234
+ if ([deviceModel isEqualToString:@"Watch7,3"]) return @"Apple Watch Series 9 41mm case (GPS+Cellular)";
235
+ if ([deviceModel isEqualToString:@"Watch7,4"]) return @"Apple Watch Series 9 45mm case (GPS+Cellular)";
236
+ if ([deviceModel isEqualToString:@"Watch7,5"]) return @"Apple Watch Ultra 2";
237
+ if ([deviceModel isEqualToString:@"Watch7,8"]) return @"Apple Watch Series 10 42mm case (GPS)";
238
+ if ([deviceModel isEqualToString:@"Watch7,9"]) return @"Apple Watch Series 10 46mm case (GPS)";
239
+ if ([deviceModel isEqualToString:@"Watch7,10"]) return @"Apple Watch Series 10 42mm case (GPS+Cellular)";
240
+ if ([deviceModel isEqualToString:@"Watch7,11"]) return @"Apple Watch Series 10 46mm case (GPS+Cellular)";
241
+ if ([deviceModel isEqualToString:@"Watch7,12"]) return @"Apple Watch Ultra 3 49mm case";
242
+ if ([deviceModel isEqualToString:@"Watch7,13"]) return @"Apple Watch SE 3 40mm case";
243
+ if ([deviceModel isEqualToString:@"Watch7,14"]) return @"Apple Watch SE 3 44mm case";
244
+ if ([deviceModel isEqualToString:@"Watch7,15"]) return @"Apple Watch SE 3 40mm case (GPS+Cellular)";
245
+ if ([deviceModel isEqualToString:@"Watch7,16"]) return @"Apple Watch SE 3 44mm case (GPS+Cellular)";
246
+ if ([deviceModel isEqualToString:@"Watch7,17"]) return @"Apple Watch Series 11 42mm case";
247
+ if ([deviceModel isEqualToString:@"Watch7,18"]) return @"Apple Watch Series 11 46mm case";
248
+ if ([deviceModel isEqualToString:@"Watch7,19"]) return @"Apple Watch Series 11 42mm case (GPS+Celllular)";
249
+ if ([deviceModel isEqualToString:@"Watch7,20"]) return @"Apple Watch Series 11 46mm case (GPS+Celllular)";
183
250
 
184
- //
185
- if ([deviceModel isEqualToString:@"AppleTV2,1"]) return @"Apple TV 2";
186
- if ([deviceModel isEqualToString:@"AppleTV3,1"]) return @"Apple TV 3";
187
- if ([deviceModel isEqualToString:@"AppleTV3,2"]) return @"Apple TV 3";
188
- if ([deviceModel isEqualToString:@"AppleTV5,3"]) return @"Apple TV 4";
189
251
 
190
252
 
191
253
  return deviceModel;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aks-dev/easyui",
3
- "version": "1.2.5",
3
+ "version": "1.2.12",
4
4
  "description": "工具箱",
5
5
  "exports": {
6
6
  ".": {
@@ -43,7 +43,7 @@
43
43
  "homepage": "https://gitee.com/the_period_of_the_ten_kingdoms",
44
44
  "repository": {
45
45
  "type": "git",
46
- "url": "https://gitee.com/the_period_of_the_ten_kingdoms/aks-dev/tree/master/easyui"
46
+ "url": "https://gitee.com/the_period_of_the_ten_kingdoms/easyui.git"
47
47
  },
48
48
  "author": "shiguo",
49
49
  "license": "MIT",