Skip to content

Commit 2a7c44f

Browse files
author
Jasper
committed
merge branch
1 parent 0df6a63 commit 2a7c44f

File tree

4 files changed

+12
-82
lines changed

4 files changed

+12
-82
lines changed

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift.xcodeproj/project.pbxproj

+2-78
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
61091D651CDAF8E4008B7EA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 61091D641CDAF8E4008B7EA3 /* Assets.xcassets */; };
1414
61091D681CDAF8E4008B7EA3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61091D661CDAF8E4008B7EA3 /* LaunchScreen.storyboard */; };
1515
61091D721CDAFCDA008B7EA3 /* ImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61091D711CDAFCDA008B7EA3 /* ImageDownloader.swift */; };
16-
83D7016B52B862258E58891D /* Pods_CYUtilProjectSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D53746AC48DAC068C766891 /* Pods_CYUtilProjectSwift.framework */; };
1716
A306D5631CE330A8008341F3 /* CYAlertViewAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = A306D5621CE330A8008341F3 /* CYAlertViewAction.swift */; };
1817
A30D07D01FCBBFE800373F1C /* WebViewControllerStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A30D07CF1FCBBFE800373F1C /* WebViewControllerStyle.swift */; };
1918
A30EA3D21CFED40F006FEF23 /* CYAudioPlayUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A30EA3D11CFED40F006FEF23 /* CYAudioPlayUtils.swift */; };
@@ -77,7 +76,6 @@
7776
A4874DFF1FE2797B002C978F /* SimpleTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874DFD1FE2797B002C978F /* SimpleTableView.swift */; };
7877
A4874E001FE2797B002C978F /* SimpleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874DFE1FE2797B002C978F /* SimpleTableViewCell.swift */; };
7978
A4874E041FE3A829002C978F /* EventListenerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874E031FE3A829002C978F /* EventListenerTests.swift */; };
80-
B2A6FB253493B156AF5B4F72 /* Pods_CYUtilProjectSwiftTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3FF914D00A31D6EDEA3F229 /* Pods_CYUtilProjectSwiftTests.framework */; };
8179
/* End PBXBuildFile section */
8280

8381
/* Begin PBXContainerItemProxy section */
@@ -104,9 +102,6 @@
104102
/* End PBXCopyFilesBuildPhase section */
105103

106104
/* Begin PBXFileReference section */
107-
0BD1B3062F4422604FC5D843 /* Pods-CYUtilProjectSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CYUtilProjectSwift.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CYUtilProjectSwift/Pods-CYUtilProjectSwift.debug.xcconfig"; sourceTree = "<group>"; };
108-
2D53746AC48DAC068C766891 /* Pods_CYUtilProjectSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CYUtilProjectSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
109-
4D6806CABC76D2FD033C6E90 /* Pods-CYUtilProjectSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CYUtilProjectSwift.release.xcconfig"; path = "Pods/Target Support Files/Pods-CYUtilProjectSwift/Pods-CYUtilProjectSwift.release.xcconfig"; sourceTree = "<group>"; };
110105
61091D5A1CDAF8E4008B7EA3 /* CYUtilProjectSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CYUtilProjectSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
111106
61091D5D1CDAF8E4008B7EA3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
112107
61091D5F1CDAF8E4008B7EA3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -115,8 +110,6 @@
115110
61091D671CDAF8E4008B7EA3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
116111
61091D691CDAF8E4008B7EA3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
117112
61091D711CDAFCDA008B7EA3 /* ImageDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageDownloader.swift; sourceTree = "<group>"; };
118-
7703B57890D7A5E3633F6303 /* Pods-CYUtilProjectSwiftTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CYUtilProjectSwiftTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-CYUtilProjectSwiftTests/Pods-CYUtilProjectSwiftTests.release.xcconfig"; sourceTree = "<group>"; };
119-
9213E6929DBD2C2D204EFCA7 /* Pods-CYUtilProjectSwiftTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CYUtilProjectSwiftTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CYUtilProjectSwiftTests/Pods-CYUtilProjectSwiftTests.debug.xcconfig"; sourceTree = "<group>"; };
120113
A306D5621CE330A8008341F3 /* CYAlertViewAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CYAlertViewAction.swift; sourceTree = "<group>"; };
121114
A30D07CF1FCBBFE800373F1C /* WebViewControllerStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewControllerStyle.swift; sourceTree = "<group>"; };
122115
A30EA3D11CFED40F006FEF23 /* CYAudioPlayUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CYAudioPlayUtils.swift; sourceTree = "<group>"; };
@@ -184,23 +177,20 @@
184177
A4874DFD1FE2797B002C978F /* SimpleTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleTableView.swift; sourceTree = "<group>"; };
185178
A4874DFE1FE2797B002C978F /* SimpleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleTableViewCell.swift; sourceTree = "<group>"; };
186179
A4874E031FE3A829002C978F /* EventListenerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListenerTests.swift; sourceTree = "<group>"; };
187-
E3FF914D00A31D6EDEA3F229 /* Pods_CYUtilProjectSwiftTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CYUtilProjectSwiftTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
188180
/* End PBXFileReference section */
189181

190182
/* Begin PBXFrameworksBuildPhase section */
191183
61091D571CDAF8E4008B7EA3 /* Frameworks */ = {
192184
isa = PBXFrameworksBuildPhase;
193185
buildActionMask = 2147483647;
194186
files = (
195-
83D7016B52B862258E58891D /* Pods_CYUtilProjectSwift.framework in Frameworks */,
196187
);
197188
runOnlyForDeploymentPostprocessing = 0;
198189
};
199190
A37AEA491F468898007B3C23 /* Frameworks */ = {
200191
isa = PBXFrameworksBuildPhase;
201192
buildActionMask = 2147483647;
202193
files = (
203-
B2A6FB253493B156AF5B4F72 /* Pods_CYUtilProjectSwiftTests.framework in Frameworks */,
204194
);
205195
runOnlyForDeploymentPostprocessing = 0;
206196
};
@@ -210,8 +200,6 @@
210200
47F7587AEA6B9A58E7F8FA3F /* Frameworks */ = {
211201
isa = PBXGroup;
212202
children = (
213-
2D53746AC48DAC068C766891 /* Pods_CYUtilProjectSwift.framework */,
214-
E3FF914D00A31D6EDEA3F229 /* Pods_CYUtilProjectSwiftTests.framework */,
215203
);
216204
name = Frameworks;
217205
sourceTree = "<group>";
@@ -222,7 +210,6 @@
222210
61091D5C1CDAF8E4008B7EA3 /* CYUtilProjectSwift */,
223211
A37AEA4D1F468898007B3C23 /* CYUtilProjectSwiftTests */,
224212
61091D5B1CDAF8E4008B7EA3 /* Products */,
225-
88F1AE672F67B973BE29AC0D /* Pods */,
226213
47F7587AEA6B9A58E7F8FA3F /* Frameworks */,
227214
);
228215
sourceTree = "<group>";
@@ -292,17 +279,6 @@
292279
path = CYCache;
293280
sourceTree = "<group>";
294281
};
295-
88F1AE672F67B973BE29AC0D /* Pods */ = {
296-
isa = PBXGroup;
297-
children = (
298-
0BD1B3062F4422604FC5D843 /* Pods-CYUtilProjectSwift.debug.xcconfig */,
299-
4D6806CABC76D2FD033C6E90 /* Pods-CYUtilProjectSwift.release.xcconfig */,
300-
9213E6929DBD2C2D204EFCA7 /* Pods-CYUtilProjectSwiftTests.debug.xcconfig */,
301-
7703B57890D7A5E3633F6303 /* Pods-CYUtilProjectSwiftTests.release.xcconfig */,
302-
);
303-
name = Pods;
304-
sourceTree = "<group>";
305-
};
306282
A306D5611CE33096008341F3 /* CYAlertView */ = {
307283
isa = PBXGroup;
308284
children = (
@@ -557,13 +533,10 @@
557533
isa = PBXNativeTarget;
558534
buildConfigurationList = 61091D6C1CDAF8E4008B7EA3 /* Build configuration list for PBXNativeTarget "CYUtilProjectSwift" */;
559535
buildPhases = (
560-
4F4B4F09F1C7D6182216F55A /* [CP] Check Pods Manifest.lock */,
561536
61091D561CDAF8E4008B7EA3 /* Sources */,
562537
61091D571CDAF8E4008B7EA3 /* Frameworks */,
563538
61091D581CDAF8E4008B7EA3 /* Resources */,
564539
A36F4EFD1F906D6600E7F4B6 /* Embed Frameworks */,
565-
1EEAB98AC6DB01F8CE17C650 /* [CP] Embed Pods Frameworks */,
566-
FA7149CE0B09130DAF7AEC5B /* [CP] Copy Pods Resources */,
567540
);
568541
buildRules = (
569542
);
@@ -661,36 +634,6 @@
661634
/* End PBXResourcesBuildPhase section */
662635

663636
/* Begin PBXShellScriptBuildPhase section */
664-
1EEAB98AC6DB01F8CE17C650 /* [CP] Embed Pods Frameworks */ = {
665-
isa = PBXShellScriptBuildPhase;
666-
buildActionMask = 2147483647;
667-
files = (
668-
);
669-
inputPaths = (
670-
);
671-
name = "[CP] Embed Pods Frameworks";
672-
outputPaths = (
673-
);
674-
runOnlyForDeploymentPostprocessing = 0;
675-
shellPath = /bin/sh;
676-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CYUtilProjectSwift/Pods-CYUtilProjectSwift-frameworks.sh\"\n";
677-
showEnvVarsInLog = 0;
678-
};
679-
4F4B4F09F1C7D6182216F55A /* [CP] Check Pods Manifest.lock */ = {
680-
isa = PBXShellScriptBuildPhase;
681-
buildActionMask = 2147483647;
682-
files = (
683-
);
684-
inputPaths = (
685-
);
686-
name = "[CP] Check Pods Manifest.lock";
687-
outputPaths = (
688-
);
689-
runOnlyForDeploymentPostprocessing = 0;
690-
shellPath = /bin/sh;
691-
shellScript = "diff \"${PODS_ROOT}/../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";
692-
showEnvVarsInLog = 0;
693-
};
694637
5878A6C77DCD2EA663537C76 /* [CP] Check Pods Manifest.lock */ = {
695638
isa = PBXShellScriptBuildPhase;
696639
buildActionMask = 2147483647;
@@ -736,21 +679,6 @@
736679
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CYUtilProjectSwiftTests/Pods-CYUtilProjectSwiftTests-frameworks.sh\"\n";
737680
showEnvVarsInLog = 0;
738681
};
739-
FA7149CE0B09130DAF7AEC5B /* [CP] Copy Pods Resources */ = {
740-
isa = PBXShellScriptBuildPhase;
741-
buildActionMask = 2147483647;
742-
files = (
743-
);
744-
inputPaths = (
745-
);
746-
name = "[CP] Copy Pods Resources";
747-
outputPaths = (
748-
);
749-
runOnlyForDeploymentPostprocessing = 0;
750-
shellPath = /bin/sh;
751-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CYUtilProjectSwift/Pods-CYUtilProjectSwift-resources.sh\"\n";
752-
showEnvVarsInLog = 0;
753-
};
754682
/* End PBXShellScriptBuildPhase section */
755683

756684
/* Begin PBXSourcesBuildPhase section */
@@ -966,7 +894,6 @@
966894
};
967895
61091D6D1CDAF8E4008B7EA3 /* Debug */ = {
968896
isa = XCBuildConfiguration;
969-
baseConfigurationReference = 0BD1B3062F4422604FC5D843 /* Pods-CYUtilProjectSwift.debug.xcconfig */;
970897
buildSettings = {
971898
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
972899
CLANG_ENABLE_MODULES = YES;
@@ -983,14 +910,13 @@
983910
PRODUCT_NAME = "$(TARGET_NAME)";
984911
SWIFT_OBJC_BRIDGING_HEADER = "CYUtilProjectSwift/CYUtilProjectSwift-Bridging-Header.h";
985912
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
986-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
913+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
987914
SWIFT_VERSION = 4.0;
988915
};
989916
name = Debug;
990917
};
991918
61091D6E1CDAF8E4008B7EA3 /* Release */ = {
992919
isa = XCBuildConfiguration;
993-
baseConfigurationReference = 4D6806CABC76D2FD033C6E90 /* Pods-CYUtilProjectSwift.release.xcconfig */;
994920
buildSettings = {
995921
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
996922
CLANG_ENABLE_MODULES = YES;
@@ -1006,14 +932,13 @@
1006932
PRODUCT_BUNDLE_IDENTIFIER = com.Jasper.CYUtilProjectSwift;
1007933
PRODUCT_NAME = "$(TARGET_NAME)";
1008934
SWIFT_OBJC_BRIDGING_HEADER = "CYUtilProjectSwift/CYUtilProjectSwift-Bridging-Header.h";
1009-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
935+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1010936
SWIFT_VERSION = 4.0;
1011937
};
1012938
name = Release;
1013939
};
1014940
A37AEA531F468898007B3C23 /* Debug */ = {
1015941
isa = XCBuildConfiguration;
1016-
baseConfigurationReference = 9213E6929DBD2C2D204EFCA7 /* Pods-CYUtilProjectSwiftTests.debug.xcconfig */;
1017942
buildSettings = {
1018943
BUNDLE_LOADER = "$(TEST_HOST)";
1019944
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1033,7 +958,6 @@
1033958
};
1034959
A37AEA541F468898007B3C23 /* Release */ = {
1035960
isa = XCBuildConfiguration;
1036-
baseConfigurationReference = 7703B57890D7A5E3633F6303 /* Pods-CYUtilProjectSwiftTests.release.xcconfig */;
1037961
buildSettings = {
1038962
BUNDLE_LOADER = "$(TEST_HOST)";
1039963
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/ViewController.swift

+5
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ class ViewController: UITableViewController, WKNavigationDelegate, WKUIDelegate
5757
navigationController?.navigationBar.prefersLargeTitles = true
5858
}
5959
}
60+
61+
override func viewDidAppear(_ animated: Bool) {
62+
super.viewDidAppear(animated)
63+
}
6064

6165
@IBAction func recordOrPause(_ sender: AnyObject) {
6266

@@ -179,6 +183,7 @@ class ViewController: UITableViewController, WKNavigationDelegate, WKUIDelegate
179183
print("点击Funy啦啦啦啦啦啦啦啦啦啦啦")
180184
}
181185

186+
print(navigationController?.viewControllers.description)
182187
navigationController?.pushViewController(web, animated: true)
183188
} else if indexPath.row == 6 {
184189
let animation = AnimationTestTableViewController(style: .plain)

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtils/HTTPUtils/HTTPClient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import UIKit
10-
import Alamofire
10+
//import Alamofire
1111

1212
class HTTPClient: NSObject {
1313
func test() {

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtils/WebViewController/WebViewController.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,10 @@ open class WebViewController: UIViewController, WKNavigationDelegate, WKUIDelega
151151
}
152152
self.navigationController?.delegate = self
153153
}
154-
155-
override open func viewDidDisappear(_ animated: Bool) {
156-
super.viewDidDisappear(animated)
154+
155+
override open func viewWillDisappear(_ animated: Bool) {
156+
super.viewWillDisappear(true)
157+
157158
self.navigationController?.delegate = nil
158159
}
159160

0 commit comments

Comments
 (0)