添加日历控件

Cao yang
1 parent 913c6d04
Showing 5 changed files with 195 additions and 175 deletions Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/report/View/CalendarView.swift
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -43,6 +43,7 @@
 		ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; };
 		ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3992064C44900A47D2C /* LineChartView.swift */; };
 		ADE33B312062202300BEA6E6 /* Macro.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE33B302062202300BEA6E6 /* Macro.swift */; };
+		ADF159612069E00000A9485D /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADF159602069E00000A9485D /* CalendarView.swift */; };
 		BF388469205A4DE900A240EF /* StudentClassInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388468205A4DE900A240EF /* StudentClassInfo.swift */; };
 		BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF38846B205A58F800A240EF /* YXMessageManager.swift */; };
 		BF38846E205A5A0000A240EF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF38846D205A59FE00A240EF /* MobileCoreServices.framework */; };
@@ -188,6 +189,7 @@
 		ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = "<group>"; };
 		ADAEA3992064C44900A47D2C /* LineChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChartView.swift; sourceTree = "<group>"; };
 		ADE33B302062202300BEA6E6 /* Macro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Macro.swift; sourceTree = "<group>"; };
+		ADF159602069E00000A9485D /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
 		BF388468205A4DE900A240EF /* StudentClassInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentClassInfo.swift; sourceTree = "<group>"; };
 		BF38846B205A58F800A240EF /* YXMessageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YXMessageManager.swift; sourceTree = "<group>"; };
 		BF38846D205A59FE00A240EF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
@@ -514,6 +516,7 @@
 			isa = PBXGroup;
 			children = (
 				BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */,
+				ADF159602069E00000A9485D /* CalendarView.swift */,
 				BF3B82A32050DA75002078EA /* ReportHeaderView.xib */,
 				BFEAAAA8205248AC0072FAAF /* TaskPresentationTableViewCell.swift */,
 				BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */,
@@ -979,6 +982,7 @@
 				BFEAAAC4205257460072FAAF /* LXCalendarMonthModel.m in Sources */,
 				BF38847E205CDE2D00A240EF /* JSViewController.swift in Sources */,
 				ADE33B312062202300BEA6E6 /* Macro.swift in Sources */,
+				ADF159612069E00000A9485D /* CalendarView.swift in Sources */,
 				BF406CD82057B529000A6681 /* MessageTableViewCell.swift in Sources */,
 				599364EC204E62E700C8B371 /* EvaluationViewController.swift in Sources */,
 				599364F0204E62E700C8B371 /* ReportViewController.swift in Sources */,
@@ -11,11 +11,17 @@ import UIKit
 class ReportViewController: UIViewController {
     var titleView:ReportHeaderView!//navigationBar自定义view
     @IBOutlet weak var reportTable: UITableView!
-    @IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度
-//    @IBOutlet var calendarView: UIView!
+    //空白页
     var EmptyView: UIView!
-    var dateView:LXCalendarView!
-    var dateAry:(weeks:[String],days:[String]) = ([],[])
+    
+    //膜板
+    var keyWindow = UIWindow()
+    var backBotton = UIButton()
+    //日历
+    var calendar = CalendarView()
+
+//    var dateAry:(weeks:[String],days:[String]) = ([],[])
+    
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -33,7 +39,7 @@ class ReportViewController: UIViewController {
             //设置顶部按钮
             setupNavigationBar()
             //设置日期页面
-//            setupDateView()
+            setupDateView()
         }
     }
     // MARK: - 设置顶部按钮
@@ -42,61 +48,72 @@ class ReportViewController: UIViewController {
         let backImage = UIImage(named: "navigationBar_backgrounImage")
         self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
         self.configTheme()
-        self.navigationItem.title = "报告"
+//        self.navigationItem.title = "报告"
         setuptitleView()
     }
     func setuptitleView(){
-        // MARK: - 设置顶部的titleView
-        titleView = Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)![0] as! ReportHeaderView
-        titleView.delegate = self
-        titleView.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 44)
-        self.navigationItem.titleView = titleView
-        titleView.layoutSubviews()
-        //navigation左上角显示名称 家长未绑定孩子
-        if AccountManager.shared.isOnline() {
-            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
-                titleView.nameButton.setTitle("未绑定", for: UIControlState.normal)
-            }else{
-                titleView.nameButton.setTitle(AccountManager.shared.rawUserInfo!.contentData()["studentClass"][0]["studentName"].stringValue, for: UIControlState.normal)
-            }
-        }else{
-            titleView.nameButton.setTitle("未登录", for: UIControlState.normal)
-        }
+        
+        
+//        // MARK: - 设置顶部的titleView
+//        titleView = Bundle.main.loadNibNamed("ReportHeaderView", owner: nil, options: nil)![0] as! ReportHeaderView
+////        titleView.delegate = self
+//        titleView.frame = CGRect(x: 0, y: 0, width: screenWidth, height: 44)
+//        self.navigationItem.titleView = titleView
+//        titleView.layoutSubviews()
+//        //navigation左上角显示名称 家长未绑定孩子
+//        if AccountManager.shared.isOnline() {
+//            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
+//                titleView.nameButton.setTitle("未绑定", for: UIControlState.normal)
+//            }else{
+//                titleView.nameButton.setTitle(AccountManager.shared.rawUserInfo!.contentData()["studentClass"][0]["studentName"].stringValue, for: UIControlState.normal)
+//            }
+//        }else{
+//            titleView.nameButton.setTitle("未登录", for: UIControlState.normal)
+//        }
     }
     // MARK: - 设置日期页面
     func setupDateView(){
-//        titleView.dateButton.setTitle("\(getCurrentDate())", for: UIControlState.normal)
-//        dateViewHeight.constant = getScreenWidth()/7
-//        //添加顶部固定一周日期
-//        dateAry = getCurrentWeeks()
-//        //添加日历
-//        dateView = LXCalendarView(frame: CGRect(x: 0, y: 0, width: screenWidth, height: screenWidth/2))
-//        dateView.isHaveAnimation = true
-//        dateView.isCanScroll = true
-//        dateView.isShowLastAndNextBtn = false
-//        dateView.isShowLastAndNextDate = true
-//
-//        dateView.todayTitleColor = UIColor.red
-//        dateView.selectBackColor = UIColorFromRGB(0xC5DAFF)
-//        dateView.dealData()
-//        dateView.backgroundColor = UIColor.white
-//        calendarView.addSubview(dateView)
-//        dateView.selectBlock = { (year:NSInteger,month:NSInteger,day:NSInteger) -> () in
-//            self.calendarView.isHidden = true
-//            self.titleView.dateButton.setTitle("\(month)月\(day)日", for: UIControlState.normal)
-//            //选择日期后应隐藏日历并刷新界面
-//            appDelegate.window!.makeToast("\(year)年\(month)月\(day)日", duration: 2, position: CSToastPositionCenter)
-//
-//        }
+        
+        let headView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: 60))
+        self.view.addSubview(headView)
+        
+        //添加手势
+        let recognizer = UISwipeGestureRecognizer.init(target: self, action: #selector(showView))
+        recognizer.direction = UISwipeGestureRecognizerDirection.down
+        headView.addGestureRecognizer(recognizer)
+        
+        calendar = CalendarView.init(frame: CGRect.init(x: 0, y: 30, width: screenWidth, height: 260))
+    }
+    
+    @objc func showView(){
+        keyWindow = UIApplication.shared.keyWindow!
+        let backBtn = UIButton.init(frame: CGRect.init(x: 0, y: calendar.frame.origin.y+260+22, width: screenWidth, height: screenHeight))
+        backBtn.backgroundColor = UIColor.black
+        backBtn.alpha = 0.4
+        
+        backBtn.addTarget(self, action: #selector(closeView(btn:)), for: UIControlEvents.allEvents)
+        reportTable.isUserInteractionEnabled = false
+        
+        keyWindow.addSubview(backBtn)
+        keyWindow.addSubview(calendar)
+        calendar.isHidden = false
+    }
+    @objc func closeView(btn:UIButton) {
+        
+        reportTable.isUserInteractionEnabled = true
+        UIView.animate(withDuration: 0.3) {
+            btn.removeFromSuperview()
+            self.calendar.isHidden = true
+        }
     }
+    
     // MARK: - 页面将要显示时替换navigation的titleView
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
     }
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-//        self.calendarView.isHidden = true
     }
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
@@ -111,66 +128,59 @@ class ReportViewController: UIViewController {
 }
 // MARK: - 点击顶部titleView按钮的代理方法
-extension ReportViewController: ReportHeaderViewDelegate{
-    //点击孩子姓名
-    func selectStudentButton() {
-        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-        return
-        //如果家长未绑定孩子
-        if AccountManager.shared.isOnline() {
-            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
-                appDelegate.window!.makeToast("请先绑定孩子", duration: 1, position: CSToastPositionCenter)
-            }else{
-                //切换孩子
-                let alert = UIAlertController(title: "切换孩子", message: "", preferredStyle: UIAlertControllerStyle.actionSheet)
-                for item in AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue {
-                    let action = UIAlertAction(title: item["studentName"].stringValue, style: UIAlertActionStyle.default, handler: { (action) in
-                        //选择完孩子切换数据
-                    })
-                    alert.addAction(action)
-                }
-                self.present(alert, animated: true, completion: nil)
-            }
-        }else{
-            appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
-        }
-    }
-    //点击日期
-    func selectDateButton() {
-        
-        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-        return
-        
-//        let isHidden = calendarView.isHidden
-//        if isHidden {
-//            calendarView.isHidden = false
+//extension ReportViewController: ReportHeaderViewDelegate{
+//    //点击孩子姓名
+//    func selectStudentButton() {
+//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
+//        return
+//        //如果家长未绑定孩子
+//        if AccountManager.shared.isOnline() {
+//            if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
+//                appDelegate.window!.makeToast("请先绑定孩子", duration: 1, position: CSToastPositionCenter)
+//            }else{
+//                //切换孩子
+//                let alert = UIAlertController(title: "切换孩子", message: "", preferredStyle: UIAlertControllerStyle.actionSheet)
+//                for item in AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue {
+//                    let action = UIAlertAction(title: item["studentName"].stringValue, style: UIAlertActionStyle.default, handler: { (action) in
+//                        //选择完孩子切换数据
+//                    })
+//                    alert.addAction(action)
+//                }
+//                self.present(alert, animated: true, completion: nil)
+//            }
 //        }else{
-//            calendarView.isHidden = true
+//            appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
 //        }
-    }
-    //点击筛选
-    func selectTypeButton() {
-        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
-        return
-    }
-}
-// MARK: - 顶部展示日期
-extension ReportViewController: UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout {
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width: getScreenWidth()/7, height: getScreenWidth()/7)
-    }
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 0
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ReportDateCollectionViewCell", for: indexPath) as! ReportDateCollectionViewCell
-        cell.setupWithDate(week: dateAry.weeks[indexPath.row], date: dateAry.days[indexPath.row])
-        return cell
-    }
-    
-    
-}
+//    }
+//    //点击日期
+//    func selectDateButton() {
+//
+//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
+//        return
+//    }
+//    //点击筛选
+//    func selectTypeButton() {
+//        appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
+//        return
+//    }
+//}
+//// MARK: - 顶部展示日期
+//extension ReportViewController: UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout {
+//    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+//        return CGSize(width: getScreenWidth()/7, height: getScreenWidth()/7)
+//    }
+//    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+//        return 0
+//    }
+//
+//    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+//        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ReportDateCollectionViewCell", for: indexPath) as! ReportDateCollectionViewCell
+//        cell.setupWithDate(week: dateAry.weeks[indexPath.row], date: dateAry.days[indexPath.row])
+//        return cell
+//    }
+//
+//
+//}
 // MARK: - 作业报告列表
 extension ReportViewController: UITableViewDelegate,UITableViewDataSource{
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -0,0 +1,72 @@
+//
+//  CalendarView.swift
+//  ParentAssistant
+//
+//  Created by Cao yang on 2018/3/27.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+
+class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource {
+
+    
+    var weekLab = ["日","一","二","三","四","五","六"]
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.drawCalendarView(frame: frame)
+    }
+    
+    func drawCalendarView(frame:CGRect) {
+        //TODO: 数据源待完成
+        let dayLab = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"]
+        weekLab.append(contentsOf: dayLab)
+         //设置layout
+        let flowlayout = UICollectionViewFlowLayout()
+        flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40)
+        flowlayout.minimumLineSpacing = 0
+        flowlayout.minimumInteritemSpacing = 0
+        flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0)
+        flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0)
+        flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0)
+        
+        let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout)
+        calendarView.delegate = self
+        calendarView.dataSource = self
+        calendarView.backgroundColor = UIColor.white
+        calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell")
+        self.addSubview(calendarView)
+    }
+    
+    //MARK: - Delegate
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return weekLab.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath)
+        let lab = UILabel.init(frame: cell.bounds)
+        lab.text = weekLab[indexPath.row]
+        lab.textAlignment = .center
+        cell.addSubview(lab)
+        return cell
+        
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        print("点击了 第 \(weekLab[indexPath.row])")
+    }
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
+
+}
@@ -532,70 +532,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k9z-2G-Fhx">
-                                <rect key="frame" x="0.0" y="64" width="375" height="66"/>
-                                <subviews>
-                                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="qrg-1E-cj1">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="74"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="JEd-qR-M0H">
-                                            <size key="itemSize" width="72" height="66"/>
-                                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                        </collectionViewFlowLayout>
-                                        <cells>
-                                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ReportDateCollectionViewCell" id="nWe-hG-7vd" customClass="ReportDateCollectionViewCell" customModule="ParentAssistant" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="72" height="66"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
-                                                    <rect key="frame" x="0.0" y="0.0" width="72" height="66"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FXs-QS-gp4">
-                                                            <rect key="frame" x="0.0" y="0.0" width="72" height="33"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YPT-sg-8nw">
-                                                            <rect key="frame" x="0.0" y="33" width="72" height="33"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                    </subviews>
-                                                </view>
-                                                <constraints>
-                                                    <constraint firstItem="YPT-sg-8nw" firstAttribute="leading" secondItem="nWe-hG-7vd" secondAttribute="leading" id="HkR-pZ-Ipo"/>
-                                                    <constraint firstItem="FXs-QS-gp4" firstAttribute="top" secondItem="nWe-hG-7vd" secondAttribute="top" id="Oac-9M-ihz"/>
-                                                    <constraint firstAttribute="trailing" secondItem="YPT-sg-8nw" secondAttribute="trailing" id="XHq-aJ-fWg"/>
-                                                    <constraint firstItem="YPT-sg-8nw" firstAttribute="top" secondItem="FXs-QS-gp4" secondAttribute="bottom" id="aLc-pS-8gY"/>
-                                                    <constraint firstItem="FXs-QS-gp4" firstAttribute="leading" secondItem="nWe-hG-7vd" secondAttribute="leading" id="ala-Gh-0Nr"/>
-                                                    <constraint firstAttribute="trailing" secondItem="FXs-QS-gp4" secondAttribute="trailing" id="bOL-H5-Mex"/>
-                                                    <constraint firstItem="FXs-QS-gp4" firstAttribute="height" secondItem="nWe-hG-7vd" secondAttribute="height" multiplier="1:2" id="eil-wN-3jX"/>
-                                                    <constraint firstAttribute="bottom" secondItem="YPT-sg-8nw" secondAttribute="bottom" id="pu1-56-EfG"/>
-                                                </constraints>
-                                                <connections>
-                                                    <outlet property="dateLabel" destination="YPT-sg-8nw" id="VMN-zF-vR5"/>
-                                                    <outlet property="weekLabel" destination="FXs-QS-gp4" id="tRg-2N-ioR"/>
-                                                </connections>
-                                            </collectionViewCell>
-                                        </cells>
-                                        <connections>
-                                            <outlet property="dataSource" destination="oqH-t7-mJp" id="YKj-Tw-BhH"/>
-                                            <outlet property="delegate" destination="oqH-t7-mJp" id="f7v-II-ZH5"/>
-                                        </connections>
-                                    </collectionView>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="66" id="38f-Kq-3QN"/>
-                                </constraints>
-                            </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EEs-Ae-t7U">
-                                <rect key="frame" x="0.0" y="135" width="375" height="483"/>
+                                <rect key="frame" x="0.0" y="134" width="375" height="484"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
@@ -821,19 +759,15 @@
                         </subviews>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="JYY-zh-cHV"/>
-                            <constraint firstItem="k9z-2G-Fhx" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="JtI-9e-igF"/>
-                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="MzB-kU-gbs"/>
-                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="NPL-F1-7Sg"/>
-                            <constraint firstItem="k9z-2G-Fhx" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="QZG-IF-A8F"/>
-                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="k9z-2G-Fhx" secondAttribute="bottom" constant="5" id="SBe-2c-H4J"/>
-                            <constraint firstItem="k9z-2G-Fhx" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="UIi-qU-PBc"/>
+                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="FAp-nP-mMp"/>
+                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" constant="70" id="PgN-se-eVb"/>
+                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="WUH-77-LAa"/>
+                            <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="e5Q-L0-iai"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/>
                     </view>
                     <navigationItem key="navigationItem" id="dVv-mJ-714"/>
                     <connections>
-                        <outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/>
                         <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
                     </connections>
                 </viewController>
@@ -0,0 +1,72 @@		@@ -0,0 +1,72 @@
	1	+//
	2	+// CalendarView.swift
	3	+// ParentAssistant
	4	+//
	5	+// Created by Cao yang on 2018/3/27.
	6	+// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
	7	+//
	8	+
	9	+import UIKit
	10	+
	11	+class CalendarView: UIView,UICollectionViewDelegate,UICollectionViewDataSource {
	12	+
	13	+
	14	+ var weekLab = ["日","一","二","三","四","五","六"]
	15	+
	16	+ override init(frame: CGRect) {
	17	+ super.init(frame: frame)
	18	+ self.drawCalendarView(frame: frame)
	19	+ }
	20	+
	21	+ func drawCalendarView(frame:CGRect) {
	22	+ //TODO: 数据源待完成
	23	+ let dayLab = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"]
	24	+ weekLab.append(contentsOf: dayLab)
	25	+ //设置layout
	26	+ let flowlayout = UICollectionViewFlowLayout()
	27	+ flowlayout.itemSize = CGSize.init(width: screenWidth/7, height:40)
	28	+ flowlayout.minimumLineSpacing = 0
	29	+ flowlayout.minimumInteritemSpacing = 0
	30	+ flowlayout.headerReferenceSize = CGSize.init(width: 0, height: 0)
	31	+ flowlayout.footerReferenceSize = CGSize.init(width: 0, height: 0)
	32	+ flowlayout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0)
	33	+
	34	+ let calendarView = UICollectionView.init(frame: frame, collectionViewLayout: flowlayout)
	35	+ calendarView.delegate = self
	36	+ calendarView.dataSource = self
	37	+ calendarView.backgroundColor = UIColor.white
	38	+ calendarView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "calendarCell")
	39	+ self.addSubview(calendarView)
	40	+ }
	41	+
	42	+ //MARK: - Delegate
	43	+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
	44	+ return weekLab.count
	45	+ }
	46	+
	47	+ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
	48	+
	49	+ let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "calendarCell", for: indexPath)
	50	+ let lab = UILabel.init(frame: cell.bounds)
	51	+ lab.text = weekLab[indexPath.row]
	52	+ lab.textAlignment = .center
	53	+ cell.addSubview(lab)
	54	+ return cell
	55	+
	56	+ }
	57	+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
	58	+ print("点击了第 \(weekLab[indexPath.row])")
	59	+ }
	60	+ required init?(coder aDecoder: NSCoder) {
	61	+ fatalError("init(coder:) has not been implemented")
	62	+ }
	63	+
	64	+ /*
	65	+ // Only override draw() if you perform custom drawing.
	66	+ // An empty implementation adversely affects performance during animation.
	67	+ override func draw(_ rect: CGRect) {
	68	+ // Drawing code
	69	+ }
	70	+ */
	71	+
	72	+}
	@@ -532,70 +532,8 @@		@@ -532,70 +532,8 @@
532	<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>	532	<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
533	<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>	533	<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
534	<subviews>	534	<subviews>
535	- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k9z-2G-Fhx">
536	- <rect key="frame" x="0.0" y="64" width="375" height="66"/>
537	- <subviews>
538	- <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="qrg-1E-cj1">
539	- <rect key="frame" x="0.0" y="0.0" width="375" height="74"/>
540	- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
541	- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
542	- <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="JEd-qR-M0H">
543	- <size key="itemSize" width="72" height="66"/>
544	- <size key="headerReferenceSize" width="0.0" height="0.0"/>
545	- <size key="footerReferenceSize" width="0.0" height="0.0"/>
546	- <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
547	- </collectionViewFlowLayout>
548	- <cells>
549	- <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ReportDateCollectionViewCell" id="nWe-hG-7vd" customClass="ReportDateCollectionViewCell" customModule="ParentAssistant" customModuleProvider="target">
550	- <rect key="frame" x="0.0" y="0.0" width="72" height="66"/>
551	- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
552	- <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
553	- <rect key="frame" x="0.0" y="0.0" width="72" height="66"/>
554	- <autoresizingMask key="autoresizingMask"/>
555	- <subviews>
556	- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FXs-QS-gp4">
557	- <rect key="frame" x="0.0" y="0.0" width="72" height="33"/>
558	- <fontDescription key="fontDescription" type="system" pointSize="15"/>
559	- <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
560	- <nil key="highlightedColor"/>
561	- </label>
562	- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YPT-sg-8nw">
563	- <rect key="frame" x="0.0" y="33" width="72" height="33"/>
564	- <fontDescription key="fontDescription" type="system" pointSize="15"/>
565	- <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
566	- <nil key="highlightedColor"/>
567	- </label>
568	- </subviews>
569	- </view>
570	- <constraints>
571	- <constraint firstItem="YPT-sg-8nw" firstAttribute="leading" secondItem="nWe-hG-7vd" secondAttribute="leading" id="HkR-pZ-Ipo"/>
572	- <constraint firstItem="FXs-QS-gp4" firstAttribute="top" secondItem="nWe-hG-7vd" secondAttribute="top" id="Oac-9M-ihz"/>
573	- <constraint firstAttribute="trailing" secondItem="YPT-sg-8nw" secondAttribute="trailing" id="XHq-aJ-fWg"/>
574	- <constraint firstItem="YPT-sg-8nw" firstAttribute="top" secondItem="FXs-QS-gp4" secondAttribute="bottom" id="aLc-pS-8gY"/>
575	- <constraint firstItem="FXs-QS-gp4" firstAttribute="leading" secondItem="nWe-hG-7vd" secondAttribute="leading" id="ala-Gh-0Nr"/>
576	- <constraint firstAttribute="trailing" secondItem="FXs-QS-gp4" secondAttribute="trailing" id="bOL-H5-Mex"/>
577	- <constraint firstItem="FXs-QS-gp4" firstAttribute="height" secondItem="nWe-hG-7vd" secondAttribute="height" multiplier="1:2" id="eil-wN-3jX"/>
578	- <constraint firstAttribute="bottom" secondItem="YPT-sg-8nw" secondAttribute="bottom" id="pu1-56-EfG"/>
579	- </constraints>
580	- <connections>
581	- <outlet property="dateLabel" destination="YPT-sg-8nw" id="VMN-zF-vR5"/>
582	- <outlet property="weekLabel" destination="FXs-QS-gp4" id="tRg-2N-ioR"/>
583	- </connections>
584	- </collectionViewCell>
585	- </cells>
586	- <connections>
587	- <outlet property="dataSource" destination="oqH-t7-mJp" id="YKj-Tw-BhH"/>
588	- <outlet property="delegate" destination="oqH-t7-mJp" id="f7v-II-ZH5"/>
589	- </connections>
590	- </collectionView>
591	- </subviews>
592	- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
593	- <constraints>
594	- <constraint firstAttribute="height" constant="66" id="38f-Kq-3QN"/>
595	- </constraints>
596	- </view>
597	<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EEs-Ae-t7U">	535	<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EEs-Ae-t7U">
598	- <rect key="frame" x="0.0" y="135" width="375" height="483"/>	536	+ <rect key="frame" x="0.0" y="134" width="375" height="484"/>
599	<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>	537	<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
600	<prototypes>	538	<prototypes>
601	<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">	539	<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
	@@ -821,19 +759,15 @@		@@ -821,19 +759,15 @@
821	</subviews>	759	</subviews>
822	<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>	760	<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
823	<constraints>	761	<constraints>
824	- <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="JYY-zh-cHV"/>
825	- <constraint firstItem="k9z-2G-Fhx" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="JtI-9e-igF"/>
826	- <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="MzB-kU-gbs"/>
827	- <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="NPL-F1-7Sg"/>
828	- <constraint firstItem="k9z-2G-Fhx" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="QZG-IF-A8F"/>
829	- <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="k9z-2G-Fhx" secondAttribute="bottom" constant="5" id="SBe-2c-H4J"/>
830	- <constraint firstItem="k9z-2G-Fhx" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="UIi-qU-PBc"/>	762	+ <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="FAp-nP-mMp"/>
		763	+ <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" constant="70" id="PgN-se-eVb"/>
		764	+ <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="WUH-77-LAa"/>
		765	+ <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="e5Q-L0-iai"/>
831	</constraints>	766	</constraints>
832	<viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/>	767	<viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/>
833	</view>	768	</view>
834	<navigationItem key="navigationItem" id="dVv-mJ-714"/>	769	<navigationItem key="navigationItem" id="dVv-mJ-714"/>
835	<connections>	770	<connections>
836	- <outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/>
837	<outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>	771	<outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
838	</connections>	772	</connections>
839	</viewController>	773	</viewController>