diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 50eb58a..800b33c 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -32,6 +32,9 @@ 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; }; 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; }; 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; + AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */; }; + AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */; }; + AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA232065FBD100ECA428 /* SceneDownCell.swift */; }; AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; }; AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; }; AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; }; @@ -173,6 +176,9 @@ 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = ""; }; A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneTopCell.swift; sourceTree = ""; }; + AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneMiddleCell.swift; sourceTree = ""; }; + AD24AA232065FBD100ECA428 /* SceneDownCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDownCell.swift; sourceTree = ""; }; AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = ""; }; AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = ""; }; AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = ""; }; @@ -512,6 +518,9 @@ AD34D1192064C79D00989F8D /* MoralDetailCell.swift */, AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */, AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */, + AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */, + AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */, + AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, ADAEA3992064C44900A47D2C /* LineChartView.swift */, ); path = View; @@ -921,6 +930,7 @@ 599364F7204E648C00C8B371 /* ChannelCollectionViewCell.swift in Sources */, BF7A4C36204CD55300460463 /* ViewController.swift in Sources */, BFEAAAA9205248AC0072FAAF /* TaskPresentationTableViewCell.swift in Sources */, + AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */, 5980BF6A2061048A00F4A35E /* LZPickerModel.m in Sources */, BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */, BF67F3C020590A2F002FDC61 /* SwiftyJSON.swift in Sources */, @@ -946,6 +956,7 @@ BFF9B7EB205772E100F39B3E /* GetBackPasswordViewController.swift in Sources */, BFF9B7F22057A28900F39B3E /* TableEmptyView.swift in Sources */, ADAEA39A2064C44900A47D2C /* LineChartView.swift in Sources */, + AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */, BFBC06CA2063AE8900CCFAFF /* ZLaunchAdImageView.swift in Sources */, BF406CE02057C708000A6681 /* OrderDetailCollectionViewCell.swift in Sources */, BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */, @@ -963,6 +974,7 @@ BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */, BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */, AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */, + AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */, BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */, BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */, AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */, diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist index d073d4a..51a860c 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ ParentAssistant.xcscheme orderHint - 1 + 0 diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 4969d2f..8aa4f92 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/MoralViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift index e594249..4092bae 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift @@ -31,10 +31,15 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS } } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - if indexPath.section == 2{ - return 80 - }else{ - return 280 + switch indexPath.section { + case 0: + return 240 + case 1: + return 235 + case 2: + return 70 + default: + return 0 } } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift index e707941..d91369f 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift @@ -28,22 +28,29 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV return 1 } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - if indexPath.section == 2 { - return 80 + + switch indexPath.section { + case 0: + return 240 + case 1: + return 235 + case 2: + return 70 + default: + return 0 } - return 250 } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { var cell = UITableViewCell.init() switch indexPath.section { case 0: - cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) + cell = tableView.dequeueReusableCell(withIdentifier: "cultureCell", for: indexPath) as! SceneTopCell return cell case 1: - cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) + cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) as! SceneMiddleCell return cell case 2: - cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) + cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) as! SceneDownCell return cell default: return cell diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift index 4183d80..63d24db 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/EducationDetailCell.swift @@ -11,6 +11,7 @@ import UIKit class EducationDetailCell: UITableViewCell { @IBOutlet weak var lineChartView: UIView! + var customLineChart = LineChartView() override func awakeFromNib() { @@ -18,11 +19,10 @@ class EducationDetailCell: UITableViewCell { let rect = self.lineChartView.bounds print(rect) customLineChart = LineChartView.init(frame: rect) - + customLineChart.drawUI(xLableArr: nil) let arr1 = [4,4,2,1,3] let arr2 = [2,1,4,4,5] - //65 105 190 - //220 0 16 + customLineChart.drawLine(point: arr1, color: UIColorWithRGB(R: 65, G: 105, B: 190)) customLineChart.drawLine(point: arr2, color: UIColorWithRGB(R: 220, G: 0, B: 16)) diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift index 2aff999..58bc3b7 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/View/LineChartView.swift @@ -10,10 +10,6 @@ import UIKit class LineChartView: UIView { - - //自定义横坐标 - var customXLabArr = Array() - //默认横坐标 private var xLabArr = ["行为","文明","课堂","作业","礼仪"] //设置纵坐标 @@ -29,24 +25,28 @@ class LineChartView: UIView { override init(frame: CGRect) { super.init(frame: frame) print("frame==\(frame)") - - if customXLabArr.count>0 { - xLabArr = customXLabArr + + } + func drawUI(xLableArr:Array?){ + + if xLableArr != nil { + xLabArr = xLableArr! } drawX() drawY() } //设置纵坐标 private func drawY() { - let yHeight = (self.bounds.height-20)/CGFloat(yCount) + + let yHeight = (self.bounds.height-60)/CGFloat(yCount) for index in 0..,color:UIColor){ let pointArr = swichPoint(arr: point) @@ -76,8 +77,9 @@ class LineChartView: UIView { drawLayer.bounds = self.bounds drawLayer.position = self.center drawLayer.lineColor = color - drawLayer.setNeedsDisplay() self.layer.addSublayer(drawLayer) + drawLayer.setNeedsDisplay() + } //MARK: - 画竖线 @@ -123,10 +125,9 @@ class DrawLayer: CALayer { context.fillEllipse(in: CGRect.init(x: xPointArr[i]-5, y: yPointArr[i]-5, width: 10, height: 10)) } - //折线 context.setStrokeColor(lineColor.cgColor) - context.setLineWidth(1) + context.setLineWidth(1.5) for i in 0.. + - @@ -898,81 +898,80 @@ - + - - + - + - + @@ -982,14 +981,14 @@ - - + + - + @@ -1023,88 +1022,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - + + + + + + + + + + + + + - + @@ -1132,60 +1113,49 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -1217,7 +1187,7 @@ - + @@ -1231,7 +1201,7 @@ - + @@ -1241,96 +1211,80 @@ - - + + - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -1343,8 +1297,14 @@ + + + + + + - + @@ -1355,29 +1315,18 @@ - - - - - - + - - - - - - - + - - + + - - + + @@ -1386,21 +1335,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - + @@ -1489,8 +1427,11 @@ + + + - + @@ -1501,84 +1442,65 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + @@ -1592,6 +1514,14 @@ + + + + + + + + @@ -2202,6 +2132,7 @@ + @@ -2211,7 +2142,6 @@ - - + diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Info.plist b/ParentAssistant/ParentAssistant/Supporting Files/Info.plist index 43ed4a3..62a086f 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Info.plist +++ b/ParentAssistant/ParentAssistant/Supporting Files/Info.plist @@ -42,6 +42,8 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad diff --git a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist index 1e7f9aa..d1b4da5 100644 --- a/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ Alamofire.xcscheme orderHint - 0 + 1 DZNEmptyDataSet.xcscheme -- libgit2 0.21.0