diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension.zip b/WeChatExtension/Rely/Plugin/WeChatExtension.zip index 388addfc..c16e8cbc 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 19b5855a..8a6bec3e 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 ec9621db..b25cf503 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 - 19F101 + 18E226 CFBundleDevelopmentRegion en CFBundleExecutable @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11C504 + 11B500 DTPlatformVersion GM DTSDKBuild - 19B90 + 19B89 DTSDKName macosx10.15 DTXcode - 1130 + 1120 DTXcodeBuild - 11C504 + 11B500 LSMinimumSystemVersion 10.10 NSHumanReadableCopyright diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib index ea6e0b3b..d08808ed 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 fd0fa2e0..324cdaac 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 05442edc..5ef31c4c 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 c5a85bb2..8bfcf9da 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 c58fc4ee..cd294196 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 7b99b76d..64301a9e 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/WeChatExtension b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension index 401bc255..214dfae9 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.pbxproj b/WeChatExtension/WeChatExtension.xcodeproj/project.pbxproj index 0df34206..5d42cc86 100644 --- a/WeChatExtension/WeChatExtension.xcodeproj/project.pbxproj +++ b/WeChatExtension/WeChatExtension.xcodeproj/project.pbxproj @@ -1043,7 +1043,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#!/bin/bash\napp_name=\"WeChat\"\nframework_name=\"WeChatExtension\"\napp_bundle_path=\"/Applications/${app_name}.app/Contents/MacOS\"\napp_executable_path=\"${app_bundle_path}/${app_name}\"\napp_executable_backup_path=\"${app_executable_path}_backup\"\nframework_path=\"${app_bundle_path}/${framework_name}.framework\"\n# 备份WeChat原始可执行文件\nif [ ! -f \"$app_executable_backup_path\" ]\nthen\ncp \"$app_executable_path\" \"$app_executable_backup_path\"\nfi\n\ncp -r \"${BUILT_PRODUCTS_DIR}/${framework_name}.framework\" ${app_bundle_path}\n./insert_dylib --all-yes \"${framework_path}/${framework_name}\" \"$app_executable_backup_path\" \"$app_executable_path\"\n\n"; + shellScript = "#!/bin/bash\napp_name=\"WeChat\"\nframework_name=\"WeChatExtension\"\napp_bundle_path=\"/Applications/${app_name}.app/Contents/MacOS\"\napp_executable_path=\"${app_bundle_path}/${app_name}\"\napp_executable_backup_path=\"${app_executable_path}_backup\"\nframework_path=\"${app_bundle_path}/${framework_name}.framework\"\n# 备份WeChat原始可执行文件\nif [ ! -f \"$app_executable_backup_path\" ]\nthen\ncp \"$app_executable_path\" \"$app_executable_backup_path\"\nfi\n\ncp -r \"${BUILT_PRODUCTS_DIR}/${framework_name}.framework\" ${app_bundle_path}\n./\"Rely\"/insert_dylib --all-yes \"${framework_path}/${framework_name}\" \"$app_executable_backup_path\" \"$app_executable_path\"\n\n"; }; 40C35106C7D038A6D8AE0BD2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; diff --git a/WeChatExtension/WeChatExtension.xcodeproj/xcuserdata/mustangym.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/WeChatExtension/WeChatExtension.xcodeproj/xcuserdata/mustangym.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ee132a14..2da07f00 100644 --- a/WeChatExtension/WeChatExtension.xcodeproj/xcuserdata/mustangym.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/WeChatExtension/WeChatExtension.xcodeproj/xcuserdata/mustangym.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -3,22 +3,4 @@ uuid = "AB56AEDC-32DD-487C-8A33-2B18248C68CA" type = "1" version = "2.0"> - - - - - - diff --git a/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m b/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m index 93625984..f8cbb5e6 100755 --- a/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m +++ b/WeChatExtension/WeChatExtension/Sources/Managers/YMAssistantMenuManager.m @@ -244,7 +244,6 @@ - (void)initAssistantMenuItems autoAuthItem, backGroundItem, quitMonitorItem, -// miniProgramItem, 小程序 newWeChatItem, forwardAndReplyItem, enableSystemBrowserItem, @@ -255,7 +254,11 @@ - (void)initAssistantMenuItems pluginItem, aboutPluginItem ]]; - + + if (LargerOrEqualLongVersion(@"2.4.2.148") == NO) { + [subMenu insertItem:miniProgramItem atIndex:4]; + } + id wechat = LargerOrEqualVersion(@"2.3.24") ? [[objc_getClass("MMServiceCenter") defaultCenter] getService:objc_getClass("MMUpdateMgr")] : [objc_getClass("WeChat") sharedInstance]; [subMenu setSubmenu:subPluginMenu forItem:pluginItem];