From 868393892adf6d3dbe448c8f5991e8e00c23b1c2 Mon Sep 17 00:00:00 2001 From: Cao yang Date: Sat, 24 Mar 2018 15:55:30 +0800 Subject: [PATCH] 手动隐藏空白页 --- ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 83540 -> 0 bytes ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift | 17 ++++++++++++----- ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard | 7 ++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index d5acb37..973f380 100644 Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift index e70570a..b40add3 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift @@ -13,14 +13,21 @@ class ReportViewController: UIViewController { @IBOutlet weak var reportTable: UITableView! @IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度 @IBOutlet var calendarView: UIView! + @IBOutlet weak var EmptyView: UIView! var dateView:LXCalendarView! var dateAry:(weeks:[String],days:[String]) = ([],[]) override func viewDidLoad() { super.viewDidLoad() - //设置顶部按钮 - setupNavigationBar() - //设置日期页面 -// setupDateView() + + //MARK: - 空白页面 + self.EmptyView.isHidden = true + + if !self.EmptyView.isHidden { + //设置顶部按钮 + setupNavigationBar() + //设置日期页面 + setupDateView() + } } // MARK: - 设置顶部按钮 func setupNavigationBar(){ @@ -29,7 +36,7 @@ class ReportViewController: UIViewController { self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default) self.configTheme() self.navigationItem.title = "报告" -// setuptitleView() + setuptitleView() } func setuptitleView(){ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index 9683b9d..ff7df1f 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -886,6 +886,7 @@ + @@ -2162,11 +2163,7 @@ - - - - - + -- libgit2 0.21.0