diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 6653502..09fd918 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -43,6 +43,15 @@ ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; }; ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3992064C44900A47D2C /* LineChartView.swift */; }; ADC9AB72207C55CE00348EF1 /* GrowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC9AB71207C55CE00348EF1 /* GrowViewController.swift */; }; + ADC9AB74207C64B300348EF1 /* MoralTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB73207C64B300348EF1 /* MoralTableViewCell.xib */; }; + ADC9AB77207C65FC00348EF1 /* GrowSubjectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */; }; + ADC9AB78207C65FC00348EF1 /* GrowSubjectCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */; }; + ADC9AB7A207C66A300348EF1 /* MoralDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB79207C66A300348EF1 /* MoralDetailCell.xib */; }; + ADC9AB7C207C66C300348EF1 /* EducationDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB7B207C66C300348EF1 /* EducationDetailCell.xib */; }; + ADC9AB7E207C66DA00348EF1 /* BehaviorDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB7D207C66DA00348EF1 /* BehaviorDetailCell.xib */; }; + ADC9AB80207C672800348EF1 /* SceneTopCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB7F207C672800348EF1 /* SceneTopCell.xib */; }; + ADC9AB82207C673300348EF1 /* SceneMiddleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB81207C673300348EF1 /* SceneMiddleCell.xib */; }; + ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */; }; 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 */; }; @@ -60,7 +69,6 @@ BF388482205F5BC800A240EF /* MessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388481205F5BC800A240EF /* MessageManager.swift */; }; BF3B8298204FC80D002078EA /* UMCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF3B8297204FC80D002078EA /* UMCommon.framework */; }; BF3B82A02050CC8B002078EA /* ReportHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */; }; - BF3B82A42050DA75002078EA /* ReportHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF3B82A32050DA75002078EA /* ReportHeaderView.xib */; }; BF406CD62057B03A000A6681 /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF406CD52057B03A000A6681 /* MessageViewController.swift */; }; BF406CD82057B529000A6681 /* MessageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF406CD72057B529000A6681 /* MessageTableViewCell.swift */; }; BF406CDA2057BEB8000A6681 /* OrderDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF406CD92057BEB8000A6681 /* OrderDetailModel.swift */; }; @@ -111,7 +119,6 @@ BFCED888205280B700055373 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED887205280B700055373 /* MyViewController.swift */; }; BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED88A20528DE700055373 /* MyViewControllerModel.swift */; }; BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAA6205118370072FAAF /* TabBarController.swift */; }; - BFEAAAA9205248AC0072FAAF /* TaskPresentationTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAA8205248AC0072FAAF /* TaskPresentationTableViewCell.swift */; }; BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */; }; BFEAAAC1205257460072FAAF /* LXCalendarDayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */; }; BFEAAAC2205257460072FAAF /* LXCalendarHearder.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAB1205257460072FAAF /* LXCalendarHearder.m */; }; @@ -190,6 +197,15 @@ ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = ""; }; ADAEA3992064C44900A47D2C /* LineChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineChartView.swift; sourceTree = ""; }; ADC9AB71207C55CE00348EF1 /* GrowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowViewController.swift; sourceTree = ""; }; + ADC9AB73207C64B300348EF1 /* MoralTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoralTableViewCell.xib; sourceTree = ""; }; + ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowSubjectCell.swift; sourceTree = ""; }; + ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GrowSubjectCell.xib; sourceTree = ""; }; + ADC9AB79207C66A300348EF1 /* MoralDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoralDetailCell.xib; sourceTree = ""; }; + ADC9AB7B207C66C300348EF1 /* EducationDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EducationDetailCell.xib; sourceTree = ""; }; + ADC9AB7D207C66DA00348EF1 /* BehaviorDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BehaviorDetailCell.xib; sourceTree = ""; }; + ADC9AB7F207C672800348EF1 /* SceneTopCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SceneTopCell.xib; sourceTree = ""; }; + ADC9AB81207C673300348EF1 /* SceneMiddleCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SceneMiddleCell.xib; sourceTree = ""; }; + ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SceneDownCell.xib; sourceTree = ""; }; ADE33B302062202300BEA6E6 /* Macro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Macro.swift; sourceTree = ""; }; ADF159602069E00000A9485D /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = ""; }; BF388468205A4DE900A240EF /* StudentClassInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentClassInfo.swift; sourceTree = ""; }; @@ -207,7 +223,6 @@ BF388481205F5BC800A240EF /* MessageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageManager.swift; sourceTree = ""; }; BF3B8297204FC80D002078EA /* UMCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UMCommon.framework; path = Pods/UMCCommon/UMCommon.framework; sourceTree = ""; }; BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportHeaderView.swift; sourceTree = ""; }; - BF3B82A32050DA75002078EA /* ReportHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReportHeaderView.xib; sourceTree = ""; }; BF406CD52057B03A000A6681 /* MessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = ""; }; BF406CD72057B529000A6681 /* MessageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageTableViewCell.swift; sourceTree = ""; }; BF406CD92057BEB8000A6681 /* OrderDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDetailModel.swift; sourceTree = ""; }; @@ -264,7 +279,6 @@ BFCED887205280B700055373 /* MyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = ""; }; BFCED88A20528DE700055373 /* MyViewControllerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewControllerModel.swift; sourceTree = ""; }; BFEAAAA6205118370072FAAF /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = ""; }; - BFEAAAA8205248AC0072FAAF /* TaskPresentationTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskPresentationTableViewCell.swift; sourceTree = ""; }; BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportDateCollectionViewCell.swift; sourceTree = ""; }; BFEAAAAE205257460072FAAF /* LXCalendarDayModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarDayModel.h; sourceTree = ""; }; BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCalendarDayModel.m; sourceTree = ""; }; @@ -528,16 +542,23 @@ children = ( BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */, ADF159602069E00000A9485D /* CalendarView.swift */, - BF3B82A32050DA75002078EA /* ReportHeaderView.xib */, - BFEAAAA8205248AC0072FAAF /* TaskPresentationTableViewCell.swift */, BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */, + ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */, + ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */, AD65FB77206354220052415B /* MoralTableViewCell.swift */, + ADC9AB73207C64B300348EF1 /* MoralTableViewCell.xib */, AD34D1192064C79D00989F8D /* MoralDetailCell.swift */, + ADC9AB79207C66A300348EF1 /* MoralDetailCell.xib */, AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */, + ADC9AB7B207C66C300348EF1 /* EducationDetailCell.xib */, AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */, + ADC9AB7D207C66DA00348EF1 /* BehaviorDetailCell.xib */, AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */, + ADC9AB7F207C672800348EF1 /* SceneTopCell.xib */, AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */, + ADC9AB81207C673300348EF1 /* SceneMiddleCell.xib */, AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, + ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */, ADAEA3992064C44900A47D2C /* LineChartView.swift */, ); path = View; @@ -840,24 +861,31 @@ files = ( BF67F3BF20590A2F002FDC61 /* Info-watchOS.plist in Resources */, 599364EB204E62E700C8B371 /* Information.storyboard in Resources */, - BF3B82A42050DA75002078EA /* ReportHeaderView.xib in Resources */, BF7A4C87204E338500460463 /* Info.plist in Resources */, 599364FC204E742000C8B371 /* ChannelSelectViewCollectionViewCell.xib in Resources */, + ADC9AB78207C65FC00348EF1 /* GrowSubjectCell.xib in Resources */, + ADC9AB80207C672800348EF1 /* SceneTopCell.xib in Resources */, 599365252050D03900C8B371 /* Evaluation.storyboard in Resources */, 5980BF672061048A00F4A35E /* Address.plist in Resources */, BF38847C205CDE1B00A240EF /* JS.storyboard in Resources */, + ADC9AB7C207C66C300348EF1 /* EducationDetailCell.xib in Resources */, BFF9B7F42057A29D00F39B3E /* TableEmptyView.xib in Resources */, + ADC9AB7E207C66DA00348EF1 /* BehaviorDetailCell.xib in Resources */, + ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */, BFEAAAC8205257460072FAAF /* LXCalenderCell.xib in Resources */, 599364F8204E648C00C8B371 /* ChannelCollectionViewCell.xib in Resources */, BFEAAAC3205257460072FAAF /* LXCalendarHearder.xib in Resources */, 59936501204E946300C8B371 /* UserCenter.storyboard in Resources */, BF67F3BE20590A2F002FDC61 /* Info-tvOS.plist in Resources */, + ADC9AB74207C64B300348EF1 /* MoralTableViewCell.xib in Resources */, BF7A4C86204E338500460463 /* Main.storyboard in Resources */, + ADC9AB7A207C66A300348EF1 /* MoralDetailCell.xib in Resources */, BF67F3BD20590A2F002FDC61 /* Info-OSX.plist in Resources */, BF621CAC205660E90040D2C1 /* My.storyboard in Resources */, BF67F3BC20590A2F002FDC61 /* Info-iOS.plist in Resources */, BF7A4C84204E338500460463 /* Assets.xcassets in Resources */, BF7A4C85204E338500460463 /* LaunchScreen.storyboard in Resources */, + ADC9AB82207C673300348EF1 /* SceneMiddleCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -956,7 +984,6 @@ BF406CD62057B03A000A6681 /* MessageViewController.swift in Sources */, 599364F7204E648C00C8B371 /* ChannelCollectionViewCell.swift in Sources */, BF7A4C36204CD55300460463 /* ViewController.swift in Sources */, - BFEAAAA9205248AC0072FAAF /* TaskPresentationTableViewCell.swift in Sources */, AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */, 5980BF6A2061048A00F4A35E /* LZPickerModel.m in Sources */, BFBC06D22064FDDE00CCFAFF /* LaunchIntroductionView.m in Sources */, @@ -1020,6 +1047,7 @@ BFF9B7F62057A4C900F39B3E /* ChildrenDetailViewController.swift in Sources */, 599364FF204E945600C8B371 /* BindingViewController.swift in Sources */, 590944E020579CFA004478B5 /* InvitationCodeVerificationViewController.swift in Sources */, + ADC9AB77207C65FC00348EF1 /* GrowSubjectCell.swift in Sources */, BFEAAAC5205257460072FAAF /* LXCalendarView.m in Sources */, BFEAAADA20525D620072FAAF /* UIView+LX_Frame.m in Sources */, BF406CDA2057BEB8000A6681 /* OrderDetailModel.swift in Sources */, diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index e085fbc..2d4f6fa 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/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift index fb1788b..f5be527 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift @@ -107,7 +107,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { //添加子控制器 for _ in 0.. Int { return 5 } @@ -87,7 +90,7 @@ extension ReportViewController: UITableViewDelegate,UITableViewDataSource{ let cell = tableView.dequeueReusableCell(withIdentifier: "MoralTableViewCell", for: indexPath) as! MoralTableViewCell return cell }else{ - let cell = tableView.dequeueReusableCell(withIdentifier: "TaskPresentationTableViewCell", for: indexPath) as! TaskPresentationTableViewCell + let cell = tableView.dequeueReusableCell(withIdentifier: "GrowSubjectCell", for: indexPath) as! GrowSubjectCell return cell } } @@ -95,4 +98,7 @@ extension ReportViewController: UITableViewDelegate,UITableViewDataSource{ return 280 } + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + + } } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib new file mode 100644 index 0000000..023ef9b --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib new file mode 100644 index 0000000..0929670 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift new file mode 100644 index 0000000..e2f512a --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift @@ -0,0 +1,24 @@ +// +// GrowSubjectCell.swift +// ParentAssistant +// +// Created by Cao yang on 2018/4/10. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class GrowSubjectCell: UITableViewCell { + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib new file mode 100644 index 0000000..eb070e2 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib new file mode 100644 index 0000000..d55dc83 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib new file mode 100644 index 0000000..9e7a9df --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.xib deleted file mode 100644 index 12143ee..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportHeaderView.xib +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib new file mode 100644 index 0000000..4c35d88 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib new file mode 100644 index 0000000..52a29d5 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib new file mode 100644 index 0000000..c2e5dcc --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/TaskPresentationTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/TaskPresentationTableViewCell.swift deleted file mode 100644 index 285f220..0000000 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/TaskPresentationTableViewCell.swift +++ /dev/null @@ -1,82 +0,0 @@ -// -// TaskPresentationTableViewCell.swift -// ParentAssistant -// -// Created by 葛建军 on 2018/3/9. -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. -// - -import UIKit -//func degreesToRadians(x:Double) -> CGFloat{ -// return (CGFloat(Double.pi*(x)/180.0)) -//} //把角度转换成PI的方式 -//let PROGREESS_WIDTH = 160 //圆直径 -//let PROGRESS_LINE_WIDTH = 4 //弧线的宽度 -class TaskPresentationTableViewCell: UITableViewCell { - - @IBOutlet var layerLabel: UILabel! - override func awakeFromNib() { - super.awakeFromNib() - // Initialization code - //可以画出上面所示的整个轨道。这个圆形是从-210度的角度到30度。 -// let path = UIBezierPath(arcCenter: CGPoint(x: 40, y: 40), radius: CGFloat((PROGREESS_WIDTH-PROGRESS_LINE_WIDTH)/2), startAngle: degreesToRadians(x: -210), endAngle: degreesToRadians(x: 30), clockwise: true) - //画出一个完成的进度的背景轨道 -// let trackLayer = CAShapeLayer()//创建一个track shape layer -// trackLayer.frame = self.layerLabel.bounds -// trackLayer.fillColor = UIColor.clear.cgColor -// trackLayer.strokeColor = UIColor.red.cgColor//指定path的渲染颜色 -// trackLayer.opacity = 0.25 //背景同学你就甘心做背景吧,不要太明显了,透明度小一点 -// trackLayer.lineCap = kCALineCapRound//指定线的边缘是圆的 -// trackLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH)//线的宽度 -// trackLayer.path = path.cgPath //把path传递給layer,然后layer会处理相应的渲染,整个逻辑和CoreGraph是一致的。 -// -// self.layerLabel.layer.addSublayer(trackLayer) - //渐变进度条 -// let progressLayer = CAShapeLayer() -// progressLayer.frame = self.layerLabel.bounds -// progressLayer.fillColor = UIColor.clear.cgColor -// progressLayer.strokeColor = UIColor.red.cgColor -// progressLayer.lineCap = kCALineCapRound; -// progressLayer.lineWidth = CGFloat(PROGRESS_LINE_WIDTH) -// progressLayer.path = path.cgPath -// progressLayer.strokeEnd = 50/100.0 //总进度 -// -// let gradientLayer = CALayer() -// let gradientLayer1 = CAGradientLayer() -// gradientLayer1.frame = CGRect(x: 0, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height) -// gradientLayer1.colors = [UIColor.yellow.cgColor,UIColor.blue.cgColor] -// gradientLayer1.locations = [0.5,0.9,1] -// gradientLayer1.startPoint = CGPoint(x: 0.5, y: 1) -// gradientLayer1.endPoint = CGPoint(x: 0.5, y: 0) -// gradientLayer.addSublayer(gradientLayer1) -// -// let gradientLayer2 = CAGradientLayer() -// gradientLayer2.frame = CGRect(x: self.layerLabel.frame.size.width/2, y: 0, width: self.layerLabel.frame.size.width/2, height: self.layerLabel.frame.size.height) -// gradientLayer2.colors = [UIColor.blue.cgColor,UIColor.blue.cgColor] -// gradientLayer2.locations = [0.1,0.5,1] -// gradientLayer2.startPoint = CGPoint(x: 0.5, y: 0) -// gradientLayer2.endPoint = CGPoint(x: 0.5, y: 1) -// gradientLayer.addSublayer(gradientLayer2) -// -// gradientLayer.mask = progressLayer//用progressLayer来截取渐变层 -// self.layerLabel.layer.addSublayer(gradientLayer) - } - //进度条效果 CAShapeLayer有一个strokeEnd的属性,这个属性是从0到1的浮点类型,正好可以用表达百分比,而且这个属性是animatable,可以动态的表示进度的变化。 - // -(void)setPercent:(NSInteger)percent animated:(BOOL)animated - // { - // [CATransaction begin]; - // [CATransaction setDisableActions:!animated]; - // [CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]]; - // [CATransaction setAnimationDuration:MAIN_SCREEN_ANIMATION_TIME]; - // progressLayer.strokeEnd = percent/100.0; - // [CATransaction commit]; - // - // _percent = percent; - // } - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - - // Configure the view for the selected state - } - -} diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index 692b997..e4567a7 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -6,7 +6,6 @@ - @@ -545,923 +544,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2058,7 +1140,6 @@ - @@ -2066,9 +1147,7 @@ - - -- libgit2 0.21.0