IOSGroup / ParentAssistant

Download as
Browse Code »

Commit d572a4289270bc7250a752345611721da36c5e56

Authored by Cao yang
1 parent b51616b7
Exists in parentassistant

统一背景色,优化UI

Showing 31 changed files with 99 additions and 63 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
  Diff comments   View file @d572a42
@@ -132,7 +132,6 @@ @@ -132,7 +132,6 @@
132 BFCED888205280B700055373 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED887205280B700055373 /* MyViewController.swift */; }; 132 BFCED888205280B700055373 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED887205280B700055373 /* MyViewController.swift */; };
133 BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED88A20528DE700055373 /* MyViewControllerModel.swift */; }; 133 BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED88A20528DE700055373 /* MyViewControllerModel.swift */; };
134 BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAA6205118370072FAAF /* TabBarController.swift */; }; 134 BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAA6205118370072FAAF /* TabBarController.swift */; };
135 - BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */; };  
136 BFEAAAC1205257460072FAAF /* LXCalendarDayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */; }; 135 BFEAAAC1205257460072FAAF /* LXCalendarDayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */; };
137 BFEAAAC2205257460072FAAF /* LXCalendarHearder.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAB1205257460072FAAF /* LXCalendarHearder.m */; }; 136 BFEAAAC2205257460072FAAF /* LXCalendarHearder.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAB1205257460072FAAF /* LXCalendarHearder.m */; };
138 BFEAAAC3205257460072FAAF /* LXCalendarHearder.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFEAAAB2205257460072FAAF /* LXCalendarHearder.xib */; }; 137 BFEAAAC3205257460072FAAF /* LXCalendarHearder.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFEAAAB2205257460072FAAF /* LXCalendarHearder.xib */; };
@@ -305,7 +304,6 @@ @@ -305,7 +304,6 @@
305 BFCED887205280B700055373 /* MyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = "<group>"; }; 304 BFCED887205280B700055373 /* MyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = "<group>"; };
306 BFCED88A20528DE700055373 /* MyViewControllerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewControllerModel.swift; sourceTree = "<group>"; }; 305 BFCED88A20528DE700055373 /* MyViewControllerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewControllerModel.swift; sourceTree = "<group>"; };
307 BFEAAAA6205118370072FAAF /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; }; 306 BFEAAAA6205118370072FAAF /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
308 - BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportDateCollectionViewCell.swift; sourceTree = "<group>"; };  
309 BFEAAAAE205257460072FAAF /* LXCalendarDayModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarDayModel.h; sourceTree = "<group>"; }; 307 BFEAAAAE205257460072FAAF /* LXCalendarDayModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarDayModel.h; sourceTree = "<group>"; };
310 BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCalendarDayModel.m; sourceTree = "<group>"; }; 308 BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCalendarDayModel.m; sourceTree = "<group>"; };
311 BFEAAAB0205257460072FAAF /* LXCalendarHearder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarHearder.h; sourceTree = "<group>"; }; 309 BFEAAAB0205257460072FAAF /* LXCalendarHearder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarHearder.h; sourceTree = "<group>"; };
@@ -588,7 +586,6 @@ @@ -588,7 +586,6 @@
588 children = ( 586 children = (
589 BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */, 587 BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */,
590 ADF159602069E00000A9485D /* CalendarView.swift */, 588 ADF159602069E00000A9485D /* CalendarView.swift */,
591 - BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */,  
592 ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */, 589 ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */,
593 ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */, 590 ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */,
594 AD65FB77206354220052415B /* MoralTableViewCell.swift */, 591 AD65FB77206354220052415B /* MoralTableViewCell.swift */,
@@ -1098,7 +1095,6 @@ @@ -1098,7 +1095,6 @@
1098 BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */, 1095 BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */,
1099 AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */, 1096 AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */,
1100 AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */, 1097 AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */,
1101 - BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */,  
1102 BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */, 1098 BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */,
1103 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */, 1099 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */,
1104 BFCED888205280B700055373 /* MyViewController.swift in Sources */, 1100 BFCED888205280B700055373 /* MyViewController.swift in Sources */,
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @d572a42
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
  Diff comments   View file @d572a42
@@ -19,8 +19,8 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate { @@ -19,8 +19,8 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
19 return view 19 return view
20 }() 20 }()
21 lazy var bottomBtn = {()-> UIButton in 21 lazy var bottomBtn = {()-> UIButton in
22 - let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-80, width: 200, height: 40))  
23 - btn.setTitle("补卡申请", for: UIControlState.normal) 22 + let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-60, width: 200, height: 40))
  23 + btn.setTitle("申请补卡", for: UIControlState.normal)
24 btn.layer.cornerRadius = 5 24 btn.layer.cornerRadius = 5
25 btn.clipsToBounds = true 25 btn.clipsToBounds = true
26 btn.setTitleColor(UIColor.black, for: UIControlState.normal) 26 btn.setTitleColor(UIColor.black, for: UIControlState.normal)
@@ -33,11 +33,20 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate { @@ -33,11 +33,20 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
33 print("补卡申请提交") 33 print("补卡申请提交")
34 } 34 }
35 35
  36 + lazy var rootView = {()->UIScrollView in
  37 + let scroll = UIScrollView.init(frame: self.view.bounds)
  38 + scroll.backgroundColor = backGroundColor
  39 + return scroll
  40 + }()
  41 +
36 override func viewDidLoad() { 42 override func viewDidLoad() {
37 super.viewDidLoad() 43 super.viewDidLoad()
38 - self.view.backgroundColor = backGroundColor  
39 - self.view.addSubview(self.cardView)  
40 - self.view.addSubview(self.bottomBtn) 44 +
  45 + self.view.addSubview(self.rootView)
  46 +
  47 + self.rootView.addSubview(self.cardView)
  48 + self.rootView.addSubview(self.bottomBtn)
  49 + self.rootView.contentSize = CGSize.init(width: 0, height: screenHeight+1)
41 setUpContentView() 50 setUpContentView()
42 // Do any additional setup after loading the view. 51 // Do any additional setup after loading the view.
43 52
@@ -47,6 +56,7 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate { @@ -47,6 +56,7 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
47 56
48 @objc func handleTap(sender:UITapGestureRecognizer){ 57 @objc func handleTap(sender:UITapGestureRecognizer){
49 if sender.state == .ended { 58 if sender.state == .ended {
  59 + print("收起键盘")
50 self.cardInputTextField.resignFirstResponder() 60 self.cardInputTextField.resignFirstResponder()
51 } 61 }
52 sender.cancelsTouchesInView = false 62 sender.cancelsTouchesInView = false
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
  Diff comments   View file @d572a42
@@ -8,14 +8,54 @@ @@ -8,14 +8,54 @@
8 8
9 import UIKit 9 import UIKit
10 10
11 -class ProgramCheckViewController: UIViewController { 11 +class ProgramCheckViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
12 12
  13 + lazy var tableView = {()-> UITableView in
  14 + let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-44-22))
  15 + table.backgroundColor = backGroundColor
  16 + table.delegate = self
  17 + table.dataSource = self
  18 + table.tableFooterView = UIView.init()
  19 + table.separatorStyle = .none
  20 + table.register(UINib.init(nibName: "GrowCheckUpTableViewCell", bundle: nil), forCellReuseIdentifier: "GrowCheckUpTableViewCell")
  21 + table.register(UINib.init(nibName: "GrowCheckDownTableViewCell", bundle: nil), forCellReuseIdentifier: "GrowCheckDownTableViewCell")
  22 + return table
  23 + }()
  24 +
  25 +
  26 +
13 override func viewDidLoad() { 27 override func viewDidLoad() {
14 super.viewDidLoad() 28 super.viewDidLoad()
15 - 29 + self.view.addSubview(self.tableView)
16 // Do any additional setup after loading the view. 30 // Do any additional setup after loading the view.
17 } 31 }
18 32
  33 +
  34 + //MARK: - TableView Delegate && DataSource
  35 + func numberOfSections(in tableView: UITableView) -> Int {
  36 + return 1
  37 + }
  38 + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
  39 + return 3
  40 + }
  41 + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
  42 + if indexPath.row == 0 {
  43 + return 120
  44 + }else{
  45 + return 160
  46 + }
  47 + }
  48 + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
  49 +
  50 + if indexPath.row == 0 {
  51 + let cell = tableView.dequeueReusableCell(withIdentifier: "GrowCheckUpTableViewCell", for: indexPath) as! GrowCheckUpTableViewCell
  52 + return cell
  53 + }else{
  54 + let cell = tableView.dequeueReusableCell(withIdentifier: "GrowCheckDownTableViewCell", for: indexPath) as! GrowCheckDownTableViewCell
  55 + return cell
  56 + }
  57 + }
  58 +
19 override func didReceiveMemoryWarning() { 59 override func didReceiveMemoryWarning() {
20 super.didReceiveMemoryWarning() 60 super.didReceiveMemoryWarning()
21 // Dispose of any resources that can be recreated. 61 // Dispose of any resources that can be recreated.
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift
  Diff comments   View file @d572a42
@@ -11,7 +11,7 @@ import UIKit @@ -11,7 +11,7 @@ import UIKit
11 class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableViewDataSource { 11 class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
12 12
13 lazy var tableView = {()-> UITableView in 13 lazy var tableView = {()-> UITableView in
14 - let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-44-22-60)) 14 + let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-66-60))
15 table.backgroundColor = backGroundColor 15 table.backgroundColor = backGroundColor
16 table.delegate = self 16 table.delegate = self
17 table.dataSource = self 17 table.dataSource = self
@@ -32,6 +32,7 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV @@ -32,6 +32,7 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV
32 return btn 32 return btn
33 }() 33 }()
34 34
  35 +
35 //data 36 //data
36 37
37 /// 请假记录 38 /// 请假记录
@@ -41,7 +42,6 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV @@ -41,7 +42,6 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV
41 override func viewDidLoad() { 42 override func viewDidLoad() {
42 super.viewDidLoad() 43 super.viewDidLoad()
43 self.view.backgroundColor = backGroundColor 44 self.view.backgroundColor = backGroundColor
44 -  
45 self.view.addSubview(self.tableView) 45 self.view.addSubview(self.tableView)
46 self.view.addSubview(self.bottomBtn) 46 self.view.addSubview(self.bottomBtn)
47 self.vacateRecodeArray = ["1","2"] 47 self.vacateRecodeArray = ["1","2"]
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift
  Diff comments   View file @d572a42
@@ -12,6 +12,8 @@ class BehaviorDetailCell: UITableViewCell { @@ -12,6 +12,8 @@ class BehaviorDetailCell: UITableViewCell {
12 12
13 override func awakeFromNib() { 13 override func awakeFromNib() {
14 super.awakeFromNib() 14 super.awakeFromNib()
  15 + self.backgroundColor = backgroundColor
  16 +
15 // Initialization code 17 // Initialization code
16 } 18 }
17 19
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 </dependencies> 10 </dependencies>
11 <objects> 11 <objects>
@@ -69,7 +69,6 @@ @@ -69,7 +69,6 @@
69 </userDefinedRuntimeAttributes> 69 </userDefinedRuntimeAttributes>
70 </view> 70 </view>
71 </subviews> 71 </subviews>
72 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
73 <constraints> 72 <constraints>
74 <constraint firstAttribute="trailing" secondItem="76r-RZ-tho" secondAttribute="trailing" constant="10" id="fOu-mh-1We"/> 73 <constraint firstAttribute="trailing" secondItem="76r-RZ-tho" secondAttribute="trailing" constant="10" id="fOu-mh-1We"/>
75 <constraint firstItem="76r-RZ-tho" firstAttribute="top" secondItem="Gtu-zB-WzI" secondAttribute="top" constant="10" id="sQm-Xh-jD6"/> 74 <constraint firstItem="76r-RZ-tho" firstAttribute="top" secondItem="Gtu-zB-WzI" secondAttribute="top" constant="10" id="sQm-Xh-jD6"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift
  Diff comments   View file @d572a42
@@ -16,6 +16,8 @@ class EducationDetailCell: UITableViewCell { @@ -16,6 +16,8 @@ class EducationDetailCell: UITableViewCell {
16 16
17 override func awakeFromNib() { 17 override func awakeFromNib() {
18 super.awakeFromNib() 18 super.awakeFromNib()
  19 + self.backgroundColor = backgroundColor
  20 +
19 let rect = self.lineChartView.bounds 21 let rect = self.lineChartView.bounds
20 print(rect) 22 print(rect)
21 customLineChart = LineChartView.init(frame: rect) 23 customLineChart = LineChartView.init(frame: rect)
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> 9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 </dependencies> 11 </dependencies>
@@ -90,7 +90,6 @@ @@ -90,7 +90,6 @@
90 </userDefinedRuntimeAttributes> 90 </userDefinedRuntimeAttributes>
91 </view> 91 </view>
92 </subviews> 92 </subviews>
93 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
94 <constraints> 93 <constraints>
95 <constraint firstItem="8hE-eE-nri" firstAttribute="top" secondItem="pme-x3-3eS" secondAttribute="top" constant="10" id="QbB-5J-7QT"/> 94 <constraint firstItem="8hE-eE-nri" firstAttribute="top" secondItem="pme-x3-3eS" secondAttribute="top" constant="10" id="QbB-5J-7QT"/>
96 <constraint firstAttribute="trailing" secondItem="8hE-eE-nri" secondAttribute="trailing" constant="10" id="UI2-CF-T98"/> 95 <constraint firstAttribute="trailing" secondItem="8hE-eE-nri" secondAttribute="trailing" constant="10" id="UI2-CF-T98"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift
  Diff comments   View file @d572a42
@@ -16,6 +16,7 @@ class GrowCheckDownTableViewCell: UITableViewCell { @@ -16,6 +16,7 @@ class GrowCheckDownTableViewCell: UITableViewCell {
16 override func awakeFromNib() { 16 override func awakeFromNib() {
17 super.awakeFromNib() 17 super.awakeFromNib()
18 // Initialization code 18 // Initialization code
  19 + self.backgroundColor = backgroundColor
19 } 20 }
20 21
21 override func setSelected(_ selected: Bool, animated: Bool) { 22 override func setSelected(_ selected: Bool, animated: Bool) {
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib
  Diff comments   View file @d572a42
@@ -85,7 +85,6 @@ @@ -85,7 +85,6 @@
85 </constraints> 85 </constraints>
86 </view> 86 </view>
87 </subviews> 87 </subviews>
88 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
89 <constraints> 88 <constraints>
90 <constraint firstItem="M2G-AT-SGp" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="2DK-lh-wLK"/> 89 <constraint firstItem="M2G-AT-SGp" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="2DK-lh-wLK"/>
91 <constraint firstItem="M2G-AT-SGp" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="anD-pN-eZ2"/> 90 <constraint firstItem="M2G-AT-SGp" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="anD-pN-eZ2"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift
  Diff comments   View file @d572a42
@@ -15,6 +15,8 @@ class GrowCheckUpTableViewCell: UITableViewCell { @@ -15,6 +15,8 @@ class GrowCheckUpTableViewCell: UITableViewCell {
15 @IBOutlet weak var checkCount: UILabel! 15 @IBOutlet weak var checkCount: UILabel!
16 override func awakeFromNib() { 16 override func awakeFromNib() {
17 super.awakeFromNib() 17 super.awakeFromNib()
  18 + self.backgroundColor = backgroundColor
  19 +
18 // Initialization code 20 // Initialization code
19 } 21 }
20 22
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib
  Diff comments   View file @d572a42
@@ -76,7 +76,6 @@ @@ -76,7 +76,6 @@
76 </constraints> 76 </constraints>
77 </view> 77 </view>
78 </subviews> 78 </subviews>
79 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
80 <constraints> 79 <constraints>
81 <constraint firstItem="4bl-Ug-Jkf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="Oj0-RK-tj4"/> 80 <constraint firstItem="4bl-Ug-Jkf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="Oj0-RK-tj4"/>
82 <constraint firstAttribute="bottom" secondItem="4bl-Ug-Jkf" secondAttribute="bottom" constant="5" id="RVP-gf-Oys"/> 81 <constraint firstAttribute="bottom" secondItem="4bl-Ug-Jkf" secondAttribute="bottom" constant="5" id="RVP-gf-Oys"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift
  Diff comments   View file @d572a42
@@ -12,6 +12,8 @@ class GrowSubjectCell: UITableViewCell { @@ -12,6 +12,8 @@ class GrowSubjectCell: UITableViewCell {
12 12
13 override func awakeFromNib() { 13 override func awakeFromNib() {
14 super.awakeFromNib() 14 super.awakeFromNib()
  15 + self.backgroundColor = backgroundColor
  16 +
15 // Initialization code 17 // Initialization code
16 } 18 }
17 19
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> 9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
10 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> 10 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
11 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 11 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -120,7 +120,6 @@ @@ -120,7 +120,6 @@
120 </userDefinedRuntimeAttributes> 120 </userDefinedRuntimeAttributes>
121 </view> 121 </view>
122 </subviews> 122 </subviews>
123 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
124 <constraints> 123 <constraints>
125 <constraint firstAttribute="bottom" secondItem="ayX-iZ-W2S" secondAttribute="bottom" id="KPa-3g-LgM"/> 124 <constraint firstAttribute="bottom" secondItem="ayX-iZ-W2S" secondAttribute="bottom" id="KPa-3g-LgM"/>
126 <constraint firstAttribute="trailing" secondItem="ayX-iZ-W2S" secondAttribute="trailing" constant="10" id="bCN-qN-yss"/> 125 <constraint firstAttribute="trailing" secondItem="ayX-iZ-W2S" secondAttribute="trailing" constant="10" id="bCN-qN-yss"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift
  Diff comments   View file @d572a42
@@ -20,6 +20,8 @@ class MoralDetailCell: UITableViewCell { @@ -20,6 +20,8 @@ class MoralDetailCell: UITableViewCell {
20 @IBOutlet weak var evaluationLab: UILabel! 20 @IBOutlet weak var evaluationLab: UILabel!
21 override func awakeFromNib() { 21 override func awakeFromNib() {
22 super.awakeFromNib() 22 super.awakeFromNib()
  23 + self.backgroundColor = backgroundColor
  24 +
23 // Initialization code 25 // Initialization code
24 } 26 }
25 27
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 </dependencies> 10 </dependencies>
11 <objects> 11 <objects>
@@ -116,7 +116,6 @@ @@ -116,7 +116,6 @@
116 </userDefinedRuntimeAttributes> 116 </userDefinedRuntimeAttributes>
117 </view> 117 </view>
118 </subviews> 118 </subviews>
119 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
120 <constraints> 119 <constraints>
121 <constraint firstAttribute="trailing" secondItem="UBb-dh-88b" secondAttribute="trailing" constant="10" id="8yJ-jh-3AX"/> 120 <constraint firstAttribute="trailing" secondItem="UBb-dh-88b" secondAttribute="trailing" constant="10" id="8yJ-jh-3AX"/>
122 <constraint firstAttribute="bottom" secondItem="UBb-dh-88b" secondAttribute="bottom" id="Krl-Qe-GPA"/> 121 <constraint firstAttribute="bottom" secondItem="UBb-dh-88b" secondAttribute="bottom" id="Krl-Qe-GPA"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift
  Diff comments   View file @d572a42
@@ -18,6 +18,8 @@ class MoralTableViewCell: UITableViewCell { @@ -18,6 +18,8 @@ class MoralTableViewCell: UITableViewCell {
18 @IBOutlet weak var reportDateLab: UILabel! 18 @IBOutlet weak var reportDateLab: UILabel!
19 override func awakeFromNib() { 19 override func awakeFromNib() {
20 super.awakeFromNib() 20 super.awakeFromNib()
  21 + self.backgroundColor = backgroundColor
  22 +
21 // Initialization code 23 // Initialization code
22 } 24 }
23 25
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> 9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 </dependencies> 11 </dependencies>
@@ -97,7 +97,6 @@ @@ -97,7 +97,6 @@
97 </userDefinedRuntimeAttributes> 97 </userDefinedRuntimeAttributes>
98 </view> 98 </view>
99 </subviews> 99 </subviews>
100 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
101 <constraints> 100 <constraints>
102 <constraint firstAttribute="bottom" secondItem="Vef-nQ-dGv" secondAttribute="bottom" id="6Cr-qJ-0jA"/> 101 <constraint firstAttribute="bottom" secondItem="Vef-nQ-dGv" secondAttribute="bottom" id="6Cr-qJ-0jA"/>
103 <constraint firstItem="Vef-nQ-dGv" firstAttribute="top" secondItem="Hdo-4K-VNc" secondAttribute="top" constant="10" id="7ls-DH-ULi"/> 102 <constraint firstItem="Vef-nQ-dGv" firstAttribute="top" secondItem="Hdo-4K-VNc" secondAttribute="top" constant="10" id="7ls-DH-ULi"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift
  Diff comments   View file @d572a42
@@ -19,6 +19,8 @@ class ProgramVacateBodyTableViewCell: UITableViewCell { @@ -19,6 +19,8 @@ class ProgramVacateBodyTableViewCell: UITableViewCell {
19 @IBOutlet weak var vacateResult: UILabel! 19 @IBOutlet weak var vacateResult: UILabel!
20 override func awakeFromNib() { 20 override func awakeFromNib() {
21 super.awakeFromNib() 21 super.awakeFromNib()
  22 + self.backgroundColor = backgroundColor
  23 +
22 // Initialization code 24 // Initialization code
23 } 25 }
24 26
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib
  Diff comments   View file @d572a42
@@ -158,7 +158,6 @@ @@ -158,7 +158,6 @@
158 </constraints> 158 </constraints>
159 </view> 159 </view>
160 </subviews> 160 </subviews>
161 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
162 <constraints> 161 <constraints>
163 <constraint firstAttribute="bottom" secondItem="3iC-h2-GLD" secondAttribute="bottom" constant="10" id="FAV-5i-UxH"/> 162 <constraint firstAttribute="bottom" secondItem="3iC-h2-GLD" secondAttribute="bottom" constant="10" id="FAV-5i-UxH"/>
164 <constraint firstItem="3iC-h2-GLD" firstAttribute="top" secondItem="yYa-Yh-jMm" secondAttribute="top" id="ObN-MI-Jfr"/> 163 <constraint firstItem="3iC-h2-GLD" firstAttribute="top" secondItem="yYa-Yh-jMm" secondAttribute="top" id="ObN-MI-Jfr"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift
  Diff comments   View file @d572a42
@@ -15,6 +15,8 @@ class ProgramVacateTableViewCell: UITableViewCell { @@ -15,6 +15,8 @@ class ProgramVacateTableViewCell: UITableViewCell {
15 @IBOutlet weak var endTime: UILabel! 15 @IBOutlet weak var endTime: UILabel!
16 override func awakeFromNib() { 16 override func awakeFromNib() {
17 super.awakeFromNib() 17 super.awakeFromNib()
  18 + self.backgroundColor = backgroundColor
  19 +
18 // Initialization code 20 // Initialization code
19 } 21 }
20 22
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib
  Diff comments   View file @d572a42
@@ -86,7 +86,6 @@ @@ -86,7 +86,6 @@
86 </constraints> 86 </constraints>
87 </view> 87 </view>
88 </subviews> 88 </subviews>
89 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
90 <constraints> 89 <constraints>
91 <constraint firstItem="A0K-zH-Rt1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="GYT-zJ-fus"/> 90 <constraint firstItem="A0K-zH-Rt1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="GYT-zJ-fus"/>
92 <constraint firstAttribute="trailing" secondItem="A0K-zH-Rt1" secondAttribute="trailing" constant="10" id="JFC-pM-1F3"/> 91 <constraint firstAttribute="trailing" secondItem="A0K-zH-Rt1" secondAttribute="trailing" constant="10" id="JFC-pM-1F3"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift
View file @b51616b
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -//  
2 -// ReportDateCollectionViewCell.swift  
3 -// ParentAssistant  
4 -//  
5 -// Created by 葛建军 on 2018/3/9.  
6 -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.  
7 -//  
8 -  
9 -import UIKit  
10 -class ReportDateCollectionViewCell: UICollectionViewCell {  
11 - @IBOutlet var weekLabel: UILabel!  
12 - @IBOutlet var dateLabel: UILabel!  
13 - func setupWithDate(week:String,date:String){  
14 - weekLabel.text = week  
15 - dateLabel.text = date  
16 -  
17 -  
18 -  
19 - }  
20 -  
21 -}  
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift
  Diff comments   View file @d572a42
@@ -18,6 +18,8 @@ class SceneDownCell: UITableViewCell { @@ -18,6 +18,8 @@ class SceneDownCell: UITableViewCell {
18 @IBOutlet weak var dateLab: UILabel! 18 @IBOutlet weak var dateLab: UILabel!
19 override func awakeFromNib() { 19 override func awakeFromNib() {
20 super.awakeFromNib() 20 super.awakeFromNib()
  21 + self.backgroundColor = backgroundColor
  22 +
21 // Initialization code 23 // Initialization code
22 } 24 }
23 25
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 9 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 </dependencies> 10 </dependencies>
11 <objects> 11 <objects>
@@ -86,7 +86,6 @@ @@ -86,7 +86,6 @@
86 </userDefinedRuntimeAttributes> 86 </userDefinedRuntimeAttributes>
87 </view> 87 </view>
88 </subviews> 88 </subviews>
89 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
90 <constraints> 89 <constraints>
91 <constraint firstAttribute="bottom" secondItem="ijR-w3-uD6" secondAttribute="bottom" id="HUg-MG-jKb"/> 90 <constraint firstAttribute="bottom" secondItem="ijR-w3-uD6" secondAttribute="bottom" id="HUg-MG-jKb"/>
92 <constraint firstItem="ijR-w3-uD6" firstAttribute="top" secondItem="YfX-AG-wY3" secondAttribute="top" constant="10" id="I6a-Rf-ww6"/> 91 <constraint firstItem="ijR-w3-uD6" firstAttribute="top" secondItem="YfX-AG-wY3" secondAttribute="top" constant="10" id="I6a-Rf-ww6"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift
  Diff comments   View file @d572a42
@@ -15,6 +15,8 @@ class SceneMiddleCell: UITableViewCell { @@ -15,6 +15,8 @@ class SceneMiddleCell: UITableViewCell {
15 var customLineChart = LineChartView() 15 var customLineChart = LineChartView()
16 override func awakeFromNib() { 16 override func awakeFromNib() {
17 super.awakeFromNib() 17 super.awakeFromNib()
  18 + self.backgroundColor = backgroundColor
  19 +
18 // Initialization code 20 // Initialization code
19 let rect = self.lineChartView.bounds 21 let rect = self.lineChartView.bounds
20 customLineChart = LineChartView.init(frame: rect) 22 customLineChart = LineChartView.init(frame: rect)
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> 9 <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 </dependencies> 11 </dependencies>
@@ -126,7 +126,6 @@ @@ -126,7 +126,6 @@
126 </userDefinedRuntimeAttributes> 126 </userDefinedRuntimeAttributes>
127 </view> 127 </view>
128 </subviews> 128 </subviews>
129 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
130 <constraints> 129 <constraints>
131 <constraint firstAttribute="trailing" secondItem="UP8-EA-Pvf" secondAttribute="trailing" constant="10" id="7Wz-Op-hRa"/> 130 <constraint firstAttribute="trailing" secondItem="UP8-EA-Pvf" secondAttribute="trailing" constant="10" id="7Wz-Op-hRa"/>
132 <constraint firstItem="UP8-EA-Pvf" firstAttribute="top" secondItem="lE4-qW-1H8" secondAttribute="top" constant="10" id="HIh-1Y-xd9"/> 131 <constraint firstItem="UP8-EA-Pvf" firstAttribute="top" secondItem="lE4-qW-1H8" secondAttribute="top" constant="10" id="HIh-1Y-xd9"/>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift
  Diff comments   View file @d572a42
@@ -16,6 +16,8 @@ class SceneTopCell: UITableViewCell { @@ -16,6 +16,8 @@ class SceneTopCell: UITableViewCell {
16 @IBOutlet weak var SuggestLab: UITextView! //指导意见 16 @IBOutlet weak var SuggestLab: UITextView! //指导意见
17 override func awakeFromNib() { 17 override func awakeFromNib() {
18 super.awakeFromNib() 18 super.awakeFromNib()
  19 + self.backgroundColor = backgroundColor
  20 +
19 // Initialization code 21 // Initialization code
20 } 22 }
21 23
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib
  Diff comments   View file @d572a42
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3 <device id="retina4_7" orientation="portrait"> 3 <device id="retina4_7" orientation="portrait">
4 <adaptation id="fullscreen"/> 4 <adaptation id="fullscreen"/>
5 </device> 5 </device>
6 <dependencies> 6 <dependencies>
7 <deployment identifier="iOS"/> 7 <deployment identifier="iOS"/>
8 - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> 8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> 9 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 10 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 </dependencies> 11 </dependencies>
@@ -100,7 +100,6 @@ @@ -100,7 +100,6 @@
100 </userDefinedRuntimeAttributes> 100 </userDefinedRuntimeAttributes>
101 </view> 101 </view>
102 </subviews> 102 </subviews>
103 - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>  
104 <constraints> 103 <constraints>
105 <constraint firstItem="Qt1-rh-kBe" firstAttribute="leading" secondItem="os2-cK-xHO" secondAttribute="leading" constant="10" id="4YI-b6-zrW"/> 104 <constraint firstItem="Qt1-rh-kBe" firstAttribute="leading" secondItem="os2-cK-xHO" secondAttribute="leading" constant="10" id="4YI-b6-zrW"/>
106 <constraint firstAttribute="bottom" secondItem="Qt1-rh-kBe" secondAttribute="bottom" id="TVS-33-w4d"/> 105 <constraint firstAttribute="bottom" secondItem="Qt1-rh-kBe" secondAttribute="bottom" id="TVS-33-w4d"/>
ParentAssistant/ParentAssistant/Classes/util/Macro.swift
  Diff comments   View file @d572a42
@@ -16,7 +16,7 @@ let statusBarHeight = UIApplication.shared.statusBarFrame.height @@ -16,7 +16,7 @@ let statusBarHeight = UIApplication.shared.statusBarFrame.height
16 var navigationBarHeight : CGFloat? 16 var navigationBarHeight : CGFloat?
17 let screenWidth = UIScreen.main.bounds.size.width 17 let screenWidth = UIScreen.main.bounds.size.width
18 let screenHeight = UIScreen.main.bounds.size.height 18 let screenHeight = UIScreen.main.bounds.size.height
19 -let backGroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) 19 +let backGroundColor = UIColor.init(red: 239/255, green: 239/255, blue: 244/255, alpha: 1)
20 20
21 //MARK: -------------------------- 接口地址 ---------------------------- 21 //MARK: -------------------------- 接口地址 ----------------------------
22 let appsecret="sincere:3a530f39f99411b454e667d69693c127" 22 let appsecret="sincere:3a530f39f99411b454e667d69693c127"