Commit 680290e79340b0e2bd857e3c1e5f33ec73720e85
Exists in
parentassistant
Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant # Conflicts: # ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
Showing
2 changed files
with
24 additions
and
0 deletions
Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
| ... | ... | @@ -848,19 +848,38 @@ |
| 848 | 848 | <constraint firstAttribute="bottom" secondItem="wGp-kr-l5S" secondAttribute="bottom" id="p0u-d2-Uig"/> |
| 849 | 849 | </constraints> |
| 850 | 850 | </view> |
| 851 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A43-XP-A41"> | |
| 852 | + <rect key="frame" x="0.0" y="64" width="375" height="554"/> | |
| 853 | + <subviews> | |
| 854 | + <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="report_none_icon" translatesAutoresizingMaskIntoConstraints="NO" id="UQe-Gr-lR7"> | |
| 855 | + <rect key="frame" x="0.0" y="0.0" width="375" height="554"/> | |
| 856 | + </imageView> | |
| 857 | + </subviews> | |
| 858 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 859 | + <constraints> | |
| 860 | + <constraint firstItem="UQe-Gr-lR7" firstAttribute="leading" secondItem="A43-XP-A41" secondAttribute="leading" id="IUB-AR-Uxa"/> | |
| 861 | + <constraint firstAttribute="trailing" secondItem="UQe-Gr-lR7" secondAttribute="trailing" id="JhX-yG-EaC"/> | |
| 862 | + <constraint firstItem="UQe-Gr-lR7" firstAttribute="top" secondItem="A43-XP-A41" secondAttribute="top" id="Uj3-Gn-cME"/> | |
| 863 | + <constraint firstAttribute="bottom" secondItem="UQe-Gr-lR7" secondAttribute="bottom" id="aTh-Mz-V0s"/> | |
| 864 | + </constraints> | |
| 865 | + </view> | |
| 851 | 866 | </subviews> |
| 852 | 867 | <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> |
| 853 | 868 | <constraints> |
| 854 | 869 | <constraint firstItem="hwJ-Xg-tKm" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="5Q0-Yi-ShV"/> |
| 855 | 870 | <constraint firstItem="hwJ-Xg-tKm" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="61Z-vW-5DV"/> |
| 871 | + <constraint firstItem="A43-XP-A41" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="Iba-zi-BPh"/> | |
| 856 | 872 | <constraint firstItem="EEs-Ae-t7U" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="JYY-zh-cHV"/> |
| 857 | 873 | <constraint firstItem="k9z-2G-Fhx" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="JtI-9e-igF"/> |
| 858 | 874 | <constraint firstItem="EEs-Ae-t7U" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="MzB-kU-gbs"/> |
| 859 | 875 | <constraint firstItem="EEs-Ae-t7U" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="NPL-F1-7Sg"/> |
| 876 | + <constraint firstItem="A43-XP-A41" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="NsR-AG-Nxb"/> | |
| 860 | 877 | <constraint firstItem="k9z-2G-Fhx" firstAttribute="leading" secondItem="9O4-jf-dgu" secondAttribute="leading" id="QZG-IF-A8F"/> |
| 861 | 878 | <constraint firstItem="EEs-Ae-t7U" firstAttribute="top" secondItem="k9z-2G-Fhx" secondAttribute="bottom" constant="5" id="SBe-2c-H4J"/> |
| 879 | + <constraint firstItem="A43-XP-A41" firstAttribute="bottom" secondItem="9O4-jf-dgu" secondAttribute="bottom" id="ShD-0u-kTc"/> | |
| 862 | 880 | <constraint firstItem="k9z-2G-Fhx" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="UIi-qU-PBc"/> |
| 863 | 881 | <constraint firstAttribute="bottom" secondItem="hwJ-Xg-tKm" secondAttribute="bottom" id="YjS-6f-Gk9"/> |
| 882 | + <constraint firstItem="A43-XP-A41" firstAttribute="top" secondItem="9O4-jf-dgu" secondAttribute="top" id="hu6-HC-sc0"/> | |
| 864 | 883 | <constraint firstItem="hwJ-Xg-tKm" firstAttribute="trailing" secondItem="9O4-jf-dgu" secondAttribute="trailing" id="sNr-ZT-Lsy"/> |
| 865 | 884 | </constraints> |
| 866 | 885 | <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/> |
| ... | ... | @@ -2144,5 +2163,10 @@ |
| 2144 | 2163 | <image name="report_bar_icon" width="22" height="20"/> |
| 2145 | 2164 | <image name="report_bar_icon_select" width="22" height="20"/> |
| 2146 | 2165 | <image name="report_teacher" width="130" height="155"/> |
| 2166 | + <image name="report_none_icon" width="250" height="250"/> | |
| 2167 | + <image name="test001" width="540" height="278"/> | |
| 2168 | + <image name="test002" width="216" height="282"/> | |
| 2169 | + <image name="test003" width="732" height="388"/> | |
| 2170 | + | |
| 2147 | 2171 | </resources> |
| 2148 | 2172 | </document> | ... | ... |