From 0e7a29c1d56a1d4396080d5142b07ed1e1b95565 Mon Sep 17 00:00:00 2001 From: "Lincoln.Law" Date: Wed, 11 Jul 2018 11:06:04 +0800 Subject: [PATCH 1/2] fixed carthage compile error --- GodEye.xcodeproj/project.pbxproj | 28 ------------------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ 2 files changed, 8 insertions(+), 28 deletions(-) create mode 100644 GodEye.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/GodEye.xcodeproj/project.pbxproj b/GodEye.xcodeproj/project.pbxproj index c421083..da9e4be 100644 --- a/GodEye.xcodeproj/project.pbxproj +++ b/GodEye.xcodeproj/project.pbxproj @@ -521,7 +521,6 @@ 9EC3B5A71E8CD2230052EC57 /* Frameworks */, 9EC3B5A81E8CD2230052EC57 /* Headers */, 9EC3B5A91E8CD2230052EC57 /* Resources */, - 9EC3B65D1E8CD4B00052EC57 /* ShellScript */, ); buildRules = ( ); @@ -615,33 +614,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 9EC3B65D1E8CD4B00052EC57 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/ESPullToRefresh.framework", - "$(SRCROOT)/Carthage/Build/iOS/ANREye.framework", - "$(SRCROOT)/Carthage/Build/iOS/AppBaseKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/AppSwizzle.framework", - "$(SRCROOT)/Carthage/Build/iOS/AssistiveButton.framework", - "$(SRCROOT)/Carthage/Build/iOS/ASLEye.framework", - "$(SRCROOT)/Carthage/Build/iOS/FileBrowser.framework", - "$(SRCROOT)/Carthage/Build/iOS/Log4G.framework", - "$(SRCROOT)/Carthage/Build/iOS/LeakEye.framework", - "$(SRCROOT)/Carthage/Build/iOS/SQLite.framework", - "$(SRCROOT)/Carthage/Build/iOS/NetworkEye.framework", - "$(SRCROOT)/Carthage/Build/iOS/SystemEye.framework", - "$(SRCROOT)/Carthage/Build/iOS/SwViewCapture.framework", - "$(SRCROOT)/Carthage/Build/iOS/CrashEye.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; 9EC3B6771E8CD6B70052EC57 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/GodEye.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GodEye.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/GodEye.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From a922bd93af5bed41235e29b0cc5abde9259f6d65 Mon Sep 17 00:00:00 2001 From: CodeEagle Date: Thu, 12 Jul 2018 09:22:37 +0800 Subject: [PATCH 2/2] update ESPullToRefresh API --- .../Classes/Controller/Sub/ConsolePrintViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GodEye/Classes/Controller/Sub/ConsolePrintViewController.swift b/GodEye/Classes/Controller/Sub/ConsolePrintViewController.swift index 17c3865..fecf84b 100644 --- a/GodEye/Classes/Controller/Sub/ConsolePrintViewController.swift +++ b/GodEye/Classes/Controller/Sub/ConsolePrintViewController.swift @@ -42,7 +42,7 @@ class ConsolePrintViewController: UIViewController { self.view.addSubview(self.recordTableView) self.view.addSubview(self.inputField) - self.recordTableView.es_addPullToRefresh { [weak self] in + self.recordTableView.es.addPullToRefresh { [weak self] in guard let sself = self else { return } @@ -51,7 +51,7 @@ class ConsolePrintViewController: UIViewController { if result == true { sself.recordTableView.reloadData() } - sself.recordTableView.es_stopPullToRefresh() + sself.recordTableView.es.stopPullToRefresh() } NotificationCenter.default.addObserver(self,