Skip to content
This repository was archived by the owner on May 4, 2018. It is now read-only.

Commit 41b2bce

Browse files
author
i_82
committed
Compatible CHECK
! ;
1 parent a6b2069 commit 41b2bce

27 files changed

+464
-269
lines changed

‎XXTouchApp.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
0FB25C361E76BC340098BEEE /* XXBaseTextEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0FB25C381E76BC340098BEEE /* XXBaseTextEditor.storyboard */; };
3737
0FB25C3F1E76BCEC0098BEEE /* XXScanDownloadTaskViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0FB25C411E76BCEC0098BEEE /* XXScanDownloadTaskViewController.storyboard */; };
3838
0FB48B7A1D922B9400CE9019 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0FB48B761D922B9400CE9019 /* Localizable.strings */; };
39+
0FB643E11EA78459007791B1 /* XXDarwinNotificationsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FB643E01EA78459007791B1 /* XXDarwinNotificationsManager.m */; };
3940
0FBDB87B1EA425320016B513 /* XXLuaInterpreter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBDB8781EA425320016B513 /* XXLuaInterpreter.mm */; };
4041
0FBDB87C1EA425320016B513 /* XXLuaVModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FBDB87A1EA425320016B513 /* XXLuaVModel.m */; };
4142
0FBDB87F1EA4255F0016B513 /* XXKeyEventModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FBDB87E1EA4255F0016B513 /* XXKeyEventModel.m */; };
@@ -121,7 +122,6 @@
121122
0FDD9D481E8EF9E3009F96C8 /* XUIListItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FDD9D381E8EF9E3009F96C8 /* XUIListItemsController.m */; };
122123
0FDD9D491E8EF9E3009F96C8 /* XUIMultipleListItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FDD9D3A1E8EF9E3009F96C8 /* XUIMultipleListItemsController.m */; };
123124
0FDD9D4A1E8EF9E3009F96C8 /* XUIOrderingListItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FDD9D3C1E8EF9E3009F96C8 /* XUIOrderingListItemsController.m */; };
124-
0FDD9D4B1E8EF9E3009F96C8 /* XUITintedListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FDD9D3E1E8EF9E3009F96C8 /* XUITintedListController.m */; };
125125
0FDD9D4C1E8EF9E3009F96C8 /* XUISpecifierParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FDD9D411E8EF9E3009F96C8 /* XUISpecifierParser.m */; };
126126
0FE36B1E1DC82C3D00E952B4 /* UMMobClick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FE36B1D1DC82C3D00E952B4 /* UMMobClick.framework */; settings = {ATTRIBUTES = (Required, ); }; };
127127
0FE36B221DC82C5F00E952B4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FE36B211DC82C5F00E952B4 /* libz.tbd */; };
@@ -287,6 +287,8 @@
287287
0FB25C401E76BCEC0098BEEE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/XXScanDownloadTaskViewController.storyboard; sourceTree = "<group>"; };
288288
0FB25C431E76BCF10098BEEE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/XXScanDownloadTaskViewController.strings"; sourceTree = "<group>"; };
289289
0FB48B771D922B9400CE9019 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = Localizable.strings; sourceTree = "<group>"; };
290+
0FB643DF1EA78459007791B1 /* XXDarwinNotificationsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XXDarwinNotificationsManager.h; sourceTree = "<group>"; };
291+
0FB643E01EA78459007791B1 /* XXDarwinNotificationsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XXDarwinNotificationsManager.m; sourceTree = "<group>"; };
290292
0FBD99DD1EA5579400EFB8FD /* XUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUIAction.h; sourceTree = "<group>"; };
291293
0FBDB8771EA425320016B513 /* XXLuaInterpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XXLuaInterpreter.h; sourceTree = "<group>"; };
292294
0FBDB8781EA425320016B513 /* XXLuaInterpreter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = XXLuaInterpreter.mm; sourceTree = "<group>"; };
@@ -452,8 +454,6 @@
452454
0FDD9D3A1E8EF9E3009F96C8 /* XUIMultipleListItemsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XUIMultipleListItemsController.m; sourceTree = "<group>"; };
453455
0FDD9D3B1E8EF9E3009F96C8 /* XUIOrderingListItemsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUIOrderingListItemsController.h; sourceTree = "<group>"; };
454456
0FDD9D3C1E8EF9E3009F96C8 /* XUIOrderingListItemsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XUIOrderingListItemsController.m; sourceTree = "<group>"; };
455-
0FDD9D3D1E8EF9E3009F96C8 /* XUITintedListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUITintedListController.h; sourceTree = "<group>"; };
456-
0FDD9D3E1E8EF9E3009F96C8 /* XUITintedListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XUITintedListController.m; sourceTree = "<group>"; };
457457
0FDD9D401E8EF9E3009F96C8 /* XUISpecifierParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUISpecifierParser.h; sourceTree = "<group>"; };
458458
0FDD9D411E8EF9E3009F96C8 /* XUISpecifierParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XUISpecifierParser.m; sourceTree = "<group>"; };
459459
0FDD9D421E8EF9E3009F96C8 /* XUICommonDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUICommonDefine.h; sourceTree = "<group>"; };
@@ -757,6 +757,8 @@
757757
0FE881D31D75ABE9003907A7 /* XXLocalDataService.m */,
758758
0FEABE871D9A169F007B96A8 /* XXCodeMakerService.h */,
759759
0FEABE881D9A169F007B96A8 /* XXCodeMakerService.m */,
760+
0FB643DF1EA78459007791B1 /* XXDarwinNotificationsManager.h */,
761+
0FB643E01EA78459007791B1 /* XXDarwinNotificationsManager.m */,
760762
);
761763
path = Services;
762764
sourceTree = "<group>";
@@ -1127,8 +1129,6 @@
11271129
0FDD9D3A1E8EF9E3009F96C8 /* XUIMultipleListItemsController.m */,
11281130
0FDD9D3B1E8EF9E3009F96C8 /* XUIOrderingListItemsController.h */,
11291131
0FDD9D3C1E8EF9E3009F96C8 /* XUIOrderingListItemsController.m */,
1130-
0FDD9D3D1E8EF9E3009F96C8 /* XUITintedListController.h */,
1131-
0FDD9D3E1E8EF9E3009F96C8 /* XUITintedListController.m */,
11321132
);
11331133
path = Controller;
11341134
sourceTree = "<group>";
@@ -1945,6 +1945,7 @@
19451945
0FCF8A9D1DD013E700F4C906 /* lbaselib.c in Sources */,
19461946
0FCF8AA41DD013E700F4C906 /* ldo.c in Sources */,
19471947
0F9046431DD855780006E6DD /* IAPShare.m in Sources */,
1948+
0FB643E11EA78459007791B1 /* XXDarwinNotificationsManager.m in Sources */,
19481949
0FDD9D271E8EF98B009F96C8 /* XXPaymentActivity.m in Sources */,
19491950
0FCF8AB91DD013E700F4C906 /* lutf8lib.c in Sources */,
19501951
0FCF8ADC1DD0145400F4C906 /* SIAlertView.m in Sources */,
@@ -2004,7 +2005,6 @@
20042005
5251213082D00C5B94A2E478 /* XXLocationPickerController.m in Sources */,
20052006
525129F953B4C0A9014EFD41 /* XXCodeBlockTableViewCell.m in Sources */,
20062007
52512E0F3D7F970EB64E9AD8 /* XXCodeBlocksViewController.m in Sources */,
2007-
0FDD9D4B1E8EF9E3009F96C8 /* XUITintedListController.m in Sources */,
20082008
5251239A4A8419B029DE0767 /* XXAddCodeBlockTableViewController.m in Sources */,
20092009
52512F9AA741CE0135B74E97 /* XXCodeBlockNavigationController.m in Sources */,
20102010
52512FEFB26BD3EFA2A62790 /* XXCodeBlockExpandViewController.m in Sources */,
@@ -2322,6 +2322,7 @@
23222322
);
23232323
GCC_PREFIX_HEADER = "$(SRCROOT)/XXTouchApp/Global/Defines/AppDefines.pch";
23242324
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
2325+
GCC_WARN_STRICT_SELECTOR_MATCH = NO;
23252326
HEADER_SEARCH_PATHS = (
23262327
"$(inherited)",
23272328
"\"${PODS_ROOT}/Headers/Public\"",
@@ -2393,6 +2394,7 @@
23932394
SKIP_INSTALL = NO;
23942395
SWIFT_OBJC_BRIDGING_HEADER = "";
23952396
VALID_ARCHS = "armv7 arm64";
2397+
WARNING_CFLAGS = "-Wpartial-availability";
23962398
iOSOpenDevBuildPackageOnAnyBuild = NO;
23972399
iOSOpenDevCopyOnBuild = NO;
23982400
iOSOpenDevDevice = 127.0.0.1;
@@ -2435,6 +2437,7 @@
24352437
);
24362438
GCC_PREFIX_HEADER = "$(SRCROOT)/XXTouchApp/Global/Defines/AppDefines.pch";
24372439
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
2440+
GCC_WARN_STRICT_SELECTOR_MATCH = NO;
24382441
HEADER_SEARCH_PATHS = (
24392442
"$(inherited)",
24402443
"\"${PODS_ROOT}/Headers/Public\"",
@@ -2507,6 +2510,7 @@
25072510
SKIP_INSTALL = NO;
25082511
SWIFT_OBJC_BRIDGING_HEADER = "";
25092512
VALID_ARCHS = "armv7 arm64";
2513+
WARNING_CFLAGS = "-Wpartial-availability";
25102514
iOSOpenDevBuildPackageOnAnyBuild = NO;
25112515
iOSOpenDevCopyOnBuild = NO;
25122516
iOSOpenDevDevice = 127.0.0.1;

‎XXTouchApp.xcworkspace/xcuserdata/Zheng.xcuserdatad/UserInterfaceState.xcuserstate‎

180 KB
Binary file not shown.

‎XXTouchApp/Global/AppDelegate.m‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,53 @@ - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
6464
return NO;
6565
}
6666

67+
- (BOOL)application:(UIApplication *)application
68+
openURL:(NSURL *)url
69+
sourceApplication:(nullable NSString *)sourceApplication
70+
annotation:(id)annotation {
71+
return [self application:application openURL:url];
72+
}
73+
6774
- (BOOL)application:(UIApplication *)application
6875
openURL:(NSURL *)url
6976
options:(nonnull NSDictionary<NSString *,id> *)options
7077
{
78+
return [self application:application openURL:url];
79+
}
80+
81+
- (BOOL)application:(UIApplication *)application
82+
openURL:(NSURL *)url {
7183
if ([[url scheme] isEqualToString:@"xxt"]) {
7284
NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:url
7385
resolvingAgainstBaseURL:NO];
74-
NSArray *queryItems = urlComponents.queryItems;
7586
if ([urlComponents.host isEqualToString:@"root"]) {
76-
NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name=%@", @"path"];
77-
NSURLQueryItem *queryValue = [[queryItems filteredArrayUsingPredicate:predicate] firstObject];
78-
if (queryValue && queryValue.value) {
79-
NSString *uiPath = queryValue.value;
87+
START_IGNORE_PARTIAL
88+
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0")) {
89+
NSArray *queryItems = urlComponents.queryItems;
90+
NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name=%@", @"path"];
91+
NSURLQueryItem *queryValue = [[queryItems filteredArrayUsingPredicate:predicate] firstObject];
92+
if (queryValue && queryValue.value) {
93+
NSString *uiPath = queryValue.value;
94+
[self loadRootWithXUI:uiPath];
95+
}
96+
return YES;
97+
} else {
98+
NSMutableDictionary *queryStringDictionary = [[NSMutableDictionary alloc] init];
99+
NSArray *urlQuery = [[urlComponents query] componentsSeparatedByString:@"&"];
100+
for (NSString *keyValuePair in urlQuery)
101+
{
102+
NSArray *pairComponents = [keyValuePair componentsSeparatedByString:@"="];
103+
NSString *key = [[pairComponents firstObject] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
104+
NSString *value = [[pairComponents lastObject] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
105+
if (key && value) {
106+
[queryStringDictionary setObject:value forKey:key];
107+
}
108+
}
109+
NSString *uiPath = queryStringDictionary[@"path"];
80110
[self loadRootWithXUI:uiPath];
81111
}
112+
END_IGNORE_PARTIAL
82113
}
83-
return YES;
84114
}
85115
return [self handleUrlTransfer:url];
86116
}

‎XXTouchApp/Global/Defines/Info/AppDefines.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ until (false)
337337
<key>CONTACT_URL</key>
338338
<string>mqqapi://card/show_pslcard?src_type=internal&amp;version=1&amp;uin=40898074&amp;card_type=group&amp;source=external</string>
339339
<key>DAEMON_VERSION</key>
340-
<string>1.1.2-3</string>
340+
<string>1.1.3-1</string>
341341
<key>UPDATE_API</key>
342342
<string>http://apt.xxtouch.com/Packages</string>
343343
<key>ROOT_UI</key>

‎XXTouchApp/Global/Defines/Info/Base.lproj/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dict>
6262
</array>
6363
<key>CFBundleVersion</key>
64-
<string>210</string>
64+
<string>212</string>
6565
<key>LSApplicationCategoryType</key>
6666
<string>public.app-category.utilities</string>
6767
<key>LSApplicationQueriesSchemes</key>

‎XXTouchApp/Global/Defines/SystemConstantsDefines.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0),
4242

4343
#define STYLE_TINT_COLOR [UIColor colorWithRed:26.f/255.f green:161.f/255.f blue:230.f/255.f alpha:1.f]
4444

45+
#define START_IGNORE_PARTIAL _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wpartial-availability\"")
46+
#define END_IGNORE_PARTIAL _Pragma("clang diagnostic pop")
47+
4548
#endif /* SystemConstantsDefines_h */

‎XXTouchApp/Global/GlobalSettings.m‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ - (void)setupStyle {
5656
[CSToastManager sharedStyle].activitySize = CGSizeMake(80.f, 80.f);
5757
[CSToastManager sharedStyle].verticalMargin = 16.f;
5858

59-
[SIAlertView appearance].transitionStyle = SIAlertViewTransitionStyleFade;
59+
[SIAlertView appearance].transitionStyle = SIAlertViewTransitionStyleBounce;
6060
[SIAlertView appearance].backgroundStyle = SIAlertViewBackgroundStyleSolid;
6161
[SIAlertView appearance].titleFont = [UIFont boldSystemFontOfSize:18.f];
6262
[SIAlertView appearance].messageFont = [UIFont systemFontOfSize:14.f];
@@ -79,32 +79,33 @@ - (void)setupStatistics {
7979
}
8080

8181
- (void)setupShortcutItems {
82-
if (!SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"9.0")) {
83-
return;
84-
}
85-
if (daemonInstalled()) {
86-
UIApplicationShortcutIcon *stopIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-stop"];
87-
UIApplicationShortcutItem *stopItem = [[UIApplicationShortcutItem alloc] initWithType:@"Stop"
88-
localizedTitle:NSLocalizedString(@"Stop", nil)
89-
localizedSubtitle:nil
90-
icon:stopIcon
91-
userInfo:@{@"firstShorcutKey3": @"firstShortcutKeyValue3"}];
92-
UIApplicationShortcutIcon *launchIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-launch"];
93-
UIApplicationShortcutItem *launchItem = [[UIApplicationShortcutItem alloc] initWithType:@"Launch"
94-
localizedTitle:NSLocalizedString(@"Launch", nil)
95-
localizedSubtitle:nil
96-
icon:launchIcon
97-
userInfo:@{@"firstShorcutKey2": @"firstShortcutKeyValue2"}];
98-
UIApplicationShortcutIcon *scanIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-scan"];
99-
UIApplicationShortcutItem *scanItem = [[UIApplicationShortcutItem alloc] initWithType:@"Scan"
100-
localizedTitle:NSLocalizedString(@"Scan QR Code", nil)
101-
localizedSubtitle:nil
102-
icon:scanIcon
103-
userInfo:@{@"firstShorcutKey1": @"firstShortcutKeyValue1"}];
104-
[UIApplication sharedApplication].shortcutItems = @[stopItem, launchItem, scanItem];
105-
} else {
106-
[UIApplication sharedApplication].shortcutItems = @[];
82+
START_IGNORE_PARTIAL
83+
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"9.0")) {
84+
if (daemonInstalled()) {
85+
UIApplicationShortcutIcon *stopIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-stop"];
86+
UIApplicationShortcutItem *stopItem = [[UIApplicationShortcutItem alloc] initWithType:@"Stop"
87+
localizedTitle:NSLocalizedString(@"Stop", nil)
88+
localizedSubtitle:nil
89+
icon:stopIcon
90+
userInfo:@{@"firstShorcutKey3": @"firstShortcutKeyValue3"}];
91+
UIApplicationShortcutIcon *launchIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-launch"];
92+
UIApplicationShortcutItem *launchItem = [[UIApplicationShortcutItem alloc] initWithType:@"Launch"
93+
localizedTitle:NSLocalizedString(@"Launch", nil)
94+
localizedSubtitle:nil
95+
icon:launchIcon
96+
userInfo:@{@"firstShorcutKey2": @"firstShortcutKeyValue2"}];
97+
UIApplicationShortcutIcon *scanIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"3d-scan"];
98+
UIApplicationShortcutItem *scanItem = [[UIApplicationShortcutItem alloc] initWithType:@"Scan"
99+
localizedTitle:NSLocalizedString(@"Scan QR Code", nil)
100+
localizedSubtitle:nil
101+
icon:scanIcon
102+
userInfo:@{@"firstShorcutKey1": @"firstShortcutKeyValue1"}];
103+
[UIApplication sharedApplication].shortcutItems = @[stopItem, launchItem, scanItem];
104+
} else {
105+
[UIApplication sharedApplication].shortcutItems = @[];
106+
}
107107
}
108+
END_IGNORE_PARTIAL
108109
}
109110

110111
@end

‎XXTouchApp/Libraries/Catalogs/PHPhotoLibrary+CustomPhotoCollection.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ - (void)saveImage:(UIImage *)image
5656
//再将相片保存到自定义相册中
5757
__block NSString *assetID = nil;
5858
[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
59-
assetID = [PHAssetCreationRequest creationRequestForAssetFromImage:image].placeholderForCreatedAsset.localIdentifier;
59+
START_IGNORE_PARTIAL
60+
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0")) {
61+
assetID = [PHAssetCreationRequest creationRequestForAssetFromImage:image].placeholderForCreatedAsset.localIdentifier;
62+
}
63+
END_IGNORE_PARTIAL
6064
} completionHandler:^(BOOL success, NSError * _Nullable error) {
6165
if (error) {
6266
if (failure) {

0 commit comments

Comments
 (0)