开屏协议确认

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2976,7 +2976,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3177,7 +3177,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3219,7 +3219,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -232,7 +232,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
                 vc.modalPresentationStyle = .custom
                 UIViewController.current?.navigationController?.present(vc, animated: true)
                 YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
-                    guard let self = self else { return }
+                    guard self != nil else { return }
                     tabBarController.selectedIndex = index
                     YHLoginManager.shared.loginSuccessActionBlock = nil
                 }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift

@@ -100,9 +100,34 @@ private extension YHStartPageViewController {
             make.edges.equalToSuperview()
         }
         
-//        agreeAlertView.isHidden = false
-//        cancelTimer()
-//        closeBtn.isHidden = true//for test hjl
+//
+        
+        agreeAlertView.isHidden = false
+        cancelTimer()
+        closeBtn.isHidden = true//for test hjl
+        
+        agreeAlertView.agreeBlock = {
+            self.startTimer()
+        }
+        
+        agreeAlertView.cancelBlock = {
+            //点击了取消按钮
+            YHCommonAlertView.show("", "确认退出超级APP?", "退出", "继续使用") {
+                //退出
+                exit(0)
+                
+            } callBack: {
+                //继续使用
+                self.view.addSubview(self.agreeAlertView)
+                self.agreeAlertView.snp.makeConstraints { make in
+                    make.edges.equalToSuperview()
+                }
+                
+                self.agreeAlertView.isHidden = false
+                self.cancelTimer()
+                self.closeBtn.isHidden = true//for test hjl
+            }
+        }
     }
     
     @objc func clickCancelBtn() {

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAgreementAlertView.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHAgreementAlertView: UIView {
     typealias AgreeBlock = () -> ()
     var agreeBlock: AgreeBlock?
+    var cancelBlock:AgreeBlock?
     var centerView: UIView!
     var titleLabel: UILabel!
     var lineView: UIView!
@@ -179,6 +180,9 @@ class YHAgreementAlertView: UIView {
     }
     
     @objc func disagree() {
+        if let block = self.cancelBlock {
+            block()
+        }
         dismiss()
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHCommonAlertView.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHCommonAlertView: UIView {
     typealias AgreeBlock = () -> ()
     var agreeBlock: AgreeBlock?
+    var cancelBlcok: AgreeBlock?
     var centerView: UIView!
     var titleLabel: UILabel!
     var lineView: UIView!
@@ -18,9 +19,10 @@ class YHCommonAlertView: UIView {
     var agreeButton: UIButton!
     var disAgressButton: UIButton!
     
-    static func show(_ title: String? = nil, _ message: String? = nil, _ leftButtonString: String? = nil, _ rightButtonString: String? = nil, callBack: @escaping (() -> Void)) {
+    static func show(_ title: String? = nil, _ message: String? = nil, _ leftButtonString: String? = nil, _ rightButtonString: String? = nil,cancelCallBack: (() -> Void)? = nil, callBack: @escaping (() -> Void)) {
         let view = YHCommonAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
         view.agreeBlock = callBack
+        view.cancelBlcok = cancelCallBack
         view.setContent(title, message, leftButtonString, rightButtonString)
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
@@ -54,6 +56,10 @@ class YHCommonAlertView: UIView {
                 make.height.lessThanOrEqualTo(60)
                 make.top.equalTo(37)
             }
+            
+            lineView.isHidden = true
+        } else {
+            lineView.isHidden = false
         }
     }
     
@@ -176,6 +182,9 @@ class YHCommonAlertView: UIView {
     }
     
     @objc func disagree() {
+        if let block = self.cancelBlcok {
+            block()
+        }
         dismiss()
     }