diff --git a/.gitignore b/.gitignore index f3143b7e..bca9dad4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ # Xcode # .DS_Store -*.xcuserstate \ No newline at end of file +*.xcuserstate + +# CocoaPods +# +Pods/ +Podfile.lock diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin index 44ab9c45..8679234d 100755 Binary files a/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin and b/Other/Products/Debug/WeChatPlugin.framework/Versions/A/WeChatPlugin differ diff --git a/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin index 44ab9c45..8679234d 100755 Binary files a/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin and b/Other/Products/Debug/WeChatPlugin.framework/Versions/Current/WeChatPlugin differ diff --git a/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin b/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin index 44ab9c45..8679234d 100755 Binary files a/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin and b/Other/Products/Debug/WeChatPlugin.framework/WeChatPlugin differ diff --git a/Podfile b/Podfile new file mode 100644 index 00000000..2efd0b97 --- /dev/null +++ b/Podfile @@ -0,0 +1,5 @@ +platform :osx, '10.10' + +target 'WeChatPlugin' do + pod 'GCDWebServer', '~> 3.4.2' +end diff --git a/README.md b/README.md index 57e67459..68d01b94 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ * [XMLReader](https://github.com/amarcadet/XMLReader) * [insert_dylib](https://github.com/Tyilo/insert_dylib) * [fishhook](https://github.com/facebook/fishhook) +* [GCDWebServer](https://github.com/swisspol/GCDWebServer) --- ### Other diff --git a/WeChatPlugin.xcodeproj/project.pbxproj b/WeChatPlugin.xcodeproj/project.pbxproj index 3d2bf4bf..3ca64ba2 100644 --- a/WeChatPlugin.xcodeproj/project.pbxproj +++ b/WeChatPlugin.xcodeproj/project.pbxproj @@ -57,9 +57,12 @@ 52B5CF1D1F3B4631000D9DD9 /* XMLReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B5CF051F3B4631000D9DD9 /* XMLReader.m */; }; 52EE9515203FE58500B76873 /* MMStickerMessageCellView+hook.m in Sources */ = {isa = PBXBuildFile; fileRef = 52EE9513203FE58500B76873 /* MMStickerMessageCellView+hook.m */; }; 52EE9517203FE63300B76873 /* MMStickerMessageCellView+hook.h in Headers */ = {isa = PBXBuildFile; fileRef = 52EE9516203FE63300B76873 /* MMStickerMessageCellView+hook.h */; }; + 581E98663A5F0E6327516AA8 /* libPods-WeChatPlugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F7A08DC0E3A0626801414D /* libPods-WeChatPlugin.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 13B308B4A92CE38341762A48 /* Pods-WeChatPlugin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WeChatPlugin.release.xcconfig"; path = "Pods/Target Support Files/Pods-WeChatPlugin/Pods-WeChatPlugin.release.xcconfig"; sourceTree = ""; }; + 17F7A08DC0E3A0626801414D /* libPods-WeChatPlugin.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WeChatPlugin.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 522547CD1F4AE5A700226A2A /* NSView+Action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+Action.h"; sourceTree = ""; }; 522547CE1F4AE5A700226A2A /* NSView+Action.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+Action.m"; sourceTree = ""; }; 522547D71F4C312A00226A2A /* TKAutoReplyWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKAutoReplyWindowController.h; sourceTree = ""; }; @@ -112,6 +115,7 @@ 52B5CF051F3B4631000D9DD9 /* XMLReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLReader.m; sourceTree = ""; }; 52EE9513203FE58500B76873 /* MMStickerMessageCellView+hook.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MMStickerMessageCellView+hook.m"; sourceTree = ""; }; 52EE9516203FE63300B76873 /* MMStickerMessageCellView+hook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MMStickerMessageCellView+hook.h"; sourceTree = ""; }; + 888B2791FA0BBCC192BADA47 /* Pods-WeChatPlugin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WeChatPlugin.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WeChatPlugin/Pods-WeChatPlugin.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -119,12 +123,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 581E98663A5F0E6327516AA8 /* libPods-WeChatPlugin.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 13EC3A000F46808B50A62C6F /* Frameworks */ = { + isa = PBXGroup; + children = ( + 17F7A08DC0E3A0626801414D /* libPods-WeChatPlugin.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 3C138513A2C7760B47317A95 /* Pods */ = { + isa = PBXGroup; + children = ( + 888B2791FA0BBCC192BADA47 /* Pods-WeChatPlugin.debug.xcconfig */, + 13B308B4A92CE38341762A48 /* Pods-WeChatPlugin.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; 522547CC1F4AE5A700226A2A /* Category */ = { isa = PBXGroup; children = ( @@ -210,6 +232,8 @@ children = ( 528B4F941EA7383800BC6A89 /* WeChatPlugin */, 528B4F931EA7383800BC6A89 /* Products */, + 3C138513A2C7760B47317A95 /* Pods */, + 13EC3A000F46808B50A62C6F /* Frameworks */, ); sourceTree = ""; }; @@ -376,11 +400,13 @@ isa = PBXNativeTarget; buildConfigurationList = 528B4F9A1EA7383800BC6A89 /* Build configuration list for PBXNativeTarget "WeChatPlugin" */; buildPhases = ( + A23204925F0A37A0EBE14B92 /* [CP] Check Pods Manifest.lock */, 528B4F8D1EA7383800BC6A89 /* Sources */, 528B4F8E1EA7383800BC6A89 /* Frameworks */, 528B4F8F1EA7383800BC6A89 /* Headers */, 528B4F901EA7383800BC6A89 /* Resources */, 528B4FB51EA738B100BC6A89 /* ShellScript */, + 165746E0A28B760DEA538E0D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -438,6 +464,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 165746E0A28B760DEA538E0D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeChatPlugin/Pods-WeChatPlugin-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 528B4FB51EA738B100BC6A89 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -451,6 +492,24 @@ shellPath = /bin/sh; shellScript = "#!/bin/bash\napp_name=\"WeChat\"\nframework_name=\"WeChatPlugin\"\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\nrm -rf \"./Other/Products/Debug/${framework_name}.framework\"\ncp -r \"${BUILT_PRODUCTS_DIR}/${framework_name}.framework\" \"./Other/Products/Debug/${framework_name}.framework\"\ncp -r \"${BUILT_PRODUCTS_DIR}/${framework_name}.framework\" ${app_bundle_path}\n./Other/insert_dylib --all-yes \"${framework_path}/${framework_name}\" \"$app_executable_backup_path\" \"$app_executable_path\""; }; + A23204925F0A37A0EBE14B92 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-WeChatPlugin-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -593,6 +652,7 @@ }; 528B4F9B1EA7383800BC6A89 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 888B2791FA0BBCC192BADA47 /* Pods-WeChatPlugin.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; @@ -614,6 +674,7 @@ }; 528B4F9C1EA7383800BC6A89 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 13B308B4A92CE38341762A48 /* Pods-WeChatPlugin.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; diff --git a/WeChatPlugin.xcodeproj/project.xcworkspace/xcuserdata/TK.xcuserdatad/UserInterfaceState.xcuserstate b/WeChatPlugin.xcodeproj/project.xcworkspace/xcuserdata/TK.xcuserdatad/UserInterfaceState.xcuserstate index aa160e1b..53118705 100644 Binary files a/WeChatPlugin.xcodeproj/project.xcworkspace/xcuserdata/TK.xcuserdatad/UserInterfaceState.xcuserstate and b/WeChatPlugin.xcodeproj/project.xcworkspace/xcuserdata/TK.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/WeChatPlugin.xcworkspace/contents.xcworkspacedata b/WeChatPlugin.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..89bba37f --- /dev/null +++ b/WeChatPlugin.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + +