Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…

…t into parentassistant * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant: 手动隐藏空白页

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant: 手动隐藏空白页
葛建军
2 parents b1214481 86839389
Showing 3 changed files with 13 additions and 5 deletions Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -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(){
@@ -900,6 +900,7 @@
                     </view>
                     <navigationItem key="navigationItem" id="dVv-mJ-714"/>
                     <connections>
+                        <outlet property="EmptyView" destination="A43-XP-A41" id="Lox-11-PF1"/>
                         <outlet property="calendarView" destination="hwJ-Xg-tKm" id="ukq-Ul-bvj"/>
                         <outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/>
                         <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
...	...	@@ -13,14 +13,21 @@ class ReportViewController: UIViewController {
13	13	@IBOutlet weak var reportTable: UITableView!
14	14	@IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度
15	15	@IBOutlet var calendarView: UIView!
	16	+ @IBOutlet weak var EmptyView: UIView!
16	17	var dateView:LXCalendarView!
17	18	var dateAry:(weeks:[String],days:[String]) = ([],[])
18	19	override func viewDidLoad() {
19	20	super.viewDidLoad()
20		- //设置顶部按钮
21		- setupNavigationBar()
22		- //设置日期页面
23		-// setupDateView()
	21	+
	22	+ //MARK: - 空白页面
	23	+ self.EmptyView.isHidden = true
	24	+
	25	+ if !self.EmptyView.isHidden {
	26	+ //设置顶部按钮
	27	+ setupNavigationBar()
	28	+ //设置日期页面
	29	+ setupDateView()
	30	+ }
24	31	}
25	32	// MARK: - 设置顶部按钮
26	33	func setupNavigationBar(){
...	...	@@ -29,7 +36,7 @@ class ReportViewController: UIViewController {
29	36	self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
30	37	self.configTheme()
31	38	self.navigationItem.title = "报告"
32		-// setuptitleView()
	39	+ setuptitleView()
33	40
34	41	}
35	42	func setuptitleView(){
...	...
...	...	@@ -900,6 +900,7 @@
900	900	</view>
901	901	<navigationItem key="navigationItem" id="dVv-mJ-714"/>
902	902	<connections>
	903	+ <outlet property="EmptyView" destination="A43-XP-A41" id="Lox-11-PF1"/>
903	904	<outlet property="calendarView" destination="hwJ-Xg-tKm" id="ukq-Ul-bvj"/>
904	905	<outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/>
905	906	<outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
...	...