From 58c1dc9c02f4443f871c70098c0292845f1e7f78 Mon Sep 17 00:00:00 2001 From: Cao yang Date: Fri, 23 Mar 2018 10:01:38 +0800 Subject: [PATCH] 提交 --- ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj | 4 ++++ ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 14 ++++++++++++++ ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 0 -> 25225 bytes ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift | 47 +++++++++++++++++++++++++++++++++++++++++++++-- ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift | 2 ++ ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/Contents.json | 21 --------------------- ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/相机.png | Bin 1070 -> 0 bytes ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json | 21 +++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png | Bin 0 -> 42275 bytes ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json | 21 +++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png | Bin 0 -> 17440 bytes ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json | 21 +++++++++++++++++++++ ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png | Bin 0 -> 87511 bytes ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard | 749 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------- ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 16 files changed, 896 insertions(+), 127 deletions(-) create mode 100644 ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift delete mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/Contents.json delete mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/相机.png create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json create mode 100644 ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png create mode 100644 ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj index 3b2a510..47a9abb 100644 --- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj +++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj @@ -34,6 +34,7 @@ 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB77206354220052415B /* MoralTableViewCell.swift */; }; AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB7920637F110052415B /* MoralViewController.swift */; }; + ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; }; ADE33B312062202300BEA6E6 /* Macro.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE33B302062202300BEA6E6 /* Macro.swift */; }; BF388469205A4DE900A240EF /* StudentClassInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF388468205A4DE900A240EF /* StudentClassInfo.swift */; }; BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF38846B205A58F800A240EF /* YXMessageManager.swift */; }; @@ -170,6 +171,7 @@ A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AD65FB77206354220052415B /* MoralTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralTableViewCell.swift; sourceTree = ""; }; AD65FB7920637F110052415B /* MoralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralViewController.swift; sourceTree = ""; }; + ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = ""; }; ADE33B302062202300BEA6E6 /* Macro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Macro.swift; sourceTree = ""; }; BF388468205A4DE900A240EF /* StudentClassInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentClassInfo.swift; sourceTree = ""; }; BF38846B205A58F800A240EF /* YXMessageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YXMessageManager.swift; sourceTree = ""; }; @@ -409,6 +411,7 @@ children = ( 599364E7204E62E700C8B371 /* ReportViewController.swift */, AD65FB7920637F110052415B /* MoralViewController.swift */, + ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */, BF3B829E2050CC7E002078EA /* View */, ); path = report; @@ -916,6 +919,7 @@ BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */, BFF9B7E92056852A00F39B3E /* RegisterViewController.swift in Sources */, BFBC06C72063AE8900CCFAFF /* ZLaunchAdButton.swift in Sources */, + ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */, BFBC06CE2063AE8900CCFAFF /* ZLaunchLog.swift in Sources */, BFBC06CB2063AE8900CCFAFF /* ZLaunchAdView.swift in Sources */, BFEAAACA205257460072FAAF /* NSString+NCDate.m in Sources */, diff --git a/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..51a860c --- /dev/null +++ b/ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + ParentAssistant.xcscheme + + orderHint + 0 + + + + diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..50b60a1 Binary files /dev/null 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 71fe735..e594249 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/MoralViewController.swift @@ -8,14 +8,57 @@ import UIKit -class MoralViewController: UIViewController { +class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataSource { + @IBOutlet weak var tableView: UITableView! override func viewDidLoad() { super.viewDidLoad() - + self.title = "德育报告" + tableView.delegate = self + tableView.dataSource = self // Do any additional setup after loading the view. } + func numberOfSections(in tableView: UITableView) -> Int { + return 3 + } + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + + if section == 2 { + return 3 + }else{ + return 1 + } + } + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.section == 2{ + return 80 + }else{ + return 280 + } + } + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + var cell = UITableViewCell.init() + switch indexPath.section { + case 0: + cell = tableView.dequeueReusableCell(withIdentifier: "moralDetail", for: indexPath) + return cell + case 1: + cell = tableView.dequeueReusableCell(withIdentifier: "educationDetail", for: indexPath) + return cell + case 2: + cell = tableView.dequeueReusableCell(withIdentifier: "behaviorDetail", for: indexPath) + return cell + default: + return cell + } + } + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + if indexPath.section == 2 { + let scene = Story.instantiateViewControllerWithIdentifier("SceneDetailViewController", storyName: "Main") as! SceneDetailViewController + self.navigationController?.pushViewController(scene, animated: true) + } + } override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift index 6a3abc4..bb090a5 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift @@ -123,8 +123,10 @@ extension ReportViewController: ReportHeaderViewDelegate{ } //点击日期 func selectDateButton() { + appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter) return + let isHidden = calendarView.isHidden if isHidden { calendarView.isHidden = false diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift new file mode 100644 index 0000000..e707941 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Classes/controllers/report/SceneDetailViewController.swift @@ -0,0 +1,69 @@ +// +// SceneDetailViewController.swift +// ParentAssistant +// +// Created by Cao yang on 2018/3/22. +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. +// + +import UIKit + +class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableViewDelegate { + + @IBOutlet weak var sceneTableView: UITableView! + override func viewDidLoad() { + super.viewDidLoad() + self.title = "场景详情" + sceneTableView.delegate = self + sceneTableView.dataSource = self + // Do any additional setup after loading the view. + } + func numberOfSections(in tableView: UITableView) -> Int { + return 3 + } + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + if section == 2 { + return 5 + } + return 1 + } + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.section == 2 { + return 80 + } + 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) + return cell + case 1: + cell = tableView.dequeueReusableCell(withIdentifier: "scoreCell", for: indexPath) + return cell + case 2: + cell = tableView.dequeueReusableCell(withIdentifier: "disciplineCell", for: indexPath) + return cell + default: + return cell + } + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/Contents.json deleted file mode 100644 index 6b59bf0..0000000 --- a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "相机.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/相机.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/相机.png deleted file mode 100644 index d3acf84..0000000 Binary files a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/evaluation/evaluation_icon_camera.imageset/相机.png and /dev/null differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json new file mode 100644 index 0000000..15ba96b --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "test001.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png new file mode 100644 index 0000000..a6f3502 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json new file mode 100644 index 0000000..9a92e31 --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "test002.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png new file mode 100644 index 0000000..9ac86f5 Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json new file mode 100644 index 0000000..0e44a1a --- /dev/null +++ b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "test003.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png new file mode 100644 index 0000000..6da415d Binary files /dev/null and b/ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png differ diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index fec183e..fd15f93 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -7,6 +7,7 @@ + @@ -63,7 +64,7 @@ - + @@ -78,22 +79,12 @@ - - - - - @@ -129,32 +120,22 @@ - + - - - - - @@ -199,12 +180,6 @@ - - - - - - @@ -258,7 +233,7 @@ - +