瀏覽代碼

update intro

Marino Faggiana 6 年之前
父節點
當前提交
0b3802107c
共有 2 個文件被更改,包括 48 次插入15 次删除
  1. 40 7
      iOSClient/Brand/Intro/CCIntro.m
  2. 8 8
      iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

+ 40 - 7
iOSClient/Brand/Intro/CCIntro.m

@@ -22,10 +22,10 @@
 //
 
 #import "CCIntro.h"
-
+#import "AppDelegate.h"
 #import "NCBridgeSwift.h"
 
-@interface CCIntro ()
+@interface CCIntro () <SwiftModalWebVCDelegate>
 {
     int titlePositionY;
     int descPositionY;
@@ -76,11 +76,6 @@
     [self.intro hideWithFadeOutDuration:0.7];
 }
 
-- (void)host:(id)sender
-{
-    
-}
-
 - (void)show
 {
     [self showIntro];
@@ -234,4 +229,42 @@
     [self.intro showInView:self.rootView animateDuration:0];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Web =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)host:(id)sender
+{
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    SwiftModalWebVC *webVC = [[SwiftModalWebVC alloc] initWithUrlString:[NCBrandOptions sharedInstance].linkLoginHost];
+    webVC.delegateWeb = self;
+    
+    [appDelegate.window.rootViewController presentViewController:webVC animated:YES completion:nil];
+}
+    
+- (void)didStartLoading
+{
+    
+}
+
+- (void)didReceiveServerRedirectForProvisionalNavigationWithUrl:(NSURL *)url
+{
+    
+}
+
+- (void)didFinishLoadingWithSuccess:(BOOL)success url:(NSURL *)url
+{
+    
+}
+
+- (void)webDismiss
+{
+    
+}
+
+- (void)decidePolicyForNavigationAction:(WKWebView *)webView decidePolicyFor:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
+
 @end

+ 8 - 8
iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

@@ -8,17 +8,17 @@
 
 import UIKit
 
-public protocol SwiftModalWebVCDelegate: class {
-    func didStartLoading()
-    func didReceiveServerRedirectForProvisionalNavigation(url: URL)
-    func didFinishLoading(success: Bool, url: URL)
-    func webDismiss()
-    func decidePolicyForNavigationAction(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void)
+@objc public protocol SwiftModalWebVCDelegate: class {
+    @objc func didStartLoading()
+    @objc func didReceiveServerRedirectForProvisionalNavigation(url: URL)
+    @objc func didFinishLoading(success: Bool, url: URL)
+    @objc func webDismiss()
+    @objc func decidePolicyForNavigationAction(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void)
 }
 
 public class SwiftModalWebVC: UINavigationController {
     
-    public weak var delegateWeb: SwiftModalWebVCDelegate?
+    @objc public weak var delegateWeb: SwiftModalWebVCDelegate?
     
     public enum SwiftModalWebVCTheme {
         case lightBlue, lightBlack, dark, custom
@@ -26,7 +26,7 @@ public class SwiftModalWebVC: UINavigationController {
     
     weak var webViewDelegate: UIWebViewDelegate? = nil
     
-    public convenience init(urlString: String) {
+    @objc public convenience init(urlString: String) {
         self.init(pageURL: URL(string: urlString)!)
     }