IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 8a4950fa2b299a72427c2fb2ea5f12a3d4f0afcc

Authored by Cao yang
1 parent 8f642321
Exists in parentassistant

页面尺寸规范,完善页面

Showing 18 changed files with 463 additions and 362 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
  Diff comments   View file @8a4950f
@@ -32,6 +32,9 @@ @@ -32,6 +32,9 @@
32 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; }; 32 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; };
33 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; }; 33 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; };
34 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; 34 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; };
  35 + AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */; };
  36 + AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */; };
  37 + AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA232065FBD100ECA428 /* SceneDownCell.swift */; };
35 AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; }; 38 AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; };
36 AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; }; 39 AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; };
37 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; }; 40 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; };
@@ -173,6 +176,9 @@ @@ -173,6 +176,9 @@
173 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; }; 176 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
174 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = "<group>"; }; 177 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = "<group>"; };
175 A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 178 A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  179 + AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneTopCell.swift; sourceTree = "<group>"; };
  180 + AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneMiddleCell.swift; sourceTree = "<group>"; };
  181 + AD24AA232065FBD100ECA428 /* SceneDownCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDownCell.swift; sourceTree = "<group>"; };
176 AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = "<group>"; }; 182 AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = "<group>"; };
177 AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = "<group>"; }; 183 AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = "<group>"; };
178 AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = "<group>"; }; 184 AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = "<group>"; };
@@ -512,6 +518,9 @@ @@ -512,6 +518,9 @@
512 AD34D1192064C79D00989F8D /* MoralDetailCell.swift */, 518 AD34D1192064C79D00989F8D /* MoralDetailCell.swift */,
513 AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */, 519 AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */,
514 AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */, 520 AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */,
  521 + AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */,
  522 + AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */,
  523 + AD24AA232065FBD100ECA428 /* SceneDownCell.swift */,
515 ADAEA3992064C44900A47D2C /* LineChartView.swift */, 524 ADAEA3992064C44900A47D2C /* LineChartView.swift */,
516 ); 525 );
517 path = View; 526 path = View;
@@ -921,6 +930,7 @@ @@ -921,6 +930,7 @@
921 599364F7204E648C00C8B371 /* ChannelCollectionViewCell.swift in Sources */, 930 599364F7204E648C00C8B371 /* ChannelCollectionViewCell.swift in Sources */,
922 BF7A4C36204CD55300460463 /* ViewController.swift in Sources */, 931 BF7A4C36204CD55300460463 /* ViewController.swift in Sources */,
923 BFEAAAA9205248AC0072FAAF /* TaskPresentationTableViewCell.swift in Sources */, 932 BFEAAAA9205248AC0072FAAF /* TaskPresentationTableViewCell.swift in Sources */,
  933 + AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */,
924 5980BF6A2061048A00F4A35E /* LZPickerModel.m in Sources */, 934 5980BF6A2061048A00F4A35E /* LZPickerModel.m in Sources */,
925 BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */, 935 BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */,
926 BF67F3C020590A2F002FDC61 /* SwiftyJSON.swift in Sources */, 936 BF67F3C020590A2F002FDC61 /* SwiftyJSON.swift in Sources */,
@@ -946,6 +956,7 @@ @@ -946,6 +956,7 @@
946 BFF9B7EB205772E100F39B3E /* GetBackPasswordViewController.swift in Sources */, 956 BFF9B7EB205772E100F39B3E /* GetBackPasswordViewController.swift in Sources */,
947 BFF9B7F22057A28900F39B3E /* TableEmptyView.swift in Sources */, 957 BFF9B7F22057A28900F39B3E /* TableEmptyView.swift in Sources */,
948 ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */, 958 ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */,
  959 + AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */,
949 BFBC06CA2063AE8900CCFAFF /* ZLaunchAdImageView.swift in Sources */, 960 BFBC06CA2063AE8900CCFAFF /* ZLaunchAdImageView.swift in Sources */,
950 BF406CE02057C708000A6681 /* OrderDetailCollectionViewCell.swift in Sources */, 961 BF406CE02057C708000A6681 /* OrderDetailCollectionViewCell.swift in Sources */,
951 BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */, 962 BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */,
@@ -963,6 +974,7 @@ @@ -963,6 +974,7 @@
963 BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */, 974 BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */,
964 BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */, 975 BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */,
965 AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */, 976 AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */,
  977 + AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */,
966 BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */, 978 BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */,
967 BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */, 979 BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */,
968 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */, 980 AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */,
ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
  Diff comments   View file @8a4950f
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <key>ParentAssistant.xcscheme</key> 7 <key>ParentAssistant.xcscheme</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @8a4950f
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift
  Diff comments   View file @8a4950f
@@ -31,10 +31,15 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS @@ -31,10 +31,15 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS
31 } 31 }
32 } 32 }
33 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 33 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
34 - if indexPath.section == 2{  
35 - return 80  
36 - }else{  
37 - return 280 34 + switch indexPath.section {
  35 + case 0:
  36 + return 240
  37 + case 1:
  38 + return 235
  39 + case 2:
  40 + return 70
  41 + default:
  42 + return 0
38 } 43 }
39 } 44 }
40 func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { 45 func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift
  Diff comments   View file @8a4950f
@@ -28,22 +28,29 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV @@ -28,22 +28,29 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV
28 return 1 28 return 1
29 } 29 }
30 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { 30 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
31 - if indexPath.section == 2 {  
32 - return 80 31 +
  32 + switch indexPath.section {
  33 + case 0:
  34 + return 240
  35 + case 1:
  36 + return 235
  37 + case 2:
  38 + return 70
  39 + default:
  40 + return 0
33 } 41 }
34 - return 250  
35 } 42 }
36 func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { 43 func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
37 var cell = UITableViewCell.init() 44 var cell = UITableViewCell.init()
38 switch indexPath.section { 45 switch indexPath.section {
39 case 0: 46 case 0:
40 - cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) 47 + cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) as! SceneTopCell
41 return cell 48 return cell
42 case 1: 49 case 1:
43 - cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) 50 + cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) as! SceneMiddleCell
44 return cell 51 return cell
45 case 2: 52 case 2:
46 - cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) 53 + cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) as! SceneDownCell
47 return cell 54 return cell
48 default: 55 default:
49 return cell 56 return cell
ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift
  Diff comments   View file @8a4950f
@@ -11,6 +11,7 @@ import UIKit @@ -11,6 +11,7 @@ import UIKit
11 class EducationDetailCell: UITableViewCell { 11 class EducationDetailCell: UITableViewCell {
12 12
13 @IBOutlet weak var lineChartView: UIView! 13 @IBOutlet weak var lineChartView: UIView!
  14 +
14 var customLineChart = LineChartView() 15 var customLineChart = LineChartView()
15 16
16 override func awakeFromNib() { 17 override func awakeFromNib() {
@@ -18,11 +19,10 @@ class EducationDetailCell: UITableViewCell { @@ -18,11 +19,10 @@ class EducationDetailCell: UITableViewCell {
18 let rect = self.lineChartView.bounds 19 let rect = self.lineChartView.bounds
19 print(rect) 20 print(rect)
20 customLineChart = LineChartView.init(frame: rect) 21 customLineChart = LineChartView.init(frame: rect)
21 - 22 + customLineChart.drawUI(xLableArr: nil)
22 let arr1 = [4,4,2,1,3] 23 let arr1 = [4,4,2,1,3]
23 let arr2 = [2,1,4,4,5] 24 let arr2 = [2,1,4,4,5]
24 - //65 105 190  
25 - //220 0 16 25 +
26 customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190)) 26 customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190))
27 customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16)) 27 customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16))
28 28
ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
  Diff comments   View file @8a4950f
@@ -10,10 +10,6 @@ import UIKit @@ -10,10 +10,6 @@ import UIKit
10 10
11 class LineChartView: UIView { 11 class LineChartView: UIView {
12 12
13 -  
14 - //自定义横坐标  
15 - var customXLabArr = Array<String>()  
16 -  
17 //默认横坐标 13 //默认横坐标
18 private var xLabArr = ["行为","文明","课堂","作业","礼仪"] 14 private var xLabArr = ["行为","文明","课堂","作业","礼仪"]
19 //设置纵坐标 15 //设置纵坐标
@@ -29,24 +25,28 @@ class LineChartView: UIView { @@ -29,24 +25,28 @@ class LineChartView: UIView {
29 override init(frame: CGRect) { 25 override init(frame: CGRect) {
30 super.init(frame: frame) 26 super.init(frame: frame)
31 print("frame==\(frame)") 27 print("frame==\(frame)")
32 -  
33 - if customXLabArr.count>0 {  
34 - xLabArr = customXLabArr 28 +
  29 + }
  30 + func drawUI(xLableArr:Array<String>?){
  31 +
  32 + if xLableArr != nil {
  33 + xLabArr = xLableArr!
35 } 34 }
36 drawX() 35 drawX()
37 drawY() 36 drawY()
38 } 37 }
39 //设置纵坐标 38 //设置纵坐标
40 private func drawY() { 39 private func drawY() {
41 - let yHeight = (self.bounds.height-20)/CGFloat(yCount) 40 +
  41 + let yHeight = (self.bounds.height-60)/CGFloat(yCount)
42 for index in 0..<yCount{ 42 for index in 0..<yCount{
43 let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20)) 43 let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20))
44 yLab.text = "\(GPA-index)" 44 yLab.text = "\(GPA-index)"
45 yLab.font = UIFont.systemFont(ofSize: 14) 45 yLab.font = UIFont.systemFont(ofSize: 14)
46 self.addSubview(yLab) 46 self.addSubview(yLab)
47 47
48 - let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: self.bounds.size.width-40, height: 0.5))  
49 - lineLab.backgroundColor = UIColor.lightGray 48 + let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: self.bounds.size.width-40, height: 0.4))
  49 + lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
50 self.addSubview(lineLab) 50 self.addSubview(lineLab)
51 51
52 yCenterArr.append(yLab.frame.origin.y+10) 52 yCenterArr.append(yLab.frame.origin.y+10)
@@ -56,17 +56,18 @@ class LineChartView: UIView { @@ -56,17 +56,18 @@ class LineChartView: UIView {
56 private func drawX() { 56 private func drawX() {
57 let xWidth = (self.bounds.width)/CGFloat(yCount) 57 let xWidth = (self.bounds.width)/CGFloat(yCount)
58 for index in 0..<xCount { 58 for index in 0..<xCount {
59 - let nameLab = UILabel.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-30, width: 40, height: 20)) 59 + let nameLab = UILabel.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 20))
  60 + nameLab.textAlignment = .center
60 nameLab.text = xLabArr[index] 61 nameLab.text = xLabArr[index]
61 - nameLab.font = UIFont.systemFont(ofSize: 14)  
62 - nameLab.textColor = UIColor.gray 62 + nameLab.font = UIFont.systemFont(ofSize: 13)
  63 + nameLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
63 self.addSubview(nameLab) 64 self.addSubview(nameLab)
64 65
65 xCenterArr.append(nameLab.frame.origin.x+20) 66 xCenterArr.append(nameLab.frame.origin.x+20)
66 } 67 }
67 } 68 }
68 69
69 - //Mark: - 画折线 70 + //MARK: - 画折线
70 func drawLine(point:Array<Int>,color:UIColor){ 71 func drawLine(point:Array<Int>,color:UIColor){
71 72
72 let pointArr = swichPoint(arr: point) 73 let pointArr = swichPoint(arr: point)
@@ -76,8 +77,9 @@ class LineChartView: UIView { @@ -76,8 +77,9 @@ class LineChartView: UIView {
76 drawLayer.bounds = self.bounds 77 drawLayer.bounds = self.bounds
77 drawLayer.position = self.center 78 drawLayer.position = self.center
78 drawLayer.lineColor = color 79 drawLayer.lineColor = color
79 - drawLayer.setNeedsDisplay()  
80 self.layer.addSublayer(drawLayer) 80 self.layer.addSublayer(drawLayer)
  81 + drawLayer.setNeedsDisplay()
  82 +
81 } 83 }
82 //MARK: - 画竖线 84 //MARK: - 画竖线
83 85
@@ -123,10 +125,9 @@ class DrawLayer: CALayer { @@ -123,10 +125,9 @@ class DrawLayer: CALayer {
123 context.fillEllipse(in: CGRect.init(x: xPointArr[i]-5, y: yPointArr[i]-5, width: 10, height: 10)) 125 context.fillEllipse(in: CGRect.init(x: xPointArr[i]-5, y: yPointArr[i]-5, width: 10, height: 10))
124 126
125 } 127 }
126 -  
127 //折线 128 //折线
128 context.setStrokeColor(lineColor.cgColor) 129 context.setStrokeColor(lineColor.cgColor)
129 - context.setLineWidth(1) 130 + context.setLineWidth(1.5)
130 for i in 0..<xPointArr.count { 131 for i in 0..<xPointArr.count {
131 if i == 0 { 132 if i == 0 {
132 context.move(to: CGPoint.init(x: xPointArr[0] , y: yPointArr[0])) 133 context.move(to: CGPoint.init(x: xPointArr[0] , y: yPointArr[0]))
@@ -137,7 +138,6 @@ class DrawLayer: CALayer { @@ -137,7 +138,6 @@ class DrawLayer: CALayer {
137 context.strokePath() 138 context.strokePath()
138 } 139 }
139 140
140 -  
141 } 141 }
142 142
143 143
ParentAssistant/ParentAssistant/Classes/controllers/report/View/SceneDownCell.swift 0 → 100644
  Diff comments   View file @8a4950f
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +//
  2 +// SceneDownCell.swift
  3 +// ParentAssistant
  4 +//
  5 +// Created by Cao yang on 2018/3/24.
  6 +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
  7 +//
  8 +
  9 +import UIKit
  10 +
  11 +class SceneDownCell: UITableViewCell {
  12 +
  13 + @IBOutlet weak var evaluateLab: UILabel!
  14 + @IBOutlet weak var sceneLab: UILabel!
  15 + @IBOutlet weak var scoreLab: UILabel!
  16 + @IBOutlet weak var nameLab: UILabel!
  17 + @IBOutlet weak var classLab: UILabel!
  18 + @IBOutlet weak var dateLab: UILabel!
  19 + override func awakeFromNib() {
  20 + super.awakeFromNib()
  21 + // Initialization code
  22 + }
  23 +
  24 + override func setSelected(_ selected: Bool, animated: Bool) {
  25 + super.setSelected(selected, animated: animated)
  26 +
  27 + // Configure the view for the selected state
  28 + }
  29 +
  30 +}
ParentAssistant/ParentAssistant/Classes/controllers/report/View/SceneMiddleCell.swift 0 → 100644
  Diff comments   View file @8a4950f
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +//
  2 +// SceneMiddleCell.swift
  3 +// ParentAssistant
  4 +//
  5 +// Created by Cao yang on 2018/3/24.
  6 +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
  7 +//
  8 +
  9 +import UIKit
  10 +
  11 +class SceneMiddleCell: UITableViewCell {
  12 +
  13 + @IBOutlet weak var lineChartView: UIView!
  14 +
  15 + var customLineChart = LineChartView()
  16 + override func awakeFromNib() {
  17 + super.awakeFromNib()
  18 + // Initialization code
  19 + let rect = self.lineChartView.bounds
  20 + customLineChart = LineChartView.init(frame: rect)
  21 + let customXLabArr = ["03/12","03/13","03/14","03/15","03/16"]
  22 +
  23 + customLineChart.drawUI(xLableArr:customXLabArr)
  24 +
  25 + let arr1 = [5,4,5,5,5]
  26 + let arr2 = [4,4,2,1,3]
  27 + let arr3 = [3,3,4,3,4]
  28 +
  29 +
  30 + customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 129, G: 199, B: 132))
  31 + customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 92, G: 145, B: 230))
  32 + customLineChart.drawLine(point: arr3, color: UIColorWithRGB(R: 255, G: 213, B: 79))
  33 +
  34 + self.lineChartView.addSubview(customLineChart)
  35 +
  36 + }
  37 +
  38 + override func setSelected(_ selected: Bool, animated: Bool) {
  39 + super.setSelected(selected, animated: animated)
  40 +
  41 + // Configure the view for the selected state
  42 + }
  43 +
  44 +}
ParentAssistant/ParentAssistant/Classes/controllers/report/View/SceneTopCell.swift 0 → 100644
  Diff comments   View file @8a4950f
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +//
  2 +// SceneTopCell.swift
  3 +// ParentAssistant
  4 +//
  5 +// Created by Cao yang on 2018/3/24.
  6 +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
  7 +//
  8 +
  9 +import UIKit
  10 +
  11 +class SceneTopCell: UITableViewCell {
  12 +
  13 + @IBOutlet weak var scoreLab: UILabel! //得分
  14 + @IBOutlet weak var GPALab: UILabel! //绩点
  15 + @IBOutlet weak var LevelLab: UILabel! //等级
  16 + @IBOutlet weak var SuggestLab: UITextView! //指导意见
  17 + override func awakeFromNib() {
  18 + super.awakeFromNib()
  19 + // Initialization code
  20 + }
  21 +
  22 + override func setSelected(_ selected: Bool, animated: Bool) {
  23 + super.setSelected(selected, animated: animated)
  24 +
  25 + // Configure the view for the selected state
  26 + }
  27 +
  28 +}
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/moral_bg.imageset/Contents.json 0 → 100644
  Diff comments   View file @8a4950f
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "filename" : "moral_bg.png",
  6 + "scale" : "1x"
  7 + },
  8 + {
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "scale" : "3x"
  15 + }
  16 + ],
  17 + "info" : {
  18 + "version" : 1,
  19 + "author" : "xcode"
  20 + }
  21 +}
0 \ No newline at end of file 22 \ No newline at end of file
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/moral_bg.imageset/moral_bg.png 0 → 100644
View file @8a4950f

32.9 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_teacher.imageset/Contents.json 0 → 100644
  Diff comments   View file @8a4950f
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "report_teacher@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "report_teacher@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 \ No newline at end of file 23 \ No newline at end of file
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_teacher.imageset/report_teacher@2x.png 0 → 100644
View file @8a4950f

22.7 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/report_teacher.imageset/report_teacher@3x.png 0 → 100644
View file @8a4950f

35.1 KB
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @8a4950f
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
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="13772"/>
  9 + <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
9 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> 10 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
10 - <capability name="Constraints to layout margins" minToolsVersion="6.0"/>  
11 <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> 11 <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
12 <capability name="Safe area layout guides" minToolsVersion="9.0"/> 12 <capability name="Safe area layout guides" minToolsVersion="9.0"/>
13 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> 13 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -898,81 +898,80 @@ @@ -898,81 +898,80 @@
898 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-yM-hGe"> 898 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-yM-hGe">
899 <rect key="frame" x="10" y="10" width="355" height="270"/> 899 <rect key="frame" x="10" y="10" width="355" height="270"/>
900 <subviews> 900 <subviews>
901 - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EcR-iO-zzH"> 901 + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="moral_bg" translatesAutoresizingMaskIntoConstraints="NO" id="EcR-iO-zzH">
902 <rect key="frame" x="0.0" y="0.0" width="355" height="270"/> 902 <rect key="frame" x="0.0" y="0.0" width="355" height="270"/>
903 - <color key="backgroundColor" red="0.22575283050537109" green="0.73064249753952026" blue="0.92262524366378784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>  
904 </imageView> 903 </imageView>
905 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="德育得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kJr-OQ-uJV"> 904 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="德育得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kJr-OQ-uJV">
906 - <rect key="frame" x="40" y="20" width="66" height="20"/>  
907 - <fontDescription key="fontDescription" type="system" pointSize="16"/>  
908 - <color key="textColor" red="0.051375745996832825" green="0.16511302134149486" blue="0.45782439720812185" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 905 + <rect key="frame" x="40" y="15" width="61.5" height="18"/>
  906 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  907 + <color key="textColor" red="0.050980392156862744" green="0.16470588235294117" blue="0.45882352941176469" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
909 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 908 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
910 </label> 909 </label>
911 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pPw-dt-Xzf"> 910 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pPw-dt-Xzf">
912 - <rect key="frame" x="31.5" y="50" width="83" height="40"/>  
913 - <fontDescription key="fontDescription" type="system" pointSize="33"/> 911 + <rect key="frame" x="34" y="48" width="75" height="36"/>
  912 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
914 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 913 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
915 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 914 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
916 </label> 915 </label>
917 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKn-CP-eGk"> 916 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKn-CP-eGk">
918 - <rect key="frame" x="222.5" y="50" width="100" height="40"/>  
919 - <fontDescription key="fontDescription" type="system" pointSize="33"/> 917 + <rect key="frame" x="227" y="50" width="91" height="36"/>
  918 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
920 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 919 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
921 <nil key="highlightedColor"/> 920 <nil key="highlightedColor"/>
922 </label> 921 </label>
923 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hkb-po-YgG"> 922 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hkb-po-YgG">
924 - <rect key="frame" x="23" y="110" width="100" height="20"/>  
925 - <fontDescription key="fontDescription" type="system" pointSize="16"/> 923 + <rect key="frame" x="24.5" y="104" width="93.5" height="18"/>
  924 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
926 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 925 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
927 <nil key="highlightedColor"/> 926 <nil key="highlightedColor"/>
928 </label> 927 </label>
929 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升5名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="loz-6S-4SZ"> 928 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同期上升5名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="loz-6S-4SZ">
930 - <rect key="frame" x="226.5" y="110" width="92" height="20"/>  
931 - <fontDescription key="fontDescription" type="system" pointSize="16"/> 929 + <rect key="frame" x="229.5" y="106" width="86" height="18"/>
  930 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
932 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 931 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
933 <nil key="highlightedColor"/> 932 <nil key="highlightedColor"/>
934 </label> 933 </label>
935 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年03月03号" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhW-z2-zvL"> 934 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年03月03号" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhW-z2-zvL">
936 - <rect key="frame" x="210" y="20" width="125" height="20"/> 935 + <rect key="frame" x="210" y="15" width="125" height="20"/>
937 <fontDescription key="fontDescription" type="system" pointSize="16"/> 936 <fontDescription key="fontDescription" type="system" pointSize="16"/>
938 - <color key="textColor" red="0.04378364389881239" green="0.14071327995740801" blue="0.3901689403553299" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 937 + <color key="textColor" red="0.082352941176470587" green="0.396078431372549" blue="0.75294117647058822" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
939 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 938 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
940 </label> 939 </label>
941 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均分1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fxg-5d-gP4"> 940 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均分1.1分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fxg-5d-gP4">
942 - <rect key="frame" x="22" y="140" width="102" height="17"/>  
943 - <fontDescription key="fontDescription" type="system" pointSize="14"/> 941 + <rect key="frame" x="16.5" y="132" width="109" height="18"/>
  942 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
944 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 943 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
945 <nil key="highlightedColor"/> 944 <nil key="highlightedColor"/>
946 </label> 945 </label>
947 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均排名1.1名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKB-Hn-Ran"> 946 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高于平均排名1.1名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKB-Hn-Ran">
948 - <rect key="frame" x="214.5" y="140" width="116" height="17"/>  
949 - <fontDescription key="fontDescription" type="system" pointSize="14"/> 947 + <rect key="frame" x="210.5" y="134" width="124" height="18"/>
  948 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
950 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 949 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
951 <nil key="highlightedColor"/> 950 <nil key="highlightedColor"/>
952 </label> 951 </label>
953 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="哎哟不错哦,德育评价打败了33%的同学!注意行为规范将更上一层楼" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6hf-ET-tXW"> 952 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="哎哟不错哦,德育评价打败了33%的同学!注意行为规范将更上一层楼" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6hf-ET-tXW">
954 - <rect key="frame" x="20" y="197" width="315" height="40"/> 953 + <rect key="frame" x="20" y="170" width="315" height="40"/>
955 <constraints> 954 <constraints>
956 <constraint firstAttribute="height" constant="40" id="psR-HE-T23"/> 955 <constraint firstAttribute="height" constant="40" id="psR-HE-T23"/>
957 </constraints> 956 </constraints>
958 - <fontDescription key="fontDescription" type="system" pointSize="16"/>  
959 - <color key="textColor" red="0.09198654443025589" green="0.17189717292785645" blue="0.63014686107635498" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 957 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  958 + <color key="textColor" red="0.082352941176470587" green="0.396078431372549" blue="0.75294117647058822" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
960 <nil key="highlightedColor"/> 959 <nil key="highlightedColor"/>
961 </label> 960 </label>
962 </subviews> 961 </subviews>
963 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 962 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
964 <constraints> 963 <constraints>
965 <constraint firstAttribute="trailing" secondItem="6hf-ET-tXW" secondAttribute="trailing" constant="20" id="2Tj-Ve-WtW"/> 964 <constraint firstAttribute="trailing" secondItem="6hf-ET-tXW" secondAttribute="trailing" constant="20" id="2Tj-Ve-WtW"/>
966 - <constraint firstItem="kJr-OQ-uJV" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="502-cT-UfL"/> 965 + <constraint firstItem="kJr-OQ-uJV" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="15" id="502-cT-UfL"/>
967 <constraint firstItem="pPw-dt-Xzf" firstAttribute="centerX" secondItem="kJr-OQ-uJV" secondAttribute="centerX" id="AzG-TO-CG2"/> 966 <constraint firstItem="pPw-dt-Xzf" firstAttribute="centerX" secondItem="kJr-OQ-uJV" secondAttribute="centerX" id="AzG-TO-CG2"/>
968 <constraint firstItem="cKB-Hn-Ran" firstAttribute="top" secondItem="loz-6S-4SZ" secondAttribute="bottom" constant="10" id="BDo-p2-BtV"/> 967 <constraint firstItem="cKB-Hn-Ran" firstAttribute="top" secondItem="loz-6S-4SZ" secondAttribute="bottom" constant="10" id="BDo-p2-BtV"/>
969 - <constraint firstItem="XKn-CP-eGk" firstAttribute="top" secondItem="HhW-z2-zvL" secondAttribute="bottom" constant="10" id="BGy-UG-tlR"/> 968 + <constraint firstItem="XKn-CP-eGk" firstAttribute="top" secondItem="HhW-z2-zvL" secondAttribute="bottom" constant="15" id="BGy-UG-tlR"/>
970 <constraint firstItem="EcR-iO-zzH" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" id="KHa-7w-P6J"/> 969 <constraint firstItem="EcR-iO-zzH" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" id="KHa-7w-P6J"/>
971 <constraint firstItem="cKB-Hn-Ran" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="Pi8-gc-a9g"/> 970 <constraint firstItem="cKB-Hn-Ran" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="Pi8-gc-a9g"/>
972 <constraint firstItem="HhW-z2-zvL" firstAttribute="trailing" secondItem="NuA-yM-hGe" secondAttribute="trailing" constant="-20" id="SlW-1a-fii"/> 971 <constraint firstItem="HhW-z2-zvL" firstAttribute="trailing" secondItem="NuA-yM-hGe" secondAttribute="trailing" constant="-20" id="SlW-1a-fii"/>
973 <constraint firstItem="loz-6S-4SZ" firstAttribute="top" secondItem="XKn-CP-eGk" secondAttribute="bottom" constant="20" id="Wyn-HL-kAX"/> 972 <constraint firstItem="loz-6S-4SZ" firstAttribute="top" secondItem="XKn-CP-eGk" secondAttribute="bottom" constant="20" id="Wyn-HL-kAX"/>
974 <constraint firstItem="Fxg-5d-gP4" firstAttribute="centerX" secondItem="pPw-dt-Xzf" secondAttribute="centerX" id="XJq-vE-dEe"/> 973 <constraint firstItem="Fxg-5d-gP4" firstAttribute="centerX" secondItem="pPw-dt-Xzf" secondAttribute="centerX" id="XJq-vE-dEe"/>
975 - <constraint firstItem="pPw-dt-Xzf" firstAttribute="top" secondItem="kJr-OQ-uJV" secondAttribute="bottom" constant="10" id="Zq8-G2-nmf"/> 974 + <constraint firstItem="pPw-dt-Xzf" firstAttribute="top" secondItem="kJr-OQ-uJV" secondAttribute="bottom" constant="15" id="Zq8-G2-nmf"/>
976 <constraint firstAttribute="bottom" secondItem="EcR-iO-zzH" secondAttribute="bottom" id="bD2-Ic-8FB"/> 975 <constraint firstAttribute="bottom" secondItem="EcR-iO-zzH" secondAttribute="bottom" id="bD2-Ic-8FB"/>
977 <constraint firstItem="XKn-CP-eGk" firstAttribute="centerX" secondItem="HhW-z2-zvL" secondAttribute="centerX" id="cJf-Oy-8XW"/> 976 <constraint firstItem="XKn-CP-eGk" firstAttribute="centerX" secondItem="HhW-z2-zvL" secondAttribute="centerX" id="cJf-Oy-8XW"/>
978 <constraint firstItem="6hf-ET-tXW" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="20" id="chf-Pk-BRe"/> 977 <constraint firstItem="6hf-ET-tXW" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="20" id="chf-Pk-BRe"/>
@@ -982,14 +981,14 @@ @@ -982,14 +981,14 @@
982 <constraint firstAttribute="trailing" secondItem="EcR-iO-zzH" secondAttribute="trailing" id="jgC-VC-Bdn"/> 981 <constraint firstAttribute="trailing" secondItem="EcR-iO-zzH" secondAttribute="trailing" id="jgC-VC-Bdn"/>
983 <constraint firstItem="kJr-OQ-uJV" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="40" id="mO7-dF-5MB"/> 982 <constraint firstItem="kJr-OQ-uJV" firstAttribute="leading" secondItem="NuA-yM-hGe" secondAttribute="leading" constant="40" id="mO7-dF-5MB"/>
984 <constraint firstItem="hkb-po-YgG" firstAttribute="top" secondItem="pPw-dt-Xzf" secondAttribute="bottom" constant="20" id="obS-hd-z9K"/> 983 <constraint firstItem="hkb-po-YgG" firstAttribute="top" secondItem="pPw-dt-Xzf" secondAttribute="bottom" constant="20" id="obS-hd-z9K"/>
985 - <constraint firstItem="6hf-ET-tXW" firstAttribute="top" secondItem="Fxg-5d-gP4" secondAttribute="bottom" constant="40" id="q0U-qj-DJO"/>  
986 - <constraint firstItem="HhW-z2-zvL" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="20" id="q7J-cI-IMF"/> 984 + <constraint firstItem="6hf-ET-tXW" firstAttribute="top" secondItem="Fxg-5d-gP4" secondAttribute="bottom" constant="20" id="q0U-qj-DJO"/>
  985 + <constraint firstItem="HhW-z2-zvL" firstAttribute="top" secondItem="NuA-yM-hGe" secondAttribute="top" constant="15" id="q7J-cI-IMF"/>
987 <constraint firstItem="loz-6S-4SZ" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="yfa-jP-3Zs"/> 986 <constraint firstItem="loz-6S-4SZ" firstAttribute="centerX" secondItem="XKn-CP-eGk" secondAttribute="centerX" id="yfa-jP-3Zs"/>
988 </constraints> 987 </constraints>
989 <userDefinedRuntimeAttributes> 988 <userDefinedRuntimeAttributes>
990 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 989 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
991 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 990 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
992 - <integer key="value" value="6"/> 991 + <integer key="value" value="5"/>
993 </userDefinedRuntimeAttribute> 992 </userDefinedRuntimeAttribute>
994 </userDefinedRuntimeAttributes> 993 </userDefinedRuntimeAttributes>
995 </view> 994 </view>
@@ -1023,88 +1022,70 @@ @@ -1023,88 +1022,70 @@
1023 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vXo-Fa-6Hr"> 1022 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vXo-Fa-6Hr">
1024 <rect key="frame" x="10" y="10" width="355" height="269.5"/> 1023 <rect key="frame" x="10" y="10" width="355" height="269.5"/>
1025 <subviews> 1024 <subviews>
1026 - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BAf-AK-gLj">  
1027 - <rect key="frame" x="50" y="15" width="255" height="44"/>  
1028 - <subviews>  
1029 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hB5-yY-cds">  
1030 - <rect key="frame" x="36" y="0.0" width="35" height="44"/>  
1031 - <constraints>  
1032 - <constraint firstAttribute="height" constant="44" id="ba9-GG-6DC"/>  
1033 - </constraints>  
1034 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1035 - <nil key="textColor"/>  
1036 - <nil key="highlightedColor"/>  
1037 - </label>  
1038 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昨日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbT-TJ-Rlx">  
1039 - <rect key="frame" x="210" y="0.0" width="35" height="44"/>  
1040 - <constraints>  
1041 - <constraint firstAttribute="height" constant="44" id="0Qq-BR-OZ6"/>  
1042 - </constraints>  
1043 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1044 - <nil key="textColor"/>  
1045 - <nil key="highlightedColor"/>  
1046 - </label>  
1047 - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2l-9v-6mj">  
1048 - <rect key="frame" x="10" y="14" width="16" height="16"/>  
1049 - <color key="backgroundColor" red="0.25490196078431371" green="0.41176470588235292" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>  
1050 - <constraints>  
1051 - <constraint firstAttribute="width" constant="16" id="7Uu-Sj-DgF"/>  
1052 - <constraint firstAttribute="height" constant="16" id="ZLo-3g-2uU"/>  
1053 - </constraints>  
1054 - <userDefinedRuntimeAttributes>  
1055 - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>  
1056 - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">  
1057 - <integer key="value" value="8"/>  
1058 - </userDefinedRuntimeAttribute>  
1059 - </userDefinedRuntimeAttributes>  
1060 - </view>  
1061 - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="woJ-aK-qdt">  
1062 - <rect key="frame" x="184" y="14" width="16" height="16"/>  
1063 - <color key="backgroundColor" red="0.86274509803921573" green="0.0" blue="0.062745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>  
1064 - <constraints>  
1065 - <constraint firstAttribute="width" constant="16" id="KqF-Oh-IfA"/>  
1066 - <constraint firstAttribute="height" constant="16" id="YHQ-d0-qVM"/>  
1067 - </constraints>  
1068 - <userDefinedRuntimeAttributes>  
1069 - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>  
1070 - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">  
1071 - <integer key="value" value="8"/>  
1072 - </userDefinedRuntimeAttribute>  
1073 - </userDefinedRuntimeAttributes>  
1074 - </view>  
1075 - </subviews>  
1076 - <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1025 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昨日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vbT-TJ-Rlx">
  1026 + <rect key="frame" x="227.5" y="10" width="31" height="18"/>
  1027 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  1028 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1029 + <nil key="highlightedColor"/>
  1030 + </label>
  1031 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2l-9v-6mj">
  1032 + <rect key="frame" x="70.5" y="10" width="16" height="16"/>
  1033 + <color key="backgroundColor" red="0.25490196078431371" green="0.41176470588235292" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1077 <constraints> 1034 <constraints>
1078 - <constraint firstItem="vbT-TJ-Rlx" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="top" id="5zB-pN-mee"/>  
1079 - <constraint firstAttribute="height" constant="44" id="8kY-AD-xJd"/>  
1080 - <constraint firstItem="vbT-TJ-Rlx" firstAttribute="leading" secondItem="woJ-aK-qdt" secondAttribute="trailing" constant="10" id="8qg-WB-jyd"/>  
1081 - <constraint firstAttribute="trailing" secondItem="vbT-TJ-Rlx" secondAttribute="trailing" constant="10" id="Izb-9p-OUB"/>  
1082 - <constraint firstItem="g2l-9v-6mj" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="top" constant="14" id="QLs-n1-HYg"/>  
1083 - <constraint firstItem="hB5-yY-cds" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="top" id="fEE-Xl-Bvo"/>  
1084 - <constraint firstItem="g2l-9v-6mj" firstAttribute="leading" secondItem="BAf-AK-gLj" secondAttribute="leading" constant="10" id="fWJ-vl-IYK"/>  
1085 - <constraint firstItem="woJ-aK-qdt" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="top" constant="14" id="ipM-hU-2vL"/>  
1086 - <constraint firstItem="hB5-yY-cds" firstAttribute="leading" secondItem="g2l-9v-6mj" secondAttribute="trailing" constant="10" id="k53-ly-Ddj"/>  
1087 - <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hB5-yY-cds" secondAttribute="trailing" constant="20" symbolic="YES" id="nbQ-l7-6mG"/> 1035 + <constraint firstAttribute="height" constant="16" id="8ZT-7b-Jlh"/>
  1036 + <constraint firstAttribute="width" constant="16" id="Tp5-1I-d7U"/>
1088 </constraints> 1037 </constraints>
  1038 + <userDefinedRuntimeAttributes>
  1039 + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
  1040 + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
  1041 + <integer key="value" value="8"/>
  1042 + </userDefinedRuntimeAttribute>
  1043 + </userDefinedRuntimeAttributes>
  1044 + </view>
  1045 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="woJ-aK-qdt">
  1046 + <rect key="frame" x="201.5" y="10" width="16" height="16"/>
  1047 + <color key="backgroundColor" red="0.86274509803921573" green="0.0" blue="0.062745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1048 + <constraints>
  1049 + <constraint firstAttribute="width" constant="16" id="FHe-Ab-WLj"/>
  1050 + <constraint firstAttribute="height" constant="16" id="uy6-dQ-f1D"/>
  1051 + </constraints>
  1052 + <userDefinedRuntimeAttributes>
  1053 + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
  1054 + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
  1055 + <integer key="value" value="8"/>
  1056 + </userDefinedRuntimeAttribute>
  1057 + </userDefinedRuntimeAttributes>
1089 </view> 1058 </view>
1090 <view contentMode="scaleToFill" restorationIdentifier="moralLineChart" translatesAutoresizingMaskIntoConstraints="NO" id="3tc-50-XKr"> 1059 <view contentMode="scaleToFill" restorationIdentifier="moralLineChart" translatesAutoresizingMaskIntoConstraints="NO" id="3tc-50-XKr">
1091 - <rect key="frame" x="0.0" y="59" width="355" height="210.5"/> 1060 + <rect key="frame" x="0.0" y="38" width="355" height="231"/>
1092 </view> 1061 </view>
  1062 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hB5-yY-cds">
  1063 + <rect key="frame" x="96.5" y="10" width="31" height="18"/>
  1064 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  1065 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1066 + <nil key="highlightedColor"/>
  1067 + </label>
1093 </subviews> 1068 </subviews>
1094 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1069 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1095 <constraints> 1070 <constraints>
1096 - <constraint firstItem="BAf-AK-gLj" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="15" id="EdB-30-jd8"/>  
1097 - <constraint firstItem="BAf-AK-gLj" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" constant="50" id="Foc-Ql-7UA"/>  
1098 - <constraint firstItem="3tc-50-XKr" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" id="LKH-Xf-sSi"/>  
1099 - <constraint firstAttribute="trailing" secondItem="BAf-AK-gLj" secondAttribute="trailing" constant="50" id="NKu-wo-SUP"/>  
1100 - <constraint firstAttribute="trailing" secondItem="3tc-50-XKr" secondAttribute="trailing" id="bjx-CV-I0v"/>  
1101 - <constraint firstAttribute="bottom" secondItem="3tc-50-XKr" secondAttribute="bottom" id="f0z-WO-LfT"/>  
1102 - <constraint firstItem="3tc-50-XKr" firstAttribute="top" secondItem="BAf-AK-gLj" secondAttribute="bottom" id="jZe-ix-tAh"/> 1071 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="vbT-TJ-Rlx" secondAttribute="trailing" constant="20" symbolic="YES" id="2PU-Yx-LbD"/>
  1072 + <constraint firstItem="woJ-aK-qdt" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="10" id="Dps-v1-uEv"/>
  1073 + <constraint firstItem="vbT-TJ-Rlx" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="10" id="Kwl-6a-0KH"/>
  1074 + <constraint firstItem="g2l-9v-6mj" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="10" id="ODN-fb-3cl"/>
  1075 + <constraint firstItem="3tc-50-XKr" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="leading" id="Qsb-PE-ISX"/>
  1076 + <constraint firstItem="vbT-TJ-Rlx" firstAttribute="leading" secondItem="vXo-Fa-6Hr" secondAttribute="centerX" constant="50" id="UE4-CL-hfO"/>
  1077 + <constraint firstItem="hB5-yY-cds" firstAttribute="top" secondItem="vXo-Fa-6Hr" secondAttribute="top" constant="10" id="VtE-pO-f1d"/>
  1078 + <constraint firstAttribute="trailing" secondItem="3tc-50-XKr" secondAttribute="trailing" id="WHN-o8-90v"/>
  1079 + <constraint firstItem="hB5-yY-cds" firstAttribute="trailing" secondItem="vXo-Fa-6Hr" secondAttribute="centerX" constant="-50" id="YIS-vS-HPs"/>
  1080 + <constraint firstItem="3tc-50-XKr" firstAttribute="top" secondItem="hB5-yY-cds" secondAttribute="bottom" constant="10" id="hg1-Bt-fWy"/>
  1081 + <constraint firstAttribute="bottom" secondItem="3tc-50-XKr" secondAttribute="bottom" id="kQo-ox-SzX"/>
  1082 + <constraint firstItem="hB5-yY-cds" firstAttribute="leading" secondItem="g2l-9v-6mj" secondAttribute="trailing" constant="10" id="nFK-I0-GfF"/>
  1083 + <constraint firstItem="vbT-TJ-Rlx" firstAttribute="leading" secondItem="woJ-aK-qdt" secondAttribute="trailing" constant="10" id="sMF-Ia-J81"/>
1103 </constraints> 1084 </constraints>
1104 <userDefinedRuntimeAttributes> 1085 <userDefinedRuntimeAttributes>
1105 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1086 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1106 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1087 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1107 - <integer key="value" value="6"/> 1088 + <integer key="value" value="5"/>
1108 </userDefinedRuntimeAttribute> 1089 </userDefinedRuntimeAttribute>
1109 </userDefinedRuntimeAttributes> 1090 </userDefinedRuntimeAttributes>
1110 </view> 1091 </view>
@@ -1132,60 +1113,49 @@ @@ -1132,60 +1113,49 @@
1132 <rect key="frame" x="10" y="10" width="355" height="89.5"/> 1113 <rect key="frame" x="10" y="10" width="355" height="89.5"/>
1133 <subviews> 1114 <subviews>
1134 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 增长1.1分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOj-hC-AHs"> 1115 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 增长1.1分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOj-hC-AHs">
1135 - <rect key="frame" x="10" y="40" width="143.5" height="20"/>  
1136 - <constraints>  
1137 - <constraint firstAttribute="height" constant="20" id="3zD-IC-3oi"/>  
1138 - </constraints>  
1139 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1140 - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> 1116 + <rect key="frame" x="10" y="38" width="104" height="14.5"/>
  1117 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
  1118 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="0.98793343321917804" colorSpace="custom" customColorSpace="sRGB"/>
1141 <nil key="highlightedColor"/> 1119 <nil key="highlightedColor"/>
1142 </label> 1120 </label>
1143 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dcR-3E-z4e">  
1144 - <rect key="frame" x="323" y="10" width="22" height="30"/>  
1145 - <constraints>  
1146 - <constraint firstAttribute="height" constant="30" id="yIL-7E-thg"/>  
1147 - </constraints>  
1148 - <fontDescription key="fontDescription" type="system" pointSize="20"/>  
1149 - <color key="textColor" red="0.0" green="0.97680455450000003" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1121 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A-" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dcR-3E-z4e">
  1122 + <rect key="frame" x="328.5" y="10" width="16.5" height="18"/>
  1123 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  1124 + <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1150 <nil key="highlightedColor"/> 1125 <nil key="highlightedColor"/>
1151 </label> 1126 </label>
1152 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排名:第三名 增长1名" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pKi-l3-fED">  
1153 - <rect key="frame" x="180" y="40" width="155.5" height="20"/>  
1154 - <constraints>  
1155 - <constraint firstAttribute="height" constant="20" id="wAx-AC-wB7"/>  
1156 - </constraints>  
1157 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1158 - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.50393300513698636" colorSpace="custom" customColorSpace="sRGB"/> 1127 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排名:第三名 增长1名" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pKi-l3-fED">
  1128 + <rect key="frame" x="234" y="38" width="111" height="14.5"/>
  1129 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
  1130 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1159 <nil key="highlightedColor"/> 1131 <nil key="highlightedColor"/>
1160 </label> 1132 </label>
1161 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="行为规范" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i3X-WD-17R">  
1162 - <rect key="frame" x="10" y="10" width="77.5" height="20"/>  
1163 - <constraints>  
1164 - <constraint firstAttribute="height" constant="20" id="tkD-27-2zS"/>  
1165 - </constraints>  
1166 - <fontDescription key="fontDescription" type="system" pointSize="19"/>  
1167 - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.82876712328767121" colorSpace="custom" customColorSpace="sRGB"/> 1133 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="行为规范" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i3X-WD-17R">
  1134 + <rect key="frame" x="10" y="10" width="61.5" height="18"/>
  1135 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  1136 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1168 <nil key="highlightedColor"/> 1137 <nil key="highlightedColor"/>
1169 </label> 1138 </label>
1170 </subviews> 1139 </subviews>
1171 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1140 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1172 <constraints> 1141 <constraints>
1173 - <constraint firstItem="dcR-3E-z4e" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="20" symbolic="YES" id="5IH-UD-w2m"/>  
1174 - <constraint firstItem="HOj-hC-AHs" firstAttribute="leading" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="10" id="95i-QX-Y3F"/>  
1175 - <constraint firstAttribute="trailing" secondItem="dcR-3E-z4e" secondAttribute="trailing" constant="10" id="Cd3-4P-wa1"/>  
1176 - <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="i3X-WD-17R" secondAttribute="trailing" constant="20" symbolic="YES" id="D15-ex-oBf"/>  
1177 - <constraint firstItem="dcR-3E-z4e" firstAttribute="top" secondItem="3Qp-zh-xwy" secondAttribute="top" constant="10" id="EaB-NF-flN"/>  
1178 - <constraint firstAttribute="trailing" secondItem="pKi-l3-fED" secondAttribute="trailing" constant="19.5" id="IQP-7C-QZV"/>  
1179 - <constraint firstItem="pKi-l3-fED" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="HOj-hC-AHs" secondAttribute="trailing" symbolic="YES" id="NTX-lO-8rF"/>  
1180 - <constraint firstItem="i3X-WD-17R" firstAttribute="leading" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="10" id="WQn-HK-HqW"/>  
1181 - <constraint firstItem="HOj-hC-AHs" firstAttribute="top" secondItem="i3X-WD-17R" secondAttribute="bottom" constant="10" id="fQp-g2-GfI"/>  
1182 - <constraint firstItem="pKi-l3-fED" firstAttribute="top" secondItem="dcR-3E-z4e" secondAttribute="bottom" id="l3K-LN-KQt"/>  
1183 - <constraint firstItem="i3X-WD-17R" firstAttribute="top" secondItem="3Qp-zh-xwy" secondAttribute="top" constant="10" id="oqC-O4-8ps"/> 1142 + <constraint firstItem="pKi-l3-fED" firstAttribute="top" secondItem="dcR-3E-z4e" secondAttribute="bottom" constant="10" id="8To-zg-byO"/>
  1143 + <constraint firstItem="dcR-3E-z4e" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="20" symbolic="YES" id="KVF-R5-Gzo"/>
  1144 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="HOj-hC-AHs" secondAttribute="trailing" constant="20" symbolic="YES" id="RQa-yj-hzU"/>
  1145 + <constraint firstItem="dcR-3E-z4e" firstAttribute="top" secondItem="3Qp-zh-xwy" secondAttribute="top" constant="10" id="SAg-Hh-AP3"/>
  1146 + <constraint firstItem="i3X-WD-17R" firstAttribute="leading" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="10" id="VfL-3c-OuG"/>
  1147 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="i3X-WD-17R" secondAttribute="trailing" constant="20" symbolic="YES" id="Ww5-II-kLF"/>
  1148 + <constraint firstItem="pKi-l3-fED" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3Qp-zh-xwy" secondAttribute="leading" constant="20" symbolic="YES" id="dQT-ju-MtH"/>
  1149 + <constraint firstItem="HOj-hC-AHs" firstAttribute="top" secondItem="i3X-WD-17R" secondAttribute="bottom" constant="10" id="ecc-Vh-sgH"/>
  1150 + <constraint firstItem="HOj-hC-AHs" firstAttribute="leading" secondItem="i3X-WD-17R" secondAttribute="leading" id="fYN-Hv-UZg"/>
  1151 + <constraint firstItem="pKi-l3-fED" firstAttribute="trailing" secondItem="dcR-3E-z4e" secondAttribute="trailing" id="mnS-XF-vD0"/>
  1152 + <constraint firstItem="i3X-WD-17R" firstAttribute="top" secondItem="3Qp-zh-xwy" secondAttribute="top" constant="10" id="nNU-vb-9Ba"/>
  1153 + <constraint firstItem="dcR-3E-z4e" firstAttribute="trailing" secondItem="3Qp-zh-xwy" secondAttribute="trailing" constant="-10" id="ngN-44-upK"/>
1184 </constraints> 1154 </constraints>
1185 <userDefinedRuntimeAttributes> 1155 <userDefinedRuntimeAttributes>
1186 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1156 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1187 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1157 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1188 - <integer key="value" value="6"/> 1158 + <integer key="value" value="5"/>
1189 </userDefinedRuntimeAttribute> 1159 </userDefinedRuntimeAttribute>
1190 </userDefinedRuntimeAttributes> 1160 </userDefinedRuntimeAttributes>
1191 </view> 1161 </view>
@@ -1217,7 +1187,7 @@ @@ -1217,7 +1187,7 @@
1217 </viewController> 1187 </viewController>
1218 <placeholder placeholderIdentifier="IBFirstResponder" id="dWZ-wh-hFd" userLabel="First Responder" sceneMemberID="firstResponder"/> 1188 <placeholder placeholderIdentifier="IBFirstResponder" id="dWZ-wh-hFd" userLabel="First Responder" sceneMemberID="firstResponder"/>
1219 </objects> 1189 </objects>
1220 - <point key="canvasLocation" x="2359" y="410"/> 1190 + <point key="canvasLocation" x="2357.5999999999999" y="409.7451274362819"/>
1221 </scene> 1191 </scene>
1222 <!--场景详情--> 1192 <!--场景详情-->
1223 <scene sceneID="UoQ-sj-mPR"> 1193 <scene sceneID="UoQ-sj-mPR">
@@ -1231,7 +1201,7 @@ @@ -1231,7 +1201,7 @@
1231 <rect key="frame" x="0.0" y="20" width="375" height="637"/> 1201 <rect key="frame" x="0.0" y="20" width="375" height="637"/>
1232 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> 1202 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
1233 <prototypes> 1203 <prototypes>
1234 - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cultureCell" rowHeight="250" id="Sbf-4Z-E81"> 1204 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SceneTopCell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cultureCell" rowHeight="250" id="Sbf-4Z-E81" customClass="SceneTopCell" customModule="ParentAssistant" customModuleProvider="target">
1235 <rect key="frame" x="0.0" y="28" width="375" height="250"/> 1205 <rect key="frame" x="0.0" y="28" width="375" height="250"/>
1236 <autoresizingMask key="autoresizingMask"/> 1206 <autoresizingMask key="autoresizingMask"/>
1237 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Sbf-4Z-E81" id="p9c-ar-2iv"> 1207 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Sbf-4Z-E81" id="p9c-ar-2iv">
@@ -1241,96 +1211,80 @@ @@ -1241,96 +1211,80 @@
1241 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8E5-EK-QBq"> 1211 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8E5-EK-QBq">
1242 <rect key="frame" x="10" y="10" width="355" height="240"/> 1212 <rect key="frame" x="10" y="10" width="355" height="240"/>
1243 <subviews> 1213 <subviews>
1244 - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="test002" translatesAutoresizingMaskIntoConstraints="NO" id="XXc-j0-EmD">  
1245 - <rect key="frame" x="5" y="20" width="130" height="186"/> 1214 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="report_teacher" translatesAutoresizingMaskIntoConstraints="NO" id="XXc-j0-EmD">
  1215 + <rect key="frame" x="20" y="20" width="127" height="192"/>
1246 <constraints> 1216 <constraints>
1247 - <constraint firstAttribute="height" constant="186" id="cz5-BS-oE1"/>  
1248 - <constraint firstAttribute="width" constant="130" id="wr9-zn-Jgm"/> 1217 + <constraint firstAttribute="width" constant="127" id="8fh-8G-qfV"/>
  1218 + <constraint firstAttribute="height" constant="192" id="AtU-Bg-zLg"/>
  1219 + <constraint firstAttribute="width" secondItem="XXc-j0-EmD" secondAttribute="height" multiplier="127:192" id="USC-5B-2u0"/>
1249 </constraints> 1220 </constraints>
1250 </imageView> 1221 </imageView>
1251 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文明礼仪" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Psh-KP-4Wq">  
1252 - <rect key="frame" x="150" y="10" width="120" height="40"/>  
1253 - <constraints>  
1254 - <constraint firstAttribute="height" constant="40" id="euf-Y6-DJb"/>  
1255 - <constraint firstAttribute="width" constant="120" id="tme-v3-0lv"/>  
1256 - </constraints>  
1257 - <fontDescription key="fontDescription" type="system" pointSize="20"/>  
1258 - <color key="textColor" red="0.05977229492278846" green="0.25587294009390937" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1222 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文明礼仪" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Psh-KP-4Wq">
  1223 + <rect key="frame" x="167" y="15" width="73.5" height="21.5"/>
  1224 + <fontDescription key="fontDescription" type="system" pointSize="18"/>
  1225 + <color key="textColor" red="0.082352941176470587" green="0.396078431372549" blue="0.75294117647058822" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1259 <nil key="highlightedColor"/> 1226 <nil key="highlightedColor"/>
1260 </label> 1227 </label>
1261 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="得分: 85 分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wcw-jF-3E1">  
1262 - <rect key="frame" x="150" y="55" width="120" height="20"/>  
1263 - <constraints>  
1264 - <constraint firstAttribute="width" constant="120" id="Cmj-y1-SxA"/>  
1265 - <constraint firstAttribute="height" constant="20" id="OHe-DK-sz2"/>  
1266 - </constraints>  
1267 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1268 - <color key="textColor" red="0.35603391029945258" green="0.78778803151874899" blue="0.98780536167512689" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1228 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="得分: 85 分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wcw-jF-3E1">
  1229 + <rect key="frame" x="167" y="45" width="91.5" height="21.5"/>
  1230 + <fontDescription key="fontDescription" type="system" pointSize="18"/>
  1231 + <color key="textColor" red="0.45098039215686275" green="0.70980392156862748" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1269 <nil key="highlightedColor"/> 1232 <nil key="highlightedColor"/>
1270 </label> 1233 </label>
1271 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XBZ-1A-yLH">  
1272 - <rect key="frame" x="150" y="80" width="120" height="20"/>  
1273 - <constraints>  
1274 - <constraint firstAttribute="height" constant="20" id="Ojz-nO-vxg"/>  
1275 - <constraint firstAttribute="width" constant="120" id="Pi9-kV-9TP"/>  
1276 - </constraints>  
1277 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1278 - <color key="textColor" red="0.35732034071183999" green="0.79063448645729151" blue="0.99137452411167515" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1234 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XBZ-1A-yLH">
  1235 + <rect key="frame" x="167" y="76.5" width="95.5" height="21.5"/>
  1236 + <fontDescription key="fontDescription" type="system" pointSize="18"/>
  1237 + <color key="textColor" red="0.45098039215686275" green="0.70980392156862748" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1279 <nil key="highlightedColor"/> 1238 <nil key="highlightedColor"/>
1280 </label> 1239 </label>
1281 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等级: A-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NVG-Dm-581"> 1240 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等级: A-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NVG-Dm-581">
1282 - <rect key="frame" x="150" y="105" width="120" height="20"/>  
1283 - <constraints>  
1284 - <constraint firstAttribute="height" constant="20" id="Ybe-M8-6A5"/>  
1285 - <constraint firstAttribute="width" constant="120" id="x6U-mh-zmk"/>  
1286 - </constraints>  
1287 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1288 - <color key="textColor" red="0.36042921420844276" green="0.79751341922543606" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1241 + <rect key="frame" x="167" y="108" width="66" height="21.5"/>
  1242 + <fontDescription key="fontDescription" type="system" pointSize="18"/>
  1243 + <color key="textColor" red="0.45098039215686275" green="0.70980392156862748" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1289 <nil key="highlightedColor"/> 1244 <nil key="highlightedColor"/>
1290 </label> 1245 </label>
1291 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="指导意见:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="peF-aY-iLQ"> 1246 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="指导意见:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="peF-aY-iLQ">
1292 - <rect key="frame" x="150" y="135" width="120" height="20"/>  
1293 - <constraints>  
1294 - <constraint firstAttribute="height" constant="20" id="e0v-7a-wVW"/>  
1295 - <constraint firstAttribute="width" constant="120" id="wTx-0f-epB"/>  
1296 - </constraints>  
1297 - <fontDescription key="fontDescription" type="system" pointSize="17"/>  
1298 - <color key="textColor" red="0.08818466372138678" green="0.28730014058798492" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1247 + <rect key="frame" x="167" y="149.5" width="65.5" height="18"/>
  1248 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  1249 + <color key="textColor" red="0.082352941176470587" green="0.30980392156862746" blue="0.70196078431372544" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1299 <nil key="highlightedColor"/> 1250 <nil key="highlightedColor"/>
1300 </label> 1251 </label>
1301 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="与上次相比有进步,保持文明礼仪,注意行为规范" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="FAc-nJ-yb3"> 1252 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="与上次相比有进步,保持文明礼仪,注意行为规范" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="FAc-nJ-yb3">
1302 - <rect key="frame" x="145" y="155" width="200" height="57"/> 1253 + <rect key="frame" x="162" y="167.5" width="183" height="62.5"/>
1303 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1254 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1304 - <constraints>  
1305 - <constraint firstAttribute="height" constant="57" id="YHu-NQ-pqg"/>  
1306 - </constraints>  
1307 - <color key="textColor" red="0.12349432013048467" green="0.21636298090844941" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>  
1308 - <fontDescription key="fontDescription" type="system" pointSize="14"/> 1255 + <color key="textColor" red="0.082352941176470587" green="0.30980392156862746" blue="0.70196078431372544" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1256 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
1309 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> 1257 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
1310 </textView> 1258 </textView>
1311 </subviews> 1259 </subviews>
1312 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1260 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1313 <constraints> 1261 <constraints>
1314 - <constraint firstItem="NVG-Dm-581" firstAttribute="top" secondItem="XBZ-1A-yLH" secondAttribute="bottom" constant="5" id="00S-XO-JRT"/>  
1315 - <constraint firstItem="XXc-j0-EmD" firstAttribute="top" secondItem="8E5-EK-QBq" secondAttribute="top" constant="20" id="178-70-P4o"/>  
1316 - <constraint firstItem="XBZ-1A-yLH" firstAttribute="top" secondItem="Wcw-jF-3E1" secondAttribute="bottom" constant="5" id="6Uz-eq-sN1"/>  
1317 - <constraint firstAttribute="trailing" secondItem="FAc-nJ-yb3" secondAttribute="trailing" constant="10" id="ECL-YW-wNo"/>  
1318 - <constraint firstItem="NVG-Dm-581" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="KDh-S9-SfN"/>  
1319 - <constraint firstItem="Wcw-jF-3E1" firstAttribute="top" secondItem="Psh-KP-4Wq" secondAttribute="bottom" constant="5" id="PRB-97-KpQ"/>  
1320 - <constraint firstItem="XBZ-1A-yLH" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="T4P-0a-gGW"/>  
1321 - <constraint firstItem="FAc-nJ-yb3" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="10" id="XdY-a7-b8j"/>  
1322 - <constraint firstItem="Psh-KP-4Wq" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="Z0v-sm-EXD"/>  
1323 - <constraint firstItem="XXc-j0-EmD" firstAttribute="leading" secondItem="8E5-EK-QBq" secondAttribute="leading" constant="5" id="ZV4-zg-9Fe"/>  
1324 - <constraint firstItem="peF-aY-iLQ" firstAttribute="top" secondItem="NVG-Dm-581" secondAttribute="bottom" constant="10" id="a0L-8y-7UB"/>  
1325 - <constraint firstItem="Psh-KP-4Wq" firstAttribute="top" secondItem="8E5-EK-QBq" secondAttribute="top" constant="10" id="lNE-Kv-rVj"/>  
1326 - <constraint firstItem="Wcw-jF-3E1" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="scG-to-yGf"/>  
1327 - <constraint firstItem="FAc-nJ-yb3" firstAttribute="top" secondItem="peF-aY-iLQ" secondAttribute="bottom" id="v5b-rv-Wf5"/>  
1328 - <constraint firstItem="peF-aY-iLQ" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="v6a-mq-e5A"/> 1262 + <constraint firstAttribute="bottom" secondItem="FAc-nJ-yb3" secondAttribute="bottom" constant="10" id="0cS-YS-blc"/>
  1263 + <constraint firstItem="Psh-KP-4Wq" firstAttribute="top" secondItem="8E5-EK-QBq" secondAttribute="top" constant="15" id="1Rr-Zj-G59"/>
  1264 + <constraint firstItem="Wcw-jF-3E1" firstAttribute="leading" secondItem="Psh-KP-4Wq" secondAttribute="leading" id="21y-e9-sIB"/>
  1265 + <constraint firstItem="XXc-j0-EmD" firstAttribute="leading" secondItem="8E5-EK-QBq" secondAttribute="leading" constant="20" id="3z0-Y4-Re0"/>
  1266 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Wcw-jF-3E1" secondAttribute="trailing" constant="20" symbolic="YES" id="6F9-No-Abc"/>
  1267 + <constraint firstItem="NVG-Dm-581" firstAttribute="top" secondItem="XBZ-1A-yLH" secondAttribute="bottom" constant="10" id="6hH-fU-wi2"/>
  1268 + <constraint firstItem="Psh-KP-4Wq" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="20" id="Eal-lD-2Lz"/>
  1269 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="NVG-Dm-581" secondAttribute="trailing" constant="20" symbolic="YES" id="FPE-Jo-pu3"/>
  1270 + <constraint firstItem="Wcw-jF-3E1" firstAttribute="top" secondItem="Psh-KP-4Wq" secondAttribute="top" constant="30" id="LbO-tv-G4z"/>
  1271 + <constraint firstItem="XXc-j0-EmD" firstAttribute="top" secondItem="8E5-EK-QBq" secondAttribute="top" constant="20" id="P3i-cj-KPE"/>
  1272 + <constraint firstItem="FAc-nJ-yb3" firstAttribute="top" secondItem="peF-aY-iLQ" secondAttribute="bottom" id="PeV-fd-6q5"/>
  1273 + <constraint firstItem="XBZ-1A-yLH" firstAttribute="top" secondItem="Wcw-jF-3E1" secondAttribute="bottom" constant="10" id="Ub5-jw-GDw"/>
  1274 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="peF-aY-iLQ" secondAttribute="trailing" constant="20" symbolic="YES" id="XIh-d2-l68"/>
  1275 + <constraint firstItem="XBZ-1A-yLH" firstAttribute="leading" secondItem="Psh-KP-4Wq" secondAttribute="leading" id="cRw-iP-MlB"/>
  1276 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="XBZ-1A-yLH" secondAttribute="trailing" constant="20" symbolic="YES" id="e0E-2R-0ji"/>
  1277 + <constraint firstItem="FAc-nJ-yb3" firstAttribute="leading" secondItem="XXc-j0-EmD" secondAttribute="trailing" constant="15" id="fH9-hM-DoS"/>
  1278 + <constraint firstItem="NVG-Dm-581" firstAttribute="leading" secondItem="Psh-KP-4Wq" secondAttribute="leading" id="ff6-Qs-Cml"/>
  1279 + <constraint firstItem="peF-aY-iLQ" firstAttribute="top" secondItem="NVG-Dm-581" secondAttribute="bottom" constant="20" id="r2c-Wy-Qzu"/>
  1280 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Psh-KP-4Wq" secondAttribute="trailing" constant="20" symbolic="YES" id="rgU-lH-ulB"/>
  1281 + <constraint firstAttribute="trailing" secondItem="FAc-nJ-yb3" secondAttribute="trailing" constant="10" id="uOI-K1-TnD"/>
  1282 + <constraint firstItem="peF-aY-iLQ" firstAttribute="leading" secondItem="Psh-KP-4Wq" secondAttribute="leading" id="zei-vg-gjZ"/>
1329 </constraints> 1283 </constraints>
1330 <userDefinedRuntimeAttributes> 1284 <userDefinedRuntimeAttributes>
1331 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1285 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1332 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1286 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1333 - <integer key="value" value="6"/> 1287 + <integer key="value" value="5"/>
1334 </userDefinedRuntimeAttribute> 1288 </userDefinedRuntimeAttribute>
1335 </userDefinedRuntimeAttributes> 1289 </userDefinedRuntimeAttributes>
1336 </view> 1290 </view>
@@ -1343,8 +1297,14 @@ @@ -1343,8 +1297,14 @@
1343 <constraint firstItem="8E5-EK-QBq" firstAttribute="top" secondItem="p9c-ar-2iv" secondAttribute="top" constant="10" id="n3L-T7-7zE"/> 1297 <constraint firstItem="8E5-EK-QBq" firstAttribute="top" secondItem="p9c-ar-2iv" secondAttribute="top" constant="10" id="n3L-T7-7zE"/>
1344 </constraints> 1298 </constraints>
1345 </tableViewCellContentView> 1299 </tableViewCellContentView>
  1300 + <connections>
  1301 + <outlet property="GPALab" destination="XBZ-1A-yLH" id="C5U-gf-84W"/>
  1302 + <outlet property="LevelLab" destination="NVG-Dm-581" id="I1r-Ig-JbX"/>
  1303 + <outlet property="SuggestLab" destination="FAc-nJ-yb3" id="AkJ-56-nbB"/>
  1304 + <outlet property="scoreLab" destination="Wcw-jF-3E1" id="9oD-3O-mjg"/>
  1305 + </connections>
1346 </tableViewCell> 1306 </tableViewCell>
1347 - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="scoreCell" rowHeight="280" id="YX5-IF-Qlq"> 1307 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SceneMiddleCell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="scoreCell" rowHeight="280" id="YX5-IF-Qlq" customClass="SceneMiddleCell" customModule="ParentAssistant" customModuleProvider="target">
1348 <rect key="frame" x="0.0" y="278" width="375" height="280"/> 1308 <rect key="frame" x="0.0" y="278" width="375" height="280"/>
1349 <autoresizingMask key="autoresizingMask"/> 1309 <autoresizingMask key="autoresizingMask"/>
1350 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YX5-IF-Qlq" id="eza-mR-Jnp"> 1310 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YX5-IF-Qlq" id="eza-mR-Jnp">
@@ -1355,29 +1315,18 @@ @@ -1355,29 +1315,18 @@
1355 <rect key="frame" x="10" y="10" width="355" height="270"/> 1315 <rect key="frame" x="10" y="10" width="355" height="270"/>
1356 <subviews> 1316 <subviews>
1357 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flm-QF-4ZE"> 1317 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flm-QF-4ZE">
1358 - <rect key="frame" x="8" y="64" width="339" height="198"/>  
1359 - <subviews>  
1360 - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="test003" translatesAutoresizingMaskIntoConstraints="NO" id="PYZ-o0-zkM">  
1361 - <rect key="frame" x="0.0" y="0.0" width="339" height="198"/>  
1362 - </imageView>  
1363 - </subviews> 1318 + <rect key="frame" x="0.0" y="50" width="355" height="210"/>
1364 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1319 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1365 - <constraints>  
1366 - <constraint firstAttribute="bottom" secondItem="PYZ-o0-zkM" secondAttribute="bottom" id="HcK-wx-7Go"/>  
1367 - <constraint firstAttribute="trailing" secondItem="PYZ-o0-zkM" secondAttribute="trailing" id="hab-QH-hW7"/>  
1368 - <constraint firstItem="PYZ-o0-zkM" firstAttribute="leading" secondItem="flm-QF-4ZE" secondAttribute="leading" id="u0M-Ee-xpK"/>  
1369 - <constraint firstItem="PYZ-o0-zkM" firstAttribute="top" secondItem="flm-QF-4ZE" secondAttribute="top" id="xHk-90-Nd3"/>  
1370 - </constraints>  
1371 </view> 1320 </view>
1372 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VjO-jB-oUF"> 1321 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VjO-jB-oUF">
1373 - <rect key="frame" x="8" y="7" width="339" height="49"/> 1322 + <rect key="frame" x="0.0" y="5" width="355" height="40"/>
1374 <subviews> 1323 <subviews>
1375 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kpT-5T-UAU"> 1324 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kpT-5T-UAU">
1376 - <rect key="frame" x="242" y="12" width="16" height="16"/>  
1377 - <color key="backgroundColor" red="0.23556900024414062" green="0.92213624715805054" blue="0.22870925068855286" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1325 + <rect key="frame" x="253" y="12" width="16" height="16"/>
  1326 + <color key="backgroundColor" red="0.50588235294117645" green="0.7803921568627451" blue="0.51764705882352935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1378 <constraints> 1327 <constraints>
1379 - <constraint firstAttribute="width" constant="16" id="9Lt-2a-m4m"/>  
1380 - <constraint firstAttribute="height" constant="16" id="r0O-vU-Jk8"/> 1328 + <constraint firstAttribute="height" constant="16" id="1hn-4f-qNk"/>
  1329 + <constraint firstAttribute="width" constant="16" id="Ncg-Bi-LaZ"/>
1381 </constraints> 1330 </constraints>
1382 <userDefinedRuntimeAttributes> 1331 <userDefinedRuntimeAttributes>
1383 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1332 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -1386,21 +1335,18 @@ @@ -1386,21 +1335,18 @@
1386 </userDefinedRuntimeAttribute> 1335 </userDefinedRuntimeAttribute>
1387 </userDefinedRuntimeAttributes> 1336 </userDefinedRuntimeAttributes>
1388 </view> 1337 </view>
1389 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="平均得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FrY-0D-sBM">  
1390 - <rect key="frame" x="136" y="10" width="66" height="20"/>  
1391 - <constraints>  
1392 - <constraint firstAttribute="height" constant="20" id="PuC-Jf-H7K"/>  
1393 - </constraints> 1338 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="平均得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FrY-0D-sBM">
  1339 + <rect key="frame" x="147" y="10" width="62" height="18"/>
1394 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1340 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1395 - <nil key="textColor"/> 1341 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1396 <nil key="highlightedColor"/> 1342 <nil key="highlightedColor"/>
1397 </label> 1343 </label>
1398 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FzF-1s-QFR"> 1344 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FzF-1s-QFR">
1399 <rect key="frame" x="10" y="12" width="16" height="16"/> 1345 <rect key="frame" x="10" y="12" width="16" height="16"/>
1400 - <color key="backgroundColor" red="0.25490196078431371" green="0.41176470588235292" blue="0.74509803921568629" alpha="0.58256635273972601" colorSpace="custom" customColorSpace="sRGB"/> 1346 + <color key="backgroundColor" red="0.36078431372549019" green="0.56862745098039214" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1401 <constraints> 1347 <constraints>
1402 - <constraint firstAttribute="height" constant="16" id="0ev-7O-rKb"/>  
1403 - <constraint firstAttribute="width" constant="16" id="7gn-h0-yAb"/> 1348 + <constraint firstAttribute="width" constant="16" id="FEZ-zj-3do"/>
  1349 + <constraint firstAttribute="height" constant="16" id="cM1-uc-1jU"/>
1404 </constraints> 1350 </constraints>
1405 <userDefinedRuntimeAttributes> 1351 <userDefinedRuntimeAttributes>
1406 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1352 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -1409,22 +1355,18 @@ @@ -1409,22 +1355,18 @@
1409 </userDefinedRuntimeAttribute> 1355 </userDefinedRuntimeAttribute>
1410 </userDefinedRuntimeAttributes> 1356 </userDefinedRuntimeAttributes>
1411 </view> 1357 </view>
1412 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最高得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ugR-id-hYZ">  
1413 - <rect key="frame" x="263" y="10" width="66" height="20"/>  
1414 - <constraints>  
1415 - <constraint firstAttribute="height" constant="20" id="MaU-4n-7wy"/>  
1416 - <constraint firstAttribute="width" constant="66" id="Swx-8R-cJR"/>  
1417 - </constraints> 1358 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最高得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ugR-id-hYZ">
  1359 + <rect key="frame" x="274" y="10" width="62" height="18"/>
1418 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1360 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1419 - <nil key="textColor"/> 1361 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1420 <nil key="highlightedColor"/> 1362 <nil key="highlightedColor"/>
1421 </label> 1363 </label>
1422 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NhS-aq-jEP"> 1364 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NhS-aq-jEP">
1423 - <rect key="frame" x="115" y="12" width="16" height="16"/>  
1424 - <color key="backgroundColor" red="0.99942404029999998" green="0.98555368190000003" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1365 + <rect key="frame" x="126" y="12" width="16" height="16"/>
  1366 + <color key="backgroundColor" red="1" green="0.83529411764705885" blue="0.30980392156862746" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1425 <constraints> 1367 <constraints>
1426 - <constraint firstAttribute="height" constant="16" id="SMK-d4-AyH"/>  
1427 - <constraint firstAttribute="width" constant="16" id="dta-hs-2aO"/> 1368 + <constraint firstAttribute="height" constant="16" id="5n4-nh-7N4"/>
  1369 + <constraint firstAttribute="width" constant="16" id="B7Y-D1-14r"/>
1428 </constraints> 1370 </constraints>
1429 <userDefinedRuntimeAttributes> 1371 <userDefinedRuntimeAttributes>
1430 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1372 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -1433,50 +1375,46 @@ @@ -1433,50 +1375,46 @@
1433 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1375 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1434 </userDefinedRuntimeAttributes> 1376 </userDefinedRuntimeAttributes>
1435 </view> 1377 </view>
1436 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人得分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qHt-PD-nGP">  
1437 - <rect key="frame" x="31" y="10" width="66" height="20"/>  
1438 - <constraints>  
1439 - <constraint firstAttribute="height" constant="20" id="f2C-Ho-Df7"/>  
1440 - <constraint firstAttribute="width" constant="66" id="gVn-YK-t3Z"/>  
1441 - </constraints> 1378 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人得分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qHt-PD-nGP">
  1379 + <rect key="frame" x="31" y="10" width="62" height="18"/>
1442 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1380 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1443 - <nil key="textColor"/> 1381 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1444 <nil key="highlightedColor"/> 1382 <nil key="highlightedColor"/>
1445 </label> 1383 </label>
1446 </subviews> 1384 </subviews>
1447 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1385 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1448 <constraints> 1386 <constraints>
1449 - <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="2a6-1g-zjG"/>  
1450 - <constraint firstItem="FrY-0D-sBM" firstAttribute="leading" secondItem="VjO-jB-oUF" secondAttribute="leading" constant="136" id="DYt-iz-wDE"/>  
1451 - <constraint firstItem="FrY-0D-sBM" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="10" id="J8z-qY-53A"/>  
1452 - <constraint firstItem="NhS-aq-jEP" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="KXR-f9-3PX"/>  
1453 - <constraint firstItem="ugR-id-hYZ" firstAttribute="leading" secondItem="kpT-5T-UAU" secondAttribute="trailing" constant="5" id="MRZ-eO-UpZ"/>  
1454 - <constraint firstItem="FzF-1s-QFR" firstAttribute="leading" secondItem="VjO-jB-oUF" secondAttribute="leading" constant="10" id="Pb3-Lf-Ot5"/>  
1455 - <constraint firstAttribute="trailing" secondItem="FrY-0D-sBM" secondAttribute="trailing" constant="137" id="TIH-Mg-PyB"/>  
1456 - <constraint firstItem="ugR-id-hYZ" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="10" id="dPr-Oz-NTF"/>  
1457 - <constraint firstItem="qHt-PD-nGP" firstAttribute="leading" secondItem="FzF-1s-QFR" secondAttribute="trailing" constant="5" id="dUK-5b-0P3"/>  
1458 - <constraint firstItem="qHt-PD-nGP" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="10" id="dfw-3q-cuS"/>  
1459 - <constraint firstAttribute="trailing" secondItem="ugR-id-hYZ" secondAttribute="trailing" constant="10" id="dtU-Gc-PG7"/>  
1460 - <constraint firstItem="FrY-0D-sBM" firstAttribute="leading" secondItem="NhS-aq-jEP" secondAttribute="trailing" constant="5" id="iSy-GK-MRq"/>  
1461 - <constraint firstItem="kpT-5T-UAU" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="uXQ-NV-EfU"/> 1387 + <constraint firstItem="kpT-5T-UAU" firstAttribute="leading" secondItem="FrY-0D-sBM" secondAttribute="trailing" constant="44" id="3Eb-l2-lFC"/>
  1388 + <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="qHt-PD-nGP" secondAttribute="bottom" id="AVn-SW-YYk"/>
  1389 + <constraint firstItem="qHt-PD-nGP" firstAttribute="leading" secondItem="FzF-1s-QFR" secondAttribute="trailing" constant="5" id="Bve-eI-a2E"/>
  1390 + <constraint firstItem="ugR-id-hYZ" firstAttribute="leading" secondItem="kpT-5T-UAU" secondAttribute="trailing" constant="5" id="GJA-xX-TVh"/>
  1391 + <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="ugR-id-hYZ" secondAttribute="bottom" id="JIb-Of-4eG"/>
  1392 + <constraint firstItem="FrY-0D-sBM" firstAttribute="leading" secondItem="NhS-aq-jEP" secondAttribute="trailing" constant="5" id="Ooa-Zh-AF7"/>
  1393 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="qHt-PD-nGP" secondAttribute="trailing" constant="20" symbolic="YES" id="czv-1K-HVF"/>
  1394 + <constraint firstItem="FzF-1s-QFR" firstAttribute="leading" secondItem="VjO-jB-oUF" secondAttribute="leading" constant="10" id="ePE-eT-MAA"/>
  1395 + <constraint firstItem="FzF-1s-QFR" firstAttribute="centerY" secondItem="VjO-jB-oUF" secondAttribute="centerY" id="gZG-qH-S86"/>
  1396 + <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="kpT-5T-UAU" secondAttribute="top" id="jEi-px-wKs"/>
  1397 + <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="NhS-aq-jEP" secondAttribute="top" id="ljF-W5-ncP"/>
  1398 + <constraint firstAttribute="trailing" secondItem="ugR-id-hYZ" secondAttribute="trailing" constant="19" id="rHY-LT-eQK"/>
  1399 + <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="FrY-0D-sBM" secondAttribute="bottom" id="v8D-TK-lTU"/>
  1400 + <constraint firstAttribute="height" constant="40" id="z5k-bG-9tN"/>
1462 </constraints> 1401 </constraints>
1463 </view> 1402 </view>
1464 </subviews> 1403 </subviews>
1465 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1404 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1466 <constraints> 1405 <constraints>
1467 - <constraint firstItem="flm-QF-4ZE" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="bottom" constant="8" symbolic="YES" id="1Hq-fC-yZt"/>  
1468 - <constraint firstItem="VjO-jB-oUF" firstAttribute="leading" secondItem="pyr-9X-CHE" secondAttribute="leadingMargin" id="Bed-68-EEI"/>  
1469 - <constraint firstAttribute="bottom" secondItem="VjO-jB-oUF" secondAttribute="bottom" constant="214" id="TaP-rN-aOK"/>  
1470 - <constraint firstItem="VjO-jB-oUF" firstAttribute="top" secondItem="pyr-9X-CHE" secondAttribute="top" constant="7" id="ZAW-U7-67q"/>  
1471 - <constraint firstItem="flm-QF-4ZE" firstAttribute="bottom" secondItem="pyr-9X-CHE" secondAttribute="bottomMargin" id="cgP-v6-S1R"/>  
1472 - <constraint firstItem="VjO-jB-oUF" firstAttribute="trailing" secondItem="pyr-9X-CHE" secondAttribute="trailingMargin" id="lcp-2D-o7h"/>  
1473 - <constraint firstItem="VjO-jB-oUF" firstAttribute="trailing" secondItem="flm-QF-4ZE" secondAttribute="trailing" id="lib-eB-qvC"/>  
1474 - <constraint firstItem="VjO-jB-oUF" firstAttribute="leading" secondItem="flm-QF-4ZE" secondAttribute="leading" id="rbZ-WT-CDk"/> 1406 + <constraint firstItem="flm-QF-4ZE" firstAttribute="leading" secondItem="pyr-9X-CHE" secondAttribute="leading" id="043-VS-p4w"/>
  1407 + <constraint firstAttribute="trailing" secondItem="VjO-jB-oUF" secondAttribute="trailing" id="HCw-cm-kyY"/>
  1408 + <constraint firstItem="VjO-jB-oUF" firstAttribute="leading" secondItem="pyr-9X-CHE" secondAttribute="leading" id="M8N-FO-lpe"/>
  1409 + <constraint firstItem="VjO-jB-oUF" firstAttribute="top" secondItem="pyr-9X-CHE" secondAttribute="top" constant="5" id="d6H-jw-DAr"/>
  1410 + <constraint firstAttribute="trailing" secondItem="flm-QF-4ZE" secondAttribute="trailing" id="tZN-Tu-HI0"/>
  1411 + <constraint firstItem="flm-QF-4ZE" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="bottom" constant="5" id="vLz-rX-QNf"/>
  1412 + <constraint firstAttribute="bottom" secondItem="flm-QF-4ZE" secondAttribute="bottom" constant="10" id="wnq-2Q-YKz"/>
1475 </constraints> 1413 </constraints>
1476 <userDefinedRuntimeAttributes> 1414 <userDefinedRuntimeAttributes>
1477 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1415 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1478 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1416 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1479 - <integer key="value" value="6"/> 1417 + <integer key="value" value="5"/>
1480 </userDefinedRuntimeAttribute> 1418 </userDefinedRuntimeAttribute>
1481 </userDefinedRuntimeAttributes> 1419 </userDefinedRuntimeAttributes>
1482 </view> 1420 </view>
@@ -1489,8 +1427,11 @@ @@ -1489,8 +1427,11 @@
1489 <constraint firstItem="pyr-9X-CHE" firstAttribute="top" secondItem="eza-mR-Jnp" secondAttribute="top" constant="10" id="jEa-Pb-u9n"/> 1427 <constraint firstItem="pyr-9X-CHE" firstAttribute="top" secondItem="eza-mR-Jnp" secondAttribute="top" constant="10" id="jEa-Pb-u9n"/>
1490 </constraints> 1428 </constraints>
1491 </tableViewCellContentView> 1429 </tableViewCellContentView>
  1430 + <connections>
  1431 + <outlet property="lineChartView" destination="flm-QF-4ZE" id="G8g-fC-ANv"/>
  1432 + </connections>
1492 </tableViewCell> 1433 </tableViewCell>
1493 - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="disciplineCell" rowHeight="90" id="gXN-fm-dPx"> 1434 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SceneDownCell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="disciplineCell" rowHeight="90" id="gXN-fm-dPx" customClass="SceneDownCell" customModule="ParentAssistant" customModuleProvider="target">
1494 <rect key="frame" x="0.0" y="558" width="375" height="90"/> 1435 <rect key="frame" x="0.0" y="558" width="375" height="90"/>
1495 <autoresizingMask key="autoresizingMask"/> 1436 <autoresizingMask key="autoresizingMask"/>
1496 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gXN-fm-dPx" id="0Hn-Z4-F5G"> 1437 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gXN-fm-dPx" id="0Hn-Z4-F5G">
@@ -1501,84 +1442,65 @@ @@ -1501,84 +1442,65 @@
1501 <rect key="frame" x="10" y="10" width="355" height="80"/> 1442 <rect key="frame" x="10" y="10" width="355" height="80"/>
1502 <subviews> 1443 <subviews>
1503 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优秀" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JXG-zZ-B4o"> 1444 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优秀" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JXG-zZ-B4o">
1504 - <rect key="frame" x="10" y="10" width="50" height="20"/>  
1505 - <constraints>  
1506 - <constraint firstAttribute="width" constant="50" id="5jk-O5-ZKh"/>  
1507 - <constraint firstAttribute="height" constant="20" id="xza-Bs-Xg4"/>  
1508 - </constraints> 1445 + <rect key="frame" x="10" y="10" width="31" height="18"/>
1509 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1446 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1510 - <color key="textColor" red="0.27279120683670044" green="0.91192549467086792" blue="0.5818055272102356" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1447 + <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1511 <nil key="highlightedColor"/> 1448 <nil key="highlightedColor"/>
1512 </label> 1449 </label>
1513 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+4" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oqg-R7-DJP"> 1450 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+4" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oqg-R7-DJP">
1514 - <rect key="frame" x="295" y="10" width="50" height="20"/>  
1515 - <constraints>  
1516 - <constraint firstAttribute="width" constant="50" id="PLj-Zy-kza"/>  
1517 - <constraint firstAttribute="height" constant="20" id="ywL-4D-cc0"/>  
1518 - </constraints> 1451 + <rect key="frame" x="326" y="10" width="19" height="18"/>
1519 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1452 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1520 - <color key="textColor" red="0.27279120683670044" green="0.91192549467086792" blue="0.5818055272102356" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1453 + <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1521 <nil key="highlightedColor"/> 1454 <nil key="highlightedColor"/>
1522 </label> 1455 </label>
1523 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="沈小东" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alw-wz-UnE">  
1524 - <rect key="frame" x="10" y="40" width="80" height="20"/>  
1525 - <constraints>  
1526 - <constraint firstAttribute="height" constant="20" id="Wqz-AI-UgY"/>  
1527 - <constraint firstAttribute="width" constant="80" id="f6i-xg-gdo"/>  
1528 - </constraints>  
1529 - <fontDescription key="fontDescription" type="system" pointSize="15"/>  
1530 - <nil key="textColor"/> 1456 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="沈小东" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alw-wz-UnE">
  1457 + <rect key="frame" x="10" y="38" width="37" height="14.5"/>
  1458 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
  1459 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1531 <nil key="highlightedColor"/> 1460 <nil key="highlightedColor"/>
1532 </label> 1461 </label>
1533 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="二年(2)班" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7nd-dC-VJe">  
1534 - <rect key="frame" x="90" y="40" width="80" height="20"/>  
1535 - <constraints>  
1536 - <constraint firstAttribute="width" constant="80" id="ImH-Zu-VOs"/>  
1537 - <constraint firstAttribute="height" constant="20" id="xQu-f1-ncs"/>  
1538 - </constraints>  
1539 - <fontDescription key="fontDescription" type="system" pointSize="15"/>  
1540 - <nil key="textColor"/> 1462 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="二年(2)班" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7nd-dC-VJe">
  1463 + <rect key="frame" x="77" y="38.5" width="53.5" height="14.5"/>
  1464 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
  1465 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1541 <nil key="highlightedColor"/> 1466 <nil key="highlightedColor"/>
1542 </label> 1467 </label>
1543 - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-03-12 17:30" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AZt-aj-618">  
1544 - <rect key="frame" x="180" y="40" width="165" height="20"/>  
1545 - <constraints>  
1546 - <constraint firstAttribute="height" constant="20" id="JnP-ZA-fcx"/>  
1547 - </constraints>  
1548 - <fontDescription key="fontDescription" type="system" pointSize="15"/>  
1549 - <nil key="textColor"/> 1468 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-03-12 17:30" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AZt-aj-618">
  1469 + <rect key="frame" x="243" y="38.5" width="102" height="14.5"/>
  1470 + <fontDescription key="fontDescription" type="system" pointSize="12"/>
  1471 + <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1550 <nil key="highlightedColor"/> 1472 <nil key="highlightedColor"/>
1551 </label> 1473 </label>
1552 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课堂纪律-上课发言" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftO-pc-XdN"> 1474 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课堂纪律-上课发言" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftO-pc-XdN">
1553 - <rect key="frame" x="99" y="10" width="157" height="20"/>  
1554 - <constraints>  
1555 - <constraint firstAttribute="height" constant="20" id="U6q-9r-Nfr"/>  
1556 - </constraints> 1475 + <rect key="frame" x="113" y="10" width="129.5" height="18"/>
1557 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1476 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1558 - <color key="textColor" red="0.27279120683670044" green="0.91192549467086792" blue="0.5818055272102356" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1477 + <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1559 <nil key="highlightedColor"/> 1478 <nil key="highlightedColor"/>
1560 </label> 1479 </label>
1561 </subviews> 1480 </subviews>
1562 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> 1481 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1563 <constraints> 1482 <constraints>
1564 - <constraint firstItem="alw-wz-UnE" firstAttribute="top" secondItem="JXG-zZ-B4o" secondAttribute="bottom" constant="10" id="1f1-iz-X3D"/>  
1565 - <constraint firstAttribute="trailing" secondItem="ftO-pc-XdN" secondAttribute="trailing" constant="99" id="AxJ-tu-bk5"/>  
1566 - <constraint firstItem="7nd-dC-VJe" firstAttribute="leading" secondItem="alw-wz-UnE" secondAttribute="trailing" id="BUV-bh-YI5"/>  
1567 - <constraint firstItem="7nd-dC-VJe" firstAttribute="top" secondItem="ftO-pc-XdN" secondAttribute="bottom" constant="10" id="Dr8-PW-p3W"/>  
1568 - <constraint firstItem="alw-wz-UnE" firstAttribute="leading" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="10" id="NtT-Sf-PBs"/>  
1569 - <constraint firstAttribute="trailing" secondItem="AZt-aj-618" secondAttribute="trailing" constant="10" id="RsE-rL-y0s"/>  
1570 - <constraint firstItem="JXG-zZ-B4o" firstAttribute="leading" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="10" id="TKW-OL-7sc"/>  
1571 - <constraint firstItem="ftO-pc-XdN" firstAttribute="leading" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="99" id="XR5-nY-qmX"/>  
1572 - <constraint firstItem="AZt-aj-618" firstAttribute="leading" secondItem="7nd-dC-VJe" secondAttribute="trailing" constant="10" id="jkL-9P-Nlt"/>  
1573 - <constraint firstItem="ftO-pc-XdN" firstAttribute="top" secondItem="n4a-T5-fp6" secondAttribute="top" constant="10" id="lXK-u0-r1O"/>  
1574 - <constraint firstItem="AZt-aj-618" firstAttribute="top" secondItem="ftO-pc-XdN" secondAttribute="bottom" constant="10" id="qTi-Ak-ANb"/>  
1575 - <constraint firstItem="JXG-zZ-B4o" firstAttribute="top" secondItem="n4a-T5-fp6" secondAttribute="top" constant="10" id="tcE-vD-YD1"/>  
1576 - <constraint firstItem="Oqg-R7-DJP" firstAttribute="top" secondItem="n4a-T5-fp6" secondAttribute="top" constant="10" id="uFR-Cc-5uM"/>  
1577 - <constraint firstAttribute="trailing" secondItem="Oqg-R7-DJP" secondAttribute="trailing" constant="10" id="x5V-4u-XLf"/> 1483 + <constraint firstItem="alw-wz-UnE" firstAttribute="leading" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="10" id="0td-DY-9pm"/>
  1484 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JXG-zZ-B4o" secondAttribute="trailing" constant="20" symbolic="YES" id="180-kj-8ST"/>
  1485 + <constraint firstItem="AZt-aj-618" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="20" symbolic="YES" id="GyA-ZT-JyN"/>
  1486 + <constraint firstItem="Oqg-R7-DJP" firstAttribute="trailing" secondItem="n4a-T5-fp6" secondAttribute="trailing" constant="-10" id="Hod-TJ-XWI"/>
  1487 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="alw-wz-UnE" secondAttribute="trailing" constant="20" symbolic="YES" id="LWc-vC-fyI"/>
  1488 + <constraint firstItem="AZt-aj-618" firstAttribute="centerY" secondItem="alw-wz-UnE" secondAttribute="centerY" id="RSh-Sd-Qvq"/>
  1489 + <constraint firstItem="Oqg-R7-DJP" firstAttribute="centerY" secondItem="ftO-pc-XdN" secondAttribute="centerY" id="Rcm-uR-jnW"/>
  1490 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7nd-dC-VJe" secondAttribute="trailing" constant="20" symbolic="YES" id="RxU-xd-tz5"/>
  1491 + <constraint firstItem="JXG-zZ-B4o" firstAttribute="top" secondItem="n4a-T5-fp6" secondAttribute="top" constant="10" id="aAB-Iz-m8v"/>
  1492 + <constraint firstItem="AZt-aj-618" firstAttribute="trailing" secondItem="n4a-T5-fp6" secondAttribute="trailing" constant="-10" id="cMN-Y5-XfK"/>
  1493 + <constraint firstItem="Oqg-R7-DJP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="20" symbolic="YES" id="cYe-Rb-Nvi"/>
  1494 + <constraint firstItem="7nd-dC-VJe" firstAttribute="centerY" secondItem="alw-wz-UnE" secondAttribute="centerY" id="h6E-aG-8LR"/>
  1495 + <constraint firstItem="JXG-zZ-B4o" firstAttribute="leading" secondItem="n4a-T5-fp6" secondAttribute="leading" constant="10" id="hEL-FI-W0K"/>
  1496 + <constraint firstItem="ftO-pc-XdN" firstAttribute="top" secondItem="n4a-T5-fp6" secondAttribute="top" constant="10" id="jAH-Re-diy"/>
  1497 + <constraint firstItem="7nd-dC-VJe" firstAttribute="leading" secondItem="alw-wz-UnE" secondAttribute="trailing" constant="30" id="me6-Nb-vUN"/>
  1498 + <constraint firstItem="alw-wz-UnE" firstAttribute="top" secondItem="JXG-zZ-B4o" secondAttribute="bottom" constant="10" id="oQw-xS-oQ6"/>
  1499 + <constraint firstItem="ftO-pc-XdN" firstAttribute="centerX" secondItem="n4a-T5-fp6" secondAttribute="centerX" id="sp3-sr-rtC"/>
1578 </constraints> 1500 </constraints>
1579 <userDefinedRuntimeAttributes> 1501 <userDefinedRuntimeAttributes>
1580 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1502 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1581 - <integer key="value" value="6"/> 1503 + <integer key="value" value="5"/>
1582 </userDefinedRuntimeAttribute> 1504 </userDefinedRuntimeAttribute>
1583 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1505 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1584 </userDefinedRuntimeAttributes> 1506 </userDefinedRuntimeAttributes>
@@ -1592,6 +1514,14 @@ @@ -1592,6 +1514,14 @@
1592 <constraint firstAttribute="trailing" secondItem="n4a-T5-fp6" secondAttribute="trailing" constant="10" id="j5s-Dn-wGu"/> 1514 <constraint firstAttribute="trailing" secondItem="n4a-T5-fp6" secondAttribute="trailing" constant="10" id="j5s-Dn-wGu"/>
1593 </constraints> 1515 </constraints>
1594 </tableViewCellContentView> 1516 </tableViewCellContentView>
  1517 + <connections>
  1518 + <outlet property="classLab" destination="7nd-dC-VJe" id="FYH-UD-qwM"/>
  1519 + <outlet property="dateLab" destination="AZt-aj-618" id="FmC-UU-low"/>
  1520 + <outlet property="evaluateLab" destination="JXG-zZ-B4o" id="Vyd-7x-Ypd"/>
  1521 + <outlet property="nameLab" destination="alw-wz-UnE" id="FIk-iz-fAH"/>
  1522 + <outlet property="sceneLab" destination="ftO-pc-XdN" id="Cf4-YB-tQt"/>
  1523 + <outlet property="scoreLab" destination="Oqg-R7-DJP" id="Rje-Aq-BFW"/>
  1524 + </connections>
1595 </tableViewCell> 1525 </tableViewCell>
1596 </prototypes> 1526 </prototypes>
1597 </tableView> 1527 </tableView>
@@ -2202,6 +2132,7 @@ @@ -2202,6 +2132,7 @@
2202 <image name="evaluation_icon_learningManagement" width="45" height="47"/> 2132 <image name="evaluation_icon_learningManagement" width="45" height="47"/>
2203 <image name="evaluation_icon_play" width="59" height="59"/> 2133 <image name="evaluation_icon_play" width="59" height="59"/>
2204 <image name="evaluation_icon_training" width="47" height="47"/> 2134 <image name="evaluation_icon_training" width="47" height="47"/>
  2135 + <image name="moral_bg" width="690" height="430"/>
2205 <image name="my_bar_icon" width="19" height="22"/> 2136 <image name="my_bar_icon" width="19" height="22"/>
2206 <image name="my_bar_icon_select" width="19" height="22"/> 2137 <image name="my_bar_icon_select" width="19" height="22"/>
2207 <image name="my_defphoto" width="61" height="61"/> 2138 <image name="my_defphoto" width="61" height="61"/>
@@ -2211,7 +2142,6 @@ @@ -2211,7 +2142,6 @@
2211 <image name="navigationBar_backgrounImage" width="375" height="139"/> 2142 <image name="navigationBar_backgrounImage" width="375" height="139"/>
2212 <image name="report_bar_icon" width="22" height="20"/> 2143 <image name="report_bar_icon" width="22" height="20"/>
2213 <image name="report_bar_icon_select" width="22" height="20"/> 2144 <image name="report_bar_icon_select" width="22" height="20"/>
2214 - <image name="test002" width="216" height="282"/>  
2215 - <image name="test003" width="732" height="388"/> 2145 + <image name="report_teacher" width="130" height="155"/>
2216 </resources> 2146 </resources>
2217 </document> 2147 </document>
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
  Diff comments   View file @8a4950f
@@ -42,6 +42,8 @@ @@ -42,6 +42,8 @@
42 <key>UISupportedInterfaceOrientations</key> 42 <key>UISupportedInterfaceOrientations</key>
43 <array> 43 <array>
44 <string>UIInterfaceOrientationPortrait</string> 44 <string>UIInterfaceOrientationPortrait</string>
  45 + <string>UIInterfaceOrientationLandscapeLeft</string>
  46 + <string>UIInterfaceOrientationLandscapeRight</string>
45 </array> 47 </array>
46 <key>UISupportedInterfaceOrientations~ipad</key> 48 <key>UISupportedInterfaceOrientations~ipad</key>
47 <array> 49 <array>
ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
  Diff comments   View file @8a4950f
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <key>Alamofire.xcscheme</key> 7 <key>Alamofire.xcscheme</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 <key>DZNEmptyDataSet.xcscheme</key> 12 <key>DZNEmptyDataSet.xcscheme</key>
13 <dict> 13 <dict>