长版本号判断

likecreep · Apr 26, 2020 · b1ec696 · b1ec696
1 parent d2b9c21
commit b1ec696
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/WeChatExtension/WeChatExtension/Sources/Hook/WeChat+hook.m b/WeChatExtension/WeChatExtension/Sources/Hook/WeChat+hook.m
@@ -577,7 +577,7 @@ - (void)hook_handleWebViewDataItem:(id)arg1 windowId:(id)arg2 {
     WebViewDataItem *item = (WebViewDataItem *)arg1;
     if ([[TKWeChatPluginConfig sharedConfig] systemBrowserEnable]) {
         MMURLHandler *urlHander = [objc_getClass("MMURLHandler") defaultHandler];
-        if (LargerOrEqualVersion(@"2.4.0")) {
+        if (LargerOrEqualLongVersion(@"2.4.0.149")) {
             [urlHander openURLWithDefault:item.urlString];
         } else if (LargerOrEqualVersion(@"2.3.26")) {
             [urlHander openURLWithDefault:item.urlString useA8Key:NO];

diff --git a/WeChatExtension/WeChatExtension/Sources/Utils/YMUtility.h b/WeChatExtension/WeChatExtension/Sources/Utils/YMUtility.h
@@ -9,12 +9,12 @@
 #import <Foundation/Foundation.h>
 
 #define LargerOrEqualVersion(version) [YMUtility isLargerOrEqualVersion:version]
+#define LargerOrEqualLongVersion(version) [YMUtility isLargeOrEqualLongVersion:version]
 NS_ASSUME_NONNULL_BEGIN
 
 @interface YMUtility : NSObject
-
 + (BOOL)isLargerOrEqualVersion:(NSString *)version;
-
++ (BOOL)isLargeOrEqualLongVersion:(NSString *)version;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/WeChatExtension/WeChatExtension/Sources/Utils/YMUtility.m b/WeChatExtension/WeChatExtension/Sources/Utils/YMUtility.m
@@ -19,4 +19,14 @@ + (BOOL)isLargerOrEqualVersion:(NSString *)version
         return YES;
     }
 }
+
++ (BOOL)isLargeOrEqualLongVersion:(NSString *)version
+{
+    NSDictionary *dict = [NSBundle mainBundle].infoDictionary;
+    if ([dict[@"MMBundleVersion"] compare:version options:NSNumericSearch] == NSOrderedAscending) {
+        return NO;
+    } else {
+        return YES;
+    }
+}
 @end