From 866dc83e7620b84b19dfafe33258aa54787bf553 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Sat, 24 Mar 2018 17:45:12 +0800
Subject: [PATCH] 给折线图添加虚线和下划线

---
 ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 83649 -> 0 bytes
 ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift                |  2 +-
 ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift                       | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 ParentAssistant/ParentAssistant/MainViewController.swift                                                  |  2 +-
 ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard                               | 86 +++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
 5 files changed, 103 insertions(+), 56 deletions(-)

diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 973f380..3df6bb1 100644
Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift
index d91369f..d390720 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift
@@ -33,7 +33,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV
         case 0:
             return 240
         case 1:
-            return 235
+            return 260
         case 2:
             return 70
         default:
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
index 58bc3b7..a6420cf 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
@@ -21,6 +21,16 @@ class LineChartView: UIView {
     //储存横纵坐标,画线用
     private var xCenterArr = Array<CGFloat>()
     private var yCenterArr = Array<CGFloat>()
+    //判断是否重复点击
+    private var btnTouch = 10
+    //虚线
+    private let lineLayer = CAShapeLayer()
+    //横坐标下划线
+    private let xMoveLayer = CAShapeLayer()
+    //纵坐标Lab数组
+    private var yMoveLaArr = Array<UILabel>()
+    
+    
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -42,28 +52,34 @@ class LineChartView: UIView {
         for index in 0..<yCount{
             let yLab = UILabel.init(frame: CGRect.init(x: 10, y: CGFloat(index)*yHeight, width: 20, height: 20))
             yLab.text = "\(GPA-index)"
+            yLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
             yLab.font = UIFont.systemFont(ofSize: 14)
             self.addSubview(yLab)
             
-            let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: self.bounds.size.width-40, height: 0.4))
+            let lineLab = UILabel.init(frame: CGRect.init(x: 30, y: yLab.center.y, width: screenWidth-60, height: 0.4))
             lineLab.backgroundColor = UIColorWithRGB(R: 190, G: 190, B: 190)
             self.addSubview(lineLab)
             
+            yMoveLaArr.append(yLab)
             yCenterArr.append(yLab.frame.origin.y+10)
         }
     }
     //设置横坐标
     private func drawX() {
-        let xWidth = (self.bounds.width)/CGFloat(yCount)
+        let xWidth = (screenWidth-20)/CGFloat(yCount)
         for index in 0..<xCount {
-            let nameLab = UILabel.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 20))
-            nameLab.textAlignment = .center
-            nameLab.text = xLabArr[index]
-            nameLab.font = UIFont.systemFont(ofSize: 13)
-            nameLab.textColor = UIColorWithRGB(R: 119, G: 119, B: 119)
-            self.addSubview(nameLab)
-
-            xCenterArr.append(nameLab.frame.origin.x+20)
+            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 20))
+            nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
+            nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
+            nameBtn.titleLabel!.textAlignment = .center
+            nameBtn.titleLabel!.font = UIFont.systemFont(ofSize: 13)
+//            nameBtn.backgroundColor = UIColor.orange
+            nameBtn.tag = index
+            self.addSubview(nameBtn)
+            
+            nameBtn.addTarget(self, action: #selector(touchXAction(tap:)), for: UIControlEvents.touchUpInside)
+            
+            xCenterArr.append(nameBtn.frame.origin.x+20)
         }
     }
     
@@ -71,6 +87,7 @@ class LineChartView: UIView {
      func drawLine(point:Array<Int>,color:UIColor){
         
         let pointArr = swichPoint(arr: point)
+        
         let drawLayer = DrawLayer()
         drawLayer.xPointArr = xCenterArr
         drawLayer.yPointArr = [yCenterArr[pointArr[0]],yCenterArr[pointArr[1]],yCenterArr[pointArr[2]],yCenterArr[pointArr[3]],yCenterArr[pointArr[4]]]
@@ -82,7 +99,37 @@ class LineChartView: UIView {
         
     }
     //MARK: - 画竖线
-    
+    @objc func touchXAction(tap:UIButton){
+        
+        let index = tap.tag
+
+        if btnTouch != index {
+            
+            lineLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
+            lineLayer.lineWidth = 1
+            let arr = [5,5]
+            lineLayer.lineDashPhase = 0
+            lineLayer.lineDashPattern = arr as [NSNumber]
+            self.layer.addSublayer(lineLayer)
+            
+            let movePath = CGMutablePath()
+            movePath.move(to: CGPoint.init(x: xCenterArr[index], y: yCenterArr[0]))
+            movePath.addLine(to: CGPoint.init(x: xCenterArr[index], y: 10+5*(self.bounds.height-60)/CGFloat(yCount)))
+            lineLayer.path = movePath
+            
+            xMoveLayer.strokeColor = UIColorWithRGB(R: 92, G: 145, B: 230).cgColor
+            xMoveLayer.lineWidth = 2
+            self.layer.addSublayer(xMoveLayer)
+            let movePath2 = CGMutablePath()
+            movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-50))
+            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-50))
+            xMoveLayer.path = movePath2
+            
+        }
+        btnTouch = index
+        
+        
+    }
     //MARK: - 特定横坐标颜色,下划线
     
     //转换y坐标
diff --git a/ParentAssistant/ParentAssistant/MainViewController.swift b/ParentAssistant/ParentAssistant/MainViewController.swift
index fefd65b..117b148 100644
--- a/ParentAssistant/ParentAssistant/MainViewController.swift
+++ b/ParentAssistant/ParentAssistant/MainViewController.swift
@@ -12,7 +12,7 @@ class MainViewController: UINavigationController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        self.view.backgroundColor = UIColor.white
         // Do any additional setup after loading the view.
     }
 
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
index ff7df1f..742738a 100644
--- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -22,16 +22,16 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw">
-                                <rect key="frame" x="0.0" y="64" width="375" height="554"/>
+                                <rect key="frame" x="0.0" y="64" width="376" height="554"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="554"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="376" height="554"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu">
-                                                <rect key="frame" x="8" y="8" width="359" height="350"/>
+                                                <rect key="frame" x="8" y="8" width="360" height="350"/>
                                                 <subviews>
                                                     <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P">
-                                                        <rect key="frame" x="0.0" y="0.0" width="359" height="92"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="360" height="92"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/>
@@ -49,20 +49,20 @@
                                                         </connections>
                                                     </collectionView>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32">
-                                                        <rect key="frame" x="0.0" y="100" width="359" height="1"/>
+                                                        <rect key="frame" x="0.0" y="100" width="360" height="1"/>
                                                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/>
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT">
-                                                        <rect key="frame" x="0.0" y="101" width="359" height="249"/>
+                                                        <rect key="frame" x="0.0" y="101" width="360" height="249"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG">
-                                                                <rect key="frame" x="179.5" y="0.0" width="179.5" height="249"/>
+                                                                <rect key="frame" x="180" y="0.0" width="180" height="249"/>
                                                                 <subviews>
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7">
-                                                                        <rect key="frame" x="14.5" y="49.5" width="150" height="150"/>
+                                                                        <rect key="frame" x="15" y="49.5" width="150" height="150"/>
                                                                         <subviews>
                                                                             <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training" translatesAutoresizingMaskIntoConstraints="NO" id="jM3-pe-HNZ">
                                                                                 <rect key="frame" x="50" y="50" width="50" height="50"/>
@@ -116,7 +116,7 @@
                                                                 </constraints>
                                                             </view>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i">
-                                                                <rect key="frame" x="0.0" y="0.0" width="179.5" height="249"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="180" height="249"/>
                                                                 <subviews>
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7">
                                                                         <rect key="frame" x="15" y="49.5" width="150" height="150"/>
@@ -202,10 +202,10 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e">
-                                                <rect key="frame" x="8" y="366" width="359" height="35"/>
+                                                <rect key="frame" x="8" y="366" width="360" height="35"/>
                                                 <subviews>
                                                     <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">
-                                                        <rect key="frame" x="142" y="7" width="75" height="21"/>
+                                                        <rect key="frame" x="142.5" y="7" width="75" height="21"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/>
                                                         </constraints>
@@ -214,7 +214,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <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">
-                                                        <rect key="frame" x="225" y="17" width="104" height="1"/>
+                                                        <rect key="frame" x="225.5" y="17" width="104.5" height="1"/>
                                                         <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/>
@@ -224,7 +224,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <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">
-                                                        <rect key="frame" x="30" y="17" width="104" height="1"/>
+                                                        <rect key="frame" x="30" y="17" width="104.5" height="1"/>
                                                         <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/>
@@ -248,16 +248,16 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6">
-                                                <rect key="frame" x="8" y="409" width="359" height="175.5"/>
+                                                <rect key="frame" x="8" y="409" width="360" height="176"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK">
-                                                        <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI">
-                                                                <rect key="frame" x="8" y="139" width="70" height="28"/>
+                                                                <rect key="frame" x="8" y="139.5" width="70" height="28"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/>
                                                                 </constraints>
@@ -267,13 +267,13 @@
                                                                 </state>
                                                             </button>
                                                             <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">
-                                                                <rect key="frame" x="8" y="113" width="61.5" height="18"/>
+                                                                <rect key="frame" x="8" y="113.5" width="61.5" height="18"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175" height="175.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="175.5" height="176"/>
                                                                 <connections>
                                                                     <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/>
                                                                 </connections>
@@ -303,13 +303,13 @@
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r">
-                                                        <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/>
+                                                        <rect key="frame" x="184" y="92" width="176" height="84"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="84"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw">
-                                                                <rect key="frame" x="8" y="47" width="70" height="28"/>
+                                                                <rect key="frame" x="8" y="47.5" width="70" height="28"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/>
                                                                 </constraints>
@@ -319,13 +319,13 @@
                                                                 </state>
                                                             </button>
                                                             <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">
-                                                                <rect key="frame" x="8" y="21" width="61.5" height="18"/>
+                                                                <rect key="frame" x="8" y="21.5" width="61.5" height="18"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175" height="83.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
                                                                 <connections>
                                                                     <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/>
                                                                 </connections>
@@ -354,10 +354,10 @@
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
-                                                        <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/>
+                                                        <rect key="frame" x="184" y="0.0" width="176" height="84"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="176" height="84"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
                                                                 <rect key="frame" x="8" y="48" width="70" height="28"/>
@@ -376,7 +376,7 @@
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5">
-                                                                <rect key="frame" x="-0.5" y="0.0" width="176" height="83.5"/>
+                                                                <rect key="frame" x="-0.5" y="0.0" width="176.5" height="83.5"/>
                                                                 <connections>
                                                                     <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/>
                                                                 </connections>
@@ -584,7 +584,7 @@
                                 <rect key="frame" x="0.0" y="135" width="375" height="483"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="28" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                             <segue destination="aZ0-4x-DE7" kind="show" id="W8C-3m-iNT"/>
                                         </connections>
                                     </tableViewCell>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="308" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                 <rect key="frame" x="0.0" y="64" width="375" height="544"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="28" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                             <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/>
                                         </connections>
                                     </tableViewCell>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="308" width="375" height="280"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                             <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/>
                                         </connections>
                                     </tableViewCell>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="588" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Qp-zh-xwy">
-                                                    <rect key="frame" x="10" y="10" width="355" height="89.5"/>
+                                                    <rect key="frame" x="10" y="10" width="394" height="89.5"/>
                                                     <subviews>
                                                         <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">
                                                             <rect key="frame" x="10" y="38" width="104" height="14.5"/>
@@ -1139,13 +1139,13 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <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">
-                                                            <rect key="frame" x="328.5" y="10" width="16.5" height="18"/>
+                                                            <rect key="frame" x="367.5" y="10" width="16.5" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <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">
-                                                            <rect key="frame" x="234" y="38" width="111" height="14.5"/>
+                                                            <rect key="frame" x="273" y="38" width="111" height="14.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
@@ -1324,18 +1324,18 @@
                                             <outlet property="scoreLab" destination="Wcw-jF-3E1" id="9oD-3O-mjg"/>
                                         </connections>
                                     </tableViewCell>
-                                    <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">
-                                        <rect key="frame" x="0.0" y="278" width="375" height="280"/>
+                                    <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">
+                                        <rect key="frame" x="0.0" y="278" width="375" height="300"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YX5-IF-Qlq" id="eza-mR-Jnp">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="280"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="300"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pyr-9X-CHE">
-                                                    <rect key="frame" x="10" y="10" width="355" height="270"/>
+                                                    <rect key="frame" x="10" y="10" width="355" height="290"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="flm-QF-4ZE">
-                                                            <rect key="frame" x="0.0" y="50" width="355" height="210"/>
+                                                            <rect key="frame" x="0.0" y="50" width="355" height="230"/>
                                                             <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VjO-jB-oUF">
@@ -1452,7 +1452,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <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">
-                                        <rect key="frame" x="0.0" y="558" width="375" height="90"/>
+                                        <rect key="frame" x="0.0" y="578" width="375" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gXN-fm-dPx" id="0Hn-Z4-F5G">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
@@ -1763,7 +1763,7 @@
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </view>
                                 <prototypes>
-                                    <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">
+                                    <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">
                                         <rect key="frame" x="0.0" y="28" width="343" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <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 @@
                                             <outlet property="newLabel" destination="Cgm-Km-mZE" id="ZPq-dp-KUH"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
                                         <rect key="frame" x="0.0" y="72" width="343" height="30"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g">
--
libgit2 0.21.0