From 55f4e53f08b2b386c95a6e01e90a8e950383c640 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Mon, 26 Mar 2018 10:09:53 +0800
Subject: [PATCH] 点击折线图添加数字显示

---
 ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 87178 -> 0 bytes
 ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift                       | 50 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index b785fa3..d17cfa7 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/View/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
index a6420cf..18e4d6e 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift
@@ -29,9 +29,11 @@ class LineChartView: UIView {
     private let xMoveLayer = CAShapeLayer()
     //纵坐标Lab数组
     private var yMoveLaArr = Array<UILabel>()
-    
-    
-    
+    //折线图数据数组
+    private var dateArr = Array<Array<Int>>()
+    //显示的数字
+    var yLabArray = Array<UILabel>()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         print("frame==\(frame)")
@@ -68,7 +70,7 @@ class LineChartView: UIView {
     private func drawX() {
         let xWidth = (screenWidth-20)/CGFloat(yCount)
         for index in 0..<xCount {
-            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 20))
+            let nameBtn = UIButton.init(frame: CGRect.init(x: xWidth+CGFloat(index)*xWidth, y: self.bounds.height-70, width: 40, height: 25))
             nameBtn.setTitle(xLabArr[index], for: UIControlState.normal)
             nameBtn.setTitleColor(UIColorWithRGB(R: 119, G: 119, B: 119), for: UIControlState.normal)
             nameBtn.titleLabel!.textAlignment = .center
@@ -97,14 +99,18 @@ class LineChartView: UIView {
         self.layer.addSublayer(drawLayer)
         drawLayer.setNeedsDisplay()
         
+        dateArr.append(point)
+        
     }
-    //MARK: - 画竖线
+    //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]
@@ -112,6 +118,7 @@ class LineChartView: UIView {
             lineLayer.lineDashPattern = arr as [NSNumber]
             self.layer.addSublayer(lineLayer)
             
+            //X轴下划线
             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)))
@@ -121,17 +128,40 @@ class LineChartView: UIView {
             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))
+            movePath2.move(to: CGPoint.init(x: xCenterArr[index]-15, y: self.bounds.height-45))
+            movePath2.addLine(to: CGPoint.init(x: xCenterArr[index]+15, y: self.bounds.height-45))
             xMoveLayer.path = movePath2
             
+            if yLabArray.count == dateArr.count {
+                for label in yLabArray {
+                    label.removeFromSuperview()
+                }
+            }
+            yLabArray.removeAll()
+            //数字显示
+            for i in 0..<dateArr.count {
+                let arr = dateArr[i]
+                //y坐标数值
+                let y = arr[index]
+                let yLab = yMoveLaArr[GPA-y]
+                var rect = yLab.frame
+                rect.origin.x = xCenterArr[index]+10
+                
+                let newLab = UILabel()
+                newLab.text = yLab.text
+                newLab.textColor = yLab.textColor
+                newLab.font = yLab.font
+                newLab.frame = rect
+                self.addSubview(newLab)
+                yLabArray.append(newLab)
+            }
+        }else{
+            print(yLabArray)
         }
         btnTouch = index
         
         
     }
-    //MARK: - 特定横坐标颜色,下划线
-    
     //转换y坐标
     func swichPoint(arr:Array<Int>)->Array<Int>{
         var array = Array<Int>()
--
libgit2 0.21.0