diff --git a/WeChatExtension/.DS_Store b/WeChatExtension/.DS_Store index e9a6bd6a..fc968f60 100644 Binary files a/WeChatExtension/.DS_Store and b/WeChatExtension/.DS_Store differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension.zip b/WeChatExtension/Rely/Plugin/WeChatExtension.zip index c16e8cbc..21b16c31 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension.zip and b/WeChatExtension/Rely/Plugin/WeChatExtension.zip differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Base.lproj/TKRemoteControlWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Base.lproj/TKRemoteControlWindowController.nib index 8a6bec3e..19b5855a 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Base.lproj/TKRemoteControlWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Base.lproj/TKRemoteControlWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist index b25cf503..25d4aed7 100644 --- a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist +++ b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18E226 + 19F101 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.6.7 + 2.6.8 CFBundleSupportedPlatforms MacOSX @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11B500 + 11C504 DTPlatformVersion GM DTSDKBuild - 19B89 + 19B90 DTSDKName macosx10.15 DTXcode - 1120 + 1130 DTXcodeBuild - 11B500 + 11C504 LSMinimumSystemVersion 10.10 NSHumanReadableCopyright @@ -45,6 +45,6 @@ showUpdateWindow versionInfo - v2.6.7(2020-09-16):\n👉🏻 适配微信2.4.2(15650)Beta 148 \n👉🏻 修复微信会话列表为空 \n👉🏻 新增通讯录管理皮肤适配 \n👉🏻 小程序成为独立模块，多开与小程序终于完美兼容，喜极而泣！\n + v2.6.8(2020-09-20):\n👉🏻 系统低于macOS10.14不再支持皮肤 \n👉🏻 修复2.4.2 (15650)选取联系人Crash \n👉🏻 优化UI细节 \n diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib index d08808ed..ea6e0b3b 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAutoReplyWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAutoReplyWindowController.nib index 324cdaac..fd0fa2e0 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAutoReplyWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAutoReplyWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKDownloadWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKDownloadWindowController.nib index 5ef31c4c..05442edc 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKDownloadWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKDownloadWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/VAutoForwardingWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/VAutoForwardingWindowController.nib index 8bfcf9da..c5a85bb2 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/VAutoForwardingWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/VAutoForwardingWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib index cd294196..c58fc4ee 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMStrangerCheckWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMStrangerCheckWindowController.nib index 64301a9e..7b99b76d 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMStrangerCheckWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMStrangerCheckWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/addIcon.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/addIcon.png new file mode 100644 index 00000000..222ca086 Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/addIcon.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_icon.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_icon.png new file mode 100644 index 00000000..222ca086 Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_icon.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_new_chat_icon.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_new_chat_icon.png new file mode 100644 index 00000000..222ca086 Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/add_new_chat_icon.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon.png new file mode 100644 index 00000000..460d3b4d Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon_highlight.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon_highlight.png new file mode 100644 index 00000000..55cf2ddf Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/arrow_icon_highlight.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension index 214dfae9..a21dd539 100755 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension differ diff --git a/WeChatExtension/WeChatExtension.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/WeChatExtension/WeChatExtension.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index 7abdc3fa..67c7e136 100644 Binary files a/WeChatExtension/WeChatExtension.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/WeChatExtension/WeChatExtension.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/WeChatExtension/WeChatExtension/Base.lproj/Info.plist b/WeChatExtension/WeChatExtension/Base.lproj/Info.plist index a3fd0f7d..bc419f01 100644 --- a/WeChatExtension/WeChatExtension/Base.lproj/Info.plist +++ b/WeChatExtension/WeChatExtension/Base.lproj/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.6.7 + 2.6.8 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright @@ -25,6 +25,6 @@ showUpdateWindow versionInfo - v2.6.7(2020-09-16):\n👉🏻 适配微信2.4.2(15650)Beta 148 \n👉🏻 修复微信会话列表为空 \n👉🏻 新增通讯录管理皮肤适配 \n👉🏻 小程序成为独立模块，多开与小程序终于完美兼容，喜极而泣！\n + v2.6.8(2020-09-20):\n👉🏻 系统低于macOS10.14不再支持皮肤 \n👉🏻 修复2.4.2 (15650)选取联系人Crash \n👉🏻 优化UI细节 \n diff --git a/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m b/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m index f8cbb5e6..c3aa104c 100755 --- a/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m +++ b/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]; diff --git a/WeChatExtension/WeChatExtension/Sources/Views/AutoReply/TKAutoReplyContentView.m b/WeChatExtension/WeChatExtension/Sources/Views/AutoReply/TKAutoReplyContentView.m index c346f08e..8a03e878 100755 --- a/WeChatExtension/WeChatExtension/Sources/Views/AutoReply/TKAutoReplyContentView.m +++ b/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"]; diff --git a/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoForwarding/VAutoForwardingWindowController.m b/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoForwarding/VAutoForwardingWindowController.m index 4c6f7e86..744d2145 100644 --- a/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoForwarding/VAutoForwardingWindowController.m +++ b/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) { diff --git a/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoReply/YMAIReplyWindowController.m b/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoReply/YMAIReplyWindowController.m index 017ab5ef..26bd16b5 100644 --- a/WeChatExtension/WeChatExtension/Sources/WindowControllers/AutoReply/YMAIReplyWindowController.m +++ b/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"]; diff --git a/WeChatExtension/WeChatExtension/main.mm b/WeChatExtension/WeChatExtension/main.mm index ef11aa91..bf3db29d 100755 --- a/WeChatExtension/WeChatExtension/main.mm +++ b/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];