update

shang1219178163 · Apr 22, 2022 · 15dbad8 · 15dbad8
1 parent 2a80aee
commit 15dbad8
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 35 deletions.
diff --git a/SwiftTemplet.xcodeproj/project.pbxproj b/SwiftTemplet.xcodeproj/project.pbxproj
@@ -320,6 +320,7 @@
 		14775DEA24864BC00093DC3D /* NNTagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14775DE924864BC00093DC3D /* NNTagView.swift */; };
 		14775DEE248657FD0093DC3D /* UITableViewCellTags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14775DED248657FD0093DC3D /* UITableViewCellTags.swift */; };
 		14775DF024872CF30093DC3D /* NNCycleScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14775DEF24872CF20093DC3D /* NNCycleScrollView.swift */; };
+		14785C8F274E49E1005CBA5E /* WKWebView+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14785C8E274E49E1005CBA5E /* WKWebView+Ext.swift */; };
 		147972B62473DE7800555279 /* TextFieldStyleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147972B52473DE7800555279 /* TextFieldStyleController.swift */; };
 		1479D5CA244407A5007F7CC4 /* TableViewPrefetchRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1479D5C9244407A5007F7CC4 /* TableViewPrefetchRowController.swift */; };
 		1479D5CF24455A4D007F7CC4 /* TabbarAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1479D5CD24455A4C007F7CC4 /* TabbarAnimator.swift */; };
@@ -457,6 +458,7 @@
 		14A86A932357256500AD9BC1 /* CCSDeskViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14A86A922357256300AD9BC1 /* CCSDeskViewController.swift */; };
 		14A86A952357268300AD9BC1 /* UISearchStylesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14A86A942357268300AD9BC1 /* UISearchStylesController.swift */; };
 		14AB52C32468E0DF00D075D3 /* IOPPlateEntryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AB52C22468E0DF00D075D3 /* IOPPlateEntryController.swift */; };
+		14AB97502812379E00665A80 /* IteratorDemoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AB974F2812379E00665A80 /* IteratorDemoController.swift */; };
 		14ABDEBB2636506B00269508 /* NSObject+AddForKVO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14ABDEBA2636506B00269508 /* NSObject+AddForKVO.swift */; };
 		14ADE22123CD543100037B0B /* IOPUserCenterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14ADE22023CD543100037B0B /* IOPUserCenterController.swift */; };
 		14B03DCE26AD019D00B8634F /* NNToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B03DCD26AD019D00B8634F /* NNToolbar.swift */; };
@@ -1029,6 +1031,7 @@
 		14775DE924864BC00093DC3D /* NNTagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NNTagView.swift; sourceTree = "<group>"; };
 		14775DED248657FD0093DC3D /* UITableViewCellTags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableViewCellTags.swift; sourceTree = "<group>"; };
 		14775DEF24872CF20093DC3D /* NNCycleScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NNCycleScrollView.swift; sourceTree = "<group>"; };
+		14785C8E274E49E1005CBA5E /* WKWebView+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WKWebView+Ext.swift"; sourceTree = "<group>"; };
 		147972B52473DE7800555279 /* TextFieldStyleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldStyleController.swift; sourceTree = "<group>"; };
 		1479D5C9244407A5007F7CC4 /* TableViewPrefetchRowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewPrefetchRowController.swift; sourceTree = "<group>"; };
 		1479D5CD24455A4C007F7CC4 /* TabbarAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabbarAnimator.swift; sourceTree = "<group>"; };
@@ -1185,6 +1188,7 @@
 		14A86A922357256300AD9BC1 /* CCSDeskViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CCSDeskViewController.swift; sourceTree = "<group>"; };
 		14A86A942357268300AD9BC1 /* UISearchStylesController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UISearchStylesController.swift; sourceTree = "<group>"; };
 		14AB52C22468E0DF00D075D3 /* IOPPlateEntryController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IOPPlateEntryController.swift; sourceTree = "<group>"; };
+		14AB974F2812379E00665A80 /* IteratorDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IteratorDemoController.swift; sourceTree = "<group>"; };
 		14ABDEBA2636506B00269508 /* NSObject+AddForKVO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+AddForKVO.swift"; sourceTree = "<group>"; };
 		14ADE22023CD543100037B0B /* IOPUserCenterController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IOPUserCenterController.swift; sourceTree = "<group>"; };
 		14B03DCD26AD019D00B8634F /* NNToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NNToolbar.swift; sourceTree = "<group>"; };
@@ -2599,6 +2603,8 @@
 				142B27F526D0B2650047141D /* NNTextViewInputView.swift */,
 				14107FD722D097400011344E /* NNProgressHUD.swift */,
 				14951D6E26E06184007B3B4D /* TheadDemoController.swift */,
+				14785C8E274E49E1005CBA5E /* WKWebView+Ext.swift */,
+				14AB974F2812379E00665A80 /* IteratorDemoController.swift */,
 				1401BE8F2277D6760078A722 /* NetWorkService */,
 				1401BE8E2277D6630078A722 /* Storage */,
 				51685A0C208EA75900CE8099 /* Info.plist */,
@@ -2832,7 +2838,6 @@
 					516859FC208EA75700CE8099 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 0920;
-						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -3220,6 +3225,7 @@
 				146D49B12497612C00B25EE7 /* BookReaderController.swift in Sources */,
 				147D79A424BEE80300458F3D /* NSURLRequest+Helper.swift in Sources */,
 				14107FD822D097400011344E /* NNProgressHUD.swift in Sources */,
+				14785C8F274E49E1005CBA5E /* WKWebView+Ext.swift in Sources */,
 				1419AC572678AB080025C1AC /* NNSearchOneController.swift in Sources */,
 				1479D5CF24455A4D007F7CC4 /* TabbarAnimator.swift in Sources */,
 				14C9FA2C24FF93E90097080F /* UITableViewCellLocation.swift in Sources */,
@@ -3283,6 +3289,7 @@
 				14E2048324E635240075AB47 /* NNNetWorkOfflineView.swift in Sources */,
 				147FF4D121D0CB4700351E94 /* UITableHeaderFooterViewOne.swift in Sources */,
 				142A770B222761050016D3DA /* PickerViewController.swift in Sources */,
+				14AB97502812379E00665A80 /* IteratorDemoController.swift in Sources */,
 				1401BEA12277D76B0078A722 /* NNCacheManager.swift in Sources */,
 				145ECEA7250B042900952360 /* BlueViewController.swift in Sources */,
 				1481509424D838430071E0F6 /* NNFeedbackModel.swift in Sources */,
@@ -3865,6 +3872,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SwiftTemplet/SwiftTemplet.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 2JZLEXVN7E;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3905,8 +3913,9 @@
 				);
 				MARKETING_VERSION = 1.0.0;
 				OTHER_SWIFT_FLAGS = "\"-DDEBUG\" \"-DAPPTYPE_SWIFT\"";
-				PRODUCT_BUNDLE_IDENTIFIER = BIN.SwiftTemplet.st;
+				PRODUCT_BUNDLE_IDENTIFIER = BIN.SwiftTemplet.st123;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftTemplet/SwiftTemplet-Bridging-Header.h";
@@ -3924,6 +3933,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SwiftTemplet/SwiftTemplet.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 2JZLEXVN7E;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3963,8 +3973,9 @@
 				);
 				MARKETING_VERSION = 1.0.0;
 				OTHER_SWIFT_FLAGS = "\"-DAPPTYPE_SWIFT\"";
-				PRODUCT_BUNDLE_IDENTIFIER = BIN.SwiftTemplet.st;
+				PRODUCT_BUNDLE_IDENTIFIER = BIN.SwiftTemplet.st123;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftTemplet/SwiftTemplet-Bridging-Header.h";

diff --git a/SwiftTemplet/Controllers/IOP/IOPFuntionListController.swift b/SwiftTemplet/Controllers/IOP/IOPFuntionListController.swift
@@ -91,15 +91,11 @@ import RxCocoa
 
         view.rxDrive { (sender) in
             DDLog(sender.currentTitle)
-        }.disposed(by: disposeBag)
 
-//        view.rx.safeDrive().asDriver().drive {
-//            DDLog(button.currentTitle)
-//        } onCompleted: {
-//
-//        } onDisposed: {
-//
-//        }
+            let webVC = NNWebViewController()
+            webVC.urlString = "https://image.baidu.com/"
+            self.navigationController?.pushViewController(webVC, animated: true)
+        }.disposed(by: disposeBag)
 
         return view
     }()

diff --git a/SwiftTemplet/Controllers/Other/PickerDemoController.swift b/SwiftTemplet/Controllers/Other/PickerDemoController.swift
@@ -176,7 +176,6 @@ class PickerDemoController: UIViewController {
                     if let first = self.imagePickerVC.children.first {
                         first.edgesForExtendedLayout = []
                     }
-
                 })
             } else {
                 // Fallback on earlier versions

diff --git a/SwiftTemplet/FirstViewController.swift b/SwiftTemplet/FirstViewController.swift
@@ -70,10 +70,10 @@ class FirstViewController: UIViewController{
     lazy var list: [[[String]]] = {
         return [
             [["AlertSheetStudyController", "Alert自定义", ],
+
              ["TheadDemoController", "TheadDemoController", ],
              ["MBProgressHUDDemoController", "MBProgressHUDDemo", ],
              ["JumpSettingsController", "JumpSettingsController", ],
-
 
              ["UICollectionDispalyController", "UICollectionDispaly", ],
 

diff --git a/SwiftTemplet/NNPayTool/NNWebViewController.swift b/SwiftTemplet/NNPayTool/NNWebViewController.swift
@@ -101,12 +101,16 @@ import SnapKitExtend
         let backBarItem = UIBarButtonItem(image: UIImage(named: "icon_arrow_left_gray")!, style: .plain, target: self, action: #selector(handleActionItem(_:)))
         let closeBarItem = UIBarButtonItem(image: UIImage(named: "icon_close_gray")!, style: .plain, target: self, action: #selector(handleActionItem(_:)))
         let updateBarItem = UIBarButtonItem(title: "刷新", style: .plain, target: self, action: #selector(handleActionItem(_:)))
+        let clearCacheBarItem = UIBarButtonItem(title: "清缓存", style: .plain, target: self, action: #selector(handleActionItem(_:)))
+
         backBarItem.tag = 0
         closeBarItem.tag = 1
         updateBarItem.tag = 2
+        clearCacheBarItem.tag = 3
+
         navigationItem.leftBarButtonItems = [backBarItem, closeBarItem,]
 //        navigationItem.leftBarButtonItems = [backBarItem,]
-        navigationItem.rightBarButtonItems = [updateBarItem,]
+        navigationItem.rightBarButtonItems = [updateBarItem, clearCacheBarItem]
 
         view.addSubview(webView)
         webView.addSubview(progressView)
@@ -169,6 +173,10 @@ import SnapKitExtend
         case 2:
             webView.reload()
 
+        case 3:
+            webView.cleanCache {
+                UIAlertController(title: nil, message: "缓存清理成功!", preferredStyle: .alert).present()
+            }
         default:
             break
         }

diff --git a/SwiftTemplet/SwiftTemplet.entitlements b/SwiftTemplet/SwiftTemplet.entitlements
@@ -2,33 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array>
-		<string>iCloud.cjz.io.wasin</string>
-		<string>iCloud.io.cjz.potatso</string>
-		<string>iCloud.io.cjz.wasin</string>
-	</array>
-	<key>com.apple.developer.icloud-services</key>
-	<array>
-		<string>CloudDocuments</string>
-		<string>CloudKit</string>
-	</array>
-	<key>com.apple.developer.ubiquity-container-identifiers</key>
-	<array>
-		<string>iCloud.cjz.io.wasin</string>
-		<string>iCloud.io.cjz.potatso</string>
-		<string>iCloud.io.cjz.wasin</string>
-	</array>
-	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
-	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
+	<key>com.apple.security.files.downloads.read-write</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.personal-information.location</key>

diff --git a/SwiftTemplet/ThirdViewController.swift b/SwiftTemplet/ThirdViewController.swift
@@ -95,8 +95,11 @@ class ThirdViewController: UIViewController{
 //             ["NNFormViewController", "表单视图", ],
              ],
 
+
+
             [["ValidateProtocolController", "MixIn协议扩展", ],
             ["CurryViewController", "Curry", ],
+            ["IteratorDemoController", "IteratorDemo", ],
             ["NNUserLogInController", "RxSwift函数响应型编程", ],
             ["TimerViewController", "Timer", ],
             ["ObserveViewController", "Observe", ],

diff --git a/build/XCBuildData/839ffa883a88dff41287b4d9466d0306-manifest.xcbuild b/build/XCBuildData/839ffa883a88dff41287b4d9466d0306-manifest.xcbuild
diff --git a/build/XCBuildData/BuildDescriptionCacheIndex-026e7d1c09ebe33ce08e7fee7f5e2de2 b/build/XCBuildData/BuildDescriptionCacheIndex-026e7d1c09ebe33ce08e7fee7f5e2de2