Commit a2a153f1ca7b88a2cd7d2f506094cc4f74b95249
1 parent
ecf1f11c
Exists in
parentassistant
隐藏首页
Showing
7 changed files
with
34 additions
and
33 deletions
Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
@@ -52,6 +52,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | @@ -52,6 +52,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { | ||
52 | self.navigationItem.titleView = titleView | 52 | self.navigationItem.titleView = titleView |
53 | self.view.addSubview(contentScrollView) | 53 | self.view.addSubview(contentScrollView) |
54 | 54 | ||
55 | + self.title = "成长" | ||
55 | setUpTitle() | 56 | setUpTitle() |
56 | setChildViewContent() | 57 | setChildViewContent() |
57 | 58 |
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift
@@ -16,6 +16,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS | @@ -16,6 +16,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS | ||
16 | table.backgroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) | 16 | table.backgroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) |
17 | table.delegate = self | 17 | table.delegate = self |
18 | table.dataSource = self | 18 | table.dataSource = self |
19 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
19 | table.register(UINib.init(nibName: "MoralDetailCell", bundle: nil), forCellReuseIdentifier: "moralDetail") | 20 | table.register(UINib.init(nibName: "MoralDetailCell", bundle: nil), forCellReuseIdentifier: "moralDetail") |
20 | table.register(UINib.init(nibName: "EducationDetailCell", bundle: nil), forCellReuseIdentifier: "educationDetail") | 21 | table.register(UINib.init(nibName: "EducationDetailCell", bundle: nil), forCellReuseIdentifier: "educationDetail") |
21 | table.register(UINib.init(nibName: "BehaviorDetailCell", bundle: nil), forCellReuseIdentifier: "behaviorDetail") | 22 | table.register(UINib.init(nibName: "BehaviorDetailCell", bundle: nil), forCellReuseIdentifier: "behaviorDetail") |
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift
@@ -21,6 +21,7 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData | @@ -21,6 +21,7 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData | ||
21 | table.delegate = self | 21 | table.delegate = self |
22 | table.dataSource = self | 22 | table.dataSource = self |
23 | table.backgroundColor = backGroundColor | 23 | table.backgroundColor = backGroundColor |
24 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
24 | table.register(UINib.init(nibName: "MoralTableViewCell", bundle: nil), forCellReuseIdentifier: "MoralTableViewCell") | 25 | table.register(UINib.init(nibName: "MoralTableViewCell", bundle: nil), forCellReuseIdentifier: "MoralTableViewCell") |
25 | table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") | 26 | table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") |
26 | return table | 27 | return table |
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift
@@ -15,6 +15,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV | @@ -15,6 +15,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV | ||
15 | table.backgroundColor = backGroundColor | 15 | table.backgroundColor = backGroundColor |
16 | table.delegate = self | 16 | table.delegate = self |
17 | table.dataSource = self | 17 | table.dataSource = self |
18 | + table.separatorStyle = UITableViewCellSeparatorStyle.none | ||
18 | table.register(UINib.init(nibName: "SceneTopCell", bundle: nil), forCellReuseIdentifier: "cultureCell") | 19 | table.register(UINib.init(nibName: "SceneTopCell", bundle: nil), forCellReuseIdentifier: "cultureCell") |
19 | table.register(UINib.init(nibName: "SceneMiddleCell", bundle: nil), forCellReuseIdentifier: "scoreCell") | 20 | table.register(UINib.init(nibName: "SceneMiddleCell", bundle: nil), forCellReuseIdentifier: "scoreCell") |
20 | table.register(UINib.init(nibName: "SceneDownCell", bundle: nil), forCellReuseIdentifier: "disciplineCell") | 21 | table.register(UINib.init(nibName: "SceneDownCell", bundle: nil), forCellReuseIdentifier: "disciplineCell") |
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PbF-i7-G0s"> | 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PbF-i7-G0s"> |
3 | <device id="retina4_7" orientation="portrait"> | 3 | <device id="retina4_7" orientation="portrait"> |
4 | <adaptation id="fullscreen"/> | 4 | <adaptation id="fullscreen"/> |
5 | </device> | 5 | </device> |
6 | <dependencies> | 6 | <dependencies> |
7 | <deployment identifier="iOS"/> | 7 | <deployment identifier="iOS"/> |
8 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> | 8 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> |
9 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> | 9 | <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> |
10 | <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> | 10 | <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> |
11 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> | 11 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> |
@@ -21,16 +21,16 @@ | @@ -21,16 +21,16 @@ | ||
21 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 21 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
22 | <subviews> | 22 | <subviews> |
23 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw"> | 23 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S4x-QQ-MKw"> |
24 | - <rect key="frame" x="0.0" y="64" width="376" height="554"/> | 24 | + <rect key="frame" x="0.0" y="64" width="375" height="603"/> |
25 | <subviews> | 25 | <subviews> |
26 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv"> | 26 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3EJ-Pj-glv"> |
27 | - <rect key="frame" x="0.0" y="0.0" width="376" height="554"/> | 27 | + <rect key="frame" x="0.0" y="0.0" width="375" height="554"/> |
28 | <subviews> | 28 | <subviews> |
29 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu"> | 29 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-UH-DLu"> |
30 | - <rect key="frame" x="8" y="8" width="360" height="350"/> | 30 | + <rect key="frame" x="8" y="8" width="359" height="350"/> |
31 | <subviews> | 31 | <subviews> |
32 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P"> | 32 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="FnF-em-s4P"> |
33 | - <rect key="frame" x="0.0" y="0.0" width="360" height="92"/> | 33 | + <rect key="frame" x="0.0" y="0.0" width="359" height="92"/> |
34 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | 34 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
35 | <constraints> | 35 | <constraints> |
36 | <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/> | 36 | <constraint firstAttribute="height" constant="92" id="4mb-lI-Ahd"/> |
@@ -48,20 +48,20 @@ | @@ -48,20 +48,20 @@ | ||
48 | </connections> | 48 | </connections> |
49 | </collectionView> | 49 | </collectionView> |
50 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32"> | 50 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hb2-3p-n32"> |
51 | - <rect key="frame" x="0.0" y="100" width="360" height="1"/> | 51 | + <rect key="frame" x="0.0" y="100" width="359" height="1"/> |
52 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | 52 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
53 | <constraints> | 53 | <constraints> |
54 | <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/> | 54 | <constraint firstAttribute="height" constant="1" id="ocV-Mf-9Bd"/> |
55 | </constraints> | 55 | </constraints> |
56 | </view> | 56 | </view> |
57 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT"> | 57 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrY-xr-gAT"> |
58 | - <rect key="frame" x="0.0" y="101" width="360" height="249"/> | 58 | + <rect key="frame" x="0.0" y="101" width="359" height="249"/> |
59 | <subviews> | 59 | <subviews> |
60 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG"> | 60 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RPC-ey-TXG"> |
61 | - <rect key="frame" x="180" y="0.0" width="180" height="249"/> | 61 | + <rect key="frame" x="179.5" y="0.0" width="179.5" height="249"/> |
62 | <subviews> | 62 | <subviews> |
63 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7"> | 63 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKI-XD-Eo7"> |
64 | - <rect key="frame" x="15" y="49.5" width="150" height="150"/> | 64 | + <rect key="frame" x="14.5" y="49.5" width="150" height="150"/> |
65 | <subviews> | 65 | <subviews> |
66 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4"> | 66 | <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_training_back" translatesAutoresizingMaskIntoConstraints="NO" id="Ck8-NZ-jI4"> |
67 | <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/> | 67 | <rect key="frame" x="0.0" y="-0.5" width="150" height="150"/> |
@@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
122 | </constraints> | 122 | </constraints> |
123 | </view> | 123 | </view> |
124 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i"> | 124 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EQ0-yG-m4i"> |
125 | - <rect key="frame" x="0.0" y="0.0" width="180" height="249"/> | 125 | + <rect key="frame" x="0.0" y="0.0" width="179.5" height="249"/> |
126 | <subviews> | 126 | <subviews> |
127 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7"> | 127 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1z3-Uc-my7"> |
128 | <rect key="frame" x="15" y="49.5" width="150" height="150"/> | 128 | <rect key="frame" x="15" y="49.5" width="150" height="150"/> |
@@ -215,10 +215,10 @@ | @@ -215,10 +215,10 @@ | ||
215 | </constraints> | 215 | </constraints> |
216 | </view> | 216 | </view> |
217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e"> | 217 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-UM-A5e"> |
218 | - <rect key="frame" x="8" y="366" width="360" height="35"/> | 218 | + <rect key="frame" x="8" y="366" width="359" height="35"/> |
219 | <subviews> | 219 | <subviews> |
220 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动专栏" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y9y-rQ-h2e"> | 220 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动专栏" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y9y-rQ-h2e"> |
221 | - <rect key="frame" x="142.5" y="7" width="75" height="21"/> | 221 | + <rect key="frame" x="142" y="7" width="75" height="21"/> |
222 | <constraints> | 222 | <constraints> |
223 | <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/> | 223 | <constraint firstAttribute="width" constant="75" id="vmI-FD-5VJ"/> |
224 | </constraints> | 224 | </constraints> |
@@ -227,7 +227,7 @@ | @@ -227,7 +227,7 @@ | ||
227 | <nil key="highlightedColor"/> | 227 | <nil key="highlightedColor"/> |
228 | </label> | 228 | </label> |
229 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUM-xf-pLP"> | 229 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUM-xf-pLP"> |
230 | - <rect key="frame" x="225.5" y="17" width="104.5" height="1"/> | 230 | + <rect key="frame" x="225" y="17" width="104" height="1"/> |
231 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 231 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
232 | <constraints> | 232 | <constraints> |
233 | <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/> | 233 | <constraint firstAttribute="height" constant="1" id="hyk-jl-669"/> |
@@ -237,7 +237,7 @@ | @@ -237,7 +237,7 @@ | ||
237 | <nil key="highlightedColor"/> | 237 | <nil key="highlightedColor"/> |
238 | </label> | 238 | </label> |
239 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jRc-ct-42f"> | 239 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jRc-ct-42f"> |
240 | - <rect key="frame" x="30" y="17" width="104.5" height="1"/> | 240 | + <rect key="frame" x="30" y="17" width="104" height="1"/> |
241 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | 241 | <color key="backgroundColor" red="0.27503338459999999" green="0.50970917940000005" blue="0.90092128520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
242 | <constraints> | 242 | <constraints> |
243 | <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/> | 243 | <constraint firstAttribute="height" constant="1" id="21G-QY-Tva"/> |
@@ -261,16 +261,16 @@ | @@ -261,16 +261,16 @@ | ||
261 | </constraints> | 261 | </constraints> |
262 | </view> | 262 | </view> |
263 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6"> | 263 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ykc-ca-zb6"> |
264 | - <rect key="frame" x="8" y="409" width="360" height="176"/> | 264 | + <rect key="frame" x="8" y="409" width="359" height="175.5"/> |
265 | <subviews> | 265 | <subviews> |
266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> | 266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kkx-lN-sfK"> |
267 | - <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 267 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/> |
268 | <subviews> | 268 | <subviews> |
269 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> | 269 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Jql-zY-Zqo"> |
270 | - <rect key="frame" x="0.0" y="0.0" width="176" height="176"/> | 270 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="175.5"/> |
271 | </imageView> | 271 | </imageView> |
272 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> | 272 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7r-js-8BI"> |
273 | - <rect key="frame" x="8" y="139.5" width="70" height="28"/> | 273 | + <rect key="frame" x="8" y="139" width="70" height="28"/> |
274 | <constraints> | 274 | <constraints> |
275 | <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/> | 275 | <constraint firstAttribute="width" constant="70" id="B9z-Pp-Oxc"/> |
276 | </constraints> | 276 | </constraints> |
@@ -280,13 +280,13 @@ | @@ -280,13 +280,13 @@ | ||
280 | </state> | 280 | </state> |
281 | </button> | 281 | </button> |
282 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6"> | 282 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6"> |
283 | - <rect key="frame" x="8" y="113.5" width="160" height="18"/> | 283 | + <rect key="frame" x="8" y="113" width="159.5" height="18"/> |
284 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 284 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
285 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 285 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
286 | <nil key="highlightedColor"/> | 286 | <nil key="highlightedColor"/> |
287 | </label> | 287 | </label> |
288 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh"> | 288 | <button opaque="NO" tag="3000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xml-PN-wWh"> |
289 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="176"/> | 289 | + <rect key="frame" x="0.0" y="0.0" width="175" height="175.5"/> |
290 | <connections> | 290 | <connections> |
291 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/> | 291 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="adV-6D-vPI"/> |
292 | </connections> | 292 | </connections> |
@@ -317,13 +317,13 @@ | @@ -317,13 +317,13 @@ | ||
317 | </userDefinedRuntimeAttributes> | 317 | </userDefinedRuntimeAttributes> |
318 | </view> | 318 | </view> |
319 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> | 319 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6YE-Yx-A8r"> |
320 | - <rect key="frame" x="184" y="92" width="176" height="84"/> | 320 | + <rect key="frame" x="183.5" y="92" width="175.5" height="83.5"/> |
321 | <subviews> | 321 | <subviews> |
322 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> | 322 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qMv-R9-Qa3"> |
323 | - <rect key="frame" x="0.0" y="0.0" width="176" height="84"/> | 323 | + <rect key="frame" x="0.0" y="0.0" width="175.5" height="83.5"/> |
324 | </imageView> | 324 | </imageView> |
325 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> | 325 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uk9-TJ-dgw"> |
326 | - <rect key="frame" x="8" y="47.5" width="70" height="28"/> | 326 | + <rect key="frame" x="8" y="47" width="70" height="28"/> |
327 | <constraints> | 327 | <constraints> |
328 | <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/> | 328 | <constraint firstAttribute="width" constant="70" id="Y09-Wp-sSm"/> |
329 | </constraints> | 329 | </constraints> |
@@ -333,13 +333,13 @@ | @@ -333,13 +333,13 @@ | ||
333 | </state> | 333 | </state> |
334 | </button> | 334 | </button> |
335 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q"> | 335 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q"> |
336 | - <rect key="frame" x="8" y="21.5" width="160" height="18"/> | 336 | + <rect key="frame" x="8" y="21" width="159.5" height="18"/> |
337 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 337 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
338 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 338 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
339 | <nil key="highlightedColor"/> | 339 | <nil key="highlightedColor"/> |
340 | </label> | 340 | </label> |
341 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr"> | 341 | <button opaque="NO" tag="3002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zvf-dA-6kr"> |
342 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> | 342 | + <rect key="frame" x="0.0" y="0.0" width="175" height="83.5"/> |
343 | <connections> | 343 | <connections> |
344 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/> | 344 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="A9J-Jx-AQ0"/> |
345 | </connections> | 345 | </connections> |
@@ -369,10 +369,10 @@ | @@ -369,10 +369,10 @@ | ||
369 | </userDefinedRuntimeAttributes> | 369 | </userDefinedRuntimeAttributes> |
370 | </view> | 370 | </view> |
371 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> | 371 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW"> |
372 | - <rect key="frame" x="184" y="0.0" width="176" height="84"/> | 372 | + <rect key="frame" x="183.5" y="0.0" width="175.5" height="84"/> |
373 | <subviews> | 373 | <subviews> |
374 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> | 374 | <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF"> |
375 | - <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/> | 375 | + <rect key="frame" x="0.0" y="0.0" width="175" height="84"/> |
376 | </imageView> | 376 | </imageView> |
377 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> | 377 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB"> |
378 | <rect key="frame" x="8" y="48" width="70" height="28"/> | 378 | <rect key="frame" x="8" y="48" width="70" height="28"/> |
@@ -385,13 +385,13 @@ | @@ -385,13 +385,13 @@ | ||
385 | </state> | 385 | </state> |
386 | </button> | 386 | </button> |
387 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> | 387 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u"> |
388 | - <rect key="frame" x="8" y="22" width="160" height="18"/> | 388 | + <rect key="frame" x="8" y="22" width="159.5" height="18"/> |
389 | <fontDescription key="fontDescription" type="system" pointSize="15"/> | 389 | <fontDescription key="fontDescription" type="system" pointSize="15"/> |
390 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 390 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
391 | <nil key="highlightedColor"/> | 391 | <nil key="highlightedColor"/> |
392 | </label> | 392 | </label> |
393 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5"> | 393 | <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YIw-qU-3V5"> |
394 | - <rect key="frame" x="-0.5" y="0.0" width="176.5" height="83.5"/> | 394 | + <rect key="frame" x="-0.5" y="0.0" width="176" height="83.5"/> |
395 | <connections> | 395 | <connections> |
396 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/> | 396 | <action selector="attendScurse:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7cN-If-1H1"/> |
397 | </connections> | 397 | </connections> |
@@ -516,7 +516,6 @@ | @@ -516,7 +516,6 @@ | ||
516 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> | 516 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
517 | </tabBar> | 517 | </tabBar> |
518 | <connections> | 518 | <connections> |
519 | - <segue destination="fWd-Qg-F7w" kind="relationship" relationship="viewControllers" id="K3U-Mn-icF"/> | ||
520 | <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/> | 519 | <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/> |
521 | <segue destination="Yrp-0h-ncC" kind="relationship" relationship="viewControllers" id="IwW-6h-n82"/> | 520 | <segue destination="Yrp-0h-ncC" kind="relationship" relationship="viewControllers" id="IwW-6h-n82"/> |
522 | <segue destination="eER-h6-27H" kind="relationship" relationship="viewControllers" id="wFB-T8-R8T"/> | 521 | <segue destination="eER-h6-27H" kind="relationship" relationship="viewControllers" id="wFB-T8-R8T"/> |
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
@@ -46,8 +46,6 @@ | @@ -46,8 +46,6 @@ | ||
46 | <key>UISupportedInterfaceOrientations</key> | 46 | <key>UISupportedInterfaceOrientations</key> |
47 | <array> | 47 | <array> |
48 | <string>UIInterfaceOrientationPortrait</string> | 48 | <string>UIInterfaceOrientationPortrait</string> |
49 | - <string>UIInterfaceOrientationLandscapeLeft</string> | ||
50 | - <string>UIInterfaceOrientationLandscapeRight</string> | ||
51 | </array> | 49 | </array> |
52 | <key>UISupportedInterfaceOrientations~ipad</key> | 50 | <key>UISupportedInterfaceOrientations~ipad</key> |
53 | <array> | 51 | <array> |