Commit a414eb79cc55937b7842cc80ee96dbe627edf771
1 parent
c725fa81
Exists in
parentassistant
no message
Showing
4 changed files
with
23 additions
and
22 deletions
Show diff stats
ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
| @@ -29,6 +29,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec | @@ -29,6 +29,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec | ||
| 29 | override func viewDidLoad() { | 29 | override func viewDidLoad() { |
| 30 | super.viewDidLoad() | 30 | super.viewDidLoad() |
| 31 | self.navigationItem.title = "慧测慧练" | 31 | self.navigationItem.title = "慧测慧练" |
| 32 | + self.navigationController?.navigationBar.tintColor=UIColor.white | ||
| 32 | addLeftBarBtn() | 33 | addLeftBarBtn() |
| 33 | locationAction() | 34 | locationAction() |
| 34 | addBottomBtn() | 35 | addBottomBtn() |
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
| @@ -589,7 +589,7 @@ | @@ -589,7 +589,7 @@ | ||
| 589 | <color key="textColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 589 | <color key="textColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 590 | <nil key="highlightedColor"/> | 590 | <nil key="highlightedColor"/> |
| 591 | </label> | 591 | </label> |
| 592 | - <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请设置密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx"> | 592 | + <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx"> |
| 593 | <rect key="frame" x="8" y="39" width="298" height="30"/> | 593 | <rect key="frame" x="8" y="39" width="298" height="30"/> |
| 594 | <constraints> | 594 | <constraints> |
| 595 | <constraint firstAttribute="height" constant="30" id="Idr-wo-mVx"/> | 595 | <constraint firstAttribute="height" constant="30" id="Idr-wo-mVx"/> |
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
| @@ -267,8 +267,7 @@ | @@ -267,8 +267,7 @@ | ||
| 267 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> | 267 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> |
| 268 | <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 268 | <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> |
| 269 | <subviews> | 269 | <subviews> |
| 270 | - | ||
| 271 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> | 270 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite1" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> |
| 272 | <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 271 | <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> |
| 273 | </imageView> | 272 | </imageView> |
| 274 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> | 273 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> |
| @@ -282,7 +281,7 @@ | @@ -282,7 +281,7 @@ | ||
| 282 | </state> | 281 | </state> |
| 283 | </button> | 282 | </button> |
| 284 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6"> | 283 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6"> |
| 285 | - <rect key="frame" x="8" y="113.5" width="61.5" height="18"/> | 284 | + <rect key="frame" x="8" y="113.5" width="160" height="18"/> |
| 286 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 285 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 287 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 286 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 288 | <nil key="highlightedColor"/> | 287 | <nil key="highlightedColor"/> |
| @@ -301,6 +300,7 @@ | @@ -301,6 +300,7 @@ | ||
| 301 | <constraint firstItem="O7r-js-8BI" firstAttribute="top" secondItem="LRo-YD-6S6" secondAttribute="bottom" constant="8" id="6hq-9D-QOl"/> | 300 | <constraint firstItem="O7r-js-8BI" firstAttribute="top" secondItem="LRo-YD-6S6" secondAttribute="bottom" constant="8" id="6hq-9D-QOl"/> |
| 302 | <constraint firstAttribute="width" secondItem="kkx-lN-sfK" secondAttribute="height" multiplier="1:1" id="HW0-lf-ojc"/> | 301 | <constraint firstAttribute="width" secondItem="kkx-lN-sfK" secondAttribute="height" multiplier="1:1" id="HW0-lf-ojc"/> |
| 303 | <constraint firstItem="Jql-zY-Zqo" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="Jyr-dl-P9R"/> | 302 | <constraint firstItem="Jql-zY-Zqo" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="Jyr-dl-P9R"/> |
| 303 | + <constraint firstAttribute="trailing" secondItem="LRo-YD-6S6" secondAttribute="trailing" constant="8" id="K6d-Nh-GuN"/> | ||
| 304 | <constraint firstAttribute="trailing" secondItem="Jql-zY-Zqo" secondAttribute="trailing" id="MEc-va-pgf"/> | 304 | <constraint firstAttribute="trailing" secondItem="Jql-zY-Zqo" secondAttribute="trailing" id="MEc-va-pgf"/> |
| 305 | <constraint firstItem="Xml-PN-wWh" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="X1z-gM-jWu"/> | 305 | <constraint firstItem="Xml-PN-wWh" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="X1z-gM-jWu"/> |
| 306 | <constraint firstItem="Jql-zY-Zqo" firstAttribute="top" secondItem="kkx-lN-sfK" secondAttribute="top" id="Zi5-eI-CED"/> | 306 | <constraint firstItem="Jql-zY-Zqo" firstAttribute="top" secondItem="kkx-lN-sfK" secondAttribute="top" id="Zi5-eI-CED"/> |
| @@ -320,8 +320,7 @@ | @@ -320,8 +320,7 @@ | ||
| 320 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> | 320 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> |
| 321 | <rect key="frame" x="184" y="92" width="176" height="84"/> | 321 | <rect key="frame" x="184" y="92" width="176" height="84"/> |
| 322 | <subviews> | 322 | <subviews> |
| 323 | - | ||
| 324 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> | 323 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> |
| 325 | <rect key="frame" x="0.0" y="0.0" width="176" height="84"/> | 324 | <rect key="frame" x="0.0" y="0.0" width="176" height="84"/> |
| 326 | </imageView> | 325 | </imageView> |
| 327 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> | 326 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> |
| @@ -335,7 +334,7 @@ | @@ -335,7 +334,7 @@ | ||
| 335 | </state> | 334 | </state> |
| 336 | </button> | 335 | </button> |
| 337 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q"> | 336 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q"> |
| 338 | - <rect key="frame" x="8" y="21.5" width="61.5" height="18"/> | 337 | + <rect key="frame" x="8" y="21.5" width="160" height="18"/> |
| 339 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 338 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 340 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 339 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 341 | <nil key="highlightedColor"/> | 340 | <nil key="highlightedColor"/> |
| @@ -349,6 +348,7 @@ | @@ -349,6 +348,7 @@ | ||
| 349 | </subviews> | 348 | </subviews> |
| 350 | <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 349 | <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 351 | <constraints> | 350 | <constraints> |
| 351 | + <constraint firstAttribute="trailing" secondItem="HzZ-gc-k6q" secondAttribute="trailing" constant="8" id="0B8-zV-Tar"/> | ||
| 352 | <constraint firstItem="zvf-dA-6kr" firstAttribute="leading" secondItem="6YE-Yx-A8r" secondAttribute="leading" id="8NH-AH-kf2"/> | 352 | <constraint firstItem="zvf-dA-6kr" firstAttribute="leading" secondItem="6YE-Yx-A8r" secondAttribute="leading" id="8NH-AH-kf2"/> |
| 353 | <constraint firstItem="qMv-R9-Qa3" firstAttribute="top" secondItem="6YE-Yx-A8r" secondAttribute="top" id="Dxq-Iz-iMF"/> | 353 | <constraint firstItem="qMv-R9-Qa3" firstAttribute="top" secondItem="6YE-Yx-A8r" secondAttribute="top" id="Dxq-Iz-iMF"/> |
| 354 | <constraint firstAttribute="bottom" secondItem="Uk9-TJ-dgw" secondAttribute="bottom" constant="8" id="HH3-Em-feP"/> | 354 | <constraint firstAttribute="bottom" secondItem="Uk9-TJ-dgw" secondAttribute="bottom" constant="8" id="HH3-Em-feP"/> |
| @@ -372,9 +372,8 @@ | @@ -372,9 +372,8 @@ | ||
| 372 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> | 372 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> |
| 373 | <rect key="frame" x="184" y="0.0" width="176" height="84"/> | 373 | <rect key="frame" x="184" y="0.0" width="176" height="84"/> |
| 374 | <subviews> | 374 | <subviews> |
| 375 | - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> | 375 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> |
| 376 | <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> | 376 | <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> |
| 377 | - | ||
| 378 | </imageView> | 377 | </imageView> |
| 379 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> | 378 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> |
| 380 | <rect key="frame" x="8" y="48" width="70" height="28"/> | 379 | <rect key="frame" x="8" y="48" width="70" height="28"/> |
| @@ -387,7 +386,7 @@ | @@ -387,7 +386,7 @@ | ||
| 387 | </state> | 386 | </state> |
| 388 | </button> | 387 | </button> |
| 389 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> | 388 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> |
| 390 | - <rect key="frame" x="8" y="22" width="61.5" height="18"/> | 389 | + <rect key="frame" x="8" y="22" width="160" height="18"/> |
| 391 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 390 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 392 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 391 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 393 | <nil key="highlightedColor"/> | 392 | <nil key="highlightedColor"/> |
| @@ -408,6 +407,7 @@ | @@ -408,6 +407,7 @@ | ||
| 408 | <constraint firstAttribute="trailing" secondItem="P7A-gb-DMF" secondAttribute="trailing" id="RXm-NJ-H9Z"/> | 407 | <constraint firstAttribute="trailing" secondItem="P7A-gb-DMF" secondAttribute="trailing" id="RXm-NJ-H9Z"/> |
| 409 | <constraint firstAttribute="bottom" secondItem="P7A-gb-DMF" secondAttribute="bottom" id="UDc-4Y-4Df"/> | 408 | <constraint firstAttribute="bottom" secondItem="P7A-gb-DMF" secondAttribute="bottom" id="UDc-4Y-4Df"/> |
| 410 | <constraint firstAttribute="trailing" secondItem="YIw-qU-3V5" secondAttribute="trailing" id="WjU-kd-7cK"/> | 409 | <constraint firstAttribute="trailing" secondItem="YIw-qU-3V5" secondAttribute="trailing" id="WjU-kd-7cK"/> |
| 410 | + <constraint firstAttribute="trailing" secondItem="IlG-SR-47u" secondAttribute="trailing" constant="8" id="Zng-vi-Gsu"/> | ||
| 411 | <constraint firstAttribute="bottom" secondItem="YIw-qU-3V5" secondAttribute="bottom" id="dlT-rW-fLJ"/> | 411 | <constraint firstAttribute="bottom" secondItem="YIw-qU-3V5" secondAttribute="bottom" id="dlT-rW-fLJ"/> |
| 412 | <constraint firstItem="YIw-qU-3V5" firstAttribute="leading" secondItem="nTE-Oc-4PW" secondAttribute="leading" id="g3m-Eg-Sph"/> | 412 | <constraint firstItem="YIw-qU-3V5" firstAttribute="leading" secondItem="nTE-Oc-4PW" secondAttribute="leading" id="g3m-Eg-Sph"/> |
| 413 | <constraint firstItem="l93-Wh-xSB" firstAttribute="top" secondItem="IlG-SR-47u" secondAttribute="bottom" constant="8" id="ofC-a7-KtM"/> | 413 | <constraint firstItem="l93-Wh-xSB" firstAttribute="top" secondItem="IlG-SR-47u" secondAttribute="bottom" constant="8" id="ofC-a7-KtM"/> |
| @@ -601,7 +601,7 @@ | @@ -601,7 +601,7 @@ | ||
| 601 | <rect key="frame" x="0.0" y="135" width="375" height="483"/> | 601 | <rect key="frame" x="0.0" y="135" width="375" height="483"/> |
| 602 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 602 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 603 | <prototypes> | 603 | <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"> | 604 | + <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 | <rect key="frame" x="0.0" y="28" width="375" height="280"/> | 605 | <rect key="frame" x="0.0" y="28" width="375" height="280"/> |
| 606 | <autoresizingMask key="autoresizingMask"/> | 606 | <autoresizingMask key="autoresizingMask"/> |
| 607 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mJ6-p0-1k0" id="Krp-EU-pqh"> | 607 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mJ6-p0-1k0" id="Krp-EU-pqh"> |
| @@ -717,7 +717,7 @@ | @@ -717,7 +717,7 @@ | ||
| 717 | <segue destination="aZ0-4x-DE7" kind="show" id="W8C-3m-iNT"/> | 717 | <segue destination="aZ0-4x-DE7" kind="show" id="W8C-3m-iNT"/> |
| 718 | </connections> | 718 | </connections> |
| 719 | </tableViewCell> | 719 | </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"> | 720 | + <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 | <rect key="frame" x="0.0" y="308" width="375" height="280"/> | 721 | <rect key="frame" x="0.0" y="308" width="375" height="280"/> |
| 722 | <autoresizingMask key="autoresizingMask"/> | 722 | <autoresizingMask key="autoresizingMask"/> |
| 723 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QrW-E0-jjq" id="UXM-6n-Q33"> | 723 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QrW-E0-jjq" id="UXM-6n-Q33"> |
| @@ -925,7 +925,7 @@ | @@ -925,7 +925,7 @@ | ||
| 925 | <rect key="frame" x="0.0" y="64" width="375" height="544"/> | 925 | <rect key="frame" x="0.0" y="64" width="375" height="544"/> |
| 926 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 926 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 927 | <prototypes> | 927 | <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"> | 928 | + <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 | <rect key="frame" x="0.0" y="28" width="375" height="280"/> | 929 | <rect key="frame" x="0.0" y="28" width="375" height="280"/> |
| 930 | <autoresizingMask key="autoresizingMask"/> | 930 | <autoresizingMask key="autoresizingMask"/> |
| 931 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="edU-Xp-UQN" id="jbp-VT-wz9"> | 931 | <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 +1049,7 @@ | @@ -1049,7 +1049,7 @@ | ||
| 1049 | <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/> | 1049 | <outlet property="risingRightLab" destination="loz-6S-4SZ" id="CMk-Ho-lDv"/> |
| 1050 | </connections> | 1050 | </connections> |
| 1051 | </tableViewCell> | 1051 | </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"> | 1052 | + <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 | <rect key="frame" x="0.0" y="308" width="375" height="280"/> | 1053 | <rect key="frame" x="0.0" y="308" width="375" height="280"/> |
| 1054 | <autoresizingMask key="autoresizingMask"/> | 1054 | <autoresizingMask key="autoresizingMask"/> |
| 1055 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cT9-nd-Syd" id="GQz-Gg-SDo"> | 1055 | <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 +1139,7 @@ | @@ -1139,7 +1139,7 @@ | ||
| 1139 | <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/> | 1139 | <outlet property="lineChartView" destination="3tc-50-XKr" id="3V4-XW-IX3"/> |
| 1140 | </connections> | 1140 | </connections> |
| 1141 | </tableViewCell> | 1141 | </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"> | 1142 | + <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 | <rect key="frame" x="0.0" y="588" width="375" height="100"/> | 1143 | <rect key="frame" x="0.0" y="588" width="375" height="100"/> |
| 1144 | <autoresizingMask key="autoresizingMask"/> | 1144 | <autoresizingMask key="autoresizingMask"/> |
| 1145 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LSs-xC-on7" id="g4b-AE-z0B"> | 1145 | <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 +1147,7 @@ | @@ -1147,7 +1147,7 @@ | ||
| 1147 | <autoresizingMask key="autoresizingMask"/> | 1147 | <autoresizingMask key="autoresizingMask"/> |
| 1148 | <subviews> | 1148 | <subviews> |
| 1149 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Qp-zh-xwy"> | 1149 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Qp-zh-xwy"> |
| 1150 | - <rect key="frame" x="10" y="10" width="394" height="89.5"/> | 1150 | + <rect key="frame" x="10" y="10" width="355" height="89.5"/> |
| 1151 | <subviews> | 1151 | <subviews> |
| 1152 | <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"> | 1152 | <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 | <rect key="frame" x="10" y="38" width="104" height="14.5"/> | 1153 | <rect key="frame" x="10" y="38" width="104" height="14.5"/> |
| @@ -1156,13 +1156,13 @@ | @@ -1156,13 +1156,13 @@ | ||
| 1156 | <nil key="highlightedColor"/> | 1156 | <nil key="highlightedColor"/> |
| 1157 | </label> | 1157 | </label> |
| 1158 | <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"> | 1158 | <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"/> | 1159 | + <rect key="frame" x="328.5" y="10" width="16.5" height="18"/> |
| 1160 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 1160 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
| 1161 | <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 1161 | <color key="textColor" red="0.29803921568627451" green="0.68627450980392157" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 1162 | <nil key="highlightedColor"/> | 1162 | <nil key="highlightedColor"/> |
| 1163 | </label> | 1163 | </label> |
| 1164 | <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"> | 1164 | <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"/> | 1165 | + <rect key="frame" x="234" y="38" width="111" height="14.5"/> |
| 1166 | <fontDescription key="fontDescription" type="system" pointSize="12"/> | 1166 | <fontDescription key="fontDescription" type="system" pointSize="12"/> |
| 1167 | <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 1167 | <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 1168 | <nil key="highlightedColor"/> | 1168 | <nil key="highlightedColor"/> |
| @@ -1780,7 +1780,7 @@ | @@ -1780,7 +1780,7 @@ | ||
| 1780 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 1780 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 1781 | </view> | 1781 | </view> |
| 1782 | <prototypes> | 1782 | <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"> | 1783 | + <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 | <rect key="frame" x="0.0" y="28" width="343" height="44"/> | 1784 | <rect key="frame" x="0.0" y="28" width="343" height="44"/> |
| 1785 | <autoresizingMask key="autoresizingMask"/> | 1785 | <autoresizingMask key="autoresizingMask"/> |
| 1786 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi"> | 1786 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi"> |
| @@ -1828,7 +1828,7 @@ | @@ -1828,7 +1828,7 @@ | ||
| 1828 | <outlet property="newLabel" destination="Cgm-Km-mZE" id="ZPq-dp-KUH"/> | 1828 | <outlet property="newLabel" destination="Cgm-Km-mZE" id="ZPq-dp-KUH"/> |
| 1829 | </connections> | 1829 | </connections> |
| 1830 | </tableViewCell> | 1830 | </tableViewCell> |
| 1831 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0"> | 1831 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0"> |
| 1832 | <rect key="frame" x="0.0" y="72" width="343" height="30"/> | 1832 | <rect key="frame" x="0.0" y="72" width="343" height="30"/> |
| 1833 | <autoresizingMask key="autoresizingMask"/> | 1833 | <autoresizingMask key="autoresizingMask"/> |
| 1834 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g"> | 1834 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g"> |
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <key>CFBundleShortVersionString</key> | 19 | <key>CFBundleShortVersionString</key> |
| 20 | <string>1.0.0</string> | 20 | <string>1.0.0</string> |
| 21 | <key>CFBundleVersion</key> | 21 | <key>CFBundleVersion</key> |
| 22 | - <string>5</string> | 22 | + <string>6</string> |
| 23 | <key>LSRequiresIPhoneOS</key> | 23 | <key>LSRequiresIPhoneOS</key> |
| 24 | <true/> | 24 | <true/> |
| 25 | <key>NSAppTransportSecurity</key> | 25 | <key>NSAppTransportSecurity</key> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | <true/> | 28 | <true/> |
| 29 | </dict> | 29 | </dict> |
| 30 | <key>NSLocationWhenInUseUsageDescription</key> | 30 | <key>NSLocationWhenInUseUsageDescription</key> |
| 31 | - <string>"需要您的同意,才能在使用期间访问位置"</string> | 31 | + <string>"需要您的同意,才能在使用期间访问位置"</string> |
| 32 | <key>NSMicrophoneUsageDescription</key> | 32 | <key>NSMicrophoneUsageDescription</key> |
| 33 | <string>访问麦克风</string> | 33 | <string>访问麦克风</string> |
| 34 | <key>NSPhotoLibraryUsageDescription</key> | 34 | <key>NSPhotoLibraryUsageDescription</key> |