diff --git a/WeChatExtension.pkg b/WeChatExtension.pkg index 47af24ee..d893fdb6 100644 Binary files a/WeChatExtension.pkg and b/WeChatExtension.pkg differ diff --git a/WeChatExtension/Rely/Install.sh b/WeChatExtension/Rely/Install.sh index 612a874c..6b24d0aa 100755 --- a/WeChatExtension/Rely/Install.sh +++ b/WeChatExtension/Rely/Install.sh @@ -20,12 +20,20 @@ app_executable_path="${app_bundle_path}/${app_name}" app_executable_backup_path="${app_executable_path}_backup" framework_path="${app_bundle_path}/${framework_name}.framework" +# 执行安装流程 +# 对 WeChat 赋予权限 +if [ ! -w "$wechat_path" ] +then +echo -e "\n\n为了将小助手写入微信, 请输入密码 ： " +sudo chown -R $(whoami) "$wechat_path" +fi + # 先执行卸载流程 if [ -f "$app_executable_backup_path" ] then -rm "$app_executable_path" -rm -rf "$framework_path" -mv "$app_executable_backup_path" "$app_executable_path" +sudo rm "$app_executable_path" +sudo rm -rf "$framework_path" +sudo mv "$app_executable_backup_path" "$app_executable_path" if [ -f "$app_executable_backup_path" ] then @@ -36,14 +44,6 @@ fi #未发现小助手 fi -# 执行安装流程 -# 对 WeChat 赋予权限 -if [ ! -w "$wechat_path" ] -then -echo -e "\n\n为了将小助手写入微信, 请输入密码 ： " -sudo chown -R $(whoami) "$wechat_path" -fi - # 判断是否已经存在备份文件 或者 是否强制覆盖安装 if [ ! -f "$app_executable_backup_path" ] || [ -n "$1" -a "$1" = "--force" ] then diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension.zip b/WeChatExtension/Rely/Plugin/WeChatExtension.zip index a0e9e4a2..7f4d5b9d 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension.zip and b/WeChatExtension/Rely/Plugin/WeChatExtension.zip differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/Update.sh b/WeChatExtension/Rely/Plugin/WeChatExtension/Update.sh index 369479f2..e3d6b65b 100755 --- a/WeChatExtension/Rely/Plugin/WeChatExtension/Update.sh +++ b/WeChatExtension/Rely/Plugin/WeChatExtension/Update.sh @@ -9,12 +9,18 @@ app_executable_path="${app_bundle_path}/${app_name}" app_executable_backup_path="${app_executable_path}_backup" framework_path="${app_bundle_path}/${framework_name}.framework" +# 对 WeChat 赋予权限 +if [ ! -w "$wechat_path" ] +then +echo -e "\n\n为了将小助手写入微信, 请输入密码 ： " +sudo chown -R $(whoami) "$wechat_path" +fi # 极少部分机器会出现签名异常情况，先执行卸载流程 if [ -f "$app_executable_backup_path" ] then -rm "$app_executable_path" -rm -rf "$framework_path" -mv "$app_executable_backup_path" "$app_executable_path" +sudo rm "$app_executable_path" +sudo rm -rf "$framework_path" +sudo mv "$app_executable_backup_path" "$app_executable_path" if [ ! -f "$app_executable_backup_path" ] then 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 24395a17..a97587d0 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 2913d222..fa10953b 100644 --- a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist +++ b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.8.1 + 2.8.2 CFBundleSupportedPlatforms MacOSX @@ -27,19 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 12B45b - DTPlatformName - macosx + 11C504 DTPlatformVersion - 11.0 + GM DTSDKBuild - 20A2408 + 19B90 DTSDKName - macosx11.0 + macosx10.15 DTXcode - 1220 + 1130 DTXcodeBuild - 12B45b + 11C504 LSMinimumSystemVersion 10.10 NSHumanReadableCopyright @@ -47,6 +45,6 @@ showUpdateWindow versionInfo - v2.8.1(2020-12-26):\n👉🏻 适配微信v2.6.0 (16787)\n👉🏻 修复消息撤回Bug \n👉🏻 适配联系人和会话选择界面和若干问题 \n👉🏻 暂未适配BigSur\n + v2.8.2(2021-01-15):\n👉🏻 适配微信v2.6.1(16837)\n👉🏻 群员监控可查看具体违规言论 \n👉🏻 修复2.6以上多选BUG \n👉🏻 2020注定是不平凡的年, MustangYM祝大家新年快乐, 带好口罩, 注意保暖, 保重!\n diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/TKAboutWindowController.nib index 09bacf4e..4381c628 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 afa754c4..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 a0a924dd..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 e5a0285f..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/WeChatIcon128@2x.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/WeChatIcon128@2x.png new file mode 100644 index 00000000..d968ccad Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/WeChatIcon128@2x.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/WeChatIcon_128.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/WeChatIcon_128.png new file mode 100644 index 00000000..d968ccad Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/WeChatIcon_128.png differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMAIReplyWindowController.nib index 3a3d43ac..8b162db9 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 ae256abc..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/YMZGMPSensitiveWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPSensitiveWindowController.nib new file mode 100644 index 00000000..35fac794 Binary files /dev/null and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPSensitiveWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPWindowController.nib b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPWindowController.nib index 022c5fda..bb864c22 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPWindowController.nib and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/YMZGMPWindowController.nib differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/selfSkin.png b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/selfSkin.png deleted file mode 100644 index 702e37db..00000000 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/selfSkin.png and /dev/null differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension index 27b19c59..2094dfce 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/Rely/Uninstall.sh b/WeChatExtension/Rely/Uninstall.sh index 2dff75c4..d5efd3a6 100755 --- a/WeChatExtension/Rely/Uninstall.sh +++ b/WeChatExtension/Rely/Uninstall.sh @@ -22,9 +22,9 @@ framework_path="${app_bundle_path}/${framework_name}.framework" # 备份WeChat原始可执行文件 if [ -f "$app_executable_backup_path" ] then -rm "$app_executable_path" -rm -rf "$framework_path" -mv "$app_executable_backup_path" "$app_executable_path" +sudo rm "$app_executable_path" +sudo rm -rf "$framework_path" +sudo mv "$app_executable_backup_path" "$app_executable_path" if [ -f "$app_executable_backup_path" ] then 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 f79425fc..3361e1d2 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