IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 88ceffe788d7ccd603490fe60e1273096621bf13

Authored by Cao yang
1 parent 2a5f317e
Exists in parentassistant

完善报告页面

Showing 12 changed files with 164 additions and 272 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @88ceffe
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift
  Diff comments   View file @88ceffe
... ... @@ -12,21 +12,28 @@ class ReportViewController: UIViewController {
12 12 var titleView:ReportHeaderView!//navigationBar自定义view
13 13 @IBOutlet weak var reportTable: UITableView!
14 14 @IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度
15   - @IBOutlet var calendarView: UIView!
16   - @IBOutlet weak var EmptyView: UIView!
  15 +// @IBOutlet var calendarView: UIView!
  16 + var EmptyView: UIView!
17 17 var dateView:LXCalendarView!
18 18 var dateAry:(weeks:[String],days:[String]) = ([],[])
19 19 override func viewDidLoad() {
20 20 super.viewDidLoad()
21 21  
22 22 //MARK: - 空白页面
  23 + EmptyView = UIView.init(frame: self.view.bounds)
  24 + EmptyView.backgroundColor = UIColor.white
23 25 self.EmptyView.isHidden = true
  26 + let imageV = UIImageView.init(frame: CGRect.init(x: 0, y: 80, width: screenWidth, height: screenWidth))
  27 + imageV.image = UIImage.init(named: "report_none_icon")
  28 + imageV.contentMode = UIViewContentMode.scaleAspectFit
  29 + EmptyView.addSubview(imageV)
  30 + self.view.addSubview(EmptyView)
24 31  
25   - if !self.EmptyView.isHidden {
  32 + if self.EmptyView.isHidden {
26 33 //设置顶部按钮
27 34 setupNavigationBar()
28 35 //设置日期页面
29   - setupDateView()
  36 +// setupDateView()
30 37 }
31 38 }
32 39 // MARK: - 设置顶部按钮
... ... @@ -59,29 +66,29 @@ class ReportViewController: UIViewController {
59 66 }
60 67 // MARK: - 设置日期页面
61 68 func setupDateView(){
62   - titleView.dateButton.setTitle("\(getCurrentDate())", for: UIControlState.normal)
63   - dateViewHeight.constant = getScreenWidth()/7
64   - //添加顶部固定一周日期
65   - dateAry = getCurrentWeeks()
66   - //添加日历
67   - dateView = LXCalendarView(frame: CGRect(x: 0, y: 0, width: screenWidth, height: screenWidth/2))
68   - dateView.isHaveAnimation = true
69   - dateView.isCanScroll = true
70   - dateView.isShowLastAndNextBtn = false
71   - dateView.isShowLastAndNextDate = true
72   -
73   - dateView.todayTitleColor = UIColor.red
74   - dateView.selectBackColor = UIColorFromRGB(0xC5DAFF)
75   - dateView.dealData()
76   - dateView.backgroundColor = UIColor.white
77   - calendarView.addSubview(dateView)
78   - dateView.selectBlock = { (year:NSInteger,month:NSInteger,day:NSInteger) -> () in
79   - self.calendarView.isHidden = true
80   - self.titleView.dateButton.setTitle("\(month)月\(day)日", for: UIControlState.normal)
81   - //选择日期后应隐藏日历并刷新界面
82   - appDelegate.window!.makeToast("\(year)年\(month)月\(day)日", duration: 2, position: CSToastPositionCenter)
83   -
84   - }
  69 +// titleView.dateButton.setTitle("\(getCurrentDate())", for: UIControlState.normal)
  70 +// dateViewHeight.constant = getScreenWidth()/7
  71 +// //添加顶部固定一周日期
  72 +// dateAry = getCurrentWeeks()
  73 +// //添加日历
  74 +// dateView = LXCalendarView(frame: CGRect(x: 0, y: 0, width: screenWidth, height: screenWidth/2))
  75 +// dateView.isHaveAnimation = true
  76 +// dateView.isCanScroll = true
  77 +// dateView.isShowLastAndNextBtn = false
  78 +// dateView.isShowLastAndNextDate = true
  79 +//
  80 +// dateView.todayTitleColor = UIColor.red
  81 +// dateView.selectBackColor = UIColorFromRGB(0xC5DAFF)
  82 +// dateView.dealData()
  83 +// dateView.backgroundColor = UIColor.white
  84 +// calendarView.addSubview(dateView)
  85 +// dateView.selectBlock = { (year:NSInteger,month:NSInteger,day:NSInteger) -> () in
  86 +// self.calendarView.isHidden = true
  87 +// self.titleView.dateButton.setTitle("\(month)月\(day)日", for: UIControlState.normal)
  88 +// //选择日期后应隐藏日历并刷新界面
  89 +// appDelegate.window!.makeToast("\(year)年\(month)月\(day)日", duration: 2, position: CSToastPositionCenter)
  90 +//
  91 +// }
85 92 }
86 93 // MARK: - 页面将要显示时替换navigation的titleView
87 94 override func viewWillAppear(_ animated: Bool) {
... ... @@ -89,7 +96,7 @@ class ReportViewController: UIViewController {
89 96 }
90 97 override func viewWillDisappear(_ animated: Bool) {
91 98 super.viewWillDisappear(animated)
92   - self.calendarView.isHidden = true
  99 +// self.calendarView.isHidden = true
93 100 }
94 101 override func viewDidLayoutSubviews() {
95 102 super.viewDidLayoutSubviews()
... ... @@ -134,12 +141,12 @@ extension ReportViewController: ReportHeaderViewDelegate{
134 141 appDelegate.window!.makeToast("该功能暂不开放", duration: 1, position: CSToastPositionCenter)
135 142 return
136 143  
137   - let isHidden = calendarView.isHidden
138   - if isHidden {
139   - calendarView.isHidden = false
140   - }else{
141   - calendarView.isHidden = true
142   - }
  144 +// let isHidden = calendarView.isHidden
  145 +// if isHidden {
  146 +// calendarView.isHidden = false
  147 +// }else{
  148 +// calendarView.isHidden = true
  149 +// }
143 150 }
144 151 //点击筛选
145 152 func selectTypeButton() {
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/Contents.json 0 → 100644
  Diff comments   View file @88ceffe
... ... @@ -0,0 +1,22 @@
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "idiom" : "universal",
  9 + "filename" : "reort_loop@2x.png",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "idiom" : "universal",
  14 + "filename" : "reort_loop@3x.png",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "version" : 1,
  20 + "author" : "xcode"
  21 + }
  22 +}
0 23 \ No newline at end of file
... ...
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@2x.png 0 → 100644
View file @88ceffe

7.52 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/report/reort_loop.imageset/reort_loop@3x.png 0 → 100644
View file @88ceffe

17.6 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/Contents.json
View file @2a5f317
... ... @@ -1,21 +0,0 @@
1   -{
2   - "images" : [
3   - {
4   - "idiom" : "universal",
5   - "filename" : "test001.png",
6   - "scale" : "1x"
7   - },
8   - {
9   - "idiom" : "universal",
10   - "scale" : "2x"
11   - },
12   - {
13   - "idiom" : "universal",
14   - "scale" : "3x"
15   - }
16   - ],
17   - "info" : {
18   - "version" : 1,
19   - "author" : "xcode"
20   - }
21   -}
22 0 \ No newline at end of file
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test001.imageset/test001.png
View file @2a5f317

41.3 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/Contents.json
View file @2a5f317
... ... @@ -1,21 +0,0 @@
1   -{
2   - "images" : [
3   - {
4   - "idiom" : "universal",
5   - "filename" : "test002.png",
6   - "scale" : "1x"
7   - },
8   - {
9   - "idiom" : "universal",
10   - "scale" : "2x"
11   - },
12   - {
13   - "idiom" : "universal",
14   - "scale" : "3x"
15   - }
16   - ],
17   - "info" : {
18   - "version" : 1,
19   - "author" : "xcode"
20   - }
21   -}
22 0 \ No newline at end of file
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test002.imageset/test002.png
View file @2a5f317

17 KB
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/Contents.json
View file @2a5f317
... ... @@ -1,21 +0,0 @@
1   -{
2   - "images" : [
3   - {
4   - "idiom" : "universal",
5   - "filename" : "test003.png",
6   - "scale" : "1x"
7   - },
8   - {
9   - "idiom" : "universal",
10   - "scale" : "2x"
11   - },
12   - {
13   - "idiom" : "universal",
14   - "scale" : "3x"
15   - }
16   - ],
17   - "info" : {
18   - "version" : 1,
19   - "author" : "xcode"
20   - }
21   -}
22 0 \ No newline at end of file
ParentAssistant/ParentAssistant/Supporting Files/Assets.xcassets/test003.imageset/test003.png
View file @2a5f317

85.5 KB
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @88ceffe
... ... @@ -267,7 +267,6 @@
267 267 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK">
268 268 <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
269 269 <subviews>
270   -
271 270 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo">
272 271 <rect key="frame" x="0.0" y="0.0" width="176" height="176"/>
273 272 </imageView>
... ... @@ -320,7 +319,6 @@
320 319 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r">
321 320 <rect key="frame" x="184" y="92" width="176" height="84"/>
322 321 <subviews>
323   -
324 322 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3">
325 323 <rect key="frame" x="0.0" y="0.0" width="176" height="84"/>
326 324 </imageView>
... ... @@ -374,7 +372,6 @@
374 372 <subviews>
375 373 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
376 374 <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
377   -
378 375 </imageView>
379 376 <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
380 377 <rect key="frame" x="8" y="48" width="70" height="28"/>
... ... @@ -558,14 +555,14 @@
558 555 <subviews>
559 556 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FXs-QS-gp4">
560 557 <rect key="frame" x="0.0" y="0.0" width="72" height="33"/>
561   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
562   - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
  558 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  559 + <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
563 560 <nil key="highlightedColor"/>
564 561 </label>
565 562 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YPT-sg-8nw">
566 563 <rect key="frame" x="0.0" y="33" width="72" height="33"/>
567   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
568   - <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
  564 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
  565 + <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
569 566 <nil key="highlightedColor"/>
570 567 </label>
571 568 </subviews>
... ... @@ -601,7 +598,7 @@
601 598 <rect key="frame" x="0.0" y="135" width="375" height="483"/>
602 599 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
603 600 <prototypes>
604   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  601 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MoralTableViewCell" rowHeight="280" id="mJ6-p0-1k0" customClass="MoralTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
605 602 <rect key="frame" x="0.0" y="28" width="375" height="280"/>
606 603 <autoresizingMask key="autoresizingMask"/>
607 604 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mJ6-p0-1k0" id="Krp-EU-pqh">
... ... @@ -615,54 +612,35 @@
615 612 <rect key="frame" x="0.0" y="0.0" width="355" height="40"/>
616 613 <color key="backgroundColor" red="0.22575283050537109" green="0.73064249753952026" blue="0.92262524366378784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
617 614 <constraints>
618   - <constraint firstAttribute="height" constant="40" id="vao-u3-nrN"/>
  615 + <constraint firstAttribute="height" constant="40" id="86l-fz-GKi"/>
619 616 </constraints>
620 617 </imageView>
621   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日德育报告" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dNY-T3-KgT">
622   - <rect key="frame" x="10" y="10" width="340" height="20"/>
623   - <constraints>
624   - <constraint firstAttribute="height" constant="20" id="Kec-F9-RAU"/>
625   - </constraints>
626   - <fontDescription key="fontDescription" type="system" pointSize="16"/>
  618 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日德育报告" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dNY-T3-KgT">
  619 + <rect key="frame" x="15" y="11" width="92" height="18"/>
  620 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
627 621 <color key="textColor" red="0.04523163015460873" green="0.032123999591391332" blue="0.1808375634517766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
628 622 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
629 623 </label>
630   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4gX-8b-M9A">
631   - <rect key="frame" x="20" y="80" width="100" height="40"/>
632   - <constraints>
633   - <constraint firstAttribute="height" constant="40" id="MCX-bJ-Z1s"/>
634   - <constraint firstAttribute="width" constant="100" id="z4C-q9-SXi"/>
635   - </constraints>
636   - <fontDescription key="fontDescription" type="system" pointSize="33"/>
  624 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.3分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4gX-8b-M9A">
  625 + <rect key="frame" x="42.5" y="60" width="75" height="36"/>
  626 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
637 627 <color key="textColor" red="0.19058823585510254" green="0.60524910688400269" blue="0.92507088184356689" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
638 628 <color key="highlightedColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
639 629 </label>
640   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wUi-ZH-dhv">
641   - <rect key="frame" x="235" y="80" width="100" height="40"/>
642   - <constraints>
643   - <constraint firstAttribute="height" constant="40" id="GxS-UM-DSr"/>
644   - <constraint firstAttribute="width" constant="100" id="v6j-vl-U9c"/>
645   - </constraints>
646   - <fontDescription key="fontDescription" type="system" pointSize="33"/>
  630 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第三名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wUi-ZH-dhv">
  631 + <rect key="frame" x="229.5" y="60" width="91" height="36"/>
  632 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
647 633 <color key="textColor" red="0.19807338714599609" green="0.57266002893447876" blue="0.92558294534683228" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
648 634 <nil key="highlightedColor"/>
649 635 </label>
650 636 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="获得 A- 评分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PWP-8j-cbc">
651   - <rect key="frame" x="10" y="140" width="120" height="30"/>
652   - <constraints>
653   - <constraint firstAttribute="height" constant="30" id="452-vE-TUK"/>
654   - <constraint firstAttribute="width" constant="120" id="wwF-5j-1Pi"/>
655   - </constraints>
  637 + <rect key="frame" x="29" y="136" width="102.5" height="21.5"/>
656 638 <fontDescription key="fontDescription" type="system" pointSize="18"/>
657 639 <color key="textColor" red="0.19807338714599609" green="0.57266002893447876" blue="0.92558294534683228" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
658 640 <nil key="highlightedColor"/>
659 641 </label>
660 642 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名次上升1名" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cGw-bV-7gl">
661   - <rect key="frame" x="225" y="140" width="120" height="30"/>
662   - <constraints>
663   - <constraint firstAttribute="height" constant="30" id="1Ak-gc-Q2s"/>
664   - <constraint firstAttribute="width" constant="120" id="GlJ-aa-3OB"/>
665   - </constraints>
  643 + <rect key="frame" x="225" y="136" width="100" height="21.5"/>
666 644 <fontDescription key="fontDescription" type="system" pointSize="18"/>
667 645 <color key="textColor" red="0.19807338714599609" green="0.57266002893447876" blue="0.92558294534683228" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
668 646 <nil key="highlightedColor"/>
... ... @@ -670,7 +648,7 @@
670 648 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="03月15日德育报告" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CBR-fL-Lkc">
671 649 <rect key="frame" x="20" y="210" width="315" height="30"/>
672 650 <constraints>
673   - <constraint firstAttribute="height" constant="30" id="Bxc-16-Hkk"/>
  651 + <constraint firstAttribute="height" constant="30" id="GnK-fl-olG"/>
674 652 </constraints>
675 653 <fontDescription key="fontDescription" type="system" pointSize="18"/>
676 654 <color key="textColor" red="0.09198654443025589" green="0.17189717292785645" blue="0.63014686107635498" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
... ... @@ -679,23 +657,23 @@
679 657 </subviews>
680 658 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
681 659 <constraints>
682   - <constraint firstAttribute="trailing" secondItem="V5l-Hg-MTd" secondAttribute="trailing" id="AtH-3F-P8F"/>
683   - <constraint firstItem="wUi-ZH-dhv" firstAttribute="top" secondItem="V5l-Hg-MTd" secondAttribute="bottom" constant="40" id="DHE-AF-3At"/>
684   - <constraint firstItem="PWP-8j-cbc" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="10" id="EMS-Wt-z06"/>
685   - <constraint firstAttribute="trailing" secondItem="wUi-ZH-dhv" secondAttribute="trailing" constant="20" id="GaA-KK-sxn"/>
686   - <constraint firstItem="PWP-8j-cbc" firstAttribute="top" secondItem="4gX-8b-M9A" secondAttribute="bottom" constant="20" id="H5Y-og-kRg"/>
687   - <constraint firstItem="4gX-8b-M9A" firstAttribute="top" secondItem="V5l-Hg-MTd" secondAttribute="bottom" constant="40" id="IMx-rh-Du6"/>
688   - <constraint firstAttribute="trailing" secondItem="dNY-T3-KgT" secondAttribute="trailing" constant="5" id="OeO-lc-NUj"/>
689   - <constraint firstItem="dNY-T3-KgT" firstAttribute="top" secondItem="0HF-X8-Jsz" secondAttribute="top" constant="10" id="Otd-7n-fAt"/>
690   - <constraint firstItem="V5l-Hg-MTd" firstAttribute="top" secondItem="0HF-X8-Jsz" secondAttribute="top" id="Sfp-io-rZj"/>
691   - <constraint firstItem="V5l-Hg-MTd" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" id="T1e-7w-Y9A"/>
692   - <constraint firstAttribute="trailing" secondItem="cGw-bV-7gl" secondAttribute="trailing" constant="10" id="daJ-5g-6cc"/>
693   - <constraint firstItem="cGw-bV-7gl" firstAttribute="top" secondItem="wUi-ZH-dhv" secondAttribute="bottom" constant="20" id="dkw-MB-uEt"/>
694   - <constraint firstItem="dNY-T3-KgT" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="10" id="hsl-CU-XTZ"/>
695   - <constraint firstItem="CBR-fL-Lkc" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="20" id="qbF-bC-Vnp"/>
696   - <constraint firstAttribute="trailing" secondItem="CBR-fL-Lkc" secondAttribute="trailing" constant="20" id="rz1-hD-ojm"/>
697   - <constraint firstItem="4gX-8b-M9A" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="20" id="t4e-2b-zdl"/>
698   - <constraint firstItem="CBR-fL-Lkc" firstAttribute="top" secondItem="PWP-8j-cbc" secondAttribute="bottom" constant="40" id="znj-d1-Z4k"/>
  660 + <constraint firstAttribute="bottom" secondItem="CBR-fL-Lkc" secondAttribute="bottom" constant="30" id="2Fi-tI-Skb"/>
  661 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="dNY-T3-KgT" secondAttribute="trailing" constant="20" symbolic="YES" id="2a7-Iq-MQu"/>
  662 + <constraint firstItem="dNY-T3-KgT" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="15" id="4pU-WL-A1O"/>
  663 + <constraint firstItem="V5l-Hg-MTd" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" id="82F-vi-Z4g"/>
  664 + <constraint firstItem="wUi-ZH-dhv" firstAttribute="centerX" secondItem="0HF-X8-Jsz" secondAttribute="trailing" constant="-80" id="C1J-qN-0U9"/>
  665 + <constraint firstItem="4gX-8b-M9A" firstAttribute="top" secondItem="0HF-X8-Jsz" secondAttribute="top" constant="60" id="CVe-hZ-ePn"/>
  666 + <constraint firstItem="wUi-ZH-dhv" firstAttribute="top" secondItem="0HF-X8-Jsz" secondAttribute="top" constant="60" id="Ken-GD-CEe"/>
  667 + <constraint firstAttribute="trailing" secondItem="CBR-fL-Lkc" secondAttribute="trailing" constant="20" id="Kti-Th-EkC"/>
  668 + <constraint firstItem="V5l-Hg-MTd" firstAttribute="top" secondItem="0HF-X8-Jsz" secondAttribute="top" id="Pnq-o3-1mX"/>
  669 + <constraint firstItem="PWP-8j-cbc" firstAttribute="top" secondItem="4gX-8b-M9A" secondAttribute="bottom" constant="40" id="S5u-HX-RiG"/>
  670 + <constraint firstItem="4gX-8b-M9A" firstAttribute="centerX" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="80" id="Ul9-i7-fGH"/>
  671 + <constraint firstItem="PWP-8j-cbc" firstAttribute="centerX" secondItem="4gX-8b-M9A" secondAttribute="centerX" id="XBP-VX-Hl1"/>
  672 + <constraint firstItem="CBR-fL-Lkc" firstAttribute="leading" secondItem="0HF-X8-Jsz" secondAttribute="leading" constant="20" id="aJx-z4-vez"/>
  673 + <constraint firstItem="cGw-bV-7gl" firstAttribute="top" secondItem="wUi-ZH-dhv" secondAttribute="bottom" constant="40" id="iUI-FG-xPg"/>
  674 + <constraint firstAttribute="trailing" secondItem="V5l-Hg-MTd" secondAttribute="trailing" id="mbf-gO-Lfv"/>
  675 + <constraint firstItem="cGw-bV-7gl" firstAttribute="centerX" secondItem="wUi-ZH-dhv" secondAttribute="centerX" id="r8e-MC-UEA"/>
  676 + <constraint firstItem="dNY-T3-KgT" firstAttribute="centerY" secondItem="V5l-Hg-MTd" secondAttribute="centerY" id="rtP-SS-W8g"/>
699 677 </constraints>
700 678 <userDefinedRuntimeAttributes>
701 679 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
... ... @@ -717,7 +695,7 @@
717 695 <segue destination="aZ0-4x-DE7" kind="show" id="W8C-3m-iNT"/>
718 696 </connections>
719 697 </tableViewCell>
720   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="TaskPresentationTableViewCell" rowHeight="280" id="QrW-E0-jjq" customClass="TaskPresentationTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  698 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="TaskPresentationTableViewCell" rowHeight="280" id="QrW-E0-jjq" customClass="TaskPresentationTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
721 699 <rect key="frame" x="0.0" y="308" width="375" height="280"/>
722 700 <autoresizingMask key="autoresizingMask"/>
723 701 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QrW-E0-jjq" id="UXM-6n-Q33">
... ... @@ -725,102 +703,96 @@
725 703 <autoresizingMask key="autoresizingMask"/>
726 704 <subviews>
727 705 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vso-JF-Ww0">
728   - <rect key="frame" x="10" y="10" width="355" height="270"/>
  706 + <rect key="frame" x="10" y="10" width="355" height="295"/>
729 707 <subviews>
730 708 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_headerView_backgroundimageView" translatesAutoresizingMaskIntoConstraints="NO" id="Z77-xu-LHM">
731 709 <rect key="frame" x="0.0" y="0.0" width="355" height="40"/>
732 710 <constraints>
733   - <constraint firstAttribute="height" constant="40" id="MzB-kc-RPS"/>
  711 + <constraint firstAttribute="height" constant="40" id="VsI-Ft-4DK"/>
734 712 </constraints>
735 713 </imageView>
736 714 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数学作业报告" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W0L-8T-0zh">
737   - <rect key="frame" x="10" y="10" width="335" height="20"/>
738   - <constraints>
739   - <constraint firstAttribute="height" constant="20" id="oKh-jM-OZ3"/>
740   - </constraints>
741   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
  715 + <rect key="frame" x="15" y="11" width="92" height="18"/>
  716 + <fontDescription key="fontDescription" type="system" pointSize="15"/>
742 717 <color key="textColor" red="0.77415133248730961" green="0.070829752761192535" blue="0.066752926169606611" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
743 718 <nil key="highlightedColor"/>
744 719 </label>
745 720 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7dP-yT-g1U">
746   - <rect key="frame" x="10" y="50" width="50" height="30"/>
747   - <constraints>
748   - <constraint firstAttribute="width" constant="50" id="Ymk-LI-4ek"/>
749   - <constraint firstAttribute="height" constant="30" id="c0L-By-LsG"/>
750   - </constraints>
751   - <fontDescription key="fontDescription" type="system" pointSize="28"/>
752   - <color key="textColor" red="0.49447929860000001" green="0.88061642650000005" blue="0.54534155129999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  721 + <rect key="frame" x="15" y="61" width="31.5" height="36"/>
  722 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
  723 + <color key="textColor" red="0.40000000000000002" green="0.73333333333333328" blue="0.41568627450980389" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
753 724 <nil key="highlightedColor"/>
754 725 </label>
755 726 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正确" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G6F-ic-fQz">
756   - <rect key="frame" x="10" y="85" width="50" height="20"/>
757   - <constraints>
758   - <constraint firstAttribute="width" constant="50" id="52i-d8-H7g"/>
759   - <constraint firstAttribute="height" constant="20" id="nJB-2O-v0I"/>
760   - </constraints>
  727 + <rect key="frame" x="16" y="99" width="31" height="18"/>
761 728 <fontDescription key="fontDescription" type="system" pointSize="15"/>
762   - <color key="textColor" red="0.49447929860000001" green="0.88061642650000005" blue="0.54534155129999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  729 + <color key="textColor" red="0.40000000000000002" green="0.73333333333333328" blue="0.41568627450980389" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
763 730 <nil key="highlightedColor"/>
764 731 </label>
765 732 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gde-QC-UfD">
766   - <rect key="frame" x="295" y="50" width="50" height="30"/>
767   - <constraints>
768   - <constraint firstAttribute="height" constant="30" id="46A-it-CDg"/>
769   - <constraint firstAttribute="width" constant="50" id="YLm-fm-iS3"/>
770   - </constraints>
771   - <fontDescription key="fontDescription" type="system" pointSize="28"/>
772   - <color key="textColor" red="0.77415133250000001" green="0.070829752760000003" blue="0.066752926170000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  733 + <rect key="frame" x="321" y="61" width="19" height="36"/>
  734 + <fontDescription key="fontDescription" type="system" pointSize="30"/>
  735 + <color key="textColor" red="0.93725490196078431" green="0.32549019607843138" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
773 736 <nil key="highlightedColor"/>
774 737 </label>
775 738 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="错误" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fpK-WX-UjI">
776   - <rect key="frame" x="295" y="85" width="50" height="20"/>
777   - <constraints>
778   - <constraint firstAttribute="height" constant="20" id="vKe-GR-0i3"/>
779   - <constraint firstAttribute="width" constant="50" id="vpQ-Ym-bq8"/>
780   - </constraints>
  739 + <rect key="frame" x="315" y="99" width="31" height="18"/>
781 740 <fontDescription key="fontDescription" type="system" pointSize="15"/>
782   - <color key="textColor" red="0.77415133250000001" green="0.070829752760000003" blue="0.066752926170000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  741 + <color key="textColor" red="0.93725490196078431" green="0.32549019607843138" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
783 742 <nil key="highlightedColor"/>
784 743 </label>
785 744 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3月4日数学作业" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NNE-hq-DVJ">
786   - <rect key="frame" x="10" y="240" width="335" height="20"/>
  745 + <rect key="frame" x="10" y="265" width="335" height="20"/>
787 746 <constraints>
788   - <constraint firstAttribute="height" constant="20" id="Mk2-l4-zRK"/>
  747 + <constraint firstAttribute="height" constant="20" id="WBe-CF-jyo"/>
789 748 </constraints>
790 749 <fontDescription key="fontDescription" type="system" pointSize="16"/>
791 750 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
792 751 <nil key="highlightedColor"/>
793 752 </label>
794   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dc0-gU-CYb">
795   - <rect key="frame" x="80" y="60" width="195" height="170"/>
796   - <fontDescription key="fontDescription" type="system" pointSize="17"/>
797   - <nil key="textColor"/>
798   - <nil key="highlightedColor"/>
799   - </label>
  753 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ySn-5I-wc2">
  754 + <rect key="frame" x="70" y="70" width="215" height="175"/>
  755 + <subviews>
  756 + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="reort_loop" translatesAutoresizingMaskIntoConstraints="NO" id="rf8-24-VQh">
  757 + <rect key="frame" x="0.0" y="0.0" width="215" height="165"/>
  758 + <constraints>
  759 + <constraint firstAttribute="width" secondItem="rf8-24-VQh" secondAttribute="height" multiplier="30:23" id="qTY-hW-T02"/>
  760 + </constraints>
  761 + </imageView>
  762 + </subviews>
  763 + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
  764 + <constraints>
  765 + <constraint firstAttribute="bottom" secondItem="rf8-24-VQh" secondAttribute="bottom" constant="10" id="51q-ed-zxD"/>
  766 + <constraint firstAttribute="trailing" secondItem="rf8-24-VQh" secondAttribute="trailing" id="CB0-MW-TjK"/>
  767 + <constraint firstItem="rf8-24-VQh" firstAttribute="leading" secondItem="ySn-5I-wc2" secondAttribute="leading" id="MIo-20-4VD"/>
  768 + <constraint firstItem="rf8-24-VQh" firstAttribute="centerX" secondItem="ySn-5I-wc2" secondAttribute="centerX" id="N54-jN-qb1"/>
  769 + <constraint firstItem="rf8-24-VQh" firstAttribute="top" secondItem="ySn-5I-wc2" secondAttribute="top" id="lcL-7D-aJL"/>
  770 + </constraints>
  771 + </view>
800 772 </subviews>
801 773 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
802 774 <constraints>
803   - <constraint firstItem="fpK-WX-UjI" firstAttribute="leading" secondItem="Dc0-gU-CYb" secondAttribute="trailing" constant="20" id="1Nq-uw-3aI"/>
804   - <constraint firstItem="Dc0-gU-CYb" firstAttribute="leading" secondItem="G6F-ic-fQz" secondAttribute="trailing" constant="20" id="2pF-Xb-v6B"/>
805   - <constraint firstAttribute="trailing" secondItem="Z77-xu-LHM" secondAttribute="trailing" id="4UQ-wV-o1F"/>
806   - <constraint firstItem="fpK-WX-UjI" firstAttribute="top" secondItem="gde-QC-UfD" secondAttribute="bottom" constant="5" id="8hB-0u-Etj"/>
807   - <constraint firstItem="Z77-xu-LHM" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" id="DXQ-3B-hJY"/>
808   - <constraint firstItem="gde-QC-UfD" firstAttribute="top" secondItem="Z77-xu-LHM" secondAttribute="bottom" constant="10" id="GM6-0x-jkC"/>
809   - <constraint firstItem="W0L-8T-0zh" firstAttribute="top" secondItem="vso-JF-Ww0" secondAttribute="top" constant="10" id="N0O-Vk-cV6"/>
810   - <constraint firstAttribute="trailing" secondItem="W0L-8T-0zh" secondAttribute="trailing" constant="10" id="Nl5-Bz-Xeq"/>
811   - <constraint firstItem="NNE-hq-DVJ" firstAttribute="top" secondItem="Dc0-gU-CYb" secondAttribute="bottom" constant="10" id="Pk2-Tp-KTI"/>
812   - <constraint firstItem="W0L-8T-0zh" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="10" id="TPx-u0-wV7"/>
813   - <constraint firstAttribute="trailing" secondItem="fpK-WX-UjI" secondAttribute="trailing" constant="10" id="VZc-Tf-iJ1"/>
814   - <constraint firstItem="NNE-hq-DVJ" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="10" id="Y7x-kz-pvp"/>
815   - <constraint firstItem="Z77-xu-LHM" firstAttribute="top" secondItem="vso-JF-Ww0" secondAttribute="top" id="aJW-Hd-URU"/>
816   - <constraint firstItem="7dP-yT-g1U" firstAttribute="top" secondItem="Z77-xu-LHM" secondAttribute="bottom" constant="10" id="gPS-jP-RHb"/>
817   - <constraint firstAttribute="trailing" secondItem="NNE-hq-DVJ" secondAttribute="trailing" constant="10" id="gfr-Xy-PQH"/>
818   - <constraint firstItem="G6F-ic-fQz" firstAttribute="top" secondItem="7dP-yT-g1U" secondAttribute="bottom" constant="5" id="jBl-xT-dHF"/>
819   - <constraint firstAttribute="trailing" secondItem="gde-QC-UfD" secondAttribute="trailing" constant="10" id="kwi-HL-DYx"/>
820   - <constraint firstItem="G6F-ic-fQz" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="10" id="rL8-Kq-uhH"/>
821   - <constraint firstAttribute="bottom" secondItem="NNE-hq-DVJ" secondAttribute="bottom" constant="10" id="vSg-Ys-NcD"/>
822   - <constraint firstItem="Dc0-gU-CYb" firstAttribute="top" secondItem="Z77-xu-LHM" secondAttribute="bottom" constant="20" id="xk1-Ta-U9p"/>
823   - <constraint firstItem="7dP-yT-g1U" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="10" id="zgP-Cm-W0H"/>
  775 + <constraint firstItem="NNE-hq-DVJ" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="10" id="22b-R8-RiA"/>
  776 + <constraint firstItem="ySn-5I-wc2" firstAttribute="top" secondItem="Z77-xu-LHM" secondAttribute="bottom" constant="30" id="68w-TH-V2K"/>
  777 + <constraint firstAttribute="bottom" secondItem="NNE-hq-DVJ" secondAttribute="bottom" constant="10" id="B9K-GK-wuK"/>
  778 + <constraint firstItem="7dP-yT-g1U" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="15" id="DFb-DT-xvn"/>
  779 + <constraint firstItem="W0L-8T-0zh" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="15" id="Gdb-en-kvN"/>
  780 + <constraint firstItem="NNE-hq-DVJ" firstAttribute="top" secondItem="ySn-5I-wc2" secondAttribute="bottom" constant="20" id="GgR-Px-Cmk"/>
  781 + <constraint firstItem="G6F-ic-fQz" firstAttribute="centerX" secondItem="7dP-yT-g1U" secondAttribute="centerX" id="Ifk-6r-xCM"/>
  782 + <constraint firstItem="W0L-8T-0zh" firstAttribute="centerY" secondItem="Z77-xu-LHM" secondAttribute="centerY" id="MSy-5q-jdh"/>
  783 + <constraint firstAttribute="trailing" secondItem="ySn-5I-wc2" secondAttribute="trailing" constant="70" id="Nx9-lq-mCG"/>
  784 + <constraint firstItem="fpK-WX-UjI" firstAttribute="centerX" secondItem="gde-QC-UfD" secondAttribute="centerX" id="RRo-R4-iQu"/>
  785 + <constraint firstAttribute="trailing" secondItem="Z77-xu-LHM" secondAttribute="trailing" id="St6-Dr-Ydw"/>
  786 + <constraint firstItem="fpK-WX-UjI" firstAttribute="centerY" secondItem="G6F-ic-fQz" secondAttribute="centerY" id="ZgL-mF-atH"/>
  787 + <constraint firstItem="7dP-yT-g1U" firstAttribute="centerY" secondItem="vso-JF-Ww0" secondAttribute="top" constant="79" id="ag7-vy-ef3"/>
  788 + <constraint firstItem="Z77-xu-LHM" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" id="fc8-7b-7wd"/>
  789 + <constraint firstItem="gde-QC-UfD" firstAttribute="centerY" secondItem="7dP-yT-g1U" secondAttribute="centerY" id="gNp-Yk-KY1"/>
  790 + <constraint firstItem="ySn-5I-wc2" firstAttribute="leading" secondItem="vso-JF-Ww0" secondAttribute="leading" constant="70" id="iwG-zO-Win"/>
  791 + <constraint firstItem="gde-QC-UfD" firstAttribute="trailing" secondItem="vso-JF-Ww0" secondAttribute="trailing" constant="-15" id="lfi-AV-eav"/>
  792 + <constraint firstAttribute="trailing" secondItem="NNE-hq-DVJ" secondAttribute="trailing" constant="10" id="mRW-CR-8Bi"/>
  793 + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="W0L-8T-0zh" secondAttribute="trailing" constant="20" symbolic="YES" id="oQ6-V1-YoW"/>
  794 + <constraint firstItem="G6F-ic-fQz" firstAttribute="top" secondItem="7dP-yT-g1U" secondAttribute="centerY" constant="20" id="ohu-wJ-w9z"/>
  795 + <constraint firstItem="Z77-xu-LHM" firstAttribute="top" secondItem="vso-JF-Ww0" secondAttribute="top" id="zcc-Ei-Da5"/>
824 796 </constraints>
825 797 <userDefinedRuntimeAttributes>
826 798 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
... ... @@ -839,9 +811,6 @@
839 811 </constraints>
840 812 </tableViewCellContentView>
841 813 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
842   - <connections>
843   - <outlet property="layerLabel" destination="Dc0-gU-CYb" id="SIh-Ga-1Gq"/>
844   - </connections>
845 814 </tableViewCell>
846 815 </prototypes>
847 816 <connections>
... ... @@ -849,62 +818,21 @@
849 818 <outlet property="delegate" destination="oqH-t7-mJp" id="M6s-DX-lrO"/>
850 819 </connections>
851 820 </tableView>
852   - <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hwJ-Xg-tKm">
853   - <rect key="frame" x="0.0" y="64" width="375" height="603"/>
854   - <subviews>
855   - <view alpha="0.10000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wGp-kr-l5S">
856   - <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
857   - <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
858   - </view>
859   - </subviews>
860   - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
861   - <constraints>
862   - <constraint firstItem="wGp-kr-l5S" firstAttribute="leading" secondItem="hwJ-Xg-tKm" secondAttribute="leading" id="K1b-Vt-oAG"/>
863   - <constraint firstAttribute="trailing" secondItem="wGp-kr-l5S" secondAttribute="trailing" id="as9-8h-QNq"/>
864   - <constraint firstItem="wGp-kr-l5S" firstAttribute="top" secondItem="hwJ-Xg-tKm" secondAttribute="top" id="glZ-PR-EXl"/>
865   - <constraint firstAttribute="bottom" secondItem="wGp-kr-l5S" secondAttribute="bottom" id="p0u-d2-Uig"/>
866   - </constraints>
867   - </view>
868   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A43-XP-A41">
869   - <rect key="frame" x="0.0" y="64" width="375" height="554"/>
870   - <subviews>
871   - <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="report_none_icon" translatesAutoresizingMaskIntoConstraints="NO" id="UQe-Gr-lR7">
872   - <rect key="frame" x="0.0" y="0.0" width="375" height="554"/>
873   - </imageView>
874   - </subviews>
875   - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
876   - <constraints>
877   - <constraint firstItem="UQe-Gr-lR7" firstAttribute="leading" secondItem="A43-XP-A41" secondAttribute="leading" id="IUB-AR-Uxa"/>
878   - <constraint firstAttribute="trailing" secondItem="UQe-Gr-lR7" secondAttribute="trailing" id="JhX-yG-EaC"/>
879   - <constraint firstItem="UQe-Gr-lR7" firstAttribute="top" secondItem="A43-XP-A41" secondAttribute="top" id="Uj3-Gn-cME"/>
880   - <constraint firstAttribute="bottom" secondItem="UQe-Gr-lR7" secondAttribute="bottom" id="aTh-Mz-V0s"/>
881   - </constraints>
882   - </view>
883 821 </subviews>
884 822 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
885 823 <constraints>
886   - <constraint firstItem="hwJ-Xg-tKm" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="5Q0-Yi-ShV"/>
887   - <constraint firstItem="hwJ-Xg-tKm" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="61Z-vW-5DV"/>
888   - <constraint firstItem="A43-XP-A41" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="Iba-zi-BPh"/>
889 824 <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="JYY-zh-cHV"/>
890 825 <constraint firstItem="k9z-2G-Fhx" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="JtI-9e-igF"/>
891 826 <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="MzB-kU-gbs"/>
892 827 <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="NPL-F1-7Sg"/>
893   - <constraint firstItem="A43-XP-A41" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="NsR-AG-Nxb"/>
894 828 <constraint firstItem="k9z-2G-Fhx" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="QZG-IF-A8F"/>
895 829 <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="k9z-2G-Fhx" secondAttribute="bottom" constant="5" id="SBe-2c-H4J"/>
896   - <constraint firstItem="A43-XP-A41" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="ShD-0u-kTc"/>
897 830 <constraint firstItem="k9z-2G-Fhx" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="UIi-qU-PBc"/>
898   - <constraint firstAttribute="bottom" secondItem="hwJ-Xg-tKm" secondAttribute="bottom" id="YjS-6f-Gk9"/>
899   - <constraint firstItem="A43-XP-A41" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="hu6-HC-sc0"/>
900   - <constraint firstItem="hwJ-Xg-tKm" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="sNr-ZT-Lsy"/>
901 831 </constraints>
902 832 <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/>
903 833 </view>
904 834 <navigationItem key="navigationItem" id="dVv-mJ-714"/>
905 835 <connections>
906   - <outlet property="EmptyView" destination="A43-XP-A41" id="Lox-11-PF1"/>
907   - <outlet property="calendarView" destination="hwJ-Xg-tKm" id="ukq-Ul-bvj"/>
908 836 <outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/>
909 837 <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/>
910 838 </connections>
... ... @@ -925,7 +853,7 @@
925 853 <rect key="frame" x="0.0" y="64" width="375" height="544"/>
926 854 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
927 855 <prototypes>
928   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  856 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="moralDetail" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="moralDetail" rowHeight="280" id="edU-Xp-UQN" customClass="MoralDetailCell" customModule="ParentAssistant" customModuleProvider="target">
929 857 <rect key="frame" x="0.0" y="28" width="375" height="280"/>
930 858 <autoresizingMask key="autoresizingMask"/>
931 859 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="edU-Xp-UQN" id="jbp-VT-wz9">
... ... @@ -1049,7 +977,7 @@
1049 977 <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/>
1050 978 </connections>
1051 979 </tableViewCell>
1052   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd" customClass="EducationDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  980 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="educationDetail" rowHeight="280" id="cT9-nd-Syd" customClass="EducationDetailCell" customModule="ParentAssistant" customModuleProvider="target">
1053 981 <rect key="frame" x="0.0" y="308" width="375" height="280"/>
1054 982 <autoresizingMask key="autoresizingMask"/>
1055 983 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cT9-nd-Syd" id="GQz-Gg-SDo">
... ... @@ -1139,7 +1067,7 @@
1139 1067 <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/>
1140 1068 </connections>
1141 1069 </tableViewCell>
1142   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7" customClass="BehaviorDetailCell" customModule="ParentAssistant" customModuleProvider="target">
  1070 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="behaviorDetail" rowHeight="100" id="LSs-xC-on7" customClass="BehaviorDetailCell" customModule="ParentAssistant" customModuleProvider="target">
1143 1071 <rect key="frame" x="0.0" y="588" width="375" height="100"/>
1144 1072 <autoresizingMask key="autoresizingMask"/>
1145 1073 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LSs-xC-on7" id="g4b-AE-z0B">
... ... @@ -1147,7 +1075,7 @@
1147 1075 <autoresizingMask key="autoresizingMask"/>
1148 1076 <subviews>
1149 1077 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Qp-zh-xwy">
1150   - <rect key="frame" x="10" y="10" width="394" height="89.5"/>
  1078 + <rect key="frame" x="10" y="10" width="355" height="89.5"/>
1151 1079 <subviews>
1152 1080 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绩点: 4.3 增长1.1分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOj-hC-AHs">
1153 1081 <rect key="frame" x="10" y="38" width="104" height="14.5"/>
... ... @@ -1156,13 +1084,13 @@
1156 1084 <nil key="highlightedColor"/>
1157 1085 </label>
1158 1086 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A-" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dcR-3E-z4e">
1159   - <rect key="frame" x="367.5" y="10" width="16.5" height="18"/>
  1087 + <rect key="frame" x="328.5" y="10" width="16.5" height="18"/>
1160 1088 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1161 1089 <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1162 1090 <nil key="highlightedColor"/>
1163 1091 </label>
1164 1092 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排名:第三名 增长1名" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pKi-l3-fED">
1165   - <rect key="frame" x="273" y="38" width="111" height="14.5"/>
  1093 + <rect key="frame" x="234" y="38" width="111" height="14.5"/>
1166 1094 <fontDescription key="fontDescription" type="system" pointSize="12"/>
1167 1095 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1168 1096 <nil key="highlightedColor"/>
... ... @@ -1780,7 +1708,7 @@
1780 1708 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1781 1709 </view>
1782 1710 <prototypes>
1783   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyTableViewCell" id="Mmu-jR-2O0" customClass="MyTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
  1711 + <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">
1784 1712 <rect key="frame" x="0.0" y="28" width="343" height="44"/>
1785 1713 <autoresizingMask key="autoresizingMask"/>
1786 1714 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi">
... ... @@ -1828,7 +1756,7 @@
1828 1756 <outlet property="newLabel" destination="Cgm-Km-mZE" id="ZPq-dp-KUH"/>
1829 1757 </connections>
1830 1758 </tableViewCell>
1831   - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
  1759 + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
1832 1760 <rect key="frame" x="0.0" y="72" width="343" height="30"/>
1833 1761 <autoresizingMask key="autoresizingMask"/>
1834 1762 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g">
... ... @@ -2166,9 +2094,7 @@
2166 2094 <image name="Information_bar_icon_select" width="22" height="20"/>
2167 2095 <image name="evaluation_bar_icon" width="22" height="21"/>
2168 2096 <image name="evaluation_bar_icon_select" width="22" height="21"/>
2169   - <image name="evaluation_icon_activite1" width="200" height="300"/>
2170 2097 <image name="evaluation_icon_activite2" width="200" height="100"/>
2171   - <image name="evaluation_icon_activite3" width="200" height="100"/>
2172 2098 <image name="evaluation_icon_camera" width="32" height="32"/>
2173 2099 <image name="evaluation_icon_detection_back" width="150" height="140"/>
2174 2100 <image name="evaluation_icon_learningManagement" width="45" height="47"/>
... ... @@ -2183,9 +2109,9 @@
2183 2109 <image name="my_icon_currentInfo" width="9" height="16"/>
2184 2110 <image name="my_icon_orderMessage" width="14" height="19"/>
2185 2111 <image name="navigationBar_backgrounImage" width="375" height="139"/>
  2112 + <image name="reort_loop" width="150" height="115"/>
2186 2113 <image name="report_bar_icon" width="22" height="20"/>
2187 2114 <image name="report_bar_icon_select" width="22" height="20"/>
2188   - <image name="report_none_icon" width="250" height="250"/>
2189 2115 <image name="report_teacher" width="130" height="155"/>
2190 2116 </resources>
2191 2117 </document>
... ...