Commit 32f281465296d776d027a1bd8869383d54542742
Exists in
parentassistant
Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant: commit 添加请假页面 隐藏首页 添加图片
Showing
29 changed files
with
835 additions
and
49 deletions
 
Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
| @@ -32,12 +32,19 @@ | @@ -32,12 +32,19 @@ | ||
| 32 | 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; }; | 32 | 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5993652B20528D5700C8B371 /* MainViewController.swift */; }; | 
| 33 | 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; }; | 33 | 59C0A9B8205375F800A8BB5A /* SelectCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */; }; | 
| 34 | 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; | 34 | 9FB4F6F97960021FB4F02BBE /* Pods_ParentAssistant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */; }; | 
| 35 | + AD198173207D9FB4009AB8B5 /* ProgramCheckViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */; }; | ||
| 36 | + AD198175207D9FC1009AB8B5 /* ProgramCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */; }; | ||
| 37 | + AD198177207D9FF5009AB8B5 /* ProgramVacateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */; }; | ||
| 35 | AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */; }; | 38 | AD24AA202065FBAF00ECA428 /* SceneTopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */; }; | 
| 36 | AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */; }; | 39 | AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */; }; | 
| 37 | AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA232065FBD100ECA428 /* SceneDownCell.swift */; }; | 40 | AD24AA242065FBD100ECA428 /* SceneDownCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD24AA232065FBD100ECA428 /* SceneDownCell.swift */; }; | 
| 38 | AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; }; | 41 | AD34D11A2064C79D00989F8D /* MoralDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D1192064C79D00989F8D /* MoralDetailCell.swift */; }; | 
| 39 | AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; }; | 42 | AD34D11C2064C7AE00989F8D /* EducationDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */; }; | 
| 40 | AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; }; | 43 | AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */; }; | 
| 44 | + AD64A2C0207F289400B25E80 /* ProgramVacateTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */; }; | ||
| 45 | + AD64A2C1207F289400B25E80 /* ProgramVacateTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */; }; | ||
| 46 | + AD64A2C3207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */; }; | ||
| 47 | + AD64A2C5207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */; }; | ||
| 41 | AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB77206354220052415B /* MoralTableViewCell.swift */; }; | 48 | AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB77206354220052415B /* MoralTableViewCell.swift */; }; | 
| 42 | AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB7920637F110052415B /* MoralViewController.swift */; }; | 49 | AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD65FB7920637F110052415B /* MoralViewController.swift */; }; | 
| 43 | ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; }; | 50 | ADAEA3982064960300A47D2C /* SceneDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */; }; | 
| @@ -188,12 +195,19 @@ | @@ -188,12 +195,19 @@ | ||
| 188 | 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; }; | 195 | 5993652B20528D5700C8B371 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; }; | 
| 189 | 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = "<group>"; }; | 196 | 59C0A9B7205375F800A8BB5A /* SelectCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCityViewController.swift; sourceTree = "<group>"; }; | 
| 190 | A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | 197 | A6EEE742C2FA920AEDF24728 /* Pods_ParentAssistant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParentAssistant.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | 
| 198 | + AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramCheckViewController.swift; sourceTree = "<group>"; }; | ||
| 199 | + AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramCardViewController.swift; sourceTree = "<group>"; }; | ||
| 200 | + AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateViewController.swift; sourceTree = "<group>"; }; | ||
| 191 | AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneTopCell.swift; sourceTree = "<group>"; }; | 201 | AD24AA1F2065FBAF00ECA428 /* SceneTopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneTopCell.swift; sourceTree = "<group>"; }; | 
| 192 | AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneMiddleCell.swift; sourceTree = "<group>"; }; | 202 | AD24AA212065FBC000ECA428 /* SceneMiddleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneMiddleCell.swift; sourceTree = "<group>"; }; | 
| 193 | AD24AA232065FBD100ECA428 /* SceneDownCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDownCell.swift; sourceTree = "<group>"; }; | 203 | AD24AA232065FBD100ECA428 /* SceneDownCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDownCell.swift; sourceTree = "<group>"; }; | 
| 194 | AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = "<group>"; }; | 204 | AD34D1192064C79D00989F8D /* MoralDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralDetailCell.swift; sourceTree = "<group>"; }; | 
| 195 | AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = "<group>"; }; | 205 | AD34D11B2064C7AE00989F8D /* EducationDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EducationDetailCell.swift; sourceTree = "<group>"; }; | 
| 196 | AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = "<group>"; }; | 206 | AD34D11D2064C7C300989F8D /* BehaviorDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorDetailCell.swift; sourceTree = "<group>"; }; | 
| 207 | + AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateTableViewCell.swift; sourceTree = "<group>"; }; | ||
| 208 | + AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateTableViewCell.xib; sourceTree = "<group>"; }; | ||
| 209 | + AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgramVacateBodyTableViewCell.swift; sourceTree = "<group>"; }; | ||
| 210 | + AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProgramVacateBodyTableViewCell.xib; sourceTree = "<group>"; }; | ||
| 197 | AD65FB77206354220052415B /* MoralTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralTableViewCell.swift; sourceTree = "<group>"; }; | 211 | AD65FB77206354220052415B /* MoralTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralTableViewCell.swift; sourceTree = "<group>"; }; | 
| 198 | AD65FB7920637F110052415B /* MoralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralViewController.swift; sourceTree = "<group>"; }; | 212 | AD65FB7920637F110052415B /* MoralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoralViewController.swift; sourceTree = "<group>"; }; | 
| 199 | ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = "<group>"; }; | 213 | ADAEA3972064960300A47D2C /* SceneDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDetailViewController.swift; sourceTree = "<group>"; }; | 
| @@ -516,6 +530,9 @@ | @@ -516,6 +530,9 @@ | ||
| 516 | isa = PBXGroup; | 530 | isa = PBXGroup; | 
| 517 | children = ( | 531 | children = ( | 
| 518 | ADC9AB87207C940700348EF1 /* ProgramViewController.swift */, | 532 | ADC9AB87207C940700348EF1 /* ProgramViewController.swift */, | 
| 533 | + AD198172207D9FB4009AB8B5 /* ProgramCheckViewController.swift */, | ||
| 534 | + AD198174207D9FC1009AB8B5 /* ProgramCardViewController.swift */, | ||
| 535 | + AD198176207D9FF5009AB8B5 /* ProgramVacateViewController.swift */, | ||
| 519 | ); | 536 | ); | 
| 520 | path = Program; | 537 | path = Program; | 
| 521 | sourceTree = "<group>"; | 538 | sourceTree = "<group>"; | 
| @@ -582,6 +599,10 @@ | @@ -582,6 +599,10 @@ | ||
| 582 | AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, | 599 | AD24AA232065FBD100ECA428 /* SceneDownCell.swift */, | 
| 583 | ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */, | 600 | ADC9AB83207C673C00348EF1 /* SceneDownCell.xib */, | 
| 584 | ADAEA3992064C44900A47D2C /* LineChartView.swift */, | 601 | ADAEA3992064C44900A47D2C /* LineChartView.swift */, | 
| 602 | + AD64A2BE207F289400B25E80 /* ProgramVacateTableViewCell.swift */, | ||
| 603 | + AD64A2BF207F289400B25E80 /* ProgramVacateTableViewCell.xib */, | ||
| 604 | + AD64A2C2207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift */, | ||
| 605 | + AD64A2C4207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib */, | ||
| 585 | ); | 606 | ); | 
| 586 | path = View; | 607 | path = View; | 
| 587 | sourceTree = "<group>"; | 608 | sourceTree = "<group>"; | 
| @@ -892,6 +913,7 @@ | @@ -892,6 +913,7 @@ | ||
| 892 | 5980BF672061048A00F4A35E /* Address.plist in Resources */, | 913 | 5980BF672061048A00F4A35E /* Address.plist in Resources */, | 
| 893 | BF38847C205CDE1B00A240EF /* JS.storyboard in Resources */, | 914 | BF38847C205CDE1B00A240EF /* JS.storyboard in Resources */, | 
| 894 | ADC9AB7C207C66C300348EF1 /* EducationDetailCell.xib in Resources */, | 915 | ADC9AB7C207C66C300348EF1 /* EducationDetailCell.xib in Resources */, | 
| 916 | + AD64A2C1207F289400B25E80 /* ProgramVacateTableViewCell.xib in Resources */, | ||
| 895 | BFF9B7F42057A29D00F39B3E /* TableEmptyView.xib in Resources */, | 917 | BFF9B7F42057A29D00F39B3E /* TableEmptyView.xib in Resources */, | 
| 896 | ADC9AB7E207C66DA00348EF1 /* BehaviorDetailCell.xib in Resources */, | 918 | ADC9AB7E207C66DA00348EF1 /* BehaviorDetailCell.xib in Resources */, | 
| 897 | ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */, | 919 | ADC9AB84207C673C00348EF1 /* SceneDownCell.xib in Resources */, | 
| @@ -906,6 +928,7 @@ | @@ -906,6 +928,7 @@ | ||
| 906 | BF67F3BD20590A2F002FDC61 /* Info-OSX.plist in Resources */, | 928 | BF67F3BD20590A2F002FDC61 /* Info-OSX.plist in Resources */, | 
| 907 | BF621CAC205660E90040D2C1 /* My.storyboard in Resources */, | 929 | BF621CAC205660E90040D2C1 /* My.storyboard in Resources */, | 
| 908 | BF67F3BC20590A2F002FDC61 /* Info-iOS.plist in Resources */, | 930 | BF67F3BC20590A2F002FDC61 /* Info-iOS.plist in Resources */, | 
| 931 | + AD64A2C5207F28EB00B25E80 /* ProgramVacateBodyTableViewCell.xib in Resources */, | ||
| 909 | BF7A4C84204E338500460463 /* Assets.xcassets in Resources */, | 932 | BF7A4C84204E338500460463 /* Assets.xcassets in Resources */, | 
| 910 | BF7A4C85204E338500460463 /* LaunchScreen.storyboard in Resources */, | 933 | BF7A4C85204E338500460463 /* LaunchScreen.storyboard in Resources */, | 
| 911 | ADC9AB82207C673300348EF1 /* SceneMiddleCell.xib in Resources */, | 934 | ADC9AB82207C673300348EF1 /* SceneMiddleCell.xib in Resources */, | 
| @@ -997,6 +1020,7 @@ | @@ -997,6 +1020,7 @@ | ||
| 997 | BF621CB02056664C0040D2C1 /* CurrentInfoViewController.swift in Sources */, | 1020 | BF621CB02056664C0040D2C1 /* CurrentInfoViewController.swift in Sources */, | 
| 998 | ADC9AB88207C940700348EF1 /* ProgramViewController.swift in Sources */, | 1021 | ADC9AB88207C940700348EF1 /* ProgramViewController.swift in Sources */, | 
| 999 | BF7A4C3C204CD55300460463 /* ParentAssistant.xcdatamodeld in Sources */, | 1022 | BF7A4C3C204CD55300460463 /* ParentAssistant.xcdatamodeld in Sources */, | 
| 1023 | + AD198177207D9FF5009AB8B5 /* ProgramVacateViewController.swift in Sources */, | ||
| 1000 | BFEAAAD620525D620072FAAF /* LxButton.m in Sources */, | 1024 | BFEAAAD620525D620072FAAF /* LxButton.m in Sources */, | 
| 1001 | 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */, | 1025 | 5993652C20528D5700C8B371 /* MainViewController.swift in Sources */, | 
| 1002 | 5993652A2052553900C8B371 /* pinyin.c in Sources */, | 1026 | 5993652A2052553900C8B371 /* pinyin.c in Sources */, | 
| @@ -1018,6 +1042,7 @@ | @@ -1018,6 +1042,7 @@ | ||
| 1018 | 5980BF692061048A00F4A35E /* LZCityPickerView.m in Sources */, | 1042 | 5980BF692061048A00F4A35E /* LZCityPickerView.m in Sources */, | 
| 1019 | BF388482205F5BC800A240EF /* MessageManager.swift in Sources */, | 1043 | BF388482205F5BC800A240EF /* MessageManager.swift in Sources */, | 
| 1020 | 5980BF682061048A00F4A35E /* LZCityPickerController.m in Sources */, | 1044 | 5980BF682061048A00F4A35E /* LZCityPickerController.m in Sources */, | 
| 1045 | + AD198173207D9FB4009AB8B5 /* ProgramCheckViewController.swift in Sources */, | ||
| 1021 | BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */, | 1046 | BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */, | 
| 1022 | BFF9B7E92056852A00F39B3E /* RegisterViewController.swift in Sources */, | 1047 | BFF9B7E92056852A00F39B3E /* RegisterViewController.swift in Sources */, | 
| 1023 | BFBC06C72063AE8900CCFAFF /* ZLaunchAdButton.swift in Sources */, | 1048 | BFBC06C72063AE8900CCFAFF /* ZLaunchAdButton.swift in Sources */, | 
| @@ -1051,6 +1076,8 @@ | @@ -1051,6 +1076,8 @@ | ||
| 1051 | 599364EC204E62E700C8B371 /* EvaluationViewController.swift in Sources */, | 1076 | 599364EC204E62E700C8B371 /* EvaluationViewController.swift in Sources */, | 
| 1052 | 599364F0204E62E700C8B371 /* ReportViewController.swift in Sources */, | 1077 | 599364F0204E62E700C8B371 /* ReportViewController.swift in Sources */, | 
| 1053 | BF621CAE2056663C0040D2C1 /* LoginViewController.swift in Sources */, | 1078 | BF621CAE2056663C0040D2C1 /* LoginViewController.swift in Sources */, | 
| 1079 | + AD64A2C0207F289400B25E80 /* ProgramVacateTableViewCell.swift in Sources */, | ||
| 1080 | + AD64A2C3207F28CF00B25E80 /* ProgramVacateBodyTableViewCell.swift in Sources */, | ||
| 1054 | 599364EA204E62E700C8B371 /* ChannelViewController.swift in Sources */, | 1081 | 599364EA204E62E700C8B371 /* ChannelViewController.swift in Sources */, | 
| 1055 | BF406CDE2057C537000A6681 /* OrderDetailTableViewCell.swift in Sources */, | 1082 | BF406CDE2057C537000A6681 /* OrderDetailTableViewCell.swift in Sources */, | 
| 1056 | BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */, | 1083 | BFEAAAC7205257460072FAAF /* LXCalenderCell.m in Sources */, | 
| @@ -1061,6 +1088,7 @@ | @@ -1061,6 +1088,7 @@ | ||
| 1061 | BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */, | 1088 | BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */, | 
| 1062 | AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */, | 1089 | AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */, | 
| 1063 | BFCED888205280B700055373 /* MyViewController.swift in Sources */, | 1090 | BFCED888205280B700055373 /* MyViewController.swift in Sources */, | 
| 1091 | + AD198175207D9FC1009AB8B5 /* ProgramCardViewController.swift in Sources */, | ||
| 1064 | AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */, | 1092 | AD65FB78206354220052415B /* MoralTableViewCell.swift in Sources */, | 
| 1065 | BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */, | 1093 | BF38846C205A58F800A240EF /* YXMessageManager.swift in Sources */, | 
| 1066 | BFBC06C92063AE8900CCFAFF /* ZLaunchAdConfig.swift in Sources */, | 1094 | BFBC06C92063AE8900CCFAFF /* ZLaunchAdConfig.swift in Sources */, | 
ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
ParentAssistant/ParentAssistant.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
0 → 100644
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
| @@ -41,6 +41,8 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -41,6 +41,8 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
| 41 | lineLay.backgroundColor = UIColor.blue.cgColor | 41 | lineLay.backgroundColor = UIColor.blue.cgColor | 
| 42 | return lineLay | 42 | return lineLay | 
| 43 | }() | 43 | }() | 
| 44 | + //是否显示右侧按钮 | ||
| 45 | + var rightBtn = UIBarButtonItem() | ||
| 44 | 46 | ||
| 45 | override func viewDidLoad() { | 47 | override func viewDidLoad() { | 
| 46 | super.viewDidLoad() | 48 | super.viewDidLoad() | 
| @@ -50,6 +52,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -50,6 +52,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
| 50 | self.navigationItem.titleView = titleView | 52 | self.navigationItem.titleView = titleView | 
| 51 | self.view.addSubview(contentScrollView) | 53 | self.view.addSubview(contentScrollView) | 
| 52 | 54 | ||
| 55 | + self.title = "成长" | ||
| 53 | setUpTitle() | 56 | setUpTitle() | 
| 54 | setChildViewContent() | 57 | setChildViewContent() | 
| 55 | 58 | ||
| @@ -92,8 +95,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -92,8 +95,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
| 92 | rightView.addSubview(imageRView) | 95 | rightView.addSubview(imageRView) | 
| 93 | 96 | ||
| 94 | // rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown) | 97 | // rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown) | 
| 95 | - let rightBtn = UIBarButtonItem.init(customView: rightView) | ||
| 96 | - self.navigationItem.rightBarButtonItem = rightBtn | 98 | + self.rightBtn = UIBarButtonItem.init(customView: rightView) | 
| 97 | 99 | ||
| 98 | //设置顶部样式 | 100 | //设置顶部样式 | 
| 99 | self.configTheme() | 101 | self.configTheme() | 
| @@ -179,6 +181,11 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -179,6 +181,11 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
| 179 | contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true) | 181 | contentScrollView.setContentOffset(CGPoint.init(x: index*getScreenWidth(), y: 0), animated: true) | 
| 180 | } | 182 | } | 
| 181 | } | 183 | } | 
| 184 | + if btn.tag == 0 { | ||
| 185 | + self.navigationItem.rightBarButtonItem = nil | ||
| 186 | + }else if index == 1 { | ||
| 187 | + self.navigationItem.rightBarButtonItem = rightBtn | ||
| 188 | + } | ||
| 182 | } | 189 | } | 
| 183 | //MARK: - ScrollView Delegate | 190 | //MARK: - ScrollView Delegate | 
| 184 | func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { | 191 | func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { | 
| @@ -189,7 +196,6 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -189,7 +196,6 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
| 189 | let btn = titleBtnArr[index] | 196 | let btn = titleBtnArr[index] | 
| 190 | 197 | ||
| 191 | clickTitleAction(btn: btn) | 198 | clickTitleAction(btn: btn) | 
| 192 | - | ||
| 193 | } | 199 | } | 
| 194 | } | 200 | } | 
| 195 | 201 | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
0 → 100644
| @@ -0,0 +1,35 @@ | @@ -0,0 +1,35 @@ | ||
| 1 | +// | ||
| 2 | +// ProgramCardViewController.swift | ||
| 3 | +// ParentAssistant | ||
| 4 | +// | ||
| 5 | +// Created by Cao yang on 2018/4/11. | ||
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | ||
| 7 | +// | ||
| 8 | + | ||
| 9 | +import UIKit | ||
| 10 | + | ||
| 11 | +class ProgramCardViewController: UIViewController { | ||
| 12 | + | ||
| 13 | + override func viewDidLoad() { | ||
| 14 | + super.viewDidLoad() | ||
| 15 | + | ||
| 16 | + // Do any additional setup after loading the view. | ||
| 17 | + } | ||
| 18 | + | ||
| 19 | + override func didReceiveMemoryWarning() { | ||
| 20 | + super.didReceiveMemoryWarning() | ||
| 21 | + // Dispose of any resources that can be recreated. | ||
| 22 | + } | ||
| 23 | + | ||
| 24 | + | ||
| 25 | + /* | ||
| 26 | + // MARK: - Navigation | ||
| 27 | + | ||
| 28 | + // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| 29 | + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| 30 | + // Get the new view controller using segue.destinationViewController. | ||
| 31 | + // Pass the selected object to the new view controller. | ||
| 32 | + } | ||
| 33 | + */ | ||
| 34 | + | ||
| 35 | +} | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
0 → 100644
| @@ -0,0 +1,35 @@ | @@ -0,0 +1,35 @@ | ||
| 1 | +// | ||
| 2 | +// ProgramCheckViewController.swift | ||
| 3 | +// ParentAssistant | ||
| 4 | +// | ||
| 5 | +// Created by Cao yang on 2018/4/11. | ||
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | ||
| 7 | +// | ||
| 8 | + | ||
| 9 | +import UIKit | ||
| 10 | + | ||
| 11 | +class ProgramCheckViewController: UIViewController { | ||
| 12 | + | ||
| 13 | + override func viewDidLoad() { | ||
| 14 | + super.viewDidLoad() | ||
| 15 | + | ||
| 16 | + // Do any additional setup after loading the view. | ||
| 17 | + } | ||
| 18 | + | ||
| 19 | + override func didReceiveMemoryWarning() { | ||
| 20 | + super.didReceiveMemoryWarning() | ||
| 21 | + // Dispose of any resources that can be recreated. | ||
| 22 | + } | ||
| 23 | + | ||
| 24 | + | ||
| 25 | + /* | ||
| 26 | + // MARK: - Navigation | ||
| 27 | + | ||
| 28 | + // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| 29 | + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| 30 | + // Get the new view controller using segue.destinationViewController. | ||
| 31 | + // Pass the selected object to the new view controller. | ||
| 32 | + } | ||
| 33 | + */ | ||
| 34 | + | ||
| 35 | +} | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift
0 → 100644
| @@ -0,0 +1,153 @@ | @@ -0,0 +1,153 @@ | ||
| 1 | +// | ||
| 2 | +// ProgramVacateViewController.swift | ||
| 3 | +// ParentAssistant | ||
| 4 | +// | ||
| 5 | +// Created by Cao yang on 2018/4/11. | ||
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | ||
| 7 | +// | ||
| 8 | + | ||
| 9 | +import UIKit | ||
| 10 | + | ||
| 11 | +class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableViewDataSource { | ||
| 12 | + | ||
| 13 | + lazy var tableView = {()-> UITableView in | ||
| 14 | + let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-44-22-60)) | ||
| 15 | + table.backgroundColor = backGroundColor | ||
| 16 | + table.delegate = self | ||
| 17 | + table.dataSource = self | ||
| 18 | + table.tableFooterView = UIView.init() | ||
| 19 | + table.separatorStyle = .none | ||
| 20 | + table.register(UINib.init(nibName: "ProgramVacateTableViewCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateTableViewCell") | ||
| 21 | + table.register(UINib.init(nibName: "ProgramVacateBodyTableViewCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateBodyTableViewCell") | ||
| 22 | + return table | ||
| 23 | + }() | ||
| 24 | + | ||
| 25 | + lazy var bottomBtn = {()-> UIButton in | ||
| 26 | + let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-60, y: screenHeight-66-50, width: 120, height: 40)) | ||
| 27 | + btn.setTitle("请假", for: UIControlState.normal) | ||
| 28 | + btn.setTitleColor(UIColor.black, for: UIControlState.normal) | ||
| 29 | + btn.backgroundColor = Theme.topBarColor() | ||
| 30 | + return btn | ||
| 31 | + }() | ||
| 32 | + | ||
| 33 | + //data | ||
| 34 | + | ||
| 35 | + /// 请假记录 | ||
| 36 | + var vacateRecodeArray = Array<String>() | ||
| 37 | + | ||
| 38 | + | ||
| 39 | + override func viewDidLoad() { | ||
| 40 | + super.viewDidLoad() | ||
| 41 | + self.view.backgroundColor = backGroundColor | ||
| 42 | + | ||
| 43 | + self.view.addSubview(self.tableView) | ||
| 44 | + self.view.addSubview(self.bottomBtn) | ||
| 45 | + self.vacateRecodeArray = ["1","2"] | ||
| 46 | + | ||
| 47 | + // Do any additional setup after loading the view. | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + //MARK: - TableView delegate & dataSourse | ||
| 51 | + func numberOfSections(in tableView: UITableView) -> Int { | ||
| 52 | + return 2 | ||
| 53 | + } | ||
| 54 | + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | ||
| 55 | + switch section { | ||
| 56 | + case 0: | ||
| 57 | + return 1 | ||
| 58 | + case 1: | ||
| 59 | + if vacateRecodeArray.count > 0 { | ||
| 60 | + return vacateRecodeArray.count+1 | ||
| 61 | + }else{ | ||
| 62 | + return 2 | ||
| 63 | + } | ||
| 64 | + default: | ||
| 65 | + return 0 | ||
| 66 | + } | ||
| 67 | + } | ||
| 68 | + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { | ||
| 69 | + | ||
| 70 | + switch indexPath.section { | ||
| 71 | + case 0: | ||
| 72 | + return 90 | ||
| 73 | + case 1: | ||
| 74 | + if indexPath.row == 0{ | ||
| 75 | + return 40 | ||
| 76 | + }else{ | ||
| 77 | + if vacateRecodeArray.count > 0 { | ||
| 78 | + return 230 | ||
| 79 | + }else{ | ||
| 80 | + return 50 | ||
| 81 | + } | ||
| 82 | + } | ||
| 83 | + default: | ||
| 84 | + return 0 | ||
| 85 | + } | ||
| 86 | + } | ||
| 87 | + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | ||
| 88 | + | ||
| 89 | + switch indexPath.section { | ||
| 90 | + case 0: | ||
| 91 | + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateTableViewCell", for: indexPath) as! ProgramVacateTableViewCell | ||
| 92 | + return cell | ||
| 93 | + case 1: | ||
| 94 | + if indexPath.row == 0 { | ||
| 95 | + let cell = UITableViewCell.init() | ||
| 96 | + cell.backgroundColor = backGroundColor | ||
| 97 | + let cellView = UIView.init(frame: CGRect.init(x: 10, y: 0, width: screenWidth-20, height: 40)) | ||
| 98 | + cellView.backgroundColor = UIColor.white | ||
| 99 | + let label = UILabel.init(frame: CGRect.init(x: 10, y: 0, width: 200, height: 40)) | ||
| 100 | + label.text = "请假记录:" | ||
| 101 | + label.textAlignment = .left | ||
| 102 | + cellView.addSubview(label) | ||
| 103 | + cell.addSubview(cellView) | ||
| 104 | + return cell | ||
| 105 | + }else{ | ||
| 106 | + if vacateRecodeArray.count > 0 { | ||
| 107 | + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateBodyTableViewCell", for: indexPath) as! ProgramVacateBodyTableViewCell | ||
| 108 | + return cell | ||
| 109 | + }else{ | ||
| 110 | + let cell = UITableViewCell.init() | ||
| 111 | + cell.backgroundColor = backGroundColor | ||
| 112 | + let cellView = UIView.init(frame: CGRect.init(x: 10, y: 0, width: screenWidth-20, height: 50)) | ||
| 113 | + cellView.backgroundColor = UIColor.white | ||
| 114 | + let label = UILabel.init(frame: CGRect.init(x: 10, y: 0, width: screenWidth-20-20, height: 50)) | ||
| 115 | + label.text = "张三今日无请假记录!" | ||
| 116 | + label.font = UIFont.systemFont(ofSize: 20) | ||
| 117 | + label.textAlignment = .center | ||
| 118 | + label.textColor = UIColor.red | ||
| 119 | + cellView.addSubview(label) | ||
| 120 | + cell.addSubview(cellView) | ||
| 121 | + return cell | ||
| 122 | + } | ||
| 123 | + } | ||
| 124 | + default: | ||
| 125 | + return UITableViewCell.init() | ||
| 126 | + } | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | ||
| 130 | + if indexPath.section == 1 && indexPath.row != 0 && vacateRecodeArray.count>0 { | ||
| 131 | + | ||
| 132 | + | ||
| 133 | + | ||
| 134 | + } | ||
| 135 | + } | ||
| 136 | + | ||
| 137 | + override func didReceiveMemoryWarning() { | ||
| 138 | + super.didReceiveMemoryWarning() | ||
| 139 | + // Dispose of any resources that can be recreated. | ||
| 140 | + } | ||
| 141 | + | ||
| 142 | + | ||
| 143 | + /* | ||
| 144 | + // MARK: - Navigation | ||
| 145 | + | ||
| 146 | + // In a storyboard-based application, you will often want to do a little preparation before navigation | ||
| 147 | + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | ||
| 148 | + // Get the new view controller using segue.destinationViewController. | ||
| 149 | + // Pass the selected object to the new view controller. | ||
| 150 | + } | ||
| 151 | + */ | ||
| 152 | + | ||
| 153 | +} | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift
| @@ -11,24 +11,66 @@ import UIKit | @@ -11,24 +11,66 @@ import UIKit | ||
| 11 | class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDataSource { | 11 | class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDataSource { | 
| 12 | 12 | ||
| 13 | lazy var tableView = {()->UITableView in | 13 | lazy var tableView = {()->UITableView in | 
| 14 | - let table = UITableView.init(frame: CGRect.init(x: 15, y: 15, width: screenWidth-30, height: screenHeight-navigationBarHeight!-(self.tabBarController?.tabBar.frame.height)!-statusBarHeight-30)) | 14 | + let table = UITableView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: screenHeight-navigationBarHeight!-(self.tabBarController?.tabBar.frame.height)!-statusBarHeight-20)) | 
| 15 | table.backgroundColor = UIColor.white | 15 | table.backgroundColor = UIColor.white | 
| 16 | table.delegate = self | 16 | table.delegate = self | 
| 17 | table.dataSource = self | 17 | table.dataSource = self | 
| 18 | + table.tableFooterView = UIView.init() | ||
| 18 | return table | 19 | return table | 
| 19 | }() | 20 | }() | 
| 20 | //Data | 21 | //Data | 
| 21 | var tableData = Array<String>() | 22 | var tableData = Array<String>() | 
| 23 | + var titleImage = Array<String>() | ||
| 22 | 24 | ||
| 23 | override func viewDidLoad() { | 25 | override func viewDidLoad() { | 
| 24 | super.viewDidLoad() | 26 | super.viewDidLoad() | 
| 25 | self.view.backgroundColor = backGroundColor | 27 | self.view.backgroundColor = backGroundColor | 
| 26 | - self.view.addSubview(self.tableView) | ||
| 27 | - self.tableData = ["考勤","补卡","请假"] | ||
| 28 | 28 | ||
| 29 | + let isCheck = true | ||
| 30 | + | ||
| 31 | + if isCheck { | ||
| 32 | + self.view.addSubview(self.tableView) | ||
| 33 | + }else{ | ||
| 34 | + drawEmptyView() | ||
| 35 | + } | ||
| 36 | + self.tableData = ["考勤","补卡","请假"] | ||
| 37 | + self.titleImage = ["program_check","program_card","program_leave"] | ||
| 29 | // Do any additional setup after loading the view. | 38 | // Do any additional setup after loading the view. | 
| 30 | } | 39 | } | 
| 31 | 40 | ||
| 41 | + func drawEmptyView () { | ||
| 42 | + | ||
| 43 | + let emptyView = UIView.init(frame: self.view.bounds) | ||
| 44 | + emptyView.backgroundColor = backGroundColor | ||
| 45 | + | ||
| 46 | + let label1 = UILabel.init(frame: CGRect.init(x: 0, y: 50, width: screenWidth, height: 30)) | ||
| 47 | + label1.text = "如需使用该模块,请前往" | ||
| 48 | + label1.textAlignment = .center | ||
| 49 | + | ||
| 50 | + let label2 = UILabel.init(frame: CGRect.init(x: 0, y: 80, width: screenWidth, height: 30)) | ||
| 51 | + label2.text = "个人中心-我的孩子" | ||
| 52 | + label2.textAlignment = .center | ||
| 53 | + label2.textColor = UIColor.blue | ||
| 54 | + | ||
| 55 | + let tapGest = UITapGestureRecognizer.init(target: self, action: #selector(gotoChildView)) | ||
| 56 | + label2.isUserInteractionEnabled = true | ||
| 57 | + label2.addGestureRecognizer(tapGest) | ||
| 58 | + | ||
| 59 | + let label3 = UILabel.init(frame: CGRect.init(x: 0, y: 110, width: screenWidth, height: 30)) | ||
| 60 | + label3.textAlignment = .center | ||
| 61 | + label3.text = "绑定孩子账号" | ||
| 62 | + | ||
| 63 | + emptyView.addSubview(label1) | ||
| 64 | + emptyView.addSubview(label2) | ||
| 65 | + emptyView.addSubview(label3) | ||
| 66 | + | ||
| 67 | + self.view.addSubview(emptyView) | ||
| 68 | + | ||
| 69 | + } | ||
| 70 | + @objc func gotoChildView () { | ||
| 71 | + print("去个人中心页面-我的孩子!") | ||
| 72 | + } | ||
| 73 | + | ||
| 32 | 74 | ||
| 33 | //MARK: - UITableView Delegate & DataSource | 75 | //MARK: - UITableView Delegate & DataSource | 
| 34 | func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | 76 | func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | 
| @@ -49,10 +91,34 @@ class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDat | @@ -49,10 +91,34 @@ class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDat | ||
| 49 | } | 91 | } | 
| 50 | func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | 92 | func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | 
| 51 | let cell = UITableViewCell.init() | 93 | let cell = UITableViewCell.init() | 
| 94 | + cell.selectionStyle = .none | ||
| 52 | cell.textLabel?.text = self.tableData[indexPath.row] | 95 | cell.textLabel?.text = self.tableData[indexPath.row] | 
| 53 | - cell.imageView?.image = UIImage.init(named: "my_icon_about") | 96 | + cell.imageView?.image = UIImage.init(named: self.titleImage[indexPath.row]) | 
| 54 | return cell | 97 | return cell | 
| 55 | } | 98 | } | 
| 99 | + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { | ||
| 100 | + return 60 | ||
| 101 | + } | ||
| 102 | + | ||
| 103 | + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | ||
| 104 | + | ||
| 105 | + switch indexPath.row { | ||
| 106 | + case 0: | ||
| 107 | + let vc = ProgramCheckViewController() | ||
| 108 | + vc.title = "考勤" | ||
| 109 | + self.navigationController?.pushViewController(vc, animated: true) | ||
| 110 | + case 1: | ||
| 111 | + let vc = ProgramCardViewController() | ||
| 112 | + vc.title = "补卡" | ||
| 113 | + self.navigationController?.pushViewController(vc, animated: true) | ||
| 114 | + case 2: | ||
| 115 | + let vc = ProgramVacateViewController() | ||
| 116 | + vc.title = "请假" | ||
| 117 | + self.navigationController?.pushViewController(vc, animated: true) | ||
| 118 | + default: | ||
| 119 | + break | ||
| 120 | + } | ||
| 121 | + } | ||
| 56 | 122 | ||
| 57 | override func didReceiveMemoryWarning() { | 123 | override func didReceiveMemoryWarning() { | 
| 58 | super.didReceiveMemoryWarning() | 124 | super.didReceiveMemoryWarning() | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift
| @@ -16,6 +16,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS | @@ -16,6 +16,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS | ||
| 16 | table.backgroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) | 16 | table.backgroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) | 
| 17 | table.delegate = self | 17 | table.delegate = self | 
| 18 | table.dataSource = self | 18 | table.dataSource = self | 
| 19 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
| 19 | table.register(UINib.init(nibName: "MoralDetailCell", bundle: nil), forCellReuseIdentifier: "moralDetail") | 20 | table.register(UINib.init(nibName: "MoralDetailCell", bundle: nil), forCellReuseIdentifier: "moralDetail") | 
| 20 | table.register(UINib.init(nibName: "EducationDetailCell", bundle: nil), forCellReuseIdentifier: "educationDetail") | 21 | table.register(UINib.init(nibName: "EducationDetailCell", bundle: nil), forCellReuseIdentifier: "educationDetail") | 
| 21 | table.register(UINib.init(nibName: "BehaviorDetailCell", bundle: nil), forCellReuseIdentifier: "behaviorDetail") | 22 | table.register(UINib.init(nibName: "BehaviorDetailCell", bundle: nil), forCellReuseIdentifier: "behaviorDetail") | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift
| @@ -21,6 +21,7 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData | @@ -21,6 +21,7 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData | ||
| 21 | table.delegate = self | 21 | table.delegate = self | 
| 22 | table.dataSource = self | 22 | table.dataSource = self | 
| 23 | table.backgroundColor = backGroundColor | 23 | table.backgroundColor = backGroundColor | 
| 24 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
| 24 | table.register(UINib.init(nibName: "MoralTableViewCell", bundle: nil), forCellReuseIdentifier: "MoralTableViewCell") | 25 | table.register(UINib.init(nibName: "MoralTableViewCell", bundle: nil), forCellReuseIdentifier: "MoralTableViewCell") | 
| 25 | table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") | 26 | table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") | 
| 26 | return table | 27 | return table | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift
| @@ -15,6 +15,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV | @@ -15,6 +15,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV | ||
| 15 | table.backgroundColor = backGroundColor | 15 | table.backgroundColor = backGroundColor | 
| 16 | table.delegate = self | 16 | table.delegate = self | 
| 17 | table.dataSource = self | 17 | table.dataSource = self | 
| 18 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
| 18 | table.register(UINib.init(nibName: "SceneTopCell", bundle: nil), forCellReuseIdentifier: "cultureCell") | 19 | table.register(UINib.init(nibName: "SceneTopCell", bundle: nil), forCellReuseIdentifier: "cultureCell") | 
| 19 | table.register(UINib.init(nibName: "SceneMiddleCell", bundle: nil), forCellReuseIdentifier: "scoreCell") | 20 | table.register(UINib.init(nibName: "SceneMiddleCell", bundle: nil), forCellReuseIdentifier: "scoreCell") | 
| 20 | table.register(UINib.init(nibName: "SceneDownCell", bundle: nil), forCellReuseIdentifier: "disciplineCell") | 21 | table.register(UINib.init(nibName: "SceneDownCell", bundle: nil), forCellReuseIdentifier: "disciplineCell") | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift
0 → 100644
| @@ -0,0 +1,31 @@ | @@ -0,0 +1,31 @@ | ||
| 1 | +// | ||
| 2 | +// ProgramVacateBodyTableViewCell.swift | ||
| 3 | +// ParentAssistant | ||
| 4 | +// | ||
| 5 | +// Created by Cao yang on 2018/4/12. | ||
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | ||
| 7 | +// | ||
| 8 | + | ||
| 9 | +import UIKit | ||
| 10 | + | ||
| 11 | +class ProgramVacateBodyTableViewCell: UITableViewCell { | ||
| 12 | + | ||
| 13 | + @IBOutlet weak var upLine: UILabel! | ||
| 14 | + @IBOutlet weak var vacateName: UILabel! | ||
| 15 | + @IBOutlet weak var vacateType: UILabel! | ||
| 16 | + @IBOutlet weak var startTime: UILabel! | ||
| 17 | + @IBOutlet weak var endTime: UILabel! | ||
| 18 | + @IBOutlet weak var examinePerson: UILabel! | ||
| 19 | + @IBOutlet weak var vacateResult: UILabel! | ||
| 20 | + override func awakeFromNib() { | ||
| 21 | + super.awakeFromNib() | ||
| 22 | + // Initialization code | ||
| 23 | + } | ||
| 24 | + | ||
| 25 | + override func setSelected(_ selected: Bool, animated: Bool) { | ||
| 26 | + super.setSelected(selected, animated: animated) | ||
| 27 | + | ||
| 28 | + // Configure the view for the selected state | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | +} | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib
0 → 100644
| @@ -0,0 +1,184 @@ | @@ -0,0 +1,184 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
| 3 | + <device id="retina4_7" orientation="portrait"> | ||
| 4 | + <adaptation id="fullscreen"/> | ||
| 5 | + </device> | ||
| 6 | + <dependencies> | ||
| 7 | + <deployment identifier="iOS"/> | ||
| 8 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> | ||
| 9 | + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| 10 | + </dependencies> | ||
| 11 | + <objects> | ||
| 12 | + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| 13 | + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| 14 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ProgramVacateBodyTableViewCell" rowHeight="232" id="fd1-Sl-6Qm" customClass="ProgramVacateBodyTableViewCell" customModule="ParentAssistant" customModuleProvider="target"> | ||
| 15 | + <rect key="frame" x="0.0" y="0.0" width="375" height="232"/> | ||
| 16 | + <autoresizingMask key="autoresizingMask"/> | ||
| 17 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fd1-Sl-6Qm" id="yYa-Yh-jMm"> | ||
| 18 | + <rect key="frame" x="0.0" y="0.0" width="375" height="231.5"/> | ||
| 19 | + <autoresizingMask key="autoresizingMask"/> | ||
| 20 | + <subviews> | ||
| 21 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3iC-h2-GLD"> | ||
| 22 | + <rect key="frame" x="10" y="0.0" width="355" height="221.5"/> | ||
| 23 | + <subviews> | ||
| 24 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="down" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gay-8r-CB4"> | ||
| 25 | + <rect key="frame" x="15" y="28" width="1" height="193"/> | ||
| 26 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | ||
| 27 | + <constraints> | ||
| 28 | + <constraint firstAttribute="width" constant="1" id="4WM-0K-GRV"/> | ||
| 29 | + </constraints> | ||
| 30 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 31 | + <nil key="textColor"/> | ||
| 32 | + <nil key="highlightedColor"/> | ||
| 33 | + </label> | ||
| 34 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zCX-fI-ung"> | ||
| 35 | + <rect key="frame" x="15" y="0.0" width="1" height="28"/> | ||
| 36 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | ||
| 37 | + <constraints> | ||
| 38 | + <constraint firstAttribute="width" constant="1" id="QZc-Lb-vnO"/> | ||
| 39 | + </constraints> | ||
| 40 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 41 | + <nil key="textColor"/> | ||
| 42 | + <nil key="highlightedColor"/> | ||
| 43 | + </label> | ||
| 44 | + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grow_ellipse" translatesAutoresizingMaskIntoConstraints="NO" id="184-vm-o8V"> | ||
| 45 | + <rect key="frame" x="10" y="18" width="10" height="10"/> | ||
| 46 | + <constraints> | ||
| 47 | + <constraint firstAttribute="height" constant="10" id="NxP-OE-KAZ"/> | ||
| 48 | + <constraint firstAttribute="width" constant="10" id="T2p-Zf-FWk"/> | ||
| 49 | + </constraints> | ||
| 50 | + </imageView> | ||
| 51 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ptA-gi-ASQ"> | ||
| 52 | + <rect key="frame" x="40" y="12.5" width="57" height="21"/> | ||
| 53 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 54 | + <nil key="textColor"/> | ||
| 55 | + <nil key="highlightedColor"/> | ||
| 56 | + </label> | ||
| 57 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SMb-fO-hlW"> | ||
| 58 | + <rect key="frame" x="107" y="12.5" width="35" height="21"/> | ||
| 59 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 60 | + <nil key="textColor"/> | ||
| 61 | + <nil key="highlightedColor"/> | ||
| 62 | + </label> | ||
| 63 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假类型:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I23-J8-cbV"> | ||
| 64 | + <rect key="frame" x="40" y="43.5" width="74" height="21"/> | ||
| 65 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 66 | + <nil key="textColor"/> | ||
| 67 | + <nil key="highlightedColor"/> | ||
| 68 | + </label> | ||
| 69 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事假" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQ9-wo-yko"> | ||
| 70 | + <rect key="frame" x="124" y="43.5" width="35" height="21"/> | ||
| 71 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 72 | + <nil key="textColor"/> | ||
| 73 | + <nil key="highlightedColor"/> | ||
| 74 | + </label> | ||
| 75 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XUE-jH-LMd"> | ||
| 76 | + <rect key="frame" x="40" y="74.5" width="74" height="21"/> | ||
| 77 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 78 | + <nil key="textColor"/> | ||
| 79 | + <nil key="highlightedColor"/> | ||
| 80 | + </label> | ||
| 81 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02 08:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o1S-an-wZs"> | ||
| 82 | + <rect key="frame" x="124" y="74.5" width="141" height="21"/> | ||
| 83 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 84 | + <nil key="textColor"/> | ||
| 85 | + <nil key="highlightedColor"/> | ||
| 86 | + </label> | ||
| 87 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="至" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q4S-hi-7fU"> | ||
| 88 | + <rect key="frame" x="185.5" y="100.5" width="18" height="21"/> | ||
| 89 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 90 | + <nil key="textColor"/> | ||
| 91 | + <nil key="highlightedColor"/> | ||
| 92 | + </label> | ||
| 93 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02 17:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m2d-nZ-oIw"> | ||
| 94 | + <rect key="frame" x="126" y="126.5" width="137" height="21"/> | ||
| 95 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 96 | + <nil key="textColor"/> | ||
| 97 | + <nil key="highlightedColor"/> | ||
| 98 | + </label> | ||
| 99 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="审批人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XmD-SZ-8bL"> | ||
| 100 | + <rect key="frame" x="40" y="157.5" width="57" height="21"/> | ||
| 101 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 102 | + <nil key="textColor"/> | ||
| 103 | + <nil key="highlightedColor"/> | ||
| 104 | + </label> | ||
| 105 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="班主任-李倩" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CmX-ZE-z2v"> | ||
| 106 | + <rect key="frame" x="107" y="157.5" width="95" height="21"/> | ||
| 107 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 108 | + <nil key="textColor"/> | ||
| 109 | + <nil key="highlightedColor"/> | ||
| 110 | + </label> | ||
| 111 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假结果:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UYo-On-ZLA"> | ||
| 112 | + <rect key="frame" x="40" y="188.5" width="74" height="21"/> | ||
| 113 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 114 | + <nil key="textColor"/> | ||
| 115 | + <nil key="highlightedColor"/> | ||
| 116 | + </label> | ||
| 117 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同意" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P6F-mV-ell"> | ||
| 118 | + <rect key="frame" x="124" y="188.5" width="35" height="21"/> | ||
| 119 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 120 | + <nil key="textColor"/> | ||
| 121 | + <nil key="highlightedColor"/> | ||
| 122 | + </label> | ||
| 123 | + </subviews> | ||
| 124 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 125 | + <constraints> | ||
| 126 | + <constraint firstItem="ptA-gi-ASQ" firstAttribute="centerY" secondItem="184-vm-o8V" secondAttribute="centerY" id="3sf-dz-jdr"/> | ||
| 127 | + <constraint firstItem="o1S-an-wZs" firstAttribute="leading" secondItem="XUE-jH-LMd" secondAttribute="trailing" constant="10" id="45A-cx-9er"/> | ||
| 128 | + <constraint firstItem="P6F-mV-ell" firstAttribute="centerY" secondItem="UYo-On-ZLA" secondAttribute="centerY" id="4jj-Yv-FyP"/> | ||
| 129 | + <constraint firstItem="184-vm-o8V" firstAttribute="bottom" secondItem="zCX-fI-ung" secondAttribute="bottom" id="7Qo-Zx-DAx"/> | ||
| 130 | + <constraint firstItem="CmX-ZE-z2v" firstAttribute="centerY" secondItem="XmD-SZ-8bL" secondAttribute="centerY" id="9d8-Eh-bXG"/> | ||
| 131 | + <constraint firstItem="XUE-jH-LMd" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="Egr-sG-T07"/> | ||
| 132 | + <constraint firstItem="Q4S-hi-7fU" firstAttribute="centerX" secondItem="o1S-an-wZs" secondAttribute="centerX" id="HXy-Rc-qfD"/> | ||
| 133 | + <constraint firstItem="P6F-mV-ell" firstAttribute="leading" secondItem="UYo-On-ZLA" secondAttribute="trailing" constant="10" id="IOH-oF-TIq"/> | ||
| 134 | + <constraint firstItem="SMb-fO-hlW" firstAttribute="centerY" secondItem="ptA-gi-ASQ" secondAttribute="centerY" id="IjA-7L-kXF"/> | ||
| 135 | + <constraint firstItem="gay-8r-CB4" firstAttribute="top" secondItem="184-vm-o8V" secondAttribute="bottom" id="Ilk-EK-SMV"/> | ||
| 136 | + <constraint firstItem="184-vm-o8V" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="10.5" id="KES-Nk-NQi"/> | ||
| 137 | + <constraint firstAttribute="bottom" secondItem="gay-8r-CB4" secondAttribute="bottom" id="KoQ-MH-wGN"/> | ||
| 138 | + <constraint firstItem="gay-8r-CB4" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="15" id="QYv-CA-Chf"/> | ||
| 139 | + <constraint firstItem="CmX-ZE-z2v" firstAttribute="leading" secondItem="XmD-SZ-8bL" secondAttribute="trailing" constant="10" id="Sa6-He-Zw1"/> | ||
| 140 | + <constraint firstItem="XmD-SZ-8bL" firstAttribute="leading" secondItem="XUE-jH-LMd" secondAttribute="leading" id="XkB-Ka-XYp"/> | ||
| 141 | + <constraint firstItem="zCX-fI-ung" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="15" id="aTH-2y-tFi"/> | ||
| 142 | + <constraint firstItem="I23-J8-cbV" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="bPl-LK-op9"/> | ||
| 143 | + <constraint firstItem="Q4S-hi-7fU" firstAttribute="top" secondItem="o1S-an-wZs" secondAttribute="bottom" constant="5" id="diF-eM-RWC"/> | ||
| 144 | + <constraint firstItem="UYo-On-ZLA" firstAttribute="leading" secondItem="XmD-SZ-8bL" secondAttribute="leading" id="fVt-dT-aZ7"/> | ||
| 145 | + <constraint firstItem="XmD-SZ-8bL" firstAttribute="top" secondItem="m2d-nZ-oIw" secondAttribute="bottom" constant="10" id="h1a-12-2u4"/> | ||
| 146 | + <constraint firstItem="m2d-nZ-oIw" firstAttribute="top" secondItem="Q4S-hi-7fU" secondAttribute="bottom" constant="5" id="h5e-sp-jOh"/> | ||
| 147 | + <constraint firstItem="184-vm-o8V" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" constant="18" id="hCe-rk-8Rh"/> | ||
| 148 | + <constraint firstItem="tQ9-wo-yko" firstAttribute="centerY" secondItem="I23-J8-cbV" secondAttribute="centerY" id="iaq-Pt-N0v"/> | ||
| 149 | + <constraint firstItem="XUE-jH-LMd" firstAttribute="top" secondItem="I23-J8-cbV" secondAttribute="bottom" constant="10" id="kFN-pq-rFH"/> | ||
| 150 | + <constraint firstItem="tQ9-wo-yko" firstAttribute="leading" secondItem="I23-J8-cbV" secondAttribute="trailing" constant="10" id="lkm-Pa-khY"/> | ||
| 151 | + <constraint firstItem="m2d-nZ-oIw" firstAttribute="centerX" secondItem="o1S-an-wZs" secondAttribute="centerX" id="osq-5I-jbe"/> | ||
| 152 | + <constraint firstItem="o1S-an-wZs" firstAttribute="centerY" secondItem="XUE-jH-LMd" secondAttribute="centerY" id="p59-e2-LBT"/> | ||
| 153 | + <constraint firstItem="ptA-gi-ASQ" firstAttribute="leading" secondItem="184-vm-o8V" secondAttribute="trailing" constant="20" id="pGi-jU-OcT"/> | ||
| 154 | + <constraint firstItem="zCX-fI-ung" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" id="pYa-T9-TGa"/> | ||
| 155 | + <constraint firstItem="I23-J8-cbV" firstAttribute="top" secondItem="ptA-gi-ASQ" secondAttribute="bottom" constant="10" id="sP9-y8-kI3"/> | ||
| 156 | + <constraint firstItem="UYo-On-ZLA" firstAttribute="top" secondItem="XmD-SZ-8bL" secondAttribute="bottom" constant="10" id="tkO-jd-7ez"/> | ||
| 157 | + <constraint firstItem="SMb-fO-hlW" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="trailing" constant="10" id="uGY-Th-x4A"/> | ||
| 158 | + </constraints> | ||
| 159 | + </view> | ||
| 160 | + </subviews> | ||
| 161 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | ||
| 162 | + <constraints> | ||
| 163 | + <constraint firstAttribute="bottom" secondItem="3iC-h2-GLD" secondAttribute="bottom" constant="10" id="FAV-5i-UxH"/> | ||
| 164 | + <constraint firstItem="3iC-h2-GLD" firstAttribute="top" secondItem="yYa-Yh-jMm" secondAttribute="top" id="ObN-MI-Jfr"/> | ||
| 165 | + <constraint firstAttribute="trailing" secondItem="3iC-h2-GLD" secondAttribute="trailing" constant="10" id="jGw-JA-Q0y"/> | ||
| 166 | + <constraint firstItem="3iC-h2-GLD" firstAttribute="leading" secondItem="yYa-Yh-jMm" secondAttribute="leading" constant="10" id="tYS-Bh-NlN"/> | ||
| 167 | + </constraints> | ||
| 168 | + </tableViewCellContentView> | ||
| 169 | + <connections> | ||
| 170 | + <outlet property="endTime" destination="m2d-nZ-oIw" id="ZpU-Qi-TcG"/> | ||
| 171 | + <outlet property="examinePerson" destination="CmX-ZE-z2v" id="GaV-qe-fuK"/> | ||
| 172 | + <outlet property="startTime" destination="o1S-an-wZs" id="Qec-Kk-7UW"/> | ||
| 173 | + <outlet property="upLine" destination="zCX-fI-ung" id="2Yc-jg-N9W"/> | ||
| 174 | + <outlet property="vacateName" destination="SMb-fO-hlW" id="P18-Y5-fEa"/> | ||
| 175 | + <outlet property="vacateResult" destination="P6F-mV-ell" id="LDB-dx-UoA"/> | ||
| 176 | + <outlet property="vacateType" destination="tQ9-wo-yko" id="NeS-11-BX1"/> | ||
| 177 | + </connections> | ||
| 178 | + <point key="canvasLocation" x="-252.5" y="9"/> | ||
| 179 | + </tableViewCell> | ||
| 180 | + </objects> | ||
| 181 | + <resources> | ||
| 182 | + <image name="grow_ellipse" width="10" height="10"/> | ||
| 183 | + </resources> | ||
| 184 | +</document> | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift
0 → 100644
| @@ -0,0 +1,26 @@ | @@ -0,0 +1,26 @@ | ||
| 1 | +// | ||
| 2 | +// ProgramVacateTableViewCell.swift | ||
| 3 | +// ParentAssistant | ||
| 4 | +// | ||
| 5 | +// Created by Cao yang on 2018/4/12. | ||
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | ||
| 7 | +// | ||
| 8 | + | ||
| 9 | +import UIKit | ||
| 10 | + | ||
| 11 | +class ProgramVacateTableViewCell: UITableViewCell { | ||
| 12 | + | ||
| 13 | + @IBOutlet weak var vacateName: UILabel! | ||
| 14 | + @IBOutlet weak var startTime: UILabel! | ||
| 15 | + @IBOutlet weak var endTime: UILabel! | ||
| 16 | + override func awakeFromNib() { | ||
| 17 | + super.awakeFromNib() | ||
| 18 | + // Initialization code | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | + override func setSelected(_ selected: Bool, animated: Bool) { | ||
| 22 | + super.setSelected(selected, animated: animated) | ||
| 23 | + | ||
| 24 | + // Configure the view for the selected state | ||
| 25 | + } | ||
| 26 | +} | 
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib
0 → 100644
| @@ -0,0 +1,109 @@ | @@ -0,0 +1,109 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
| 3 | + <device id="retina4_7" orientation="portrait"> | ||
| 4 | + <adaptation id="fullscreen"/> | ||
| 5 | + </device> | ||
| 6 | + <dependencies> | ||
| 7 | + <deployment identifier="iOS"/> | ||
| 8 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> | ||
| 9 | + <capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
| 10 | + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| 11 | + </dependencies> | ||
| 12 | + <objects> | ||
| 13 | + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| 14 | + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| 15 | + <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ProgramVacateTableViewCell" rowHeight="92" id="KGk-i7-Jjw" customClass="ProgramVacateTableViewCell" customModule="ParentAssistant" customModuleProvider="target"> | ||
| 16 | + <rect key="frame" x="0.0" y="0.0" width="389" height="92"/> | ||
| 17 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| 18 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> | ||
| 19 | + <rect key="frame" x="0.0" y="0.0" width="389" height="91.5"/> | ||
| 20 | + <autoresizingMask key="autoresizingMask"/> | ||
| 21 | + <subviews> | ||
| 22 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A0K-zH-Rt1"> | ||
| 23 | + <rect key="frame" x="10" y="10" width="369" height="72"/> | ||
| 24 | + <subviews> | ||
| 25 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0L-Bl-DnY"> | ||
| 26 | + <rect key="frame" x="207" y="41.5" width="8" height="20.5"/> | ||
| 27 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 28 | + <nil key="textColor"/> | ||
| 29 | + <nil key="highlightedColor"/> | ||
| 30 | + </label> | ||
| 31 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假人:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Tv-CA-ehv"> | ||
| 32 | + <rect key="frame" x="10" y="10" width="57" height="21"/> | ||
| 33 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 34 | + <nil key="textColor"/> | ||
| 35 | + <nil key="highlightedColor"/> | ||
| 36 | + </label> | ||
| 37 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vif-Lw-a1X"> | ||
| 38 | + <rect key="frame" x="77" y="10" width="35" height="21"/> | ||
| 39 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 40 | + <nil key="textColor"/> | ||
| 41 | + <nil key="highlightedColor"/> | ||
| 42 | + </label> | ||
| 43 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请假日期:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bJt-wD-aUL"> | ||
| 44 | + <rect key="frame" x="10" y="41" width="74" height="21"/> | ||
| 45 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 46 | + <nil key="textColor"/> | ||
| 47 | + <nil key="highlightedColor"/> | ||
| 48 | + </label> | ||
| 49 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rel-Qy-6VP"> | ||
| 50 | + <rect key="frame" x="94" y="41" width="90" height="21"/> | ||
| 51 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 52 | + <nil key="textColor"/> | ||
| 53 | + <nil key="highlightedColor"/> | ||
| 54 | + </label> | ||
| 55 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIK-21-Af2"> | ||
| 56 | + <rect key="frame" x="220" y="41" width="90" height="21"/> | ||
| 57 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 58 | + <nil key="textColor"/> | ||
| 59 | + <nil key="highlightedColor"/> | ||
| 60 | + </label> | ||
| 61 | + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grow_calendar" translatesAutoresizingMaskIntoConstraints="NO" id="B3i-HY-f54"> | ||
| 62 | + <rect key="frame" x="189" y="45.5" width="13" height="12"/> | ||
| 63 | + </imageView> | ||
| 64 | + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grow_calendar" translatesAutoresizingMaskIntoConstraints="NO" id="ilp-az-hgB"> | ||
| 65 | + <rect key="frame" x="315" y="45.5" width="13" height="12"/> | ||
| 66 | + </imageView> | ||
| 67 | + </subviews> | ||
| 68 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| 69 | + <constraints> | ||
| 70 | + <constraint firstItem="bJt-wD-aUL" firstAttribute="top" secondItem="6Tv-CA-ehv" secondAttribute="bottom" constant="10" id="0OL-rx-svf"/> | ||
| 71 | + <constraint firstItem="ilp-az-hgB" firstAttribute="centerY" secondItem="bJt-wD-aUL" secondAttribute="centerY" id="7EV-jy-9F4"/> | ||
| 72 | + <constraint firstItem="vif-Lw-a1X" firstAttribute="centerY" secondItem="6Tv-CA-ehv" secondAttribute="centerY" id="7TD-NT-Lxd"/> | ||
| 73 | + <constraint firstItem="H0L-Bl-DnY" firstAttribute="centerY" secondItem="bJt-wD-aUL" secondAttribute="centerY" id="ITS-GX-y9S"/> | ||
| 74 | + <constraint firstItem="B3i-HY-f54" firstAttribute="centerY" secondItem="Rel-Qy-6VP" secondAttribute="centerY" id="JcP-od-r2M"/> | ||
| 75 | + <constraint firstItem="ilp-az-hgB" firstAttribute="leading" secondItem="gIK-21-Af2" secondAttribute="trailing" constant="5" id="Kdw-IT-c8d"/> | ||
| 76 | + <constraint firstItem="H0L-Bl-DnY" firstAttribute="leading" secondItem="B3i-HY-f54" secondAttribute="trailing" constant="5" id="SZC-UD-HMF"/> | ||
| 77 | + <constraint firstItem="Rel-Qy-6VP" firstAttribute="centerY" secondItem="bJt-wD-aUL" secondAttribute="centerY" id="axv-QG-Ntd"/> | ||
| 78 | + <constraint firstItem="6Tv-CA-ehv" firstAttribute="leading" secondItem="A0K-zH-Rt1" secondAttribute="leading" constant="10" id="bMD-p2-wnP"/> | ||
| 79 | + <constraint firstItem="bJt-wD-aUL" firstAttribute="leading" secondItem="6Tv-CA-ehv" secondAttribute="leading" id="mK7-vI-tFc"/> | ||
| 80 | + <constraint firstItem="gIK-21-Af2" firstAttribute="centerY" secondItem="bJt-wD-aUL" secondAttribute="centerY" id="peU-cr-ev1"/> | ||
| 81 | + <constraint firstItem="vif-Lw-a1X" firstAttribute="leading" secondItem="6Tv-CA-ehv" secondAttribute="trailing" constant="10" id="pnQ-fK-xwq"/> | ||
| 82 | + <constraint firstItem="Rel-Qy-6VP" firstAttribute="leading" secondItem="bJt-wD-aUL" secondAttribute="trailing" constant="10" id="sGH-i2-tjB"/> | ||
| 83 | + <constraint firstItem="6Tv-CA-ehv" firstAttribute="top" secondItem="A0K-zH-Rt1" secondAttribute="top" constant="10" id="sXD-DY-NqG"/> | ||
| 84 | + <constraint firstItem="gIK-21-Af2" firstAttribute="leading" secondItem="H0L-Bl-DnY" secondAttribute="trailing" constant="5" id="vcT-Nz-jpC"/> | ||
| 85 | + <constraint firstItem="B3i-HY-f54" firstAttribute="leading" secondItem="Rel-Qy-6VP" secondAttribute="trailing" constant="5" id="x47-0x-gfz"/> | ||
| 86 | + </constraints> | ||
| 87 | + </view> | ||
| 88 | + </subviews> | ||
| 89 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | ||
| 90 | + <constraints> | ||
| 91 | + <constraint firstItem="A0K-zH-Rt1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="GYT-zJ-fus"/> | ||
| 92 | + <constraint firstAttribute="trailing" secondItem="A0K-zH-Rt1" secondAttribute="trailing" constant="10" id="JFC-pM-1F3"/> | ||
| 93 | + <constraint firstItem="A0K-zH-Rt1" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="lo1-GF-rL8"/> | ||
| 94 | + <constraint firstAttribute="bottom" secondItem="A0K-zH-Rt1" secondAttribute="bottom" constant="10" id="thL-h4-Sig"/> | ||
| 95 | + </constraints> | ||
| 96 | + </tableViewCellContentView> | ||
| 97 | + <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> | ||
| 98 | + <connections> | ||
| 99 | + <outlet property="endTime" destination="gIK-21-Af2" id="YWL-mH-LCE"/> | ||
| 100 | + <outlet property="startTime" destination="Rel-Qy-6VP" id="yWM-28-kpK"/> | ||
| 101 | + <outlet property="vacateName" destination="vif-Lw-a1X" id="Hyd-gs-iH0"/> | ||
| 102 | + </connections> | ||
| 103 | + <point key="canvasLocation" x="59.5" y="-38"/> | ||
| 104 | + </tableViewCell> | ||
| 105 | + </objects> | ||
| 106 | + <resources> | ||
| 107 | + <image name="grow_calendar" width="13" height="12"/> | ||
| 108 | + </resources> | ||
| 109 | +</document> | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/grow_calendar.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "grow_calendar@2x.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/grow_calendar.imageset/grow_calendar@2x.png
0 → 100644
751 Bytes
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/grow_ellipse.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "grow_ellipse@2x.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/grow_ellipse.imageset/grow_ellipse@2x.png
0 → 100644
322 Bytes
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_card.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "program_card@2x.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_card.imageset/program_card@2x.png
0 → 100644
1.21 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_check.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "program_check@2x.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_check.imageset/program_check@2x.png
0 → 100644
1.35 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_leave.imageset/Contents.json
0 → 100644
| @@ -0,0 +1,21 @@ | @@ -0,0 +1,21 @@ | ||
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "idiom" : "universal", | ||
| 9 | + "filename" : "program_levave@2x.png", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "idiom" : "universal", | ||
| 14 | + "scale" : "3x" | ||
| 15 | + } | ||
| 16 | + ], | ||
| 17 | + "info" : { | ||
| 18 | + "version" : 1, | ||
| 19 | + "author" : "xcode" | ||
| 20 | + } | ||
| 21 | +} | ||
| 0 | \ No newline at end of file | 22 | \ No newline at end of file | 
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/program_leave.imageset/program_levave@2x.png
0 → 100644
2.48 KB
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> | 
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PbF-i7-G0s"> | 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PbF-i7-G0s"> | 
| 3 | <device id="retina4_7" orientation="portrait"> | 3 | <device id="retina4_7" orientation="portrait"> | 
| 4 | <adaptation id="fullscreen"/> | 4 | <adaptation id="fullscreen"/> | 
| 5 | </device> | 5 | </device> | 
| 6 | <dependencies> | 6 | <dependencies> | 
| 7 | <deployment identifier="iOS"/> | 7 | <deployment identifier="iOS"/> | 
| 8 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> | 8 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> | 
| 9 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> | 9 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> | 
| 10 | <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> | 10 | <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> | 
| 11 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> | 11 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> | 
| @@ -21,16 +21,16 @@ | @@ -21,16 +21,16 @@ | ||
| 21 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 21 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 
| 22 | <subviews> | 22 | <subviews> | 
| 23 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw"> | 23 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw"> | 
| 24 | - <rect key="frame" x="0.0" y="64" width="376" height="554"/> | 24 | + <rect key="frame" x="0.0" y="64" width="375" height="603"/> | 
| 25 | <subviews> | 25 | <subviews> | 
| 26 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv"> | 26 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv"> | 
| 27 | - <rect key="frame" x="0.0" y="0.0" width="376" height="554"/> | 27 | + <rect key="frame" x="0.0" y="0.0" width="375" height="554"/> | 
| 28 | <subviews> | 28 | <subviews> | 
| 29 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu"> | 29 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu"> | 
| 30 | - <rect key="frame" x="8" y="8" width="360" height="350"/> | 30 | + <rect key="frame" x="8" y="8" width="359" height="350"/> | 
| 31 | <subviews> | 31 | <subviews> | 
| 32 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P"> | 32 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P"> | 
| 33 | - <rect key="frame" x="0.0" y="0.0" width="360" height="92"/> | 33 | + <rect key="frame" x="0.0" y="0.0" width="359" height="92"/> | 
| 34 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 34 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 
| 35 | <constraints> | 35 | <constraints> | 
| 36 | <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/> | 36 | <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/> | 
| @@ -48,20 +48,20 @@ | @@ -48,20 +48,20 @@ | ||
| 48 | </connections> | 48 | </connections> | 
| 49 | </collectionView> | 49 | </collectionView> | 
| 50 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32"> | 50 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32"> | 
| 51 | - <rect key="frame" x="0.0" y="100" width="360" height="1"/> | 51 | + <rect key="frame" x="0.0" y="100" width="359" height="1"/> | 
| 52 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 52 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 
| 53 | <constraints> | 53 | <constraints> | 
| 54 | <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/> | 54 | <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/> | 
| 55 | </constraints> | 55 | </constraints> | 
| 56 | </view> | 56 | </view> | 
| 57 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT"> | 57 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT"> | 
| 58 | - <rect key="frame" x="0.0" y="101" width="360" height="249"/> | 58 | + <rect key="frame" x="0.0" y="101" width="359" height="249"/> | 
| 59 | <subviews> | 59 | <subviews> | 
| 60 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG"> | 60 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG"> | 
| 61 | - <rect key="frame" x="180" y="0.0" width="180" height="249"/> | 61 | + <rect key="frame" x="179.5" y="0.0" width="179.5" height="249"/> | 
| 62 | <subviews> | 62 | <subviews> | 
| 63 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7"> | 63 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7"> | 
| 64 | - <rect key="frame" x="15" y="49.5" width="150" height="150"/> | 64 | + <rect key="frame" x="14.5" y="49.5" width="150" height="150"/> | 
| 65 | <subviews> | 65 | <subviews> | 
| 66 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4"> | 66 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4"> | 
| 67 | <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/> | 67 | <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/> | 
| @@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
| 122 | </constraints> | 122 | </constraints> | 
| 123 | </view> | 123 | </view> | 
| 124 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i"> | 124 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i"> | 
| 125 | - <rect key="frame" x="0.0" y="0.0" width="180" height="249"/> | 125 | + <rect key="frame" x="0.0" y="0.0" width="179.5" height="249"/> | 
| 126 | <subviews> | 126 | <subviews> | 
| 127 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7"> | 127 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7"> | 
| 128 | <rect key="frame" x="15" y="49.5" width="150" height="150"/> | 128 | <rect key="frame" x="15" y="49.5" width="150" height="150"/> | 
| @@ -215,10 +215,10 @@ | @@ -215,10 +215,10 @@ | ||
| 215 | </constraints> | 215 | </constraints> | 
| 216 | </view> | 216 | </view> | 
| 217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e"> | 217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e"> | 
| 218 | - <rect key="frame" x="8" y="366" width="360" height="35"/> | 218 | + <rect key="frame" x="8" y="366" width="359" height="35"/> | 
| 219 | <subviews> | 219 | <subviews> | 
| 220 | <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"> | 220 | <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"> | 
| 221 | - <rect key="frame" x="142.5" y="7" width="75" height="21"/> | 221 | + <rect key="frame" x="142" y="7" width="75" height="21"/> | 
| 222 | <constraints> | 222 | <constraints> | 
| 223 | <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/> | 223 | <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/> | 
| 224 | </constraints> | 224 | </constraints> | 
| @@ -227,7 +227,7 @@ | @@ -227,7 +227,7 @@ | ||
| 227 | <nil key="highlightedColor"/> | 227 | <nil key="highlightedColor"/> | 
| 228 | </label> | 228 | </label> | 
| 229 | <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"> | 229 | <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"> | 
| 230 | - <rect key="frame" x="225.5" y="17" width="104.5" height="1"/> | 230 | + <rect key="frame" x="225" y="17" width="104" height="1"/> | 
| 231 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 231 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 
| 232 | <constraints> | 232 | <constraints> | 
| 233 | <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/> | 233 | <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/> | 
| @@ -237,7 +237,7 @@ | @@ -237,7 +237,7 @@ | ||
| 237 | <nil key="highlightedColor"/> | 237 | <nil key="highlightedColor"/> | 
| 238 | </label> | 238 | </label> | 
| 239 | <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"> | 239 | <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"> | 
| 240 | - <rect key="frame" x="30" y="17" width="104.5" height="1"/> | 240 | + <rect key="frame" x="30" y="17" width="104" height="1"/> | 
| 241 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 241 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 
| 242 | <constraints> | 242 | <constraints> | 
| 243 | <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/> | 243 | <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/> | 
| @@ -261,16 +261,16 @@ | @@ -261,16 +261,16 @@ | ||
| 261 | </constraints> | 261 | </constraints> | 
| 262 | </view> | 262 | </view> | 
| 263 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6"> | 263 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6"> | 
| 264 | - <rect key="frame" x="8" y="409" width="360" height="176"/> | 264 | + <rect key="frame" x="8" y="409" width="359" height="175.5"/> | 
| 265 | <subviews> | 265 | <subviews> | 
| 266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> | 266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> | 
| 267 | - <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 267 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/> | 
| 268 | <subviews> | 268 | <subviews> | 
| 269 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> | 269 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> | 
| 270 | - <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 270 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/> | 
| 271 | </imageView> | 271 | </imageView> | 
| 272 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> | 272 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> | 
| 273 | - <rect key="frame" x="8" y="139.5" width="70" height="28"/> | 273 | + <rect key="frame" x="8" y="139" width="70" height="28"/> | 
| 274 | <constraints> | 274 | <constraints> | 
| 275 | <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/> | 275 | <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/> | 
| 276 | </constraints> | 276 | </constraints> | 
| @@ -280,13 +280,13 @@ | @@ -280,13 +280,13 @@ | ||
| 280 | </state> | 280 | </state> | 
| 281 | </button> | 281 | </button> | 
| 282 | <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"> | 282 | <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"> | 
| 283 | - <rect key="frame" x="8" y="113.5" width="160" height="18"/> | 283 | + <rect key="frame" x="8" y="113" width="159.5" height="18"/> | 
| 284 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 284 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 
| 285 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 285 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 
| 286 | <nil key="highlightedColor"/> | 286 | <nil key="highlightedColor"/> | 
| 287 | </label> | 287 | </label> | 
| 288 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh"> | 288 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh"> | 
| 289 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="176"/> | 289 | + <rect key="frame" x="0.0" y="0.0" width="175" height="175.5"/> | 
| 290 | <connections> | 290 | <connections> | 
| 291 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/> | 291 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/> | 
| 292 | </connections> | 292 | </connections> | 
| @@ -317,13 +317,13 @@ | @@ -317,13 +317,13 @@ | ||
| 317 | </userDefinedRuntimeAttributes> | 317 | </userDefinedRuntimeAttributes> | 
| 318 | </view> | 318 | </view> | 
| 319 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> | 319 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> | 
| 320 | - <rect key="frame" x="184" y="92" width="176" height="84"/> | 320 | + <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/> | 
| 321 | <subviews> | 321 | <subviews> | 
| 322 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> | 322 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> | 
| 323 | - <rect key="frame" x="0.0" y="0.0" width="176" height="84"/> | 323 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/> | 
| 324 | </imageView> | 324 | </imageView> | 
| 325 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> | 325 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> | 
| 326 | - <rect key="frame" x="8" y="47.5" width="70" height="28"/> | 326 | + <rect key="frame" x="8" y="47" width="70" height="28"/> | 
| 327 | <constraints> | 327 | <constraints> | 
| 328 | <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/> | 328 | <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/> | 
| 329 | </constraints> | 329 | </constraints> | 
| @@ -333,13 +333,13 @@ | @@ -333,13 +333,13 @@ | ||
| 333 | </state> | 333 | </state> | 
| 334 | </button> | 334 | </button> | 
| 335 | <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"> | 335 | <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"> | 
| 336 | - <rect key="frame" x="8" y="21.5" width="160" height="18"/> | 336 | + <rect key="frame" x="8" y="21" width="159.5" height="18"/> | 
| 337 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 337 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 
| 338 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 338 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 
| 339 | <nil key="highlightedColor"/> | 339 | <nil key="highlightedColor"/> | 
| 340 | </label> | 340 | </label> | 
| 341 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr"> | 341 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr"> | 
| 342 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> | 342 | + <rect key="frame" x="0.0" y="0.0" width="175" height="83.5"/> | 
| 343 | <connections> | 343 | <connections> | 
| 344 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/> | 344 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/> | 
| 345 | </connections> | 345 | </connections> | 
| @@ -369,10 +369,10 @@ | @@ -369,10 +369,10 @@ | ||
| 369 | </userDefinedRuntimeAttributes> | 369 | </userDefinedRuntimeAttributes> | 
| 370 | </view> | 370 | </view> | 
| 371 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> | 371 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> | 
| 372 | - <rect key="frame" x="184" y="0.0" width="176" height="84"/> | 372 | + <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/> | 
| 373 | <subviews> | 373 | <subviews> | 
| 374 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> | 374 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> | 
| 375 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> | 375 | + <rect key="frame" x="0.0" y="0.0" width="175" height="84"/> | 
| 376 | </imageView> | 376 | </imageView> | 
| 377 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> | 377 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> | 
| 378 | <rect key="frame" x="8" y="48" width="70" height="28"/> | 378 | <rect key="frame" x="8" y="48" width="70" height="28"/> | 
| @@ -385,13 +385,13 @@ | @@ -385,13 +385,13 @@ | ||
| 385 | </state> | 385 | </state> | 
| 386 | </button> | 386 | </button> | 
| 387 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> | 387 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> | 
| 388 | - <rect key="frame" x="8" y="22" width="160" height="18"/> | 388 | + <rect key="frame" x="8" y="22" width="159.5" height="18"/> | 
| 389 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 389 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 
| 390 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 390 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 
| 391 | <nil key="highlightedColor"/> | 391 | <nil key="highlightedColor"/> | 
| 392 | </label> | 392 | </label> | 
| 393 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5"> | 393 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5"> | 
| 394 | - <rect key="frame" x="-0.5" y="0.0" width="176.5" height="83.5"/> | 394 | + <rect key="frame" x="-0.5" y="0.0" width="176" height="83.5"/> | 
| 395 | <connections> | 395 | <connections> | 
| 396 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/> | 396 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/> | 
| 397 | </connections> | 397 | </connections> | 
| @@ -516,7 +516,6 @@ | @@ -516,7 +516,6 @@ | ||
| 516 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 516 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 
| 517 | </tabBar> | 517 | </tabBar> | 
| 518 | <connections> | 518 | <connections> | 
| 519 | - <segue destination="fWd-Qg-F7w" kind="relationship" relationship="viewControllers" id="K3U-Mn-icF"/> | ||
| 520 | <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/> | 519 | <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/> | 
| 521 | <segue destination="Yrp-0h-ncC" kind="relationship" relationship="viewControllers" id="IwW-6h-n82"/> | 520 | <segue destination="Yrp-0h-ncC" kind="relationship" relationship="viewControllers" id="IwW-6h-n82"/> | 
| 522 | <segue destination="eER-h6-27H" kind="relationship" relationship="viewControllers" id="wFB-T8-R8T"/> | 521 | <segue destination="eER-h6-27H" kind="relationship" relationship="viewControllers" id="wFB-T8-R8T"/> | 
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
| @@ -46,8 +46,6 @@ | @@ -46,8 +46,6 @@ | ||
| 46 | <key>UISupportedInterfaceOrientations</key> | 46 | <key>UISupportedInterfaceOrientations</key> | 
| 47 | <array> | 47 | <array> | 
| 48 | <string>UIInterfaceOrientationPortrait</string> | 48 | <string>UIInterfaceOrientationPortrait</string> | 
| 49 | - <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| 50 | - <string>UIInterfaceOrientationLandscapeRight</string> | ||
| 51 | </array> | 49 | </array> | 
| 52 | <key>UISupportedInterfaceOrientations~ipad</key> | 50 | <key>UISupportedInterfaceOrientations~ipad</key> | 
| 53 | <array> | 51 | <array> | 
ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
| @@ -12,42 +12,42 @@ | @@ -12,42 +12,42 @@ | ||
| 12 | <key>DZNEmptyDataSet.xcscheme</key> | 12 | <key>DZNEmptyDataSet.xcscheme</key> | 
| 13 | <dict> | 13 | <dict> | 
| 14 | <key>orderHint</key> | 14 | <key>orderHint</key> | 
| 15 | - <integer>2</integer> | 15 | + <integer>1</integer> | 
| 16 | </dict> | 16 | </dict> | 
| 17 | <key>Pods-ParentAssistant.xcscheme</key> | 17 | <key>Pods-ParentAssistant.xcscheme</key> | 
| 18 | <dict> | 18 | <dict> | 
| 19 | <key>orderHint</key> | 19 | <key>orderHint</key> | 
| 20 | - <integer>3</integer> | 20 | + <integer>2</integer> | 
| 21 | </dict> | 21 | </dict> | 
| 22 | <key>Reachability.xcscheme</key> | 22 | <key>Reachability.xcscheme</key> | 
| 23 | <dict> | 23 | <dict> | 
| 24 | <key>orderHint</key> | 24 | <key>orderHint</key> | 
| 25 | - <integer>4</integer> | 25 | + <integer>3</integer> | 
| 26 | </dict> | 26 | </dict> | 
| 27 | <key>SDWebImage.xcscheme</key> | 27 | <key>SDWebImage.xcscheme</key> | 
| 28 | <dict> | 28 | <dict> | 
| 29 | <key>orderHint</key> | 29 | <key>orderHint</key> | 
| 30 | - <integer>5</integer> | 30 | + <integer>4</integer> | 
| 31 | </dict> | 31 | </dict> | 
| 32 | <key>SVProgressHUD.xcscheme</key> | 32 | <key>SVProgressHUD.xcscheme</key> | 
| 33 | <dict> | 33 | <dict> | 
| 34 | <key>orderHint</key> | 34 | <key>orderHint</key> | 
| 35 | - <integer>6</integer> | 35 | + <integer>5</integer> | 
| 36 | </dict> | 36 | </dict> | 
| 37 | <key>SwiftHash.xcscheme</key> | 37 | <key>SwiftHash.xcscheme</key> | 
| 38 | <dict> | 38 | <dict> | 
| 39 | <key>orderHint</key> | 39 | <key>orderHint</key> | 
| 40 | - <integer>7</integer> | 40 | + <integer>6</integer> | 
| 41 | </dict> | 41 | </dict> | 
| 42 | <key>Toast.xcscheme</key> | 42 | <key>Toast.xcscheme</key> | 
| 43 | <dict> | 43 | <dict> | 
| 44 | <key>orderHint</key> | 44 | <key>orderHint</key> | 
| 45 | - <integer>8</integer> | 45 | + <integer>7</integer> | 
| 46 | </dict> | 46 | </dict> | 
| 47 | <key>XRCarouselView.xcscheme</key> | 47 | <key>XRCarouselView.xcscheme</key> | 
| 48 | <dict> | 48 | <dict> | 
| 49 | <key>orderHint</key> | 49 | <key>orderHint</key> | 
| 50 | - <integer>9</integer> | 50 | + <integer>8</integer> | 
| 51 | </dict> | 51 | </dict> | 
| 52 | </dict> | 52 | </dict> | 
| 53 | </dict> | 53 | </dict> |