Merge pull request #1 from TKkk-iOSer/master

update 2018-01-28

Author: okayliao

Makefile

@@ -9,8 +9,6 @@ include $(THEOS)/makefiles/common.mk
 
 TWEAK_NAME = robot
 robot_FILES =  $(wildcard src/*.m) src/Tweak.xm
-robot_CFLAGS = -fobjc-arc
-robot_OBJCFLAGS = -Wno-error
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 

Others/robot.dylib

@@ -2,27 +2,23 @@
 
 微信小助手-iOS版 v1.0.0
 
-> 增加了游戏（石头剪刀布、骰子）作弊功能
-
-使用 [zhPopupController](https://github.com/snail-z/zhPopupController) 来显示作弊内容，并使用 `zhPopupController` 的 Example 模板
-
-<img src="./Others/ScreenShots/WeChatPlugin.jpg" width="500"> <img src="./Others/ScreenShots/Setting-cheat.jpg" width="500">
+<img src="./Others/ScreenShots/WeChatPlugin.jpg" width="500">
 
 **mac OS 版请戳→_→ [WeChatPlugin-MacOS](https://github.com/TKkk-iOSer/WeChatPlugin-MacOS)**
 
 ---
 
 ### 功能
+- [x] 游戏作弊（石头剪刀布、骰子）
 - [x] 修改微信运动步数
 - [x] 消息防撤回
 - [x] 自动通过好友请求
 - [x] 请求自动通过后发送欢迎语
-- [x] 消息自动回复
+- [x] 消息自动回复(完全匹配触发)
 - [x] 统一设置群公告
 - [x] 敏感词自动踢人
 - [x] 入群欢迎语
 - [x] 群消息自动回复
-- [x] 游戏作弊（石头剪刀布、骰子）
 
 **统一设置群公告、敏感词自动踢人、入群欢迎语 仅对自己创建的群有效**
 
@@ -32,14 +28,14 @@
 
 设置界面：
 
-<img src="./Others/ScreenShots/Setting-01.jpg" height="500" hspace="20" style="display: inline-block"> <img src="./Others/ScreenShots/Setting-02.jpg" height="500" hspace="20" style="display: inline-block">
+<img src="./Others/ScreenShots/Setting-03.png" height="500" hspace="20" style="display: inline-block"> <img src="./Others/ScreenShots/Setting-02.jpg" height="500" hspace="20" style="display: inline-block">
 
 
 ---
 
 ### 安装
 
-~~详细安装方法可参考[iOS 逆向 - 微信 helloWorld](http://www.jianshu.com/p/04495a429324)~~
+~~详细安装方法可参考[iOS 逆向 - 微信 helloWorld](http://www.tkkk.fun/2017/03/19/%E9%80%86%E5%90%91-%E5%BE%AE%E4%BF%A1helloWorld/)~~
 
 #### 0. 准备
 
@@ -57,8 +53,10 @@
 #### 2. 生成注入的app文件
 
 * 可直接通过百度云下载
-链接: https://pan.baidu.com/s/1c120oww 密码: 95bx（微信版本为6.5.16）
-链接: https://pan.baidu.com/s/1bL1oei 密码: grbi (微信版本 6.5.17)
+
+链接: https://pan.baidu.com/s/1o7UBqL8 密码: f71u (微信版本 6.6.0 新版自动回复失效)
+
+链接: https://pan.baidu.com/s/1c120oww 密码: 95bx（微信版本为6.5.16 无作弊功能）
 
 * 若想修改源码，生成新的dylib，可在修改之后执行`make`,之后拷贝生成的dylib(~~路径为`./theos/obj/debug/robot.dylib`~~),最后执行 `./Others/autoInsertDylib.sh ipa文件路径 dylib文件路径` 即可获得注入dylib的app文件。
 
@@ -88,7 +86,7 @@
 * [insert_dylib](https://github.com/gengjf/insert_dylib)(~~已在./Others/~~)
 * [ios-app-signer](https://github.com/DanTheMan827/ios-app-signer) (~~文件太大，请自行下载编译~~)
 * [theos](https://github.com/theos/theos)
-
+* [zhPopupController](https://github.com/snail-z/zhPopupController) 
 
 ---
 
@@ -100,4 +98,5 @@
 
 #### 听说你想请我喝下午茶？😏
 
-<img src="http://upload-images.jianshu.io/upload_images/965383-8e2af8fe607eee62.jpeg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1024" height="300" hspace="7" style="display: inline-block">
+<img src="http://upload-images.jianshu.io/upload_images/965383-cbc86dc1d75a6242.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240" height="250" hspace="50"/>&nbsp;&nbsp;&nbsp;<img src="http://upload-images.jianshu.io/upload_images/965383-76a1c7c91b987e1a.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240" height="250" hspace="50"  />
+

README.md

@@ -20,7 +20,13 @@ @implementation TKChatRoomSensitiveViewController
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        _tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:[UIScreen mainScreen].bounds style:UITableViewStyleGrouped];
+        // 增加对iPhone X的屏幕适配
+        CGRect winSize = [UIScreen mainScreen].bounds;
+        if (winSize.size.height == 812) {
+            winSize.size.height -= 88;
+            winSize.origin.y = 88;
+        }
+        _tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:winSize style:UITableViewStyleGrouped];
         _tableViewInfo.delegate = self;
     }
     return self;

src/TKChatRoomSensitiveViewController.m

@@ -22,7 +22,13 @@ @implementation TKSettingViewController
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        _tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:[UIScreen mainScreen].bounds style:UITableViewStyleGrouped];
+        // 增加对iPhone X的屏幕适配
+        CGRect winSize = [UIScreen mainScreen].bounds;
+        if (winSize.size.height == 812) { // iPhone X 高为812
+            winSize.size.height -= 88;
+            winSize.origin.y = 88;
+        }
+        _tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:winSize style:UITableViewStyleGrouped];
     }
     return self;
 }

src/TKSettingViewController.m

@@ -26,10 +26,12 @@ typedef NS_ENUM(NSUInteger, TKArrayTpye) {
     TKArrayTpyeMsgUserName
 };
 
+@class MMTableViewInfo;
+
 #pragma mark - MODEL
 
 @interface CMessageWrap : NSObject
-@property(nonatomic, assign) unsigned long m_uiGameType;  // 1、猜拳; 2、骰子; 0、自定义表情
+@property(nonatomic, assign) NSInteger m_uiGameType;  // 1、猜拳; 2、骰子; 0、自定义表情
 @property(nonatomic, assign) unsigned long m_uiGameContent;
 @property(nonatomic, strong) NSString *m_nsEmoticonMD5;
 @property(nonatomic) long long m_n64MesSvrID;
@@ -136,6 +138,7 @@ typedef NS_ENUM(NSUInteger, TKArrayTpye) {
 - (void)AddLocalMsg:(id)arg1 MsgWrap:(id)arg2 fixTime:(_Bool)arg3 NewMsgArriveNotify:(_Bool)arg4;
 - (void)AsyncOnSpecialSession:(id)arg1 MsgList:(id)arg2;
 - (id)GetHelloUsers:(id)arg1 Limit:(unsigned int)arg2 OnlyUnread:(BOOL)arg3;
+- (void)AddEmoticonMsg:(NSString *)msg MsgWrap:(CMessageWrap *)msgWrap;
 // new
 - (void)addAutoVerifyWithArray:(NSArray *)ary arrayType:(TKArrayTpye)type;
 - (void)addAutoVerifyWithMessageInfo:(NSDictionary *)info;
@@ -177,6 +180,8 @@ typedef NS_ENUM(NSUInteger, TKArrayTpye) {
 @end
 
 @interface NewSettingViewController: MMUIViewController
+
+@property(nonatomic, strong) MMTableViewInfo *m_tableViewInfo; //
 - (void)reloadTableData;
 @end
 
@@ -265,4 +270,4 @@ typedef NS_ENUM(NSUInteger, TKArrayTpye) {
 
 @interface GameController : NSObject
 + (NSString*)getMD5ByGameContent:(NSInteger) content;
-@end
+@end

src/WeChatRobot.h

@@ -117,12 +117,12 @@ - (void)setModels:(NSArray<zhIconLabelModel *> *)models {
             }
         }
     }];
-
+    _models = models;
     [self startAnimationsCompletion:NULL];
 }
 
 - (void)fullViewClicked:(UITapGestureRecognizer *)recognizer {
-    __weak zhFullView *_self = self;
+    zhFullView *_self = self;
     [self endAnimationsCompletion:^(zhFullView *fullView) {
         if (nil != self.didClickFullView) {
             _self.didClickFullView((zhFullView *)recognizer.view);
@@ -193,4 +193,3 @@ - (void)endAnimationsCompletion:(void (^)(zhFullView *))completion {
 }
 
 @end
-

src/zhFullView.m

@@ -19,15 +19,15 @@ - (instancetype)initWithFrame:(CGRect)frame {
         _iconView = [[UIImageView alloc] init];
         _iconView.userInteractionEnabled = YES;
         [self addSubview:_iconView];
-        
+
         _textLabel = [[UILabel alloc] init];
         _textLabel.userInteractionEnabled = NO;
         _textLabel.numberOfLines = 0;
         _textLabel.textColor = [UIColor darkGrayColor];
         _textLabel.font = [UIFont systemFontOfSize:12];
         _textLabel.textAlignment = NSTextAlignmentCenter;
         [self addSubview:_textLabel];
-        
+
         _horizontalLayout = NO;
         _autoresizingFlexibleSize = NO;
     }
@@ -36,30 +36,30 @@ - (instancetype)initWithFrame:(CGRect)frame {
 
 /// 水平布局
 - (void)horizontalLayoutSubviews {
-    
+
     CGFloat sideLength = self.frame.size.height - self.imageEdgeInsets.top - self.imageEdgeInsets.bottom;
     _iconView.frame = CGRectMake(self.imageEdgeInsets.left, self.imageEdgeInsets.top, sideLength, sideLength);
-    
+
     if (_textLabel.text.length > 0) {
-        
+
         CGFloat x = CGRectGetMaxX(_iconView.frame) + self.imageEdgeInsets.right;
         CGFloat h = self.frame.size.height;
         CGSize size = [_textLabel sizeThatFits:CGSizeMake(MAXFLOAT, h)];
         CGFloat y = (self.frame.size.height - size.height) / 2;
-        
+
         if (_autoresizingFlexibleSize) {
             if (_sizeLimit > 0) { // 限宽
                 if (size.width > _sizeLimit) size.width = _sizeLimit;
             }
             _textLabel.frame = CGRectMake(x, y, size.width, size.height);
-            
+
             CGRect frame = self.frame;
             frame.size.width = _textLabel.frame.origin.x + _textLabel.frame.size.width;
             self.frame = frame;
         } else {
             _textLabel.frame = CGRectMake(x, y, size.width, size.height);
         }
-        
+
     } else {
         if (_autoresizingFlexibleSize) {
             CGRect frame = self.frame;
@@ -73,29 +73,29 @@ - (void)horizontalLayoutSubviews {
 - (void)verticalLayoutSubviews {
     CGFloat sideLength = self.frame.size.width - self.imageEdgeInsets.left - self.imageEdgeInsets.right;
     _iconView.frame = CGRectMake(self.imageEdgeInsets.left, self.imageEdgeInsets.top, sideLength, sideLength);
-    
+
     if (_textLabel.text.length > 0) {
-        
+
         CGFloat y = CGRectGetMaxY(_iconView.frame) + self.imageEdgeInsets.bottom;
         CGFloat w = self.frame.size.width;
         CGFloat h = self.frame.size.height - y;
-        
+
         if (!_autoresizingFlexibleSize) {
             _textLabel.frame = CGRectMake(0, y, w, h);
         } else {
-         
+
             CGSize size = [_textLabel sizeThatFits:CGSizeMake(w, h)];
             CGFloat x = (self.frame.size.width - size.width) / 2;
             if (_sizeLimit > 0) { // 限高
                 if (size.height > _sizeLimit) size.height = _sizeLimit;
             }
             _textLabel.frame = CGRectMake(x, y, size.width, size.height);
-            
+
             CGRect frame = self.frame;
             frame.size.height = _textLabel.frame.origin.y + _textLabel.frame.size.height;
             self.frame = frame;
         }
-        
+
     } else {
         if (_autoresizingFlexibleSize) {
             CGRect frame = self.frame;
@@ -108,6 +108,7 @@ - (void)verticalLayoutSubviews {
 - (void)setModel:(zhIconLabelModel *)model {
     _textLabel.text = model.text;
     _iconView.image = model.icon;
+    _model = model;
 }
 
 - (void)updateLayoutBySize:(CGSize)size finished:(void (^)(zhIconLabel *))finished {

src/zhIconLabel.m

@@ -42,7 +42,7 @@ typedef NS_ENUM(NSInteger, zhPopupSlideStyle) {
 
 @interface zhPopupController : NSObject
 
-@property (nonatomic, weak) id <zhPopupControllerDelegate> _Nullable delegate;
+@property (nonatomic, strong) id <zhPopupControllerDelegate> delegate;
 
 /// Convenient to initialize and set maske type. (Through the `- init` initialization, maskType is zhPopupMaskTypeBlackTranslucent)
 + (instancetype)popupControllerWithMaskType:(zhPopupMaskType)maskType;
@@ -63,7 +63,7 @@ typedef NS_ENUM(NSInteger, zhPopupSlideStyle) {
 @property (nonatomic, assign) CGFloat maskAlpha; // When set maskType is zhPopupMaskTypeBlackTranslucent vaild.
 
 /// default is YES. if NO, Mask view will not respond to events.
-@property (nonatomic, assign) BOOL dismissOnMaskTouched; 
+@property (nonatomic, assign) BOOL dismissOnMaskTouched;
 
 /// default is NO. if YES, Popup view disappear from the opposite direction.
 @property (nonatomic, assign) BOOL dismissOppositeDirection; // When `layoutType = zhPopupLayoutTypeCenter` is vaild.