diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index d17cfa7..6e3690e 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 b40add3..0d923fd 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift @@ -12,21 +12,28 @@ class ReportViewController: UIViewController { var titleView:ReportHeaderView!//navigationBar自定义view @IBOutlet weak var reportTable: UITableView! @IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度 - @IBOutlet var calendarView: UIView! - @IBOutlet weak var EmptyView: UIView! +// @IBOutlet var calendarView: UIView! + var EmptyView: UIView! var dateView:LXCalendarView! var dateAry:(weeks:[String],days:[String]) = ([],[]) override func viewDidLoad() { super.viewDidLoad() //MARK: - 空白页面 + EmptyView = UIView.init(frame: self.view.bounds) + EmptyView.backgroundColor = UIColor.white self.EmptyView.isHidden = true + let imageV = UIImageView.init(frame: CGRect.init(x: 0, y: 80, width: screenWidth, height: screenWidth)) + imageV.image = UIImage.init(named: "report_none_icon") + imageV.contentMode = UIViewContentMode.scaleAspectFit + EmptyView.addSubview(imageV) + self.view.addSubview(EmptyView) - if !self.EmptyView.isHidden { + if self.EmptyView.isHidden { //设置顶部按钮 setupNavigationBar() //设置日期页面 - setupDateView() +// setupDateView() } } // MARK: - 设置顶部按钮 @@ -59,29 +66,29 @@ class ReportViewController: UIViewController { } // 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) - - } +// 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) +// +// } } // MARK: - 页面将要显示时替换navigation的titleView override func viewWillAppear(_ animated: Bool) { @@ -89,7 +96,7 @@ class ReportViewController: UIViewController { } override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) - self.calendarView.isHidden = true +// self.calendarView.isHidden = true } override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() @@ -134,12 +141,12 @@ extension ReportViewController: ReportHeaderViewDelegate{ appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter) return - let isHidden = calendarView.isHidden - if isHidden { - calendarView.isHidden = false - }else{ - calendarView.isHidden = true - } +// let isHidden = calendarView.isHidden +// if isHidden { +// calendarView.isHidden = false +// }else{ +// calendarView.isHidden = true +// } } //点击筛选 func selectTypeButton() { diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/Contents.json new file mode 100644 index 0000000..864c79e --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "reort_loop@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "reort_loop@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@2x.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@2x.png new file mode 100644 index 0000000..f46b6f3 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@2x.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@3x.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@3x.png new file mode 100644 index 0000000..a31bd90 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@3x.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json deleted file mode 100644 index 15ba96b..0000000 --- a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "test001.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png deleted file mode 100644 index a6f3502..0000000 Binary files a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png and /dev/null differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json deleted file mode 100644 index 9a92e31..0000000 --- a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "test002.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png deleted file mode 100644 index 9ac86f5..0000000 Binary files a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png and /dev/null differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json deleted file mode 100644 index 0e44a1a..0000000 --- a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "test003.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png deleted file mode 100644 index 6da415d..0000000 Binary files a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png and /dev/null differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index b5f5e7b..0d30079 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -267,7 +267,6 @@ - @@ -320,7 +319,6 @@ - @@ -374,7 +372,6 @@ -