IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 866dc83e7620b84b19dfafe33258aa54787bf553

Authored by Cao yang
1 parent 86839389
Exists in parentassistant

给折线图添加虚线和下划线

Showing 5 changed files with 103 additions and 56 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @866dc83
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift
  Diff comments   View file @866dc83
... ... @@ -33,7 +33,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV
33 33 case 0:
34 34 return 240
35 35 case 1:
36   - return 235
  36 + return 260
37 37 case 2:
38 38 return 70
39 39 default:
... ...
ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
  Diff comments   View file @866dc83
... ... @@ -21,6 +21,16 @@ class LineChartView: UIView {
21 21 //储存横纵坐标,画线用
22 22 private var xCenterArr = Array<CGFloat>()
23 23 private var yCenterArr = Array<CGFloat>()
  24 + //判断是否重复点击
  25 + private var btnTouch = 10
  26 + //虚线
  27 + private let lineLayer = CAShapeLayer()
  28 + //横坐标下划线
  29 + private let xMoveLayer = CAShapeLayer()
  30 + //纵坐标Lab数组
  31 + private var yMoveLaArr = Array<UILabel>()
  32 +
  33 +
24 34  
25 35 override init(frame: CGRect) {
26 36 super.init(frame: frame)
... ... @@ -42,28 +52,34 @@ class LineChartView: UIView {
42 52 for index in 0..<yCount{
43 53 let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20))
44 54 yLab.text = "\(GPA-index)"
  55 + yLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
45 56 yLab.font = UIFont.systemFont(ofSize: 14)
46 57 self.addSubview(yLab)
47 58  
48   - let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: self.bounds.size.width-40, height: 0.4))
  59 + let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: screenWidth-60, height: 0.4))
49 60 lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
50 61 self.addSubview(lineLab)
51 62  
  63 + yMoveLaArr.append(yLab)
52 64 yCenterArr.append(yLab.frame.origin.y+10)
53 65 }
54 66 }
55 67 //设置横坐标
56 68 private func drawX() {
57   - let xWidth = (self.bounds.width)/CGFloat(yCount)
  69 + let xWidth = (screenWidth-20)/CGFloat(yCount)
58 70 for index in 0..<xCount {
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
61   - nameLab.text = xLabArr[index]
62   - nameLab.font = UIFont.systemFont(ofSize: 13)
63   - nameLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
64   - self.addSubview(nameLab)
65   -
66   - xCenterArr.append(nameLab.frame.origin.x+20)
  71 + let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 20))
  72 + nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
  73 + nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
  74 + nameBtn.titleLabel!.textAlignment = .center
  75 + nameBtn.titleLabel!.font = UIFont.systemFont(ofSize: 13)
  76 +// nameBtn.backgroundColor = UIColor.orange
  77 + nameBtn.tag = index
  78 + self.addSubview(nameBtn)
  79 +
  80 + nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
  81 +
  82 + xCenterArr.append(nameBtn.frame.origin.x+20)
67 83 }
68 84 }
69 85  
... ... @@ -71,6 +87,7 @@ class LineChartView: UIView {
71 87 func drawLine(point:Array<Int>,color:UIColor){
72 88  
73 89 let pointArr = swichPoint(arr: point)
  90 +
74 91 let drawLayer = DrawLayer()
75 92 drawLayer.xPointArr = xCenterArr
76 93 drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]]
... ... @@ -82,7 +99,37 @@ class LineChartView: UIView {
82 99  
83 100 }
84 101 //MARK: - 画竖线
85   -
  102 + @objc func touchXAction(tap:UIButton){
  103 +
  104 + let index = tap.tag
  105 +
  106 + if btnTouch != index {
  107 +
  108 + lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
  109 + lineLayer.lineWidth = 1
  110 + let arr = [5,5]
  111 + lineLayer.lineDashPhase = 0
  112 + lineLayer.lineDashPattern = arr as [NSNumber]
  113 + self.layer.addSublayer(lineLayer)
  114 +
  115 + let movePath = CGMutablePath()
  116 + movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0]))
  117 + movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height-60)/CGFloat(yCount)))
  118 + lineLayer.path = movePath
  119 +
  120 + xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
  121 + xMoveLayer.lineWidth = 2
  122 + self.layer.addSublayer(xMoveLayer)
  123 + let movePath2 = CGMutablePath()
  124 + movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-50))
  125 + movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-50))
  126 + xMoveLayer.path = movePath2
  127 +
  128 + }
  129 + btnTouch = index
  130 +
  131 +
  132 + }
86 133 //MARK: - 特定横坐标颜色,下划线
87 134  
88 135 //转换y坐标
... ...
ParentAssistant/ParentAssistant/MainViewController.swift
  Diff comments   View file @866dc83
... ... @@ -12,7 +12,7 @@ class MainViewController: UINavigationController {
12 12  
13 13 override func viewDidLoad() {
14 14 super.viewDidLoad()
15   -
  15 + self.view.backgroundColor = UIColor.white
16 16 // Do any additional setup after loading the view.
17 17 }
18 18  
... ...
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @866dc83
... ... @@ -22,16 +22,16 @@
22 22 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
23 23 <subviews>
24 24 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw">
25   - <rect key="frame" x="0.0" y="64" width="375" height="554"/>
  25 + <rect key="frame" x="0.0" y="64" width="376" height="554"/>
26 26 <subviews>
27 27 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv">
28   - <rect key="frame" x="0.0" y="0.0" width="375" height="554"/>
  28 + <rect key="frame" x="0.0" y="0.0" width="376" height="554"/>
29 29 <subviews>
30 30 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu">
31   - <rect key="frame" x="8" y="8" width="359" height="350"/>
  31 + <rect key="frame" x="8" y="8" width="360" height="350"/>
32 32 <subviews>
33 33 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P">
34   - <rect key="frame" x="0.0" y="0.0" width="359" height="92"/>
  34 + <rect key="frame" x="0.0" y="0.0" width="360" height="92"/>
35 35 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
36 36 <constraints>
37 37 <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/>
... ... @@ -49,20 +49,20 @@
49 49 </connections>
50 50 </collectionView>
51 51 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32">
52   - <rect key="frame" x="0.0" y="100" width="359" height="1"/>
  52 + <rect key="frame" x="0.0" y="100" width="360" height="1"/>
53 53 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
54 54 <constraints>
55 55 <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/>
56 56 </constraints>
57 57 </view>
58 58 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT">
59   - <rect key="frame" x="0.0" y="101" width="359" height="249"/>
  59 + <rect key="frame" x="0.0" y="101" width="360" height="249"/>
60 60 <subviews>
61 61 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG">
62   - <rect key="frame" x="179.5" y="0.0" width="179.5" height="249"/>
  62 + <rect key="frame" x="180" y="0.0" width="180" height="249"/>
63 63 <subviews>
64 64 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7">
65   - <rect key="frame" x="14.5" y="49.5" width="150" height="150"/>
  65 + <rect key="frame" x="15" y="49.5" width="150" height="150"/>
66 66 <subviews>
67 67 <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
68 68 <rect key="frame" x="50" y="50" width="50" height="50"/>
... ... @@ -116,7 +116,7 @@
116 116 </constraints>
117 117 </view>
118 118 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i">
119   - <rect key="frame" x="0.0" y="0.0" width="179.5" height="249"/>
  119 + <rect key="frame" x="0.0" y="0.0" width="180" height="249"/>
120 120 <subviews>
121 121 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7">
122 122 <rect key="frame" x="15" y="49.5" width="150" height="150"/>
... ... @@ -202,10 +202,10 @@
202 202 </constraints>
203 203 </view>
204 204 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e">
205   - <rect key="frame" x="8" y="366" width="359" height="35"/>
  205 + <rect key="frame" x="8" y="366" width="360" height="35"/>
206 206 <subviews>
207 207 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动专栏" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y9y-rQ-h2e">
208   - <rect key="frame" x="142" y="7" width="75" height="21"/>
  208 + <rect key="frame" x="142.5" y="7" width="75" height="21"/>
209 209 <constraints>
210 210 <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/>
211 211 </constraints>
... ... @@ -214,7 +214,7 @@
214 214 <nil key="highlightedColor"/>
215 215 </label>
216 216 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUM-xf-pLP">
217   - <rect key="frame" x="225" y="17" width="104" height="1"/>
  217 + <rect key="frame" x="225.5" y="17" width="104.5" height="1"/>
218 218 <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
219 219 <constraints>
220 220 <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/>
... ... @@ -224,7 +224,7 @@
224 224 <nil key="highlightedColor"/>
225 225 </label>
226 226 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jRc-ct-42f">
227   - <rect key="frame" x="30" y="17" width="104" height="1"/>
  227 + <rect key="frame" x="30" y="17" width="104.5" height="1"/>
228 228 <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
229 229 <constraints>
230 230 <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/>
... ... @@ -248,16 +248,16 @@
248 248 </constraints>
249 249 </view>
250 250 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6">
251   - <rect key="frame" x="8" y="409" width="359" height="175.5"/>
  251 + <rect key="frame" x="8" y="409" width="360" height="176"/>
252 252 <subviews>
253 253 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK">
254   - <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
  254 + <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
255 255 <subviews>
256 256 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
257   - <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
  257 + <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
258 258 </imageView>
259 259 <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI">
260   - <rect key="frame" x="8" y="139" width="70" height="28"/>
  260 + <rect key="frame" x="8" y="139.5" width="70" height="28"/>
261 261 <constraints>
262 262 <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/>
263 263 </constraints>
... ... @@ -267,13 +267,13 @@
267 267 </state>
268 268 </button>
269 269 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6">
270   - <rect key="frame" x="8" y="113" width="61.5" height="18"/>
  270 + <rect key="frame" x="8" y="113.5" width="61.5" height="18"/>
271 271 <fontDescription key="fontDescription" type="system" pointSize="15"/>
272 272 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
273 273 <nil key="highlightedColor"/>
274 274 </label>
275 275 <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh">
276   - <rect key="frame" x="0.0" y="0.0" width="175" height="175.5"/>
  276 + <rect key="frame" x="0.0" y="0.0" width="175.5" height="176"/>
277 277 <connections>
278 278 <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/>
279 279 </connections>
... ... @@ -303,13 +303,13 @@
303 303 </userDefinedRuntimeAttributes>
304 304 </view>
305 305 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r">
306   - <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/>
  306 + <rect key="frame" x="184" y="92" width="176" height="84"/>
307 307 <subviews>
308 308 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
309   - <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/>
  309 + <rect key="frame" x="0.0" y="0.0" width="176" height="84"/>
310 310 </imageView>
311 311 <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw">
312   - <rect key="frame" x="8" y="47" width="70" height="28"/>
  312 + <rect key="frame" x="8" y="47.5" width="70" height="28"/>
313 313 <constraints>
314 314 <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/>
315 315 </constraints>
... ... @@ -319,13 +319,13 @@
319 319 </state>
320 320 </button>
321 321 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q">
322   - <rect key="frame" x="8" y="21" width="61.5" height="18"/>
  322 + <rect key="frame" x="8" y="21.5" width="61.5" height="18"/>
323 323 <fontDescription key="fontDescription" type="system" pointSize="15"/>
324 324 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
325 325 <nil key="highlightedColor"/>
326 326 </label>
327 327 <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr">
328   - <rect key="frame" x="0.0" y="0.0" width="175" height="83.5"/>
  328 + <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
329 329 <connections>
330 330 <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/>
331 331 </connections>
... ... @@ -354,10 +354,10 @@
354 354 </userDefinedRuntimeAttributes>
355 355 </view>
356 356 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
357   - <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/>
  357 + <rect key="frame" x="184" y="0.0" width="176" height="84"/>
358 358 <subviews>
359 359 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
360   - <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
  360 + <rect key="frame" x="0.0" y="0.0" width="176" height="84"/>
361 361 </imageView>
362 362 <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
363 363 <rect key="frame" x="8" y="48" width="70" height="28"/>
... ... @@ -376,7 +376,7 @@
376 376 <nil key="highlightedColor"/>
377 377 </label>
378 378 <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5">
379   - <rect key="frame" x="-0.5" y="0.0" width="176" height="83.5"/>
  379 + <rect key="frame" x="-0.5" y="0.0" width="176.5" height="83.5"/>
380 380 <connections>
381 381 <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/>
382 382 </connections>
... ... @@ -584,7 +584,7 @@
584 584 <rect key="frame" x="0.0" y="135" width="375" height="483"/>
585 585 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
586 586 <prototypes>
587   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  587 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
588 588 <rect key="frame" x="0.0" y="28" width="375" height="280"/>
589 589 <autoresizingMask key="autoresizingMask"/>
590 590 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mJ6-p0-1k0" id="Krp-EU-pqh">
... ... @@ -700,7 +700,7 @@
700 700 <segue destination="aZ0-4x-DE7" kind="show" id="W8C-3m-iNT"/>
701 701 </connections>
702 702 </tableViewCell>
703   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="TaskPresentationTableViewCell" rowHeight="280" id="QrW-E0-jjq" customClass="TaskPresentationTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  703 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="TaskPresentationTableViewCell" rowHeight="280" id="QrW-E0-jjq" customClass="TaskPresentationTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
704 704 <rect key="frame" x="0.0" y="308" width="375" height="280"/>
705 705 <autoresizingMask key="autoresizingMask"/>
706 706 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QrW-E0-jjq" id="UXM-6n-Q33">
... ... @@ -908,7 +908,7 @@
908 908 <rect key="frame" x="0.0" y="64" width="375" height="544"/>
909 909 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
910 910 <prototypes>
911   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  911 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
912 912 <rect key="frame" x="0.0" y="28" width="375" height="280"/>
913 913 <autoresizingMask key="autoresizingMask"/>
914 914 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="edU-Xp-UQN" id="jbp-VT-wz9">
... ... @@ -1032,7 +1032,7 @@
1032 1032 <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/>
1033 1033 </connections>
1034 1034 </tableViewCell>
1035   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd" customClass="EducationDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  1035 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd" customClass="EducationDetailCell" customModule="ParentAssistant" customModuleProvider="target">
1036 1036 <rect key="frame" x="0.0" y="308" width="375" height="280"/>
1037 1037 <autoresizingMask key="autoresizingMask"/>
1038 1038 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cT9-nd-Syd" id="GQz-Gg-SDo">
... ... @@ -1122,7 +1122,7 @@
1122 1122 <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/>
1123 1123 </connections>
1124 1124 </tableViewCell>
1125   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7" customClass="BehaviorDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  1125 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7" customClass="BehaviorDetailCell" customModule="ParentAssistant" customModuleProvider="target">
1126 1126 <rect key="frame" x="0.0" y="588" width="375" height="100"/>
1127 1127 <autoresizingMask key="autoresizingMask"/>
1128 1128 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LSs-xC-on7" id="g4b-AE-z0B">
... ... @@ -1130,7 +1130,7 @@
1130 1130 <autoresizingMask key="autoresizingMask"/>
1131 1131 <subviews>
1132 1132 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Qp-zh-xwy">
1133   - <rect key="frame" x="10" y="10" width="355" height="89.5"/>
  1133 + <rect key="frame" x="10" y="10" width="394" height="89.5"/>
1134 1134 <subviews>
1135 1135 <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">
1136 1136 <rect key="frame" x="10" y="38" width="104" height="14.5"/>
... ... @@ -1139,13 +1139,13 @@
1139 1139 <nil key="highlightedColor"/>
1140 1140 </label>
1141 1141 <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">
1142   - <rect key="frame" x="328.5" y="10" width="16.5" height="18"/>
  1142 + <rect key="frame" x="367.5" y="10" width="16.5" height="18"/>
1143 1143 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1144 1144 <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1145 1145 <nil key="highlightedColor"/>
1146 1146 </label>
1147 1147 <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">
1148   - <rect key="frame" x="234" y="38" width="111" height="14.5"/>
  1148 + <rect key="frame" x="273" y="38" width="111" height="14.5"/>
1149 1149 <fontDescription key="fontDescription" type="system" pointSize="12"/>
1150 1150 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1151 1151 <nil key="highlightedColor"/>
... ... @@ -1324,18 +1324,18 @@
1324 1324 <outlet property="scoreLab" destination="Wcw-jF-3E1" id="9oD-3O-mjg"/>
1325 1325 </connections>
1326 1326 </tableViewCell>
1327   - <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">
1328   - <rect key="frame" x="0.0" y="278" width="375" height="280"/>
  1327 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="SceneMiddleCell" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="scoreCell" rowHeight="300" id="YX5-IF-Qlq" customClass="SceneMiddleCell" customModule="ParentAssistant" customModuleProvider="target">
  1328 + <rect key="frame" x="0.0" y="278" width="375" height="300"/>
1329 1329 <autoresizingMask key="autoresizingMask"/>
1330 1330 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YX5-IF-Qlq" id="eza-mR-Jnp">
1331   - <rect key="frame" x="0.0" y="0.0" width="375" height="280"/>
  1331 + <rect key="frame" x="0.0" y="0.0" width="375" height="300"/>
1332 1332 <autoresizingMask key="autoresizingMask"/>
1333 1333 <subviews>
1334 1334 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pyr-9X-CHE">
1335   - <rect key="frame" x="10" y="10" width="355" height="270"/>
  1335 + <rect key="frame" x="10" y="10" width="355" height="290"/>
1336 1336 <subviews>
1337 1337 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flm-QF-4ZE">
1338   - <rect key="frame" x="0.0" y="50" width="355" height="210"/>
  1338 + <rect key="frame" x="0.0" y="50" width="355" height="230"/>
1339 1339 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1340 1340 </view>
1341 1341 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VjO-jB-oUF">
... ... @@ -1452,7 +1452,7 @@
1452 1452 </connections>
1453 1453 </tableViewCell>
1454 1454 <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">
1455   - <rect key="frame" x="0.0" y="558" width="375" height="90"/>
  1455 + <rect key="frame" x="0.0" y="578" width="375" height="90"/>
1456 1456 <autoresizingMask key="autoresizingMask"/>
1457 1457 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gXN-fm-dPx" id="0Hn-Z4-F5G">
1458 1458 <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
... ... @@ -1763,7 +1763,7 @@
1763 1763 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1764 1764 </view>
1765 1765 <prototypes>
1766   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyTableViewCell" id="Mmu-jR-2O0" customClass="MyTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  1766 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyTableViewCell" id="Mmu-jR-2O0" customClass="MyTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
1767 1767 <rect key="frame" x="0.0" y="28" width="343" height="44"/>
1768 1768 <autoresizingMask key="autoresizingMask"/>
1769 1769 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi">
... ... @@ -1811,7 +1811,7 @@
1811 1811 <outlet property="newLabel" destination="Cgm-Km-mZE" id="ZPq-dp-KUH"/>
1812 1812 </connections>
1813 1813 </tableViewCell>
1814   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
  1814 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
1815 1815 <rect key="frame" x="0.0" y="72" width="343" height="30"/>
1816 1816 <autoresizingMask key="autoresizingMask"/>
1817 1817 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g">
... ...