Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

galaxy/galaxy/AppDelegate.swift

@@ -136,12 +136,54 @@ extension AppDelegate {
         YHNetworkStatusManager.shared.listenNetWorkStatus()
     }
     
-    //1.设置主窗口
+    //1.设置闪主窗口
     private func setupRootVC() {
-        let nav = YHNavigationController(rootVC:YHStartPageViewController())
+        
+        let dateString = Date().dateString(ofStyle: .short)
+        let oldString = UserDefaults.standard.value(forKey: "todayShowStartPageViewFlag")
+        
+        if  let tempStr =  oldString as? String, tempStr == dateString {
+            setupRootVCWithTabBar()
+        } else {
+            let nav = YHNavigationController(rootVC:YHStartPageViewController())
+            window = UIWindow(frame: UIScreen.main.bounds)
+            window?.rootViewController = nav
+            window?.makeKeyAndVisible()
+        }
+        
+    }
+    
+    //1.设置HomePageView为主窗口
+    func setupRootVCWithTabBar() {
+//        gk_navigationBar.isHidden = false
+        let tabBarController = YHTabBarViewController()
+        let homeVC = YHHomePageViewController()
+        tabBarController.delegate = homeVC
+        let v0 = YHNavigationController(rootVC:homeVC)
+        let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
+        let v2 = YHNavigationController(rootVC:YHMessageListVC())
+        let v3 = YHNavigationController(rootVC:YHMyViewController())
+        
+        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
+        
+        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        
+        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        
+        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        
+        tabBarController.viewControllers = [v0,v1,v2,v3]
+        tabBarController.tabBar.backgroundColor = .white
+        
         window = UIWindow(frame: UIScreen.main.bounds)
-        window?.rootViewController = nav
+        window?.rootViewController = tabBarController
         window?.makeKeyAndVisible()
+        
+        if YHLoginManager.shared.needJumpToMsgTabFlag {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
+                goTabBarBy(tabType: .message)
+            })
+        }
     }
     
     
@@ -172,5 +214,3 @@ extension AppDelegate {
         }
     }
 }
-
-

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

@@ -42,6 +42,14 @@ class YHStartPageViewController: UIViewController {
         view.isHidden = true
         return view
     }()
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        let dateString = Date().dateString(ofStyle: .short)
+        UserDefaults.standard.set(dateString, forKey: "todayShowStartPageViewFlag")
+        UserDefaults.standard.synchronize()
+    }
 }