IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 913c6d049c8eccc05a7b0916013015f13c22ed1f

Authored by Cao yang
1 parent 88ceffe7
Exists in parentassistant

场景详情布局微调

Showing 4 changed files with 33 additions and 34 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
  Diff comments   View file @913c6d0
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <key>ParentAssistant.xcscheme</key> 7 <key>ParentAssistant.xcscheme</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>9</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @913c6d0
No preview for this file type
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
  Diff comments   View file @913c6d0
@@ -1287,11 +1287,11 @@ @@ -1287,11 +1287,11 @@
1287 <rect key="frame" x="0.0" y="5" width="355" height="40"/> 1287 <rect key="frame" x="0.0" y="5" width="355" height="40"/>
1288 <subviews> 1288 <subviews>
1289 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kpT-5T-UAU"> 1289 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kpT-5T-UAU">
1290 - <rect key="frame" x="253" y="12" width="16" height="16"/> 1290 + <rect key="frame" x="252" y="12" width="16" height="16"/>
1291 <color key="backgroundColor" red="0.50588235294117645" green="0.7803921568627451" blue="0.51764705882352935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1291 <color key="backgroundColor" red="0.50588235294117645" green="0.7803921568627451" blue="0.51764705882352935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1292 <constraints> 1292 <constraints>
1293 - <constraint firstAttribute="height" constant="16" id="1hn-4f-qNk"/>  
1294 - <constraint firstAttribute="width" constant="16" id="Ncg-Bi-LaZ"/> 1293 + <constraint firstAttribute="height" constant="16" id="IEt-v9-eDG"/>
  1294 + <constraint firstAttribute="width" constant="16" id="OKt-tl-044"/>
1295 </constraints> 1295 </constraints>
1296 <userDefinedRuntimeAttributes> 1296 <userDefinedRuntimeAttributes>
1297 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1297 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -1301,17 +1301,17 @@ @@ -1301,17 +1301,17 @@
1301 </userDefinedRuntimeAttributes> 1301 </userDefinedRuntimeAttributes>
1302 </view> 1302 </view>
1303 <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="FrY-0D-sBM"> 1303 <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="FrY-0D-sBM">
1304 - <rect key="frame" x="147" y="10" width="62" height="18"/> 1304 + <rect key="frame" x="147" y="11" width="62" height="18"/>
1305 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1305 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1306 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1306 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1307 <nil key="highlightedColor"/> 1307 <nil key="highlightedColor"/>
1308 </label> 1308 </label>
1309 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FzF-1s-QFR"> 1309 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FzF-1s-QFR">
1310 - <rect key="frame" x="10" y="12" width="16" height="16"/> 1310 + <rect key="frame" x="18" y="12" width="16" height="16"/>
1311 <color key="backgroundColor" red="0.36078431372549019" green="0.56862745098039214" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1311 <color key="backgroundColor" red="0.36078431372549019" green="0.56862745098039214" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1312 <constraints> 1312 <constraints>
1313 - <constraint firstAttribute="width" constant="16" id="FEZ-zj-3do"/>  
1314 - <constraint firstAttribute="height" constant="16" id="cM1-uc-1jU"/> 1313 + <constraint firstAttribute="height" constant="16" id="apC-YA-Vfm"/>
  1314 + <constraint firstAttribute="width" constant="16" id="zwK-C6-fkJ"/>
1315 </constraints> 1315 </constraints>
1316 <userDefinedRuntimeAttributes> 1316 <userDefinedRuntimeAttributes>
1317 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> 1317 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
@@ -1321,7 +1321,7 @@ @@ -1321,7 +1321,7 @@
1321 </userDefinedRuntimeAttributes> 1321 </userDefinedRuntimeAttributes>
1322 </view> 1322 </view>
1323 <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="ugR-id-hYZ"> 1323 <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="ugR-id-hYZ">
1324 - <rect key="frame" x="274" y="10" width="62" height="18"/> 1324 + <rect key="frame" x="273" y="11" width="62" height="18"/>
1325 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1325 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1326 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1326 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1327 <nil key="highlightedColor"/> 1327 <nil key="highlightedColor"/>
@@ -1330,8 +1330,8 @@ @@ -1330,8 +1330,8 @@
1330 <rect key="frame" x="126" y="12" width="16" height="16"/> 1330 <rect key="frame" x="126" y="12" width="16" height="16"/>
1331 <color key="backgroundColor" red="1" green="0.83529411764705885" blue="0.30980392156862746" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1331 <color key="backgroundColor" red="1" green="0.83529411764705885" blue="0.30980392156862746" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1332 <constraints> 1332 <constraints>
1333 - <constraint firstAttribute="height" constant="16" id="5n4-nh-7N4"/>  
1334 - <constraint firstAttribute="width" constant="16" id="B7Y-D1-14r"/> 1333 + <constraint firstAttribute="width" constant="16" id="80S-1A-l8G"/>
  1334 + <constraint firstAttribute="height" constant="16" id="nCV-Bs-Sec"/>
1335 </constraints> 1335 </constraints>
1336 <userDefinedRuntimeAttributes> 1336 <userDefinedRuntimeAttributes>
1337 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 1337 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -1341,7 +1341,7 @@ @@ -1341,7 +1341,7 @@
1341 </userDefinedRuntimeAttributes> 1341 </userDefinedRuntimeAttributes>
1342 </view> 1342 </view>
1343 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人得分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qHt-PD-nGP"> 1343 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人得分" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qHt-PD-nGP">
1344 - <rect key="frame" x="31" y="10" width="62" height="18"/> 1344 + <rect key="frame" x="39" y="11" width="62" height="18"/>
1345 <fontDescription key="fontDescription" type="system" pointSize="15"/> 1345 <fontDescription key="fontDescription" type="system" pointSize="15"/>
1346 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1346 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1347 <nil key="highlightedColor"/> 1347 <nil key="highlightedColor"/>
@@ -1349,19 +1349,18 @@ @@ -1349,19 +1349,18 @@
1349 </subviews> 1349 </subviews>
1350 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> 1350 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1351 <constraints> 1351 <constraints>
1352 - <constraint firstItem="kpT-5T-UAU" firstAttribute="leading" secondItem="FrY-0D-sBM" secondAttribute="trailing" constant="44" id="3Eb-l2-lFC"/>  
1353 - <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="qHt-PD-nGP" secondAttribute="bottom" id="AVn-SW-YYk"/>  
1354 - <constraint firstItem="qHt-PD-nGP" firstAttribute="leading" secondItem="FzF-1s-QFR" secondAttribute="trailing" constant="5" id="Bve-eI-a2E"/>  
1355 - <constraint firstItem="ugR-id-hYZ" firstAttribute="leading" secondItem="kpT-5T-UAU" secondAttribute="trailing" constant="5" id="GJA-xX-TVh"/>  
1356 - <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="ugR-id-hYZ" secondAttribute="bottom" id="JIb-Of-4eG"/>  
1357 - <constraint firstItem="FrY-0D-sBM" firstAttribute="leading" secondItem="NhS-aq-jEP" secondAttribute="trailing" constant="5" id="Ooa-Zh-AF7"/>  
1358 - <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="qHt-PD-nGP" secondAttribute="trailing" constant="20" symbolic="YES" id="czv-1K-HVF"/>  
1359 - <constraint firstItem="FzF-1s-QFR" firstAttribute="leading" secondItem="VjO-jB-oUF" secondAttribute="leading" constant="10" id="ePE-eT-MAA"/>  
1360 - <constraint firstItem="FzF-1s-QFR" firstAttribute="centerY" secondItem="VjO-jB-oUF" secondAttribute="centerY" id="gZG-qH-S86"/>  
1361 - <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="kpT-5T-UAU" secondAttribute="top" id="jEi-px-wKs"/>  
1362 - <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="NhS-aq-jEP" secondAttribute="top" id="ljF-W5-ncP"/>  
1363 - <constraint firstAttribute="trailing" secondItem="ugR-id-hYZ" secondAttribute="trailing" constant="19" id="rHY-LT-eQK"/>  
1364 - <constraint firstItem="FzF-1s-QFR" firstAttribute="bottom" secondItem="FrY-0D-sBM" secondAttribute="bottom" id="v8D-TK-lTU"/> 1352 + <constraint firstItem="ugR-id-hYZ" firstAttribute="centerY" secondItem="VjO-jB-oUF" secondAttribute="centerY" id="2RF-BQ-Gki"/>
  1353 + <constraint firstItem="NhS-aq-jEP" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="698-32-eyY"/>
  1354 + <constraint firstItem="FrY-0D-sBM" firstAttribute="centerX" secondItem="VjO-jB-oUF" secondAttribute="centerX" id="AS9-hN-3w3"/>
  1355 + <constraint firstItem="ugR-id-hYZ" firstAttribute="trailing" secondItem="VjO-jB-oUF" secondAttribute="trailing" constant="-20" id="LTs-7i-DNl"/>
  1356 + <constraint firstItem="FrY-0D-sBM" firstAttribute="centerY" secondItem="VjO-jB-oUF" secondAttribute="centerY" id="Mgc-zw-8JS"/>
  1357 + <constraint firstItem="qHt-PD-nGP" firstAttribute="centerX" secondItem="VjO-jB-oUF" secondAttribute="leading" constant="70" id="Opd-Dt-ZZQ"/>
  1358 + <constraint firstItem="qHt-PD-nGP" firstAttribute="leading" secondItem="FzF-1s-QFR" secondAttribute="trailing" constant="5" id="RUd-Tr-tqp"/>
  1359 + <constraint firstItem="qHt-PD-nGP" firstAttribute="centerY" secondItem="VjO-jB-oUF" secondAttribute="centerY" id="Tc8-5K-We8"/>
  1360 + <constraint firstItem="FrY-0D-sBM" firstAttribute="leading" secondItem="NhS-aq-jEP" secondAttribute="trailing" constant="5" id="U4M-PU-Cjw"/>
  1361 + <constraint firstItem="FzF-1s-QFR" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="Xd0-jF-z4i"/>
  1362 + <constraint firstItem="kpT-5T-UAU" firstAttribute="top" secondItem="VjO-jB-oUF" secondAttribute="top" constant="12" id="diH-UT-dSj"/>
  1363 + <constraint firstItem="ugR-id-hYZ" firstAttribute="leading" secondItem="kpT-5T-UAU" secondAttribute="trailing" constant="5" id="heo-8z-1z6"/>
1365 <constraint firstAttribute="height" constant="40" id="z5k-bG-9tN"/> 1364 <constraint firstAttribute="height" constant="40" id="z5k-bG-9tN"/>
1366 </constraints> 1365 </constraints>
1367 </view> 1366 </view>
ParentAssistant/Pods/Pods.xcodeproj/xcuserdata/caoyang.xcuserdatad/xcschemes/xcschememanagement.plist
  Diff comments   View file @913c6d0
@@ -7,47 +7,47 @@ @@ -7,47 +7,47 @@
7 <key>Alamofire.xcscheme</key> 7 <key>Alamofire.xcscheme</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 <key>DZNEmptyDataSet.xcscheme</key> 12 <key>DZNEmptyDataSet.xcscheme</key>
13 <dict> 13 <dict>
14 <key>orderHint</key> 14 <key>orderHint</key>
15 - <integer>1</integer> 15 + <integer>2</integer>
16 </dict> 16 </dict>
17 <key>Pods-ParentAssistant.xcscheme</key> 17 <key>Pods-ParentAssistant.xcscheme</key>
18 <dict> 18 <dict>
19 <key>orderHint</key> 19 <key>orderHint</key>
20 - <integer>2</integer> 20 + <integer>3</integer>
21 </dict> 21 </dict>
22 <key>Reachability.xcscheme</key> 22 <key>Reachability.xcscheme</key>
23 <dict> 23 <dict>
24 <key>orderHint</key> 24 <key>orderHint</key>
25 - <integer>3</integer> 25 + <integer>4</integer>
26 </dict> 26 </dict>
27 <key>SDWebImage.xcscheme</key> 27 <key>SDWebImage.xcscheme</key>
28 <dict> 28 <dict>
29 <key>orderHint</key> 29 <key>orderHint</key>
30 - <integer>4</integer> 30 + <integer>5</integer>
31 </dict> 31 </dict>
32 <key>SVProgressHUD.xcscheme</key> 32 <key>SVProgressHUD.xcscheme</key>
33 <dict> 33 <dict>
34 <key>orderHint</key> 34 <key>orderHint</key>
35 - <integer>5</integer> 35 + <integer>6</integer>
36 </dict> 36 </dict>
37 <key>SwiftHash.xcscheme</key> 37 <key>SwiftHash.xcscheme</key>
38 <dict> 38 <dict>
39 <key>orderHint</key> 39 <key>orderHint</key>
40 - <integer>6</integer> 40 + <integer>7</integer>
41 </dict> 41 </dict>
42 <key>Toast.xcscheme</key> 42 <key>Toast.xcscheme</key>
43 <dict> 43 <dict>
44 <key>orderHint</key> 44 <key>orderHint</key>
45 - <integer>7</integer> 45 + <integer>8</integer>
46 </dict> 46 </dict>
47 <key>XRCarouselView.xcscheme</key> 47 <key>XRCarouselView.xcscheme</key>
48 <dict> 48 <dict>
49 <key>orderHint</key> 49 <key>orderHint</key>
50 - <integer>8</integer> 50 + <integer>9</integer>
51 </dict> 51 </dict>
52 </dict> 52 </dict>
53 </dict> 53 </dict>