diff --git a/.gitignore b/.gitignore index 3230b357..aa81593f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .DS_Store -.xcuserstate \ No newline at end of file +.xcuserstate diff --git a/WeChatExtension.pkg b/WeChatExtension.pkg index f6eb2add..ef918029 100644 Binary files a/WeChatExtension.pkg and b/WeChatExtension.pkg differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension.zip b/WeChatExtension/Rely/Plugin/WeChatExtension.zip index ce51202f..4e36518a 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/Info.plist b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/Info.plist index 73b6979b..6344a878 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.0 + 2.8.1 CFBundleSupportedPlatforms MacOSX @@ -45,6 +45,6 @@ showUpdateWindow versionInfo - v2.8.0(2020-12-23):\n👉🏻 适配微信v2.6.0 (16787)\n👉🏻 暂未适配BigSur\n + v2.8.1(2020-12-26):\n👉🏻 适配微信v2.6.0 (16787)\n👉🏻 修复消息撤回Bug \n👉🏻 适配联系人和会话选择界面和若干问题 \n👉🏻 暂未适配BigSur\n diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en-GB.lproj/Localizable.strings b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en-GB.lproj/Localizable.strings index ec71699d..9a41939a 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en-GB.lproj/Localizable.strings and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en-GB.lproj/Localizable.strings differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en.lproj/Localizable.strings b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en.lproj/Localizable.strings index 80aa8804..ccb81dba 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en.lproj/Localizable.strings and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/en.lproj/Localizable.strings differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hans.lproj/Localizable.strings b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hans.lproj/Localizable.strings index b24e4b34..b11d63d0 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hans.lproj/Localizable.strings and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hans.lproj/Localizable.strings differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hant.lproj/Localizable.strings b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hant.lproj/Localizable.strings index c6c15e8a..1372384b 100644 Binary files a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hant.lproj/Localizable.strings and b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/Resources/zh-Hant.lproj/Localizable.strings differ diff --git a/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension b/WeChatExtension/Rely/Plugin/WeChatExtension/WeChatExtension.framework/WeChatExtension index 89a13ebb..51cf2577 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 f0df5755..7d9cc712 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 b3d6eb44..862a33bf 100644 --- a/WeChatExtension/WeChatExtension/Base.lproj/Info.plist +++ b/WeChatExtension/WeChatExtension/Base.lproj/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.8.0 + 2.8.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright @@ -25,6 +25,6 @@ showUpdateWindow versionInfo - v2.8.0(2020-12-23):\n👉🏻 适配微信v2.6.0 (16787)\n👉🏻 暂未适配BigSur\n + v2.8.1(2020-12-26):\n👉🏻 适配微信v2.6.0 (16787)\n👉🏻 修复消息撤回Bug \n👉🏻 适配联系人和会话选择界面和若干问题 \n👉🏻 暂未适配BigSur\n diff --git a/WeChatExtension/WeChatExtension/Sources/Common/YMPrefixHeader.pch b/WeChatExtension/WeChatExtension/Sources/Common/YMPrefixHeader.pch index c0a51844..959e082e 100755 --- a/WeChatExtension/WeChatExtension/Sources/Common/YMPrefixHeader.pch +++ b/WeChatExtension/WeChatExtension/Sources/Common/YMPrefixHeader.pch @@ -33,7 +33,7 @@ #define kRGBColor(r,g,b,a) [NSColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:(a)] #define kArc4random_Double_inSpace(a,b) a*p_arg2 = (NSArray *)arg2; - __weak __typeof (self) wself = self; - [p_arg2 enumerateObjectsUsingBlock:^(CmdItem * _Nonnull item, NSUInteger idx, BOOL * _Nonnull stop) { - AddMsg *addMsg = [objc_getClass("AddMsg") parseFromData:item.cmdBuf.buffer]; - NSString *msg = addMsg.content.string; - if ([msg rangeOfString:@"*p_arg2 = (NSArray *)arg2; +// __weak __typeof (self) wself = self; +// [p_arg2 enumerateObjectsUsingBlock:^(CmdItem * _Nonnull item, NSUInteger idx, BOOL * _Nonnull stop) { +// AddMsg *addMsg = [objc_getClass("AddMsg") parseFromData:item.cmdBuf.buffer]; +// NSString *msg = addMsg.content.string; +// if ([msg rangeOfString:@" 0) { NSView *firstSubView = viewController.view.subviews[0]; diff --git a/WeChatExtension/WeChatExtension/WeChatPlugin.h b/WeChatExtension/WeChatExtension/WeChatPlugin.h index c84652df..a9229680 100755 --- a/WeChatExtension/WeChatExtension/WeChatPlugin.h +++ b/WeChatExtension/WeChatExtension/WeChatPlugin.h @@ -79,8 +79,15 @@ FOUNDATION_EXPORT const unsigned char WeChatPluginVersionString[]; @property(retain, nonatomic) MMLoginOneClickViewController *oneClickViewController; @end +@interface MMMouseEventView : NSView + +@end + +@class MMMainViewController; @interface MMMainWindowController : NSWindowController +@property(retain, nonatomic) MMMouseEventView *maskView; @property(retain, nonatomic) MMLoginViewController *loginViewController; +@property(retain, nonatomic) MMMainViewController *mainViewController; // @synthesize mainViewController=_mainViewController; - (void)onAuthOK; - (void)onLogOut; @end @@ -1161,6 +1168,10 @@ forHTTPHeaderField:(NSString *)field; - (id)init; @end +@interface LVSVGImageButton : SVGImageView +@property(retain, nonatomic) NSColor *alternateColor; +@end + @interface MMComposeInputViewController : NSViewController - (void)viewDidLoad; @property(nonatomic) __weak SVGButton *openBrandMenuButton; // @synthesize openBrandMenuButton=_openBrandMenuButton; @@ -1172,6 +1183,7 @@ forHTTPHeaderField:(NSString *)field; @property(nonatomic) __weak SVGButton *attachmentButton; // @synthesize attachmentButton=_attachmentButton; @property(nonatomic) __weak SVGButton *stickerButton; // @synthesize stickerButton=_stickerButton; @property(nonatomic) __weak SVGButton *multiTalkButton; // @synthesize stickerButton=_stickerButton; +@property(retain, nonatomic) LVSVGImageButton *liveButton; @end @interface MMFavSidebarHeaderRowView : NSTableRowView @@ -1250,3 +1262,21 @@ forHTTPHeaderField:(NSString *)field; @interface MMSystemMessageCellView : MMMessageCellView @property(retain, nonatomic) MMTextView *msgTextView; // @synthesize msgTextView=_msgTextView; @end + +@interface MMSessionCreateSessionButtonRowView : NSTableRowView + +@property(retain, nonatomic) NSTextField *titleField; // @synthesize titleField=_titleField; +@property(retain, nonatomic) NSView *backgroundView; // @synthesize backgroundView=_backgroundView; +@end + +@interface MMSessionPickerListSwitchSelectMode : NSTableRowView + +@end + +@interface MMContactMgrButtonView : NSView +@property(nonatomic) BOOL highlighted; // @synthesize highlighted=_highlighted; +@property(retain, nonatomic) CALayer *borderLayer; // @synthesize borderLayer=_borderLayer; +@property(retain, nonatomic) NSImageView *iconImageView; // @synthesize iconImageView=_iconImageView; +@property(retain, nonatomic) NSTextField *titleTextField; // @synthesize titleTextField=_titleTextField; +@property(retain, nonatomic) NSView *contentView; // @synthesize contentView=_contentView; +@end