v2.6.8

WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18E226</string>
+	<string>19F101</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.7</string>
+	<string>2.6.8</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,24 +27,24 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11B500</string>
+	<string>11C504</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19B89</string>
+	<string>19B90</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1120</string>
+	<string>1130</string>
 	<key>DTXcodeBuild</key>
-	<string>11B500</string>
+	<string>11C504</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2019年 WeChatExtension. All rights reserved.</string>
 	<key>showUpdateWindow</key>
 	<true/>
 	<key>versionInfo</key>
-	<string>v2.6.7(2020-09-16):\n👉🏻  适配微信2.4.2(15650)Beta 148 \n👉🏻  修复微信会话列表为空 \n👉🏻 新增通讯录管理皮肤适配 \n👉🏻 小程序成为独立模块，多开与小程序终于完美兼容，喜极而泣！\n</string>
+	<string>v2.6.8(2020-09-20):\n👉🏻  系统低于macOS10.14不再支持皮肤 \n👉🏻  修复2.4.2 (15650)选取联系人Crash \n👉🏻 优化UI细节 \n</string>
 </dict>
 </plist>

WeChatExtension/WeChatExtension/Base.lproj/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.7</string>
+	<string>2.6.8</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
@@ -25,6 +25,6 @@
 	<key>showUpdateWindow</key>
 	<true/>
 	<key>versionInfo</key>
-	<string>v2.6.7(2020-09-16):\n👉🏻  适配微信2.4.2(15650)Beta 148 \n👉🏻  修复微信会话列表为空 \n👉🏻 新增通讯录管理皮肤适配 \n👉🏻 小程序成为独立模块，多开与小程序终于完美兼容，喜极而泣！\n</string>
+	<string>v2.6.8(2020-09-20):\n👉🏻  系统低于macOS10.14不再支持皮肤 \n👉🏻  修复2.4.2 (15650)选取联系人Crash \n👉🏻 优化UI细节 \n</string>
 </dict>
 </plist>

WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m

@@ -242,14 +242,12 @@ - (void)initAssistantMenuItems
 
     [subMenu addItems:@[preventRevokeItem,
                         autoAuthItem,
-                        backGroundItem,
                         quitMonitorItem,
                         newWeChatItem,
                         forwardAndReplyItem,
                         enableSystemBrowserItem,
                         commandItem,
                         onTopItem,
-//                        checkZombieItem, 僵尸粉检测
                         forbidCheckUpdateItem,
                         pluginItem,
                         aboutPluginItem
@@ -259,6 +257,10 @@ - (void)initAssistantMenuItems
         [subMenu insertItem:miniProgramItem atIndex:4];
     }
 
+    if (@available(macOS 10.14, *)) {
+        [subMenu insertItem:backGroundItem atIndex:2];
+    }
+
     id wechat = LargerOrEqualVersion(@"2.3.24") ? [[objc_getClass("MMServiceCenter") defaultCenter] getService:objc_getClass("MMUpdateMgr")] : [objc_getClass("WeChat") sharedInstance];
     [subMenu setSubmenu:subPluginMenu forItem:pluginItem];
 

WeChatExtension/WeChatExtension/Sources/Views/AutoReply/TKAutoReplyContentView.m

@@ -236,7 +236,16 @@ - (void)selectSessionAction
     [picker setShowsOtherNonhumanChats:0];
     [picker setShowsOfficialAccounts:0];
     MMSessionPickerLogic *logic = [picker.listViewController valueForKey:@"m_logic"];
-    NSMutableOrderedSet *orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    NSMutableOrderedSet *orderSet = nil;
+    if (LargerOrEqualLongVersion(@"2.4.2.148")) {
+        orderSet = [logic valueForKey:@"_groupsForSearch"];
+    } else {
+        orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    }
+
+    if (!orderSet) {
+        orderSet = [NSMutableOrderedSet new];
+    }
 
     [orderSet addObjectsFromArray:self.model.specificContacts];
     [picker.choosenViewController setValue:self.model.specificContacts forKey:@"selectedUserNames"];

WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoForwarding/VAutoForwardingWindowController.m

@@ -224,7 +224,16 @@ - (void)addModel
     [picker setShowsOtherNonhumanChats:0];
     [picker setShowsOfficialAccounts:0];
     MMSessionPickerLogic *logic = [picker.listViewController valueForKey:@"m_logic"];
-    NSMutableOrderedSet *orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    NSMutableOrderedSet *orderSet = nil;
+    if (LargerOrEqualLongVersion(@"2.4.2.148")) {
+        orderSet = [logic valueForKey:@"_groupsForSearch"];
+    } else {
+        orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    }
+
+    if (!orderSet) {
+        orderSet = [NSMutableOrderedSet new];
+    }
     [orderSet addObjectsFromArray:self.vmodel.forwardingFromContacts];
     [picker.choosenViewController setValue:self.vmodel.forwardingFromContacts forKey:@"selectedUserNames"];
     [picker beginSheetForWindow:self.window completionHandler:^(NSOrderedSet *a1) {
@@ -317,7 +326,17 @@ - (void)forwardingToAdd
     [picker setShowsOtherNonhumanChats:0];
     [picker setShowsOfficialAccounts:0];
     MMSessionPickerLogic *logic = [picker.listViewController valueForKey:@"m_logic"];
-    NSMutableOrderedSet *orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    NSMutableOrderedSet *orderSet = nil;
+    if (LargerOrEqualLongVersion(@"2.4.2.148")) {
+        orderSet = [logic valueForKey:@"_groupsForSearch"];
+    } else {
+       orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    }
+
+    if (!orderSet) {
+        orderSet = [NSMutableOrderedSet new];
+    }
+
     [orderSet addObjectsFromArray:self.vmodel.forwardingToContacts];
     [picker.choosenViewController setValue:self.vmodel.forwardingToContacts forKey:@"selectedUserNames"];
     [picker beginSheetForWindow:self.window completionHandler:^(NSOrderedSet *a1) {

WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoReply/YMAIReplyWindowController.m

@@ -118,7 +118,16 @@ - (void)addModel
     [picker setShowsOtherNonhumanChats:0];
     [picker setShowsOfficialAccounts:0];
     MMSessionPickerLogic *logic = [picker.listViewController valueForKey:@"m_logic"];
-    NSMutableOrderedSet *orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    NSMutableOrderedSet *orderSet = nil;
+    if (LargerOrEqualLongVersion(@"2.4.2.148")) {
+        orderSet = [logic valueForKey:@"_groupsForSearch"];
+    } else {
+        orderSet = [logic valueForKey:@"_selectedUserNamesSet"];
+    }
+
+    if (!orderSet) {
+        orderSet = [NSMutableOrderedSet new];
+    }
 
     [orderSet addObjectsFromArray:self.AIModel.specificContacts];
     [picker.choosenViewController setValue:self.AIModel.specificContacts forKey:@"selectedUserNames"];

WeChatExtension/WeChatExtension/main.mm

@@ -14,7 +14,9 @@
 
 static void __attribute__((constructor)) initialize(void) {
     NSLog(@"++++++++ WeChatExtension loaded ++++++++");
-    [NSObject hookTheme];
+    if (@available(macOS 10.14, *)) {
+        [NSObject hookTheme];
+    }
     [NSObject hookWeChat];
     [NSObject hookMMChatsTableCellView];
     [NSObject hookMMStickerMessageCellView];