IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 2f4fbc0bdd97c617a3d8428050603ea26f45e899

Authored by Cao yang
1 parent 0df4690b
Exists in parentassistant

整理页面格式

Showing 22 changed files with 334 additions and 336 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
  Diff comments   View file @2f4fbc0
... ... @@ -471,9 +471,9 @@
471 471 599364E2204E62E700C8B371 /* my */ = {
472 472 isa = PBXGroup;
473 473 children = (
  474 + BFCED886205280B700055373 /* Controller */,
474 475 BFCED889205280C900055373 /* Model */,
475 476 599364E4204E62E700C8B371 /* View */,
476   - BFCED886205280B700055373 /* Controller */,
477 477 );
478 478 path = my;
479 479 sourceTree = "<group>";
... ... @@ -505,6 +505,7 @@
505 505 599364F1204E632600C8B371 /* util */ = {
506 506 isa = PBXGroup;
507 507 children = (
  508 + BF38846A205A57E700A240EF /* NIM */,
508 509 BFF9B7F02057A27C00F39B3E /* view */,
509 510 590944E12057DA73004478B5 /* utils.swift */,
510 511 ADE33B302062202300BEA6E6 /* Macro.swift */,
... ... @@ -657,7 +658,7 @@
657 658 BF38846B205A58F800A240EF /* YXMessageManager.swift */,
658 659 );
659 660 name = NIM;
660   - path = ParentAssistant/NIM;
  661 + path = ParentAssistant/Classes/util/NIM;
661 662 sourceTree = SOURCE_ROOT;
662 663 };
663 664 BF3B829E2050CC7E002078EA /* View */ = {
... ... @@ -728,7 +729,6 @@
728 729 BF7A4C6B204E320700460463 /* Classes */ = {
729 730 isa = PBXGroup;
730 731 children = (
731   - BF38846A205A57E700A240EF /* NIM */,
732 732 599364D9204E62E700C8B371 /* controllers */,
733 733 599364F1204E632600C8B371 /* util */,
734 734 BFEAAAAC205257270072FAAF /* libs */,
... ... @@ -777,10 +777,10 @@
777 777 BFCED886205280B700055373 /* Controller */ = {
778 778 isa = PBXGroup;
779 779 children = (
  780 + BFCED887205280B700055373 /* MyViewController.swift */,
780 781 BFF9B7E82056852A00F39B3E /* RegisterViewController.swift */,
781 782 BF621CAD2056663C0040D2C1 /* LoginViewController.swift */,
782 783 BFF9B7EA205772E100F39B3E /* GetBackPasswordViewController.swift */,
783   - BFCED887205280B700055373 /* MyViewController.swift */,
784 784 BF621CAF2056664C0040D2C1 /* CurrentInfoViewController.swift */,
785 785 BF406CD52057B03A000A6681 /* MessageViewController.swift */,
786 786 BF406CDB2057C110000A6681 /* OrderDetailViewController.swift */,
... ...
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @2f4fbc0
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -38,7 +38,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
38 38 lazy var titleLine = {()->CALayer in
39 39 let lineLay = CALayer.init()
40 40 lineLay.frame.size = CGSize.init(width: 50, height: 2)
41   - lineLay.backgroundColor = UIColor.blue.cgColor
  41 + lineLay.backgroundColor = UIColor.white.cgColor
42 42 return lineLay
43 43 }()
44 44 //是否显示右侧按钮
... ... @@ -70,6 +70,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
70 70 }
71 71 titleLab.font = UIFont.systemFont(ofSize: 15)
72 72 titleLab.textAlignment = .center
  73 + titleLab.textColor = .white
73 74 leftView.addSubview(titleLab)
74 75  
75 76 let imageView = UIImageView.init(frame: CGRect.init(x: 50, y: 11, width: 10, height: 22))
... ... @@ -85,6 +86,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
85 86 let rightView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
86 87 let titleRLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
87 88 titleRLab.text = "筛选"
  89 + titleRLab.textColor = .white
88 90 titleRLab.font = UIFont.systemFont(ofSize: 15)
89 91 titleRLab.textAlignment = .center
90 92 rightView.addSubview(titleRLab)
... ... @@ -131,7 +133,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
131 133 let btn = UIButton.init()
132 134 btn.setTitle(titleArr[i], for: .normal)
133 135 btn.titleLabel!.font = UIFont.systemFont(ofSize: 17)
134   - btn.setTitleColor(UIColor.black, for: .normal)
  136 + btn.setTitleColor(UIColor.white, for: .normal)
135 137 btn.tag = i
136 138 btn.addTarget(self, action: #selector(clickTitleAction(btn:)), for:UIControlEvents.touchUpInside)
137 139 btn.frame.size = CGSize.init(width: 40, height: ZJBNavH)
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift
  Diff comments   View file @2f4fbc0
... ... @@ -8,11 +8,53 @@
8 8  
9 9 import UIKit
10 10  
11   -class ProgramVacateAddView: UIView {
  11 +class ProgramVacateAddView: UIView,UITableViewDelegate,UITableViewDataSource {
12 12  
  13 + lazy var tableView = { ()-> UITableView in
  14 +
  15 + let table = UITableView.init(frame: self.bounds)
  16 + table.delegate = self
  17 + table.dataSource = self
  18 + table.register(UINib.init(nibName: "ProgramVacateDetailCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateDetailCell")
  19 + table.register(UINib.init(nibName: "ProgramVacateTextFieldCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateTextFieldCell")
  20 + table.register(UINib.init(nibName: "ProgramVacateImageCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateImageCell")
  21 + return table
  22 + }()
  23 +
  24 + //data
  25 + var dataArr = Array<String>()
  26 +
13 27 override init(frame: CGRect) {
14 28 super.init(frame: frame)
  29 + self.dataArr = ["学生姓名:","班级:","请假场景:","请假类型:","请假时间:","返校时间:","离校原因:","照片:","审核人:"]
  30 + self.addSubview(self.tableView)
  31 +
  32 + }
  33 +
  34 + //MARK: - TableView Deleagate && DataSource
  35 + func numberOfSections(in tableView: UITableView) -> Int {
  36 +
  37 + return 1
  38 + }
  39 + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
  40 +
  41 + return self.dataArr.count
15 42 }
  43 + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
  44 + return 50
  45 + }
  46 + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
  47 +
  48 + if indexPath.row != 6 || indexPath.row != 7 {
  49 +
  50 + let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateDetailCell", for: indexPath) as! ProgramVacateDetailCell
  51 + cell.titleLab.text = dataArr[indexPath.row]
  52 + return cell
  53 + }
  54 +
  55 + return UITableViewCell.init()
  56 + }
  57 +
16 58  
17 59  
18 60 required init?(coder aDecoder: NSCoder) {
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib
  Diff comments   View file @2f4fbc0
... ... @@ -55,7 +55,7 @@
55 55 <nil key="highlightedColor"/>
56 56 </label>
57 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"/>
  58 + <rect key="frame" x="120" y="12.5" width="35" height="21"/>
59 59 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 60 <nil key="textColor"/>
61 61 <nil key="highlightedColor"/>
... ... @@ -67,7 +67,7 @@
67 67 <nil key="highlightedColor"/>
68 68 </label>
69 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"/>
  70 + <rect key="frame" x="120" y="43.5" width="35" height="21"/>
71 71 <fontDescription key="fontDescription" type="system" pointSize="17"/>
72 72 <nil key="textColor"/>
73 73 <nil key="highlightedColor"/>
... ... @@ -79,19 +79,19 @@
79 79 <nil key="highlightedColor"/>
80 80 </label>
81 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"/>
  82 + <rect key="frame" x="120" y="74.5" width="141" height="21"/>
83 83 <fontDescription key="fontDescription" type="system" pointSize="17"/>
84 84 <nil key="textColor"/>
85 85 <nil key="highlightedColor"/>
86 86 </label>
87 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"/>
  88 + <rect key="frame" x="181.5" y="100.5" width="18" height="21"/>
89 89 <fontDescription key="fontDescription" type="system" pointSize="17"/>
90 90 <nil key="textColor"/>
91 91 <nil key="highlightedColor"/>
92 92 </label>
93 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"/>
  94 + <rect key="frame" x="122" y="126.5" width="137" height="21"/>
95 95 <fontDescription key="fontDescription" type="system" pointSize="17"/>
96 96 <nil key="textColor"/>
97 97 <nil key="highlightedColor"/>
... ... @@ -103,7 +103,7 @@
103 103 <nil key="highlightedColor"/>
104 104 </label>
105 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"/>
  106 + <rect key="frame" x="120" y="157.5" width="95" height="21"/>
107 107 <fontDescription key="fontDescription" type="system" pointSize="17"/>
108 108 <nil key="textColor"/>
109 109 <nil key="highlightedColor"/>
... ... @@ -115,7 +115,7 @@
115 115 <nil key="highlightedColor"/>
116 116 </label>
117 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"/>
  118 + <rect key="frame" x="120" y="188.5" width="35" height="21"/>
119 119 <fontDescription key="fontDescription" type="system" pointSize="17"/>
120 120 <nil key="textColor"/>
121 121 <nil key="highlightedColor"/>
... ... @@ -124,19 +124,19 @@
124 124 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
125 125 <constraints>
126 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"/>
  127 + <constraint firstItem="o1S-an-wZs" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="45A-cx-9er"/>
128 128 <constraint firstItem="P6F-mV-ell" firstAttribute="centerY" secondItem="UYo-On-ZLA" secondAttribute="centerY" id="4jj-Yv-FyP"/>
129 129 <constraint firstItem="184-vm-o8V" firstAttribute="bottom" secondItem="zCX-fI-ung" secondAttribute="bottom" id="7Qo-Zx-DAx"/>
130 130 <constraint firstItem="CmX-ZE-z2v" firstAttribute="centerY" secondItem="XmD-SZ-8bL" secondAttribute="centerY" id="9d8-Eh-bXG"/>
131 131 <constraint firstItem="XUE-jH-LMd" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="Egr-sG-T07"/>
132 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"/>
  133 + <constraint firstItem="P6F-mV-ell" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="IOH-oF-TIq"/>
134 134 <constraint firstItem="SMb-fO-hlW" firstAttribute="centerY" secondItem="ptA-gi-ASQ" secondAttribute="centerY" id="IjA-7L-kXF"/>
135 135 <constraint firstItem="gay-8r-CB4" firstAttribute="top" secondItem="184-vm-o8V" secondAttribute="bottom" id="Ilk-EK-SMV"/>
136 136 <constraint firstItem="184-vm-o8V" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="10.5" id="KES-Nk-NQi"/>
137 137 <constraint firstAttribute="bottom" secondItem="gay-8r-CB4" secondAttribute="bottom" id="KoQ-MH-wGN"/>
138 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"/>
  139 + <constraint firstItem="CmX-ZE-z2v" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="Sa6-He-Zw1"/>
140 140 <constraint firstItem="XmD-SZ-8bL" firstAttribute="leading" secondItem="XUE-jH-LMd" secondAttribute="leading" id="XkB-Ka-XYp"/>
141 141 <constraint firstItem="zCX-fI-ung" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="15" id="aTH-2y-tFi"/>
142 142 <constraint firstItem="I23-J8-cbV" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="bPl-LK-op9"/>
... ... @@ -147,14 +147,14 @@
147 147 <constraint firstItem="184-vm-o8V" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" constant="18" id="hCe-rk-8Rh"/>
148 148 <constraint firstItem="tQ9-wo-yko" firstAttribute="centerY" secondItem="I23-J8-cbV" secondAttribute="centerY" id="iaq-Pt-N0v"/>
149 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"/>
  150 + <constraint firstItem="tQ9-wo-yko" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="lkm-Pa-khY"/>
151 151 <constraint firstItem="m2d-nZ-oIw" firstAttribute="centerX" secondItem="o1S-an-wZs" secondAttribute="centerX" id="osq-5I-jbe"/>
152 152 <constraint firstItem="o1S-an-wZs" firstAttribute="centerY" secondItem="XUE-jH-LMd" secondAttribute="centerY" id="p59-e2-LBT"/>
153 153 <constraint firstItem="ptA-gi-ASQ" firstAttribute="leading" secondItem="184-vm-o8V" secondAttribute="trailing" constant="20" id="pGi-jU-OcT"/>
154 154 <constraint firstItem="zCX-fI-ung" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" id="pYa-T9-TGa"/>
155 155 <constraint firstItem="I23-J8-cbV" firstAttribute="top" secondItem="ptA-gi-ASQ" secondAttribute="bottom" constant="10" id="sP9-y8-kI3"/>
156 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"/>
  157 + <constraint firstItem="SMb-fO-hlW" firstAttribute="leading" secondItem="184-vm-o8V" secondAttribute="trailing" constant="100" id="uGY-Th-x4A"/>
158 158 </constraints>
159 159 </view>
160 160 </subviews>
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift
  Diff comments   View file @2f4fbc0
... ... @@ -10,7 +10,7 @@ import UIKit
10 10  
11 11 class ProgramVacateDetailCell: UITableViewCell {
12 12  
13   - @IBOutlet weak var titileLab: UILabel!
  13 + @IBOutlet weak var titleLab: UILabel!
14 14 @IBOutlet weak var contentLab: UILabel!
15 15 override func awakeFromNib() {
16 16 super.awakeFromNib()
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib
  Diff comments   View file @2f4fbc0
... ... @@ -42,7 +42,7 @@
42 42 <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
43 43 <connections>
44 44 <outlet property="contentLab" destination="eTH-2V-g25" id="pLy-g6-civ"/>
45   - <outlet property="titileLab" destination="SSR-6D-Og1" id="fjT-XO-XM8"/>
  45 + <outlet property="titleLab" destination="SSR-6D-Og1" id="Mhi-xj-7nL"/>
46 46 </connections>
47 47 <point key="canvasLocation" x="-151" y="-31"/>
48 48 </tableViewCell>
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift
  Diff comments   View file @2f4fbc0
... ... @@ -51,7 +51,7 @@ class ProgramVacateDetailView: UIView,UITableViewDelegate,UITableViewDataSource
51 51  
52 52 if indexPath.row != 6 && indexPath.row != 7 {
53 53 let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateDetailCell", for: indexPath) as! ProgramVacateDetailCell
54   - cell.titileLab.text = dataArr[indexPath.row]
  54 + cell.titleLab.text = dataArr[indexPath.row]
55 55 cell.contentLab.text = "张三"
56 56 return cell
57 57 }else if indexPath.row == 6 {
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib
  Diff comments   View file @2f4fbc0
... ... @@ -23,7 +23,7 @@
23 23 <rect key="frame" x="10" y="10" width="369" height="72"/>
24 24 <subviews>
25 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"/>
  26 + <rect key="frame" x="213" y="41.5" width="8" height="20.5"/>
27 27 <fontDescription key="fontDescription" type="system" pointSize="17"/>
28 28 <nil key="textColor"/>
29 29 <nil key="highlightedColor"/>
... ... @@ -35,7 +35,7 @@
35 35 <nil key="highlightedColor"/>
36 36 </label>
37 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"/>
  38 + <rect key="frame" x="100" y="10" width="35" height="21"/>
39 39 <fontDescription key="fontDescription" type="system" pointSize="17"/>
40 40 <nil key="textColor"/>
41 41 <nil key="highlightedColor"/>
... ... @@ -47,22 +47,22 @@
47 47 <nil key="highlightedColor"/>
48 48 </label>
49 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"/>
  50 + <rect key="frame" x="100" y="41" width="90" height="21"/>
51 51 <fontDescription key="fontDescription" type="system" pointSize="17"/>
52 52 <nil key="textColor"/>
53 53 <nil key="highlightedColor"/>
54 54 </label>
55 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"/>
  56 + <rect key="frame" x="226" y="41" width="90" height="21"/>
57 57 <fontDescription key="fontDescription" type="system" pointSize="17"/>
58 58 <nil key="textColor"/>
59 59 <nil key="highlightedColor"/>
60 60 </label>
61 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"/>
  62 + <rect key="frame" x="195" y="45.5" width="13" height="12"/>
63 63 </imageView>
64 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"/>
  65 + <rect key="frame" x="321" y="45.5" width="13" height="12"/>
66 66 </imageView>
67 67 </subviews>
68 68 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
... ... @@ -78,8 +78,8 @@
78 78 <constraint firstItem="6Tv-CA-ehv" firstAttribute="leading" secondItem="A0K-zH-Rt1" secondAttribute="leading" constant="10" id="bMD-p2-wnP"/>
79 79 <constraint firstItem="bJt-wD-aUL" firstAttribute="leading" secondItem="6Tv-CA-ehv" secondAttribute="leading" id="mK7-vI-tFc"/>
80 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"/>
  81 + <constraint firstItem="vif-Lw-a1X" firstAttribute="leading" secondItem="A0K-zH-Rt1" secondAttribute="leading" constant="100" id="pnQ-fK-xwq"/>
  82 + <constraint firstItem="Rel-Qy-6VP" firstAttribute="leading" secondItem="vif-Lw-a1X" secondAttribute="leading" id="sGH-i2-tjB"/>
83 83 <constraint firstItem="6Tv-CA-ehv" firstAttribute="top" secondItem="A0K-zH-Rt1" secondAttribute="top" constant="10" id="sXD-DY-NqG"/>
84 84 <constraint firstItem="gIK-21-Af2" firstAttribute="leading" secondItem="H0L-Bl-DnY" secondAttribute="trailing" constant="5" id="vcT-Nz-jpC"/>
85 85 <constraint firstItem="B3i-HY-f54" firstAttribute="leading" secondItem="Rel-Qy-6VP" secondAttribute="trailing" constant="5" id="x47-0x-gfz"/>
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift
  Diff comments   View file @2f4fbc0
... ... @@ -97,8 +97,8 @@ class CalendarDateManager: NSObject {
97 97  
98 98 static let shared = CalendarDateManager()
99 99  
100   - private var date = Date.init(timeInterval: 150*86400, since: Date())
101   -// private var date = Date()
  100 +// private var date = Date.init(timeInterval: 150*86400, since: Date())
  101 + private var date = Date()
102 102 override init() {}
103 103  
104 104 /// 获取当前周ofMonth
... ...
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -16,10 +16,8 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
16 16 var channel:Int=0
17 17 override func viewDidLoad() {
18 18 super.viewDidLoad()
19   - self.navigationController?.navigationBar.barStyle = UIBarStyle.default// UIColorFromRGB(0xC5DAFF)
20   - let backImage = UIImage(named: "navigationBar_backgrounImage")
21   - self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
22   - // Do any additional setup after loading the view.
  19 + self.configTheme()
  20 +
23 21 if isFirstviewController{
24 22 self.navigationItem.title = ""
25 23 addLeftBarBtn()
... ... @@ -135,7 +133,6 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
135 133 }) {
136 134 tap.view?.isUserInteractionEnabled = true
137 135 }
138   -
139 136 }
140 137  
141 138 //完成选择城市
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -8,22 +8,78 @@
8 8  
9 9 import UIKit
10 10 //校卡激活页面
11   -class ActivationSchoolCardViewController: UINavigationController {
  11 +class ActivationSchoolCardViewController: UIViewController,UITextFieldDelegate {
12 12 var info:StudentClassInfo!//孩子信息
13   - @IBOutlet var nameLabel: UILabel!//孩子姓名
14   - @IBOutlet var cardNumberTextField: UITextField!//卡号
  13 +
  14 + lazy var showView = {()-> UIView in
  15 + let view = UIView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: 110))
  16 + view.backgroundColor = UIColor.white
  17 +
  18 + return view
  19 + }()
  20 + lazy var nameLable = {()-> UILabel in
  21 + let label = UILabel.init(frame: CGRect.init(x: 100, y: 20, width: 180, height: 30))
  22 + label.text = info.studentName
  23 + label.textAlignment = .center
  24 + return label
  25 + }()
  26 + lazy var cardNumberTextField = {()->UITextField in
  27 + let field = UITextField.init(frame: CGRect.init(x: 100, y: 70, width:180, height: 30))
  28 + field.delegate = self
  29 + field.textAlignment = .center
  30 + field.placeholder = "请输入卡号"
  31 + return field
  32 + }()
  33 +
15 34 override func viewDidLoad() {
16 35 super.viewDidLoad()
17   - nameLabel.text = info.studentName
  36 + self.view.backgroundColor = backGroundColor
  37 + self.view.addSubview(self.showView)
  38 +
  39 + drawUI()
  40 + }
  41 +
  42 + func drawUI(){
  43 +
  44 + let nameTitle = UILabel.init(frame: CGRect.init(x: 20, y: 20, width: 100, height: 30))
  45 + nameTitle.text = "持卡人:"
  46 +
  47 + let cardTitle = UILabel.init(frame: CGRect.init(x: 20, y: 70, width: 100, height: 30))
  48 + cardTitle.text = "卡号:"
  49 +
  50 + let btn = UIButton.init(frame: CGRect.init(x: 10, y: screenHeight-66-80, width: screenWidth-20, height: 40))
  51 + btn.setTitle("确定", for: UIControlState.normal)
  52 + btn.backgroundColor = Theme.topBarColor()
  53 + btn.layer.cornerRadius = 5
  54 + btn.clipsToBounds = true
  55 + btn.addTarget(self, action: #selector(activationAction(_:)), for: .touchUpInside)
  56 +
  57 + showView.addSubview(nameTitle)
  58 + showView.addSubview(self.nameLable)
  59 + showView.addSubview(cardTitle)
  60 + showView.addSubview(self.cardNumberTextField)
  61 +
  62 + self.view.addSubview(btn)
  63 + }
  64 + func textFieldShouldReturn(_ textField: UITextField) -> Bool {
  65 + return cardNumberTextField.resignFirstResponder()
18 66 }
  67 +
19 68 // MARK: - 确定按钮
20   - @IBAction func activationAction(_ sender: UIButton) {
  69 + @objc func activationAction(_ sender: UIButton) {
21 70 if cardNumberTextField.text == "" {
22 71 self.view.makeToast("卡号不能为空")
23 72 }
24 73  
  74 + let alert = UIAlertController.init(title: "卡号:\(cardNumberTextField.text!)", message: "已成功激活!", preferredStyle: UIAlertControllerStyle.alert)
  75 + let action = UIAlertAction.init(title: "返回", style: UIAlertActionStyle.default) { (action) in
  76 + self.dismiss(animated: true, completion: nil)
  77 + }
  78 + alert.addAction(action)
  79 + self.present(alert, animated: true, completion: nil)
25 80 }
26 81  
  82 +
27 83 override func didReceiveMemoryWarning() {
28 84 super.didReceiveMemoryWarning()
29 85 // Dispose of any resources that can be recreated.
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -18,6 +18,7 @@ class ChildrenDetailViewController: UIViewController {
18 18 var info:StudentClassInfo!//孩子信息
19 19 override func viewDidLoad() {
20 20 super.viewDidLoad()
  21 +
21 22 setUpWithInfo()
22 23 }
23 24 func setUpWithInfo() {
... ... @@ -29,8 +30,9 @@ class ChildrenDetailViewController: UIViewController {
29 30 }
30 31 // MARK: - 校卡激活
31 32 @IBAction func activationSchoolCardAction(_ sender: UIButton) {
32   - let vc = Story.instantiateViewControllerWithIdentifier("ActivationSchoolCardViewController", storyName: "My") as! ActivationSchoolCardViewController
  33 + let vc = ActivationSchoolCardViewController()
33 34 vc.info = info
  35 + vc.title = "校卡激活"
34 36 self.navigationController?.pushViewController(vc, animated: true)
35 37 }
36 38 // MARK: - 解除绑定
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/CurrentInfoViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -23,7 +23,7 @@ class CurrentInfoViewController: UIViewController,UIImagePickerControllerDelegat
23 23 }
24 24 // MARK: - 设置控件属性
25 25 func layoutSubViews(){
26   - self.navigationController?.isNavigationBarHidden = true
  26 +// self.navigationController?.isNavigationBarHidden = true
27 27 personIconImageView.layer.borderWidth = 1.0
28 28 personIconImageView.layer.borderColor = UIColor.white.cgColor
29 29 boyBtn.setImage(UIImage(named: "my_currentInf_genderselected"), for: UIControlState.selected)
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
  Diff comments   View file @2f4fbc0
1 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">
  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">
3 3 <device id="retina4_7" orientation="portrait">
4 4 <adaptation id="fullscreen"/>
5 5 </device>
6 6 <dependencies>
7 7 <deployment identifier="iOS"/>
8   - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9 9 <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
10 10 <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
11 11 <capability name="Safe area layout guides" minToolsVersion="9.0"/>
... ... @@ -821,10 +821,10 @@
821 821 </constraints>
822 822 </view>
823 823 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uth-8y-Dh9">
824   - <rect key="frame" x="8" y="280" width="359" height="70"/>
  824 + <rect key="frame" x="8" y="280" width="359" height="80"/>
825 825 <subviews>
826 826 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihB-8i-MWP">
827   - <rect key="frame" x="8" y="35" width="343" height="1"/>
  827 + <rect key="frame" x="8" y="40" width="343" height="1"/>
828 828 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
829 829 <constraints>
830 830 <constraint firstAttribute="height" constant="1" id="VD3-nv-neo"/>
... ... @@ -840,7 +840,7 @@
840 840 <nil key="highlightedColor"/>
841 841 </label>
842 842 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y6m-lj-t2V">
843   - <rect key="frame" x="8" y="44" width="31" height="18"/>
  843 + <rect key="frame" x="8" y="54" width="31" height="18"/>
844 844 <fontDescription key="fontDescription" type="system" pointSize="15"/>
845 845 <nil key="textColor"/>
846 846 <nil key="highlightedColor"/>
... ... @@ -849,19 +849,22 @@
849 849 <rect key="frame" x="62" y="8" width="289" height="18"/>
850 850 <nil key="textColor"/>
851 851 <fontDescription key="fontDescription" type="system" pointSize="15"/>
852   - <textInputTraits key="textInputTraits"/>
  852 + <textInputTraits key="textInputTraits" returnKeyType="done"/>
  853 + <connections>
  854 + <outlet property="delegate" destination="izC-aW-wN3" id="hbx-jD-Mit"/>
  855 + </connections>
853 856 </textField>
854 857 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="女" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a0P-5N-IiP">
855   - <rect key="frame" x="314.5" y="44" width="15.5" height="18"/>
  858 + <rect key="frame" x="304.5" y="54" width="15.5" height="18"/>
856 859 <fontDescription key="fontDescription" type="system" pointSize="15"/>
857 860 <nil key="textColor"/>
858 861 <nil key="highlightedColor"/>
859 862 </label>
860 863 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WZc-Xr-O2X">
861   - <rect key="frame" x="330" y="43" width="21" height="21"/>
  864 + <rect key="frame" x="325" y="50" width="24" height="24"/>
862 865 <constraints>
863 866 <constraint firstAttribute="width" secondItem="WZc-Xr-O2X" secondAttribute="height" multiplier="1:1" id="fe9-zN-kOK"/>
864   - <constraint firstAttribute="width" constant="21" id="iBQ-AE-XtE"/>
  867 + <constraint firstAttribute="width" constant="24" id="iBQ-AE-XtE"/>
865 868 </constraints>
866 869 <state key="normal" image="my_currentInf_gendernoselected"/>
867 870 <connections>
... ... @@ -869,10 +872,10 @@
869 872 </connections>
870 873 </button>
871 874 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dwh-Ac-2Me">
872   - <rect key="frame" x="285" y="43" width="21" height="21"/>
  875 + <rect key="frame" x="265.5" y="50" width="24" height="24"/>
873 876 <constraints>
874 877 <constraint firstAttribute="width" secondItem="dwh-Ac-2Me" secondAttribute="height" multiplier="1:1" id="05m-7S-UJX"/>
875   - <constraint firstAttribute="width" constant="21" id="QjG-x1-3VV"/>
  878 + <constraint firstAttribute="width" constant="24" id="QjG-x1-3VV"/>
876 879 </constraints>
877 880 <state key="normal" image="my_currentInf_gendernoselected"/>
878 881 <connections>
... ... @@ -880,7 +883,7 @@
880 883 </connections>
881 884 </button>
882 885 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="男" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="12a-FL-Ibf">
883   - <rect key="frame" x="269.5" y="44" width="15.5" height="18"/>
  886 + <rect key="frame" x="245" y="54" width="15.5" height="18"/>
884 887 <fontDescription key="fontDescription" type="system" pointSize="15"/>
885 888 <nil key="textColor"/>
886 889 <nil key="highlightedColor"/>
... ... @@ -889,17 +892,17 @@
889 892 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
890 893 <constraints>
891 894 <constraint firstAttribute="trailing" secondItem="IMI-JO-boC" secondAttribute="trailing" constant="8" id="37N-xB-Mt3"/>
892   - <constraint firstItem="dwh-Ac-2Me" firstAttribute="leading" secondItem="12a-FL-Ibf" secondAttribute="trailing" id="5Ba-Me-Bon"/>
893   - <constraint firstItem="a0P-5N-IiP" firstAttribute="leading" secondItem="dwh-Ac-2Me" secondAttribute="trailing" constant="8" id="A4J-Jt-vSg"/>
  895 + <constraint firstItem="dwh-Ac-2Me" firstAttribute="leading" secondItem="12a-FL-Ibf" secondAttribute="trailing" constant="5" id="5Ba-Me-Bon"/>
  896 + <constraint firstItem="a0P-5N-IiP" firstAttribute="leading" secondItem="dwh-Ac-2Me" secondAttribute="trailing" constant="15" id="A4J-Jt-vSg"/>
894 897 <constraint firstAttribute="trailing" secondItem="ihB-8i-MWP" secondAttribute="trailing" constant="8" id="CA5-e0-Qt8"/>
895 898 <constraint firstAttribute="bottom" secondItem="WZc-Xr-O2X" secondAttribute="bottom" constant="6" id="CFs-Hx-0M5"/>
896 899 <constraint firstItem="IMI-JO-boC" firstAttribute="top" secondItem="Uth-8y-Dh9" secondAttribute="top" constant="8" id="FfE-Fp-ZKM"/>
897 900 <constraint firstAttribute="bottom" secondItem="12a-FL-Ibf" secondAttribute="bottom" constant="8" id="WL8-z6-nWt"/>
898   - <constraint firstAttribute="height" constant="70" id="bAI-JN-7AY"/>
899   - <constraint firstAttribute="trailing" secondItem="WZc-Xr-O2X" secondAttribute="trailing" constant="8" id="cWg-To-gWg"/>
  901 + <constraint firstAttribute="height" constant="80" id="bAI-JN-7AY"/>
  902 + <constraint firstAttribute="trailing" secondItem="WZc-Xr-O2X" secondAttribute="trailing" constant="10" id="cWg-To-gWg"/>
900 903 <constraint firstItem="y6m-lj-t2V" firstAttribute="leading" secondItem="Uth-8y-Dh9" secondAttribute="leading" constant="8" id="ebc-qf-TI2"/>
901 904 <constraint firstItem="GyV-YU-DoH" firstAttribute="leading" secondItem="Uth-8y-Dh9" secondAttribute="leading" constant="8" id="f8g-CU-aMV"/>
902   - <constraint firstItem="WZc-Xr-O2X" firstAttribute="leading" secondItem="a0P-5N-IiP" secondAttribute="trailing" id="h0f-qb-svC"/>
  905 + <constraint firstItem="WZc-Xr-O2X" firstAttribute="leading" secondItem="a0P-5N-IiP" secondAttribute="trailing" constant="5" id="h0f-qb-svC"/>
903 906 <constraint firstAttribute="bottom" secondItem="a0P-5N-IiP" secondAttribute="bottom" constant="8" id="ifX-Hr-13T"/>
904 907 <constraint firstItem="ihB-8i-MWP" firstAttribute="centerY" secondItem="Uth-8y-Dh9" secondAttribute="centerY" id="jWx-kK-Lof"/>
905 908 <constraint firstItem="IMI-JO-boC" firstAttribute="leading" secondItem="GyV-YU-DoH" secondAttribute="trailing" constant="8" id="kTr-BS-8wC"/>
... ... @@ -917,10 +920,10 @@
917 920 </userDefinedRuntimeAttributes>
918 921 </view>
919 922 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BJp-u6-ttX">
920   - <rect key="frame" x="8" y="621" width="359" height="30"/>
921   - <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  923 + <rect key="frame" x="8" y="611" width="359" height="40"/>
  924 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
922 925 <constraints>
923   - <constraint firstAttribute="height" constant="30" id="0f5-sE-CbZ"/>
  926 + <constraint firstAttribute="height" constant="40" id="0f5-sE-CbZ"/>
924 927 </constraints>
925 928 <state key="normal" title="确认">
926 929 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -1291,7 +1294,7 @@
1291 1294 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1292 1295 <subviews>
1293 1296 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="by8-8x-HbM">
1294   - <rect key="frame" x="0.0" y="64" width="375" height="549"/>
  1297 + <rect key="frame" x="0.0" y="64" width="375" height="553"/>
1295 1298 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
1296 1299 <prototypes>
1297 1300 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MyChildrenTableViewCell" rowHeight="70" id="AsM-fi-1E0" customClass="MyChildrenTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
... ... @@ -1317,16 +1320,16 @@
1317 1320 <nil key="highlightedColor"/>
1318 1321 </label>
1319 1322 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AOx-bl-8U0">
1320   - <rect key="frame" x="317" y="21" width="50" height="20"/>
  1323 + <rect key="frame" x="297" y="16" width="70" height="30"/>
1321 1324 <constraints>
1322   - <constraint firstAttribute="height" constant="20" id="CG4-9A-01l"/>
1323   - <constraint firstAttribute="width" constant="50" id="tlY-GL-P0q"/>
  1325 + <constraint firstAttribute="height" constant="30" id="CG4-9A-01l"/>
  1326 + <constraint firstAttribute="width" constant="70" id="tlY-GL-P0q"/>
1324 1327 </constraints>
1325 1328 <state key="normal" title="去订购"/>
1326 1329 <userDefinedRuntimeAttributes>
1327 1330 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1328 1331 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1329   - <integer key="value" value="5"/>
  1332 + <integer key="value" value="15"/>
1330 1333 </userDefinedRuntimeAttribute>
1331 1334 </userDefinedRuntimeAttributes>
1332 1335 <connections>
... ... @@ -1366,8 +1369,11 @@
1366 1369 </connections>
1367 1370 </tableView>
1368 1371 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="um9-GN-HgW">
1369   - <rect key="frame" x="8" y="621" width="359" height="30"/>
1370   - <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1372 + <rect key="frame" x="8" y="617" width="359" height="40"/>
  1373 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1374 + <constraints>
  1375 + <constraint firstAttribute="height" constant="40" id="k20-dz-daj"/>
  1376 + </constraints>
1371 1377 <state key="normal" title="添加绑定账号">
1372 1378 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1373 1379 </state>
... ... @@ -1386,10 +1392,10 @@
1386 1392 <constraints>
1387 1393 <constraint firstItem="by8-8x-HbM" firstAttribute="leading" secondItem="IF8-NC-RgQ" secondAttribute="leading" id="9HL-cF-clD"/>
1388 1394 <constraint firstItem="by8-8x-HbM" firstAttribute="top" secondItem="IF8-NC-RgQ" secondAttribute="top" id="FKk-ev-gxD"/>
1389   - <constraint firstItem="um9-GN-HgW" firstAttribute="top" secondItem="by8-8x-HbM" secondAttribute="bottom" constant="8" id="Y9e-RN-i9M"/>
  1395 + <constraint firstItem="um9-GN-HgW" firstAttribute="top" secondItem="by8-8x-HbM" secondAttribute="bottom" id="Y9e-RN-i9M"/>
1390 1396 <constraint firstItem="um9-GN-HgW" firstAttribute="leading" secondItem="IF8-NC-RgQ" secondAttribute="leading" constant="8" id="d96-0Q-uan"/>
1391 1397 <constraint firstItem="by8-8x-HbM" firstAttribute="trailing" secondItem="IF8-NC-RgQ" secondAttribute="trailing" id="dQq-IL-sWY"/>
1392   - <constraint firstItem="IF8-NC-RgQ" firstAttribute="bottom" secondItem="um9-GN-HgW" secondAttribute="bottom" constant="16" id="q7h-cW-Cap"/>
  1398 + <constraint firstItem="IF8-NC-RgQ" firstAttribute="bottom" secondItem="um9-GN-HgW" secondAttribute="bottom" constant="10" id="q7h-cW-Cap"/>
1393 1399 <constraint firstItem="IF8-NC-RgQ" firstAttribute="trailing" secondItem="um9-GN-HgW" secondAttribute="trailing" constant="8" id="xJI-Pc-8Pr"/>
1394 1400 </constraints>
1395 1401 <viewLayoutGuide key="safeArea" id="IF8-NC-RgQ"/>
... ... @@ -1568,10 +1574,10 @@
1568 1574 </constraints>
1569 1575 </view>
1570 1576 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmq-mD-M7V">
1571   - <rect key="frame" x="8" y="583" width="359" height="30"/>
  1577 + <rect key="frame" x="8" y="563" width="359" height="40"/>
1572 1578 <color key="backgroundColor" red="0.26289805769920349" green="0.83853167295455933" blue="0.5797455906867981" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1573 1579 <constraints>
1574   - <constraint firstAttribute="height" constant="30" id="TDs-w3-m8B"/>
  1580 + <constraint firstAttribute="height" constant="40" id="TDs-w3-m8B"/>
1575 1581 </constraints>
1576 1582 <state key="normal" title="校卡激活">
1577 1583 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -1587,10 +1593,10 @@
1587 1593 </connections>
1588 1594 </button>
1589 1595 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eob-2f-LHk">
1590   - <rect key="frame" x="8" y="621" width="359" height="30"/>
  1596 + <rect key="frame" x="8" y="611" width="359" height="40"/>
1591 1597 <color key="backgroundColor" red="0.99277454614639282" green="0.58486777544021606" blue="0.58350682258605957" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1592 1598 <constraints>
1593   - <constraint firstAttribute="height" constant="30" id="4TM-cx-grP"/>
  1599 + <constraint firstAttribute="height" constant="40" id="4TM-cx-grP"/>
1594 1600 </constraints>
1595 1601 <state key="normal" title="解除绑定">
1596 1602 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -1646,119 +1652,6 @@
1646 1652 </objects>
1647 1653 <point key="canvasLocation" x="910" y="606"/>
1648 1654 </scene>
1649   - <!--校卡激活-->
1650   - <scene sceneID="ife-4P-5ZO">
1651   - <objects>
1652   - <viewController storyboardIdentifier="ActivationSchoolCardViewController" id="PmZ-B7-NJl" customClass="ActivationSchoolCardViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
1653   - <view key="view" contentMode="scaleToFill" id="7qg-B6-foy">
1654   - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1655   - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1656   - <subviews>
1657   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b7a-Ma-IMT">
1658   - <rect key="frame" x="16" y="265.5" width="343" height="200"/>
1659   - <subviews>
1660   - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hqJ-dt-VX1">
1661   - <rect key="frame" x="8" y="162" width="327" height="30"/>
1662   - <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1663   - <constraints>
1664   - <constraint firstAttribute="height" constant="30" id="Q7U-19-vsq"/>
1665   - </constraints>
1666   - <state key="normal" title="确定">
1667   - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1668   - </state>
1669   - <userDefinedRuntimeAttributes>
1670   - <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
1671   - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1672   - <integer key="value" value="5"/>
1673   - </userDefinedRuntimeAttribute>
1674   - </userDefinedRuntimeAttributes>
1675   - <connections>
1676   - <action selector="activationAction:" destination="PmZ-B7-NJl" eventType="touchUpInside" id="Ksh-r0-pNC"/>
1677   - </connections>
1678   - </button>
1679   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="卡号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Nq-Xv-dmq">
1680   - <rect key="frame" x="30" y="89" width="70" height="21"/>
1681   - <constraints>
1682   - <constraint firstAttribute="width" constant="70" id="F0z-oJ-wvJ"/>
1683   - </constraints>
1684   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
1685   - <nil key="textColor"/>
1686   - <nil key="highlightedColor"/>
1687   - </label>
1688   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="持卡人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1Y-8N-EP4">
1689   - <rect key="frame" x="30" y="60" width="69.5" height="21"/>
1690   - <constraints>
1691   - <constraint firstAttribute="width" constant="70" id="oEu-tI-1vf"/>
1692   - </constraints>
1693   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
1694   - <nil key="textColor"/>
1695   - <nil key="highlightedColor"/>
1696   - </label>
1697   - <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入卡号" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ydQ-Nw-taF">
1698   - <rect key="frame" x="108" y="91.5" width="227" height="17"/>
1699   - <nil key="textColor"/>
1700   - <fontDescription key="fontDescription" type="system" pointSize="14"/>
1701   - <textInputTraits key="textInputTraits"/>
1702   - </textField>
1703   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xV0-Xz-JLq">
1704   - <rect key="frame" x="108" y="87.5" width="227" height="0.0"/>
1705   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
1706   - <nil key="textColor"/>
1707   - <nil key="highlightedColor"/>
1708   - </label>
1709   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tBg-aB-jbG">
1710   - <rect key="frame" x="108" y="108.5" width="227" height="1"/>
1711   - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
1712   - <constraints>
1713   - <constraint firstAttribute="height" constant="1" id="0ep-an-Xnu"/>
1714   - </constraints>
1715   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
1716   - <nil key="textColor"/>
1717   - <nil key="highlightedColor"/>
1718   - </label>
1719   - </subviews>
1720   - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1721   - <constraints>
1722   - <constraint firstItem="ydQ-Nw-taF" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="0PR-YB-H1K"/>
1723   - <constraint firstItem="6Nq-Xv-dmq" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="0qf-xz-Xc2"/>
1724   - <constraint firstAttribute="trailing" secondItem="hqJ-dt-VX1" secondAttribute="trailing" constant="8" id="CMh-Kx-Bat"/>
1725   - <constraint firstAttribute="trailing" secondItem="xV0-Xz-JLq" secondAttribute="trailing" constant="8" id="Fkz-pa-chm"/>
1726   - <constraint firstItem="I1Y-8N-EP4" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="KQp-Ie-CkZ"/>
1727   - <constraint firstAttribute="height" constant="200" id="QLR-Wj-mRw"/>
1728   - <constraint firstItem="6Nq-Xv-dmq" firstAttribute="top" secondItem="I1Y-8N-EP4" secondAttribute="bottom" constant="8" id="W5O-rZ-VTK"/>
1729   - <constraint firstItem="tBg-aB-jbG" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="c8H-IA-Ktj"/>
1730   - <constraint firstAttribute="trailing" secondItem="tBg-aB-jbG" secondAttribute="trailing" constant="8" id="k2l-hw-vNO"/>
1731   - <constraint firstItem="ydQ-Nw-taF" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="kdg-98-Ff8"/>
1732   - <constraint firstAttribute="bottom" secondItem="hqJ-dt-VX1" secondAttribute="bottom" constant="8" id="mrd-tC-O3U"/>
1733   - <constraint firstItem="6Nq-Xv-dmq" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="rJM-mi-fV3"/>
1734   - <constraint firstItem="hqJ-dt-VX1" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="8" id="sYo-om-3Tu"/>
1735   - <constraint firstAttribute="trailing" secondItem="ydQ-Nw-taF" secondAttribute="trailing" constant="8" id="xMF-Z6-xjU"/>
1736   - <constraint firstItem="ydQ-Nw-taF" firstAttribute="top" secondItem="xV0-Xz-JLq" secondAttribute="bottom" constant="4" id="xTh-T1-fNQ"/>
1737   - <constraint firstItem="tBg-aB-jbG" firstAttribute="top" secondItem="ydQ-Nw-taF" secondAttribute="bottom" id="xpy-QI-qcy"/>
1738   - <constraint firstItem="xV0-Xz-JLq" firstAttribute="leading" secondItem="I1Y-8N-EP4" secondAttribute="trailing" constant="8" id="yTS-Dn-AB2"/>
1739   - </constraints>
1740   - </view>
1741   - </subviews>
1742   - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
1743   - <constraints>
1744   - <constraint firstItem="b7a-Ma-IMT" firstAttribute="leading" secondItem="ZrG-k7-97i" secondAttribute="leading" constant="16" id="K9c-89-uSQ"/>
1745   - <constraint firstItem="ZrG-k7-97i" firstAttribute="trailing" secondItem="b7a-Ma-IMT" secondAttribute="trailing" constant="16" id="St5-Nd-paj"/>
1746   - <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerX" secondItem="ZrG-k7-97i" secondAttribute="centerX" id="Z0U-Sc-Zuc"/>
1747   - <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerY" secondItem="ZrG-k7-97i" secondAttribute="centerY" id="v0s-4b-Pg0"/>
1748   - </constraints>
1749   - <viewLayoutGuide key="safeArea" id="ZrG-k7-97i"/>
1750   - </view>
1751   - <navigationItem key="navigationItem" title="校卡激活" id="GXY-kd-xer"/>
1752   - <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
1753   - <connections>
1754   - <outlet property="cardNumberTextField" destination="ydQ-Nw-taF" id="fs1-fT-56C"/>
1755   - <outlet property="nameLabel" destination="xV0-Xz-JLq" id="Oii-qf-u8T"/>
1756   - </connections>
1757   - </viewController>
1758   - <placeholder placeholderIdentifier="IBFirstResponder" id="pcB-ds-46z" userLabel="First Responder" sceneMemberID="firstResponder"/>
1759   - </objects>
1760   - <point key="canvasLocation" x="1605.5999999999999" y="605.84707646176912"/>
1761   - </scene>
1762 1655 </scenes>
1763 1656 <resources>
1764 1657 <image name="defphoto" width="128" height="128"/>
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -21,6 +21,7 @@ class MyChildrenViewController: UIViewController{
21 21 //防止tabbar隐藏导致页面跳一下
22 22 self.tabBarController?.tabBar.isHidden = true
23 23 self.navigationController?.setNavigationBarHidden(false, animated: true)
  24 +
24 25 }
25 26 // MARK: - 设置控件属性
26 27 func layoutSubViews(){
... ...
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
  Diff comments   View file @2f4fbc0
... ... @@ -27,8 +27,9 @@ class MyViewController: UIViewController {
27 27 }
28 28 // MARK: - 设置控件属性
29 29 func layoutSubViews(){
30   - let backImage = UIImage(named: "navigationBar_backgrounImage")
31   - self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
  30 +// let backImage = UIImage(named: "navigationBar_backgrounImage")
  31 +// self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
  32 + self.configTheme()
32 33 // MARK: - 是否是iPhoneX顶部刘海
33 34 if UIApplication.shared.statusBarFrame.size.height>20 {
34 35 titleViewHeight.constant = 88
... ... @@ -41,7 +42,7 @@ class MyViewController: UIViewController {
41 42 let backButton = UIBarButtonItem()
42 43 backButton.title = "个人中心"
43 44 self.navigationItem.backBarButtonItem = backButton
44   - self.configTheme()
  45 +
45 46 //添加退出登录的通知，防止在本页面时账号被顶 不能及时刷新页面
46 47 NotificationCenter.default.addObserver(self, selector: #selector(MyViewController.loginOutNotificationAction), name: NSNotification.Name(rawValue: "loginOutSuccess"), object: nil)
47 48 NotificationCenter.default.addObserver(self, selector: #selector(MyViewController.receivedNewNotificationAction), name: NSNotification.Name(rawValue: MessageNotification.receiveMessage), object: nil)
... ...
ParentAssistant/ParentAssistant/Classes/util/Macro.swift
  Diff comments   View file @2f4fbc0
... ... @@ -17,7 +17,7 @@ var navigationBarHeight : CGFloat?
17 17 let screenWidth = UIScreen.main.bounds.size.width
18 18 let screenHeight = UIScreen.main.bounds.size.height
19 19 let backGroundColor = UIColor.init(red: 239/255, green: 239/255, blue: 244/255, alpha: 1)
20   -
  20 +let navigationColor = UIColorWithRGB(R: 109, G: 155, B: 255)
21 21 //MARK: -------------------------- 接口地址 ----------------------------
22 22 let appsecret="sincere:3a530f39f99411b454e667d69693c127"
23 23 var ReleaseHOST:String!="http://campus.myjxt.com"//正式网址
... ...
ParentAssistant/ParentAssistant/Classes/util/NIM/YXMessageManager.swift 0 → 100644
  Diff comments   View file @2f4fbc0
... ... @@ -0,0 +1,124 @@
  1 +//
  2 +// YXMessageManager.swift
  3 +// ParentAssistant
  4 +//
  5 +// Created by 葛建军 on 2018/3/15.
  6 +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
  7 +//
  8 +
  9 +import UIKit
  10 +import CoreData
  11 +class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationManagerDelegate {
  12 + static let share=YXMessageManager()
  13 + private override init() {}
  14 + func addYXDelegate(){
  15 + //添加云信代理
  16 + NIMSDK.shared().loginManager.add(YXMessageManager.share as NIMLoginManagerDelegate)
  17 + NIMSDK.shared().systemNotificationManager.add(YXMessageManager.share as NIMSystemNotificationManagerDelegate)
  18 + }
  19 + //登录云信
  20 + func loginWithYX(account:String,token:String,completion:((Bool)->Void)?){
  21 + NIMSDK.shared().loginManager.login(account, token: token) { (error) in
  22 + var b:Bool
  23 + if error==nil {
  24 + //登录成功
  25 + b=true
  26 + }else{
  27 + //登录失败
  28 + b=false
  29 + }
  30 + completion?(b)
  31 + }
  32 + }
  33 + func autoLogin(account:String,token:String){
  34 + NIMSDK.shared().loginManager.autoLogin(account, token: token)
  35 + }
  36 + //退出登录
  37 + func loginOut(completion:((Bool)->Void)?){
  38 + NIMSDK.shared().loginManager.logout { (error) in
  39 + var b:Bool
  40 + if error==nil {
  41 + //退出成功
  42 + b=true
  43 + }else{
  44 + //退出失败
  45 + b=false
  46 + }
  47 + completion?(b)
  48 + }
  49 + }
  50 + /**
  51 + * 被踢(服务器/其他端)回调
  52 + *
  53 + * @param code 被踢原因
  54 + * @param clientType 发起踢出的客户端类型
  55 + */
  56 + func onKick(_ code: NIMKickReason, clientType: NIMLoginClientType) {
  57 + var reason="您的帐号已在别处登录"
  58 + switch (code) {
  59 + case NIMKickReason.byClient:
  60 + var clientName=""
  61 + switch (clientType) {
  62 + case NIMLoginClientType.typeAOS:
  63 + clientName="Android";
  64 + case NIMLoginClientType.typeiOS:
  65 + clientName="iOS";
  66 + case NIMLoginClientType.typePC:
  67 + clientName="电脑";
  68 + case NIMLoginClientType.typeWeb:
  69 + clientName="网页";
  70 + default:
  71 + clientName="";
  72 + }
  73 + reason = clientName == "" ? "你的帐号在其他设备上登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员" : "你的帐号在\(clientName)端登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员"
  74 + break
  75 + case NIMKickReason.byClientManually:
  76 + break
  77 + default: //code=NIMKickReason.ByServer:
  78 + reason="你被服务器踢下线"
  79 +
  80 + break;
  81 + }
  82 + appDelegate.window!.makeToast("下线通知:\(reason)", duration: 3, position: CSToastPositionCenter)
  83 + AccountManager.shared.logOut(auto: true)
  84 + }
  85 + /**
  86 + * 登录回调
  87 + *
  88 + * @param step 登录步骤
  89 + * @discussion 这个回调主要用于客户端UI的刷新
  90 + */
  91 + func onLogin(_ step: NIMLoginStep) {
  92 +
  93 + }
  94 + /**
  95 + * 自动登录失败回调
  96 + *
  97 + * @param error 失败原因
  98 + * @discussion 自动重连不需要上层开发关心，但是如果发生一些需要上层开发处理的错误，SDK 会通过这个方法回调
  99 + * 用户需要处理的情况包括：AppKey 未被设置，参数错误，密码错误，多端登录冲突，账号被封禁，操作过于频繁等
  100 + */
  101 + func onAutoLoginFailed(_ error: Error) {
  102 + AccountManager.shared.logOut()
  103 + }
  104 + func onReceive(_ notification: NIMCustomSystemNotification) {
  105 + if let info=JSON.fromString(notification.content) {
  106 + if info["type"].stringValue=="attach"{//群发通知
  107 + let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
  108 + attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
  109 + attachItem.content = info["content"].stringValue
  110 + attachItem.ownId = AccountManager.shared.userid
  111 + attachItem.save()
  112 + NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
  113 + }else if info["type"].stringValue=="ordermess"{//订购通知
  114 + let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
  115 + attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
  116 + attachItem.type = "ordermess"
  117 + attachItem.content = info["content"].stringValue
  118 + attachItem.ownId = AccountManager.shared.userid
  119 + attachItem.save()
  120 + NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
  121 + }
  122 + }
  123 + }
  124 +}
... ...
ParentAssistant/ParentAssistant/Classes/util/utils.swift
  Diff comments   View file @2f4fbc0
... ... @@ -315,7 +315,7 @@ extension UIApplication {
315 315 }
316 316 class Theme{
317 317 static func topBarColor()->UIColor{
318   - return UIColorFromRGB(0xC5DAFF)//UIColorFromRGB(0xff9b34)f6595f
  318 + return UIColorWithRGB(R: 109, G: 155, B: 255)
319 319 }
320 320 ///按钮样式
321 321 static func configButton(_ button:UIButton){
... ... @@ -573,11 +573,11 @@ extension UIViewController{
573 573 ///设置顶栏的各种显示属性
574 574 func configTheme(){
575 575 self.navigationItem.title=self.navigationController?.title
576   - self.navigationController?.navigationBar.barTintColor=Theme.topBarColor()
577   - self.navigationController?.navigationBar.tintColor=UIColor.black
  576 + self.navigationController?.navigationBar.barTintColor = navigationColor
  577 + self.navigationController?.navigationBar.tintColor = UIColor.white
578 578 self.navigationController?.navigationBar.isTranslucent=false
579 579 let textAttributes = NSMutableDictionary(capacity:1)
580   - textAttributes.setObject(UIColor.black, forKey: NSAttributedStringKey.foregroundColor as NSCopying)
  580 + textAttributes.setObject(UIColor.white, forKey: NSAttributedStringKey.foregroundColor as NSCopying)
581 581 self.navigationController?.navigationBar.titleTextAttributes=textAttributes as! [AnyHashable: Any] as? [NSAttributedStringKey : Any]
582 582 }
583 583 ///套上UINavigationController
... ...
ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
View file @0df4690
... ... @@ -1,124 +0,0 @@
1   -//
2   -// YXMessageManager.swift
3   -// ParentAssistant
4   -//
5   -// Created by 葛建军 on 2018/3/15.
6   -// Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
7   -//
8   -
9   -import UIKit
10   -import CoreData
11   -class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationManagerDelegate {
12   - static let share=YXMessageManager()
13   - private override init() {}
14   - func addYXDelegate(){
15   - //添加云信代理
16   - NIMSDK.shared().loginManager.add(YXMessageManager.share as NIMLoginManagerDelegate)
17   - NIMSDK.shared().systemNotificationManager.add(YXMessageManager.share as NIMSystemNotificationManagerDelegate)
18   - }
19   - //登录云信
20   - func loginWithYX(account:String,token:String,completion:((Bool)->Void)?){
21   - NIMSDK.shared().loginManager.login(account, token: token) { (error) in
22   - var b:Bool
23   - if error==nil {
24   - //登录成功
25   - b=true
26   - }else{
27   - //登录失败
28   - b=false
29   - }
30   - completion?(b)
31   - }
32   - }
33   - func autoLogin(account:String,token:String){
34   - NIMSDK.shared().loginManager.autoLogin(account, token: token)
35   - }
36   - //退出登录
37   - func loginOut(completion:((Bool)->Void)?){
38   - NIMSDK.shared().loginManager.logout { (error) in
39   - var b:Bool
40   - if error==nil {
41   - //退出成功
42   - b=true
43   - }else{
44   - //退出失败
45   - b=false
46   - }
47   - completion?(b)
48   - }
49   - }
50   - /**
51   - * 被踢(服务器/其他端)回调
52   - *
53   - * @param code 被踢原因
54   - * @param clientType 发起踢出的客户端类型
55   - */
56   - func onKick(_ code: NIMKickReason, clientType: NIMLoginClientType) {
57   - var reason="您的帐号已在别处登录"
58   - switch (code) {
59   - case NIMKickReason.byClient:
60   - var clientName=""
61   - switch (clientType) {
62   - case NIMLoginClientType.typeAOS:
63   - clientName="Android";
64   - case NIMLoginClientType.typeiOS:
65   - clientName="iOS";
66   - case NIMLoginClientType.typePC:
67   - clientName="电脑";
68   - case NIMLoginClientType.typeWeb:
69   - clientName="网页";
70   - default:
71   - clientName="";
72   - }
73   - reason = clientName == "" ? "你的帐号在其他设备上登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员" : "你的帐号在\(clientName)端登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员"
74   - break
75   - case NIMKickReason.byClientManually:
76   - break
77   - default: //code=NIMKickReason.ByServer:
78   - reason="你被服务器踢下线"
79   -
80   - break;
81   - }
82   - appDelegate.window!.makeToast("下线通知:\(reason)", duration: 3, position: CSToastPositionCenter)
83   - AccountManager.shared.logOut(auto: true)
84   - }
85   - /**
86   - * 登录回调
87   - *
88   - * @param step 登录步骤
89   - * @discussion 这个回调主要用于客户端UI的刷新
90   - */
91   - func onLogin(_ step: NIMLoginStep) {
92   -
93   - }
94   - /**
95   - * 自动登录失败回调
96   - *
97   - * @param error 失败原因
98   - * @discussion 自动重连不需要上层开发关心，但是如果发生一些需要上层开发处理的错误，SDK 会通过这个方法回调
99   - * 用户需要处理的情况包括：AppKey 未被设置，参数错误，密码错误，多端登录冲突，账号被封禁，操作过于频繁等
100   - */
101   - func onAutoLoginFailed(_ error: Error) {
102   - AccountManager.shared.logOut()
103   - }
104   - func onReceive(_ notification: NIMCustomSystemNotification) {
105   - if let info=JSON.fromString(notification.content) {
106   - if info["type"].stringValue=="attach"{//群发通知
107   - let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
108   - attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
109   - attachItem.content = info["content"].stringValue
110   - attachItem.ownId = AccountManager.shared.userid
111   - attachItem.save()
112   - NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
113   - }else if info["type"].stringValue=="ordermess"{//订购通知
114   - let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
115   - attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
116   - attachItem.type = "ordermess"
117   - attachItem.content = info["content"].stringValue
118   - attachItem.ownId = AccountManager.shared.userid
119   - attachItem.save()
120   - NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
121   - }
122   - }
123   - }
124   -}
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @2f4fbc0
... ... @@ -514,6 +514,7 @@
514 514 <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
515 515 <autoresizingMask key="autoresizingMask"/>
516 516 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
  517 + <color key="tintColor" red="0.42745098039215684" green="0.54509803921568623" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
517 518 </tabBar>
518 519 <connections>
519 520 <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/>
... ... @@ -707,10 +708,10 @@
707 708 <rect key="frame" x="0.0" y="192" width="375" height="426"/>
708 709 <subviews>
709 710 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b1H-Ru-LCm">
710   - <rect key="frame" x="16" y="386" width="351" height="30"/>
711   - <color key="backgroundColor" red="0.65884900089999998" green="0.7812994123" blue="0.99654072520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  711 + <rect key="frame" x="10" y="376" width="355" height="40"/>
  712 + <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
712 713 <constraints>
713   - <constraint firstAttribute="height" constant="30" id="Siu-uN-x5b"/>
  714 + <constraint firstAttribute="height" constant="40" id="Siu-uN-x5b"/>
714 715 </constraints>
715 716 <state key="normal" title="退出登录">
716 717 <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -729,25 +730,25 @@
729 730 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
730 731 <constraints>
731 732 <constraint firstAttribute="bottom" secondItem="b1H-Ru-LCm" secondAttribute="bottom" constant="10" id="CNc-iw-Nuh"/>
732   - <constraint firstAttribute="trailing" secondItem="b1H-Ru-LCm" secondAttribute="trailing" constant="8" id="FPX-uT-Dca"/>
733   - <constraint firstItem="b1H-Ru-LCm" firstAttribute="leading" secondItem="vZR-tF-hRq" secondAttribute="leading" constant="16" id="lif-j8-7oK"/>
  733 + <constraint firstAttribute="trailing" secondItem="b1H-Ru-LCm" secondAttribute="trailing" constant="10" id="FPX-uT-Dca"/>
  734 + <constraint firstItem="b1H-Ru-LCm" firstAttribute="leading" secondItem="vZR-tF-hRq" secondAttribute="leading" constant="10" id="lif-j8-7oK"/>
734 735 </constraints>
735 736 </view>
736 737 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="a1N-wB-mTL">
737   - <rect key="frame" x="16" y="200" width="343" height="368"/>
  738 + <rect key="frame" x="10" y="200" width="355" height="368"/>
738 739 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
739 740 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
740 741 <view key="tableFooterView" contentMode="scaleToFill" id="3Fn-Rv-e1i">
741   - <rect key="frame" x="0.0" y="102" width="343" height="1"/>
  742 + <rect key="frame" x="0.0" y="102" width="355" height="1"/>
742 743 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
743 744 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
744 745 </view>
745 746 <prototypes>
746 747 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyTableViewCell" id="Mmu-jR-2O0" customClass="MyTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
747   - <rect key="frame" x="0.0" y="28" width="343" height="44"/>
  748 + <rect key="frame" x="0.0" y="28" width="355" height="44"/>
748 749 <autoresizingMask key="autoresizingMask"/>
749 750 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi">
750   - <rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
  751 + <rect key="frame" x="0.0" y="0.0" width="355" height="43.5"/>
751 752 <autoresizingMask key="autoresizingMask"/>
752 753 <subviews>
753 754 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_icon_orderMessage" translatesAutoresizingMaskIntoConstraints="NO" id="sh9-9Q-Xco">
... ... @@ -792,10 +793,10 @@
792 793 </connections>
793 794 </tableViewCell>
794 795 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
795   - <rect key="frame" x="0.0" y="72" width="343" height="30"/>
  796 + <rect key="frame" x="0.0" y="72" width="355" height="30"/>
796 797 <autoresizingMask key="autoresizingMask"/>
797 798 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g">
798   - <rect key="frame" x="0.0" y="0.0" width="343" height="29.5"/>
  799 + <rect key="frame" x="0.0" y="0.0" width="355" height="29.5"/>
799 800 <autoresizingMask key="autoresizingMask"/>
800 801 </tableViewCellContentView>
801 802 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
... ... @@ -817,10 +818,10 @@
817 818 <constraint firstItem="a1N-wB-mTL" firstAttribute="top" secondItem="Rmi-WH-7xV" secondAttribute="bottom" constant="8" id="dKW-8l-Tht"/>
818 819 <constraint firstItem="Rmi-WH-7xV" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" id="pZd-mJ-ACf"/>
819 820 <constraint firstItem="vZR-tF-hRq" firstAttribute="trailing" secondItem="EYK-6R-gmX" secondAttribute="trailing" id="qCq-PT-dV3"/>
820   - <constraint firstItem="EYK-6R-gmX" firstAttribute="trailing" secondItem="a1N-wB-mTL" secondAttribute="trailing" constant="16" id="qtY-RT-AYd"/>
  821 + <constraint firstItem="EYK-6R-gmX" firstAttribute="trailing" secondItem="a1N-wB-mTL" secondAttribute="trailing" constant="10" id="qtY-RT-AYd"/>
821 822 <constraint firstItem="vZR-tF-hRq" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" id="wvd-Qr-ft1"/>
822 823 <constraint firstItem="Rmi-WH-7xV" firstAttribute="trailing" secondItem="EYK-6R-gmX" secondAttribute="trailing" id="yZK-hv-21o"/>
823   - <constraint firstItem="a1N-wB-mTL" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" constant="16" id="zCA-1V-skA"/>
  824 + <constraint firstItem="a1N-wB-mTL" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" constant="10" id="zCA-1V-skA"/>
824 825 </constraints>
825 826 <viewLayoutGuide key="safeArea" id="EYK-6R-gmX"/>
826 827 </view>
... ... @@ -1107,7 +1108,9 @@
1107 1108 <scene sceneID="k70-QL-d6T">
1108 1109 <objects>
1109 1110 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="eER-h6-27H" customClass="MainViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
1110   - <tabBarItem key="tabBarItem" title="个人中心" image="my_bar_icon" selectedImage="my_bar_icon_select" id="Rn5-qq-H6e"/>
  1111 + <tabBarItem key="tabBarItem" title="个人中心" image="my_bar_icon" selectedImage="my_bar_icon_select" id="Rn5-qq-H6e">
  1112 + <color key="badgeColor" red="0.42745098039215684" green="0.54509803921568623" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  1113 + </tabBarItem>
1111 1114 <toolbarItems/>
1112 1115 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="faE-a1-9KB">
1113 1116 <rect key="frame" x="0.0" y="20" width="375" height="44"/>
... ... @@ -1149,4 +1152,5 @@
1149 1152 <image name="report_bar_icon" width="22" height="20"/>
1150 1153 <image name="report_bar_icon_select" width="22" height="20"/>
1151 1154 </resources>
  1155 + <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1152 1156 </document>
... ...