Update: BaseItem 支持系统版本判断

Tencent · Feb 8, 2023 · 527c345 · 527c345
1 parent 6e70208
commit 527c345
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/Lemon/Info.plist b/Lemon/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.0</string>
+	<string>5.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>10000001</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.h b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.h
@@ -48,8 +48,6 @@ typedef NS_ENUM(NSUInteger, SandboxType) {
 @property (nonatomic, strong) NSString * actionID;
 // 清理种类
 @property (nonatomic, assign) QMActionType type;
-// 对应的系统，默认为nil，全部系统
-@property (nonatomic, strong) NSString * os;
 
 @property (nonatomic, assign) BOOL recommend;
 @property (nonatomic, assign) BOOL showResult;
@@ -82,7 +80,6 @@ typedef NS_ENUM(NSUInteger, SandboxType) {
 
 - (void)addActionPathItem:(QMActionPathItem *)item;
 
-- (BOOL)checkVersion:(NSString *)curSysVersion;
 - (BOOL)checkAppVersion;
 
 - (void)resetItemState;

diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMActionItem.m
@@ -216,21 +216,6 @@ - (void)setRecommend:(BOOL)value
     self.m_stateValue = (recommend ? NSOnState : NSOffState);
 }
 
-// 检查系统版本
-- (BOOL)checkVersion:(NSString *)curSysVersion
-{
-    BOOL retValue = NO;
-    NSString * regexStr = self.os;
-    if (regexStr
-        && ![@"" isEqualToString:regexStr])
-    {
-        retValue = [QMCleanUtils assertRegex:regexStr matchStr:curSysVersion];
-        if (!retValue)  return NO;
-
-    }
-    return YES;
-}
-
 // 检查软件版本
 - (BOOL)checkAppVersion:(NSBundle *)bundle
 {

diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.h b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.h
@@ -22,6 +22,11 @@
 
 @property(nonatomic, assign) NSCellStateValue m_stateValue;
 
+// 对应的系统，默认为nil，全部系统
+@property (nonatomic, strong) NSString * os;
+
+- (BOOL)checkVersion:(NSString *)curSysVersion;
+
 // 扫描结果
 - (NSArray *)resultItemArray;
 // 移除所有结果

diff --git a/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m b/LemonClener/LemonClener/libcleaner/QMXMLItem/QMBaseItem.m
@@ -9,6 +9,7 @@
 #import "QMBaseItem.h"
 #import "QMResultItem.h"
 #import "QMCategoryItem.h"
+#import "QMCleanUtils.h"
 
 @implementation QMBaseItem
 @synthesize progressValue;
@@ -38,6 +39,21 @@ -(id)mutableCopyWithZone:(NSZone *)zone{
     return copy;
 }
 
+// 检查系统版本
+- (BOOL)checkVersion:(NSString *)curSysVersion
+{
+    BOOL retValue = NO;
+    NSString * regexStr = self.os;
+    if (regexStr
+        && ![@"" isEqualToString:regexStr])
+    {
+        retValue = [QMCleanUtils assertRegex:regexStr matchStr:curSysVersion];
+        if (!retValue)  return NO;
+
+    }
+    return YES;
+}
+
 - (NSArray *)resultItemArray
 {
     return [self subItemArray];

diff --git a/LemonClener/LemonClener/libcleaner/QMXMLParse.m b/LemonClener/LemonClener/libcleaner/QMXMLParse.m
@@ -206,6 +206,12 @@ - (void)createCategorySubItem:(NSDictionary *)attributeDict
     if (![allKeys containsObject:kXMLKeyID])
     return;
     m_curCategorySubItem = [[QMCategorySubItem alloc] init];
+    if ([allKeys containsObject:kXMLKeyOS]) {
+        m_curCategorySubItem.os = [attributeDict objectForKey:kXMLKeyOS];
+    }
+    if (![m_curCategorySubItem checkVersion:m_curSysVersion]) {
+        return;
+    }
     m_curCategorySubItem.subCategoryID = [attributeDict objectForKey:kXMLKeyID];
     if ([allKeys containsObject:kXMLKeyRecommend]){
         m_curCategorySubItem.recommend = [[attributeDict objectForKey:kXMLKeyRecommend] boolValue];