替换启动图

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

@@ -100,33 +100,39 @@ private extension YHStartPageViewController {
             make.edges.equalToSuperview()
         }
         
-//
-        
-        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()
+        if let key = UserDefaults.standard.value(forKey: "userAgreeProtocal") as? String,key.contains("true") {
+            startTimer()
+        } else {
+            agreeAlertView.isHidden = false
+            cancelTimer()
+            closeBtn.isHidden = true
+            agreeAlertView.agreeBlock = {
+                UserDefaults.standard.set("true", forKey: "userAgreeProtocal")
+                UserDefaults.standard.synchronize()
+                self.closeBtn.isHidden = false
+                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
                 }
-                
-                self.agreeAlertView.isHidden = false
-                self.cancelTimer()
-                self.closeBtn.isHidden = true//for test hjl
             }
+            
         }
     }
     

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

@@ -19,14 +19,6 @@ class YHAgreementAlertView: 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)) {
-//        let view = YHCommonAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
-//        view.agreeBlock = callBack
-//        view.setContent(title, message, leftButtonString, rightButtonString)
-//        let window = UIApplication.shared.yhKeyWindow()
-//        window?.addSubview(view)
-//    }
-    
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = UIColor(white: 0.5, alpha: 0.1)
@@ -35,28 +27,6 @@ class YHAgreementAlertView: UIView {
         addGestureRecognizer(tap)
         setView()
     }
-
-//    func setContent(_ title: String? = nil, _ message: String? = nil, _ leftButtonString: String? = nil, _ rightButtonString: String? = nil) {
-//        self.titleLabel.text = title
-//        self.messageLabel.text = message
-//        self.disAgressButton.setTitle(leftButtonString, for: .normal)
-//        self.agreeButton.setTitle(rightButtonString, for: .normal)
-//        
-//        if title?.count == 0 || title == nil {
-//            centerView.snp.remakeConstraints { make in
-//                make.center.equalToSuperview()
-//                make.width.equalTo(299)
-//                make.height.equalTo(164)
-//            }
-//            
-//            messageLabel.snp.remakeConstraints { make in
-//                make.left.equalTo(22)
-//                make.right.equalTo(-22)
-//                make.height.lessThanOrEqualTo(60)
-//                make.top.equalTo(37)
-//            }
-//        }
-//    }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -83,7 +53,7 @@ class YHAgreementAlertView: UIView {
             label.textColor = UIColor.mainTextColor
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.numberOfLines = 0
-            label.text = "欢迎使用超级APP"
+            label.text = "欢迎使用智汇银河App"
             return label
         }()
         
@@ -113,7 +83,7 @@ class YHAgreementAlertView: UIView {
             label.textColor = UIColor.mainTextColor
             label.font = UIFont.PFSC_R(ofSize: 16)
             label.numberOfLines = 0
-            label.text = "感谢您信任并使用超级APP，我们将通过《超级APP隐私协议》和《超级APP用户条款》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采取的个人信息类型和用途的对应关系。此外，您还能了解到您所享受的相关权利以及实现途径。认真阅读之后，如您同意，请点击下方的按钮开始接受我们的服务。"
+            label.text = "感谢您信任并使用智汇银河App，我们将通过《智汇银河App隐私协议》和《智汇银河App用户条款》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采取的个人信息类型和用途的对应关系。此外，您还能了解到您所享受的相关权利以及实现途径。认真阅读之后，如您同意，请点击下方的按钮开始接受我们的服务。"
             return label
         }()
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -68,12 +68,10 @@ class YHServiceCenterMainViewController: YHBaseViewController {
             self.navigationController?.pushViewController(vc)
         }
         noDataView.clickBackBtnClickBlock = {[weak self] in
-            guard let self = self else { return }
-            if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
-                vc.selectedIndex = 0
-            }
+            guard self != nil else { return }
+            goTabBarBy(tabType: .home)
         }
-        noDataView.clickShowBtnClickBlock = {[weak self] in
+        noDataView.clickShowBtnClickBlock = {
             YHServiceOrderAlertView.show()
         }
     }

galaxy/galaxy/Res/Assets.xcassets/StartPage/start_page_bkg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@2x.png",
+      "filename" : "启动页@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@3x.png",
+      "filename" : "启动页@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }