适配2.3.18 && 优化代码

TKkk-iOSer · Oct 15, 2018 · d179408 · d179408
1 parent 3bf0a35
commit d179408
Show file tree

Hide file tree

Showing 23 changed files with 90 additions and 99 deletions.
diff --git a/Other/Install.sh b/Other/Install.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
 
-app_name="WeChat"
-shell_path="$(dirname "$0")"
 wechat_path="/Applications/WeChat.app"
-framework_name="WeChatPlugin"
-app_bundle_path="/Applications/${app_name}.app/Contents/MacOS"
-app_executable_path="${app_bundle_path}/${app_name}"
-app_executable_backup_path="${app_executable_path}_backup"
-framework_path="${app_bundle_path}/${framework_name}.framework"
-
 
 if [ ! -d "$wechat_path" ]
 then
@@ -20,6 +12,15 @@ exit
 fi
 fi
 
+app_name="WeChat"
+shell_path="$(dirname "$0")"
+framework_name="WeChatPlugin"
+app_bundle_path="${wechat_path}/Contents/MacOS"
+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

diff --git a/Other/Products/Debug/WeChatPlugin.framework/Headers/WeChatPlugin.h b/Other/Products/Debug/WeChatPlugin.framework/Headers/WeChatPlugin.h
@@ -262,6 +262,9 @@ FOUNDATION_EXPORT const unsigned char WeChatPluginVersionString[];
 @end
 
 @interface MMContactSearchLogic : NSObject
+{
+    unsigned long long _logicSearchResultFlag;
+}
 @property(retain, nonatomic) NSMutableArray *contactResults;
 - (void)doSearchWithKeyword:(id)arg1 searchScene:(unsigned long long)arg2 resultIsShownBlock:(id)arg3 completion:(id)arg4;
 @property(retain, nonatomic) NSMutableArray *groupResults;

diff --git a/Other/Products/Debug/WeChatPlugin.framework/Resources/Info.plist b/Other/Products/Debug/WeChatPlugin.framework/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>17E199</string>
+	<string>17G65</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>17E189</string>
+	<string>18A384</string>
 	<key>DTSDKName</key>
-	<string>macosx10.13</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0930</string>
+	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017年 tk. All rights reserved.</string>
 	<key>versionInfo</key>

diff --git a/Other/Products/Debug/WeChatPlugin.framework/Resources/en.lproj/TKAboutWindowController.nib b/Other/Products/Debug/WeChatPlugin.framework/Resources/en.lproj/TKAboutWindowController.nib
diff --git a/...Products/Debug/WeChatPlugin.framework/Resources/zh-Hans.lproj/TKAboutWindowController.nib b/...Products/Debug/WeChatPlugin.framework/Resources/zh-Hans.lproj/TKAboutWindowController.nib
diff --git a/...Products/Debug/WeChatPlugin.framework/Resources/zh-Hant.lproj/TKAboutWindowController.nib b/...Products/Debug/WeChatPlugin.framework/Resources/zh-Hant.lproj/TKAboutWindowController.nib
diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/A/Headers/WeChatPlugin.h b/Other/Products/Debug/WeChatPlugin.framework/Versions/A/Headers/WeChatPlugin.h
@@ -262,6 +262,9 @@ FOUNDATION_EXPORT const unsigned char WeChatPluginVersionString[];
 @end
 
 @interface MMContactSearchLogic : NSObject
+{
+    unsigned long long _logicSearchResultFlag;
+}
 @property(retain, nonatomic) NSMutableArray *contactResults;
 - (void)doSearchWithKeyword:(id)arg1 searchScene:(unsigned long long)arg2 resultIsShownBlock:(id)arg3 completion:(id)arg4;
 @property(retain, nonatomic) NSMutableArray *groupResults;

diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/A/Resources/Info.plist b/Other/Products/Debug/WeChatPlugin.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>17E199</string>
+	<string>17G65</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>17E189</string>
+	<string>18A384</string>
 	<key>DTSDKName</key>
-	<string>macosx10.13</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0930</string>
+	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017年 tk. All rights reserved.</string>
 	<key>versionInfo</key>

diff --git a/...ts/Debug/WeChatPlugin.framework/Versions/A/Resources/en.lproj/TKAboutWindowController.nib b/...ts/Debug/WeChatPlugin.framework/Versions/A/Resources/en.lproj/TKAboutWindowController.nib
diff --git a/...bug/WeChatPlugin.framework/Versions/A/Resources/zh-Hans.lproj/TKAboutWindowController.nib b/...bug/WeChatPlugin.framework/Versions/A/Resources/zh-Hans.lproj/TKAboutWindowController.nib
diff --git a/...bug/WeChatPlugin.framework/Versions/A/Resources/zh-Hant.lproj/TKAboutWindowController.nib b/...bug/WeChatPlugin.framework/Versions/A/Resources/zh-Hant.lproj/TKAboutWindowController.nib
diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin
diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/Headers/WeChatPlugin.h b/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/Headers/WeChatPlugin.h
@@ -262,6 +262,9 @@ FOUNDATION_EXPORT const unsigned char WeChatPluginVersionString[];
 @end
 
 @interface MMContactSearchLogic : NSObject
+{
+    unsigned long long _logicSearchResultFlag;
+}
 @property(retain, nonatomic) NSMutableArray *contactResults;
 - (void)doSearchWithKeyword:(id)arg1 searchScene:(unsigned long long)arg2 resultIsShownBlock:(id)arg3 completion:(id)arg4;
 @property(retain, nonatomic) NSMutableArray *groupResults;

diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/Resources/Info.plist b/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>17E199</string>
+	<string>17G65</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>17E189</string>
+	<string>18A384</string>
 	<key>DTSDKName</key>
-	<string>macosx10.13</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0930</string>
+	<string>1000</string>
 	<key>DTXcodeBuild</key>
-	<string>9E145</string>
+	<string>10A255</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017年 tk. All rights reserved.</string>
 	<key>versionInfo</key>

diff --git a/...ug/WeChatPlugin.framework/Versions/Current/Resources/en.lproj/TKAboutWindowController.nib b/...ug/WeChatPlugin.framework/Versions/Current/Resources/en.lproj/TKAboutWindowController.nib
diff --git a/...ChatPlugin.framework/Versions/Current/Resources/zh-Hans.lproj/TKAboutWindowController.nib b/...ChatPlugin.framework/Versions/Current/Resources/zh-Hans.lproj/TKAboutWindowController.nib
diff --git a/...ChatPlugin.framework/Versions/Current/Resources/zh-Hant.lproj/TKAboutWindowController.nib b/...ChatPlugin.framework/Versions/Current/Resources/zh-Hant.lproj/TKAboutWindowController.nib
diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin
diff --git a/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin
diff --git a/Other/Uninstall.sh b/Other/Uninstall.sh
@@ -1,12 +1,6 @@
 # !/bin/bash
 
-app_name="WeChat"
 wechat_path="/Applications/WeChat.app"
-framework_name="WeChatPlugin"
-app_bundle_path="/Applications/${app_name}.app/Contents/MacOS"
-app_executable_path="${app_bundle_path}/${app_name}"
-app_executable_backup_path="${app_executable_path}_backup"
-framework_path="${app_bundle_path}/${framework_name}.framework"
 
 if [ ! -d "$wechat_path" ]
 then
@@ -18,6 +12,13 @@ exit
 fi
 fi
 
+app_name="WeChat"
+framework_name="WeChatPlugin"
+app_bundle_path="${wechat_path}/Contents/MacOS"
+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 [ -f "$app_executable_backup_path" ]
 then
@@ -26,8 +27,9 @@ rm -rf "$framework_path"
 mv "$app_executable_backup_path" "$app_executable_path"
 
 if [ -f "$app_executable_backup_path" ]
-	echo "卸载失败，请到 /Applications/WeChat.app/Contents/MacOS 路径，删除 WeChatPlugin.framework、WeChat 两个文件文件，并将 WeChat_backup 重命名为 WeChat"
 then
+	echo "卸载失败，请到 /Applications/WeChat.app/Contents/MacOS 路径，删除 WeChatPlugin.framework、WeChat 两个文件文件，并将 WeChat_backup 重命名为 WeChat"
+else
 	echo "\n\t卸载成功"
 fi
 

diff --git a/WeChatPlugin.xcworkspace/xcuserdata/TK.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/WeChatPlugin.xcworkspace/xcuserdata/TK.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,38 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "WeChatPlugin/Sources/Hook/WeChat+hook.m"
-            timestampString = "556881584.921349"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "191"
-            endingLineNumber = "191"
-            landmarkName = "-hook_OnSyncBatchAddMsgs:isFirstSync:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "WeChatPlugin/Sources/Hook/WeChat+hook.m"
-            timestampString = "556881584.922109"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "194"
-            endingLineNumber = "194"
-            landmarkName = "-hook_OnSyncBatchAddMsgs:isFirstSync:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/WeChatPlugin/Sources/Managers/TKWebServerManager.m b/WeChatPlugin/Sources/Managers/TKWebServerManager.m
@@ -72,12 +72,9 @@ - (void)addHandleForSearchUser {
     __weak typeof(self) weakSelf = self;
 
     [self.webServer addHandlerForMethod:@"GET" path:@"/wechat-plugin/user" requestClass:[GCDWebServerRequest class] processBlock:^GCDWebServerResponse * _Nullable(__kindof GCDWebServerRequest * _Nonnull request) {
-
-        NSString *hostname = request.headers[@"Host"];
-        NSString *url1 = [NSString stringWithFormat:@"127.0.0.1:%d", port];
-        NSString *url2 = [NSString stringWithFormat:@"localhost:%d", port];
-        if(!([hostname isEqualToString:url1] | [hostname isEqualToString:url2])){
-            return [GCDWebServerResponse responseWithStatusCode:404];
+
+        if (![weakSelf isLocalhost:request.headers[@"Host"]]) {
+             return [GCDWebServerResponse responseWithStatusCode:404];
         }
 
         NSString *keyword = request.query ? request.query[@"keyword"] ? request.query[@"keyword"] : @"" : @"";
@@ -112,7 +109,11 @@ - (void)addHandleForSearchUser {
             }
         }];
 
-        while (!(hasResult && logic.isContactSearched && logic.isGroupContactSearched && logic.isBrandContactSearched)) {};
+        if ([logic respondsToSelector:@selector(isContactSearched)]) {
+            while (!(hasResult && logic.isContactSearched && logic.isGroupContactSearched && logic.isBrandContactSearched)) {};
+        } else {
+            while (!(hasResult && [[logic valueForKey:@"_logicSearchResultFlag"] longLongValue])) {};
+        }
 
         MMChatMangerSearchReportMgr *reportMgr = [[objc_getClass("MMServiceCenter") defaultCenter] getService:objc_getClass("MMChatMangerSearchReportMgr")];
 
@@ -141,16 +142,14 @@ - (void)addHandleForSearchUser {
 - (void)addHandleForSearchUserChatLog {
     __weak typeof(self) weakSelf = self;
     [self.webServer addHandlerForMethod:@"GET" path:@"/wechat-plugin/chatlog" requestClass:[GCDWebServerRequest class] processBlock:^GCDWebServerResponse * _Nullable(__kindof GCDWebServerRequest * _Nonnull request) {
-        NSString *userId = request.query ? request.query[@"userId"] ? request.query[@"userId"] : nil : nil;
-        NSInteger count = request.query ? request.query[@"count"] ? [request.query[@"count"] integerValue] : 30 : 30;
-
-        NSString *hostname = request.headers[@"Host"];
-        NSString *url1 = [NSString stringWithFormat:@"127.0.0.1:%d", port];
-        NSString *url2 = [NSString stringWithFormat:@"localhost:%d", port];
-        if(!([hostname isEqualToString:url1] | [hostname isEqualToString:url2])){
+
+        if (![weakSelf isLocalhost:request.headers[@"Host"]]) {
             return [GCDWebServerResponse responseWithStatusCode:404];
         }
 
+        NSString *userId = request.query ? request.query[@"userId"] ? request.query[@"userId"] : nil : nil;
+        NSInteger count = request.query ? request.query[@"count"] ? [request.query[@"count"] integerValue] : 30 : 30;
+
         if (userId) {
             NSMutableArray *chatLogList = [NSMutableArray array];
 
@@ -182,16 +181,16 @@ - (void)addHandleForSearchUserChatLog {
 }
 
 - (void)addHandleForOpenSession {
+    __weak typeof(self) weakSelf = self;
+
     [self.webServer addHandlerForMethod:@"POST" path:@"/wechat-plugin/open-session" requestClass:[GCDWebServerURLEncodedFormRequest class] processBlock:^GCDWebServerResponse * _Nullable(__kindof GCDWebServerURLEncodedFormRequest * _Nonnull request) {
-        NSDictionary *requestBody = [request arguments];
-
-        NSString *hostname = request.headers[@"Host"];
-        NSString *url1 = [NSString stringWithFormat:@"127.0.0.1:%d", port];
-        NSString *url2 = [NSString stringWithFormat:@"localhost:%d", port];
-        if(!([hostname isEqualToString:url1] | [hostname isEqualToString:url2])){
+
+        if (![weakSelf isLocalhost:request.headers[@"Host"]]) {
             return [GCDWebServerResponse responseWithStatusCode:404];
         }
 
+        NSDictionary *requestBody = [request arguments];
+
         if (requestBody && requestBody[@"userId"]) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 MMSessionMgr *sessionMgr = [[objc_getClass("MMServiceCenter") defaultCenter] getService:objc_getClass("MMSessionMgr")];
@@ -220,16 +219,16 @@ - (void)addHandleForOpenSession {
 }
 
 - (void)addHandleForSendMsg {
+    __weak typeof(self) weakSelf = self;
+
     [self.webServer addHandlerForMethod:@"POST" path:@"/wechat-plugin/send-message" requestClass:[GCDWebServerURLEncodedFormRequest class] processBlock:^GCDWebServerResponse * _Nullable(__kindof GCDWebServerURLEncodedFormRequest * _Nonnull request) {
-        NSDictionary *requestBody = [request arguments];
-        NSString *userId = requestBody[@"userId"];
-
-        NSString *hostname = request.headers[@"Host"];
-        NSString *url1 = [NSString stringWithFormat:@"127.0.0.1:%d", port];
-        NSString *url2 = [NSString stringWithFormat:@"localhost:%d", port];
-        if(!([hostname isEqualToString:url1] | [hostname isEqualToString:url2])){
+
+        if (![weakSelf isLocalhost:request.headers[@"Host"]]) {
             return [GCDWebServerResponse responseWithStatusCode:404];
         }
+
+        NSDictionary *requestBody = [request arguments];
+        NSString *userId = requestBody[@"userId"];
 
         if (requestBody && userId.length > 0) {
             NSString *content = requestBody[@"content"];
@@ -245,11 +244,14 @@ - (void)addHandleForSendMsg {
                     [[TKMessageManager shareManager] clearUnRead:requestBody[@"userId"]];
 
                 } else if (content.length == 0 && requestBody[@"srvId"]) {
-                    NSInteger srvId = [requestBody[@"srvId"] integerValue];
-                    if (srvId != 0) {
-                        MessageData *msgData = [messageService GetMsgData:userId svrId:srvId];
-                        [[TKMessageManager shareManager] playVoiceWithMessageData:msgData];
+                    if (requestBody[@"srvId"]) {
+                        NSInteger srvId = [requestBody[@"srvId"] integerValue];
+                        if (srvId != 0) {
+                            MessageData *msgData = [messageService GetMsgData:userId svrId:srvId];
+                            [[TKMessageManager shareManager] playVoiceWithMessageData:msgData];
+                        }
                     }
+                    [[TKMessageManager shareManager] clearUnRead:userId];
                 }
             });
             return [GCDWebServerResponse responseWithStatusCode:200];
@@ -445,7 +447,7 @@ - (NSDictionary *)dictFromMessageData:(MessageData *)msgData {
             title = [title stringByAppendingString:msgData.msgVoiceText];
         }
         if (msgData.IsUnPlayed) {
-            title = [NSString stringWithFormat:@"%@%@",TKLocalizedString(@"assistant.search.message.unread"),title];
+            title = [NSString stringWithFormat:@"%@(%@)",title,TKLocalizedString(@"assistant.search.message.unread")];
         }
     } else if (msgData.messageType == 49) {
         NSString *msgContact = [msgData summaryString:NO];
@@ -491,6 +493,7 @@ - (NSDictionary *)dictWithMessageContent:(NSString *)msg {
 
     return error? nil : msgDict;
 }
+
 - (NSString *)getDateStringWithTimeStr:(NSTimeInterval)time{
     NSDate *date = [NSDate dateWithTimeIntervalSince1970:time];
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
@@ -530,4 +533,11 @@ - (NSString *)getUserNameWithContactData:(WCContactData *)contact showOriginName
     return userName ?: @"";
 }
 
+- (BOOL)isLocalhost:(NSString *)host {
+    NSArray *localhostUrls = @[[NSString stringWithFormat:@"127.0.0.1:%d", port],
+                               [NSString stringWithFormat:@"localhost:%d", port]
+                               ];
+    return [localhostUrls containsObject:host];
+}
+
 @end
diff --git a/WeChatPlugin/WeChatPlugin.h b/WeChatPlugin/WeChatPlugin.h
@@ -262,6 +262,9 @@ FOUNDATION_EXPORT const unsigned char WeChatPluginVersionString[];
 @end
 
 @interface MMContactSearchLogic : NSObject
+{
+    unsigned long long _logicSearchResultFlag;
+}
 @property(retain, nonatomic) NSMutableArray *contactResults;
 - (void)doSearchWithKeyword:(id)arg1 searchScene:(unsigned long long)arg2 resultIsShownBlock:(id)arg3 completion:(id)arg4;
 @property(retain, nonatomic) NSMutableArray *groupResults;