Commit 875b68b4011a58aa97e0cae2803848e036385267
1 parent
85598203
feat:mine page UI
Showing
35 changed files
with
208 additions
and
298 deletions
HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@2x.png deleted
1.22 KB
HDFwear/Assets.xcassets/Mine/app_update.imageset/APP检查更新@3x.png deleted
2.28 KB
HDFwear/Assets.xcassets/Mine/app_update.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "APP检查更新@2x.png", | |
| 8 | + "filename" : "app_update@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "APP检查更新@3x.png", | |
| 13 | + "filename" : "app_update@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@2x.png
0 → 100644
2.35 KB
HDFwear/Assets.xcassets/Mine/app_update.imageset/app_update@3x.png
0 → 100644
3.31 KB
HDFwear/Assets.xcassets/Mine/health_report.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "健康报告@2x.png", | |
| 8 | + "filename" : "health_report@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "健康报告@3x.png", | |
| 13 | + "filename" : "health_report@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@2x.png
0 → 100644
2.47 KB
HDFwear/Assets.xcassets/Mine/health_report.imageset/health_report@3x.png
0 → 100644
1.99 KB
HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@2x.png deleted
949 Bytes
HDFwear/Assets.xcassets/Mine/health_report.imageset/健康报告@3x.png deleted
1.6 KB
HDFwear/Assets.xcassets/Mine/mine_about.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "关于@2x.png", | |
| 8 | + "filename" : "mine_about@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "关于@3x.png", | |
| 13 | + "filename" : "mine_about@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@2x.png
0 → 100644
2.84 KB
HDFwear/Assets.xcassets/Mine/mine_about.imageset/mine_about@3x.png
0 → 100644
4.12 KB
HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@2x.png deleted
856 Bytes
HDFwear/Assets.xcassets/Mine/mine_about.imageset/关于@3x.png deleted
1.59 KB
HDFwear/Assets.xcassets/Mine/mine_data.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "我的数据@2x.png", | |
| 8 | + "filename" : "mine_data@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "我的数据@3x.png", | |
| 13 | + "filename" : "mine_data@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@2x.png
0 → 100644
2.52 KB
HDFwear/Assets.xcassets/Mine/mine_data.imageset/mine_data@3x.png
0 → 100644
1.99 KB
HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@2x.png deleted
900 Bytes
HDFwear/Assets.xcassets/Mine/mine_data.imageset/我的数据@3x.png deleted
1.55 KB
HDFwear/Assets.xcassets/Mine/personal_info.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "个人资料@2x.png", | |
| 8 | + "filename" : "personal_info@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "个人资料@3x.png", | |
| 13 | + "filename" : "personal_info@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@2x.png
0 → 100644
2.2 KB
HDFwear/Assets.xcassets/Mine/personal_info.imageset/personal_info@3x.png
0 → 100644
1.72 KB
HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@2x.png deleted
1.19 KB
HDFwear/Assets.xcassets/Mine/personal_info.imageset/个人资料@3x.png deleted
2.22 KB
HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/Contents.json
| ... | ... | @@ -5,12 +5,12 @@ |
| 5 | 5 | "scale" : "1x" |
| 6 | 6 | }, |
| 7 | 7 | { |
| 8 | - "filename" : "隐私政策@2x.png", | |
| 8 | + "filename" : "privacy_policy@2x.png", | |
| 9 | 9 | "idiom" : "universal", |
| 10 | 10 | "scale" : "2x" |
| 11 | 11 | }, |
| 12 | 12 | { |
| 13 | - "filename" : "隐私政策@3x.png", | |
| 13 | + "filename" : "privacy_policy@3x.png", | |
| 14 | 14 | "idiom" : "universal", |
| 15 | 15 | "scale" : "3x" |
| 16 | 16 | } | ... | ... |
HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@2x.png
0 → 100644
2.87 KB
HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/privacy_policy@3x.png
0 → 100644
2.18 KB
HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@2x.png deleted
795 Bytes
HDFwear/Assets.xcassets/Mine/privacy_policy.imageset/隐私政策@3x.png deleted
1.43 KB
HDFwear/Assets.xcassets/Setting/.DS_Store
No preview for this file type
HDFwear/Mine/Base.lproj/Mine.storyboard
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | |
| 3 | 3 | <device id="retina6_1" orientation="portrait" appearance="light"/> |
| 4 | 4 | <dependencies> |
| 5 | 5 | <deployment identifier="iOS"/> |
| 6 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> | |
| 6 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/> | |
| 7 | 7 | <capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 8 | 8 | <capability name="System colors in document resources" minToolsVersion="11.0"/> |
| 9 | 9 | <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| ... | ... | @@ -17,262 +17,177 @@ |
| 17 | 17 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
| 18 | 18 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 19 | 19 | <subviews> |
| 20 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i9Q-Ty-Fo0"> | |
| 21 | - <rect key="frame" x="0.0" y="88" width="414" height="85"/> | |
| 20 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z4D-1d-PPy"> | |
| 21 | + <rect key="frame" x="13" y="112" width="388" height="750"/> | |
| 22 | 22 | <subviews> |
| 23 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar_male" translatesAutoresizingMaskIntoConstraints="NO" id="2BV-dM-Vd3"> | |
| 24 | - <rect key="frame" x="10" y="11.5" width="62" height="62"/> | |
| 23 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i9Q-Ty-Fo0"> | |
| 24 | + <rect key="frame" x="0.0" y="0.0" width="388" height="117"/> | |
| 25 | + <subviews> | |
| 26 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar_male" translatesAutoresizingMaskIntoConstraints="NO" id="2BV-dM-Vd3"> | |
| 27 | + <rect key="frame" x="30" y="33.5" width="50" height="50"/> | |
| 28 | + <constraints> | |
| 29 | + <constraint firstAttribute="width" constant="50" id="8kS-dj-EcP"/> | |
| 30 | + <constraint firstAttribute="height" constant="50" id="igA-WQ-IiQ"/> | |
| 31 | + </constraints> | |
| 32 | + <userDefinedRuntimeAttributes> | |
| 33 | + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
| 34 | + <integer key="value" value="31"/> | |
| 35 | + </userDefinedRuntimeAttribute> | |
| 36 | + </userDefinedRuntimeAttributes> | |
| 37 | + </imageView> | |
| 38 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WOY-xj-Zeh"> | |
| 39 | + <rect key="frame" x="98" y="33.5" width="41.5" height="22.5"/> | |
| 40 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
| 41 | + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> | |
| 42 | + <nil key="highlightedColor"/> | |
| 43 | + </label> | |
| 44 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID:123456" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vG3-pq-sfA"> | |
| 45 | + <rect key="frame" x="98" y="59" width="65.5" height="20"/> | |
| 46 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/> | |
| 47 | + <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> | |
| 48 | + <nil key="highlightedColor"/> | |
| 49 | + </label> | |
| 50 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="j9Y-jh-Ehb"> | |
| 51 | + <rect key="frame" x="356" y="52.5" width="12" height="12"/> | |
| 52 | + <constraints> | |
| 53 | + <constraint firstAttribute="height" constant="12" id="HF6-5Y-L91"/> | |
| 54 | + <constraint firstAttribute="width" constant="12" id="kRY-9z-De2"/> | |
| 55 | + </constraints> | |
| 56 | + </imageView> | |
| 57 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QXe-bI-h3h"> | |
| 58 | + <rect key="frame" x="0.0" y="0.0" width="388" height="117"/> | |
| 59 | + <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | |
| 60 | + <connections> | |
| 61 | + <action selector="setUserInfo:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="ge2-cR-uvX"/> | |
| 62 | + </connections> | |
| 63 | + </button> | |
| 64 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="pBr-O6-gYR"> | |
| 65 | + <rect key="frame" x="20" y="116" width="348" height="1"/> | |
| 66 | + <color key="backgroundColor" red="0.86274509803921573" green="0.86274509803921573" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> | |
| 67 | + <constraints> | |
| 68 | + <constraint firstAttribute="height" constant="1" id="jos-Gq-H8Z"/> | |
| 69 | + </constraints> | |
| 70 | + </imageView> | |
| 71 | + </subviews> | |
| 72 | + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> | |
| 25 | 73 | <constraints> |
| 26 | - <constraint firstAttribute="width" constant="62" id="8kS-dj-EcP"/> | |
| 27 | - <constraint firstAttribute="height" constant="62" id="igA-WQ-IiQ"/> | |
| 74 | + <constraint firstItem="QXe-bI-h3h" firstAttribute="top" secondItem="i9Q-Ty-Fo0" secondAttribute="top" id="2m4-ad-JOQ"/> | |
| 75 | + <constraint firstItem="vG3-pq-sfA" firstAttribute="leading" secondItem="WOY-xj-Zeh" secondAttribute="leading" id="4HK-65-V8W"/> | |
| 76 | + <constraint firstItem="WOY-xj-Zeh" firstAttribute="top" secondItem="2BV-dM-Vd3" secondAttribute="top" id="5Jd-Cz-j1H"/> | |
| 77 | + <constraint firstAttribute="bottom" secondItem="QXe-bI-h3h" secondAttribute="bottom" id="CRS-bJ-Tdl"/> | |
| 78 | + <constraint firstItem="WOY-xj-Zeh" firstAttribute="leading" secondItem="2BV-dM-Vd3" secondAttribute="trailing" constant="18" id="Ckk-Zf-mNg"/> | |
| 79 | + <constraint firstAttribute="trailing" secondItem="QXe-bI-h3h" secondAttribute="trailing" id="Exb-3U-asp"/> | |
| 80 | + <constraint firstItem="2BV-dM-Vd3" firstAttribute="centerY" secondItem="i9Q-Ty-Fo0" secondAttribute="centerY" id="SaS-qm-VTn"/> | |
| 81 | + <constraint firstItem="QXe-bI-h3h" firstAttribute="leading" secondItem="i9Q-Ty-Fo0" secondAttribute="leading" id="UBA-8Q-YbW"/> | |
| 82 | + <constraint firstAttribute="trailing" secondItem="pBr-O6-gYR" secondAttribute="trailing" constant="20" id="Y4r-Pm-js6"/> | |
| 83 | + <constraint firstItem="pBr-O6-gYR" firstAttribute="leading" secondItem="i9Q-Ty-Fo0" secondAttribute="leading" constant="20" id="ahx-Zx-WH9"/> | |
| 84 | + <constraint firstItem="j9Y-jh-Ehb" firstAttribute="centerY" secondItem="i9Q-Ty-Fo0" secondAttribute="centerY" id="am8-xA-y3Q"/> | |
| 85 | + <constraint firstItem="2BV-dM-Vd3" firstAttribute="leading" secondItem="i9Q-Ty-Fo0" secondAttribute="leading" constant="30" id="avY-qj-EWO"/> | |
| 86 | + <constraint firstAttribute="bottom" secondItem="pBr-O6-gYR" secondAttribute="bottom" id="nUu-f2-Aor"/> | |
| 87 | + <constraint firstAttribute="trailing" secondItem="j9Y-jh-Ehb" secondAttribute="trailing" constant="20" id="nbK-T0-YLY"/> | |
| 88 | + <constraint firstAttribute="height" constant="117" id="qtP-h6-Q1f"/> | |
| 89 | + <constraint firstItem="vG3-pq-sfA" firstAttribute="top" secondItem="WOY-xj-Zeh" secondAttribute="bottom" constant="3" id="sEu-xy-Fg6"/> | |
| 28 | 90 | </constraints> |
| 29 | 91 | <userDefinedRuntimeAttributes> |
| 30 | 92 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> |
| 31 | - <integer key="value" value="31"/> | |
| 93 | + <integer key="value" value="10"/> | |
| 32 | 94 | </userDefinedRuntimeAttribute> |
| 33 | 95 | </userDefinedRuntimeAttributes> |
| 34 | - </imageView> | |
| 35 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WOY-xj-Zeh"> | |
| 36 | - <rect key="frame" x="81" y="20.5" width="275" height="23"/> | |
| 37 | - <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
| 38 | - <nil key="textColor"/> | |
| 39 | - <nil key="highlightedColor"/> | |
| 40 | - </label> | |
| 41 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID:123456" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vG3-pq-sfA"> | |
| 42 | - <rect key="frame" x="81" y="46.5" width="313" height="16"/> | |
| 43 | - <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="11"/> | |
| 44 | - <nil key="textColor"/> | |
| 45 | - <nil key="highlightedColor"/> | |
| 46 | - </label> | |
| 47 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="j9Y-jh-Ehb"> | |
| 48 | - <rect key="frame" x="376" y="36" width="13" height="13"/> | |
| 49 | - <constraints> | |
| 50 | - <constraint firstAttribute="height" constant="13" id="HF6-5Y-L91"/> | |
| 51 | - <constraint firstAttribute="width" constant="13" id="kRY-9z-De2"/> | |
| 52 | - </constraints> | |
| 53 | - </imageView> | |
| 54 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QXe-bI-h3h"> | |
| 55 | - <rect key="frame" x="0.0" y="0.0" width="414" height="85"/> | |
| 56 | - <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | |
| 57 | - <connections> | |
| 58 | - <action selector="setUserInfo:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="ge2-cR-uvX"/> | |
| 59 | - </connections> | |
| 60 | - </button> | |
| 61 | - </subviews> | |
| 62 | - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> | |
| 63 | - <constraints> | |
| 64 | - <constraint firstItem="QXe-bI-h3h" firstAttribute="top" secondItem="i9Q-Ty-Fo0" secondAttribute="top" id="2m4-ad-JOQ"/> | |
| 65 | - <constraint firstItem="vG3-pq-sfA" firstAttribute="leading" secondItem="WOY-xj-Zeh" secondAttribute="leading" id="4HK-65-V8W"/> | |
| 66 | - <constraint firstItem="WOY-xj-Zeh" firstAttribute="top" secondItem="2BV-dM-Vd3" secondAttribute="top" constant="9" id="5Jd-Cz-j1H"/> | |
| 67 | - <constraint firstAttribute="bottom" secondItem="QXe-bI-h3h" secondAttribute="bottom" id="CRS-bJ-Tdl"/> | |
| 68 | - <constraint firstItem="WOY-xj-Zeh" firstAttribute="leading" secondItem="2BV-dM-Vd3" secondAttribute="trailing" constant="9" id="Ckk-Zf-mNg"/> | |
| 69 | - <constraint firstAttribute="trailing" secondItem="QXe-bI-h3h" secondAttribute="trailing" id="Exb-3U-asp"/> | |
| 70 | - <constraint firstItem="2BV-dM-Vd3" firstAttribute="centerY" secondItem="i9Q-Ty-Fo0" secondAttribute="centerY" id="SaS-qm-VTn"/> | |
| 71 | - <constraint firstItem="QXe-bI-h3h" firstAttribute="leading" secondItem="i9Q-Ty-Fo0" secondAttribute="leading" id="UBA-8Q-YbW"/> | |
| 72 | - <constraint firstItem="j9Y-jh-Ehb" firstAttribute="leading" secondItem="WOY-xj-Zeh" secondAttribute="trailing" constant="20" id="aX6-bQ-1Ef"/> | |
| 73 | - <constraint firstItem="j9Y-jh-Ehb" firstAttribute="centerY" secondItem="i9Q-Ty-Fo0" secondAttribute="centerY" id="am8-xA-y3Q"/> | |
| 74 | - <constraint firstItem="2BV-dM-Vd3" firstAttribute="leading" secondItem="i9Q-Ty-Fo0" secondAttribute="leading" constant="10" id="avY-qj-EWO"/> | |
| 75 | - <constraint firstAttribute="trailing" secondItem="vG3-pq-sfA" secondAttribute="trailing" constant="20" id="h3i-dE-o1w"/> | |
| 76 | - <constraint firstAttribute="trailing" secondItem="j9Y-jh-Ehb" secondAttribute="trailing" constant="25" id="nbK-T0-YLY"/> | |
| 77 | - <constraint firstAttribute="height" constant="85" id="qtP-h6-Q1f"/> | |
| 78 | - <constraint firstItem="vG3-pq-sfA" firstAttribute="bottom" secondItem="2BV-dM-Vd3" secondAttribute="bottom" constant="-11" id="wkJ-rq-1mj"/> | |
| 79 | - </constraints> | |
| 80 | - <userDefinedRuntimeAttributes> | |
| 81 | - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
| 82 | - <integer key="value" value="10"/> | |
| 83 | - </userDefinedRuntimeAttribute> | |
| 84 | - </userDefinedRuntimeAttributes> | |
| 85 | - </view> | |
| 86 | - <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Xjz-yd-s1o"> | |
| 87 | - <rect key="frame" x="0.0" y="324" width="414" height="538"/> | |
| 88 | - <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> | |
| 89 | - <prototypes> | |
| 90 | - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MineCell" rowHeight="94" id="rb4-O9-QeW" customClass="MineCell" customModule="HDFwear" customModuleProvider="target"> | |
| 91 | - <rect key="frame" x="0.0" y="44.5" width="414" height="94"/> | |
| 92 | - <autoresizingMask key="autoresizingMask"/> | |
| 93 | - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rb4-O9-QeW" id="jNu-Xp-lf8"> | |
| 94 | - <rect key="frame" x="0.0" y="0.0" width="414" height="94"/> | |
| 95 | - <autoresizingMask key="autoresizingMask"/> | |
| 96 | - <subviews> | |
| 97 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7na-uG-ef3"> | |
| 98 | - <rect key="frame" x="12" y="37" width="20" height="20"/> | |
| 96 | + </view> | |
| 97 | + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Xjz-yd-s1o"> | |
| 98 | + <rect key="frame" x="0.0" y="127" width="388" height="623"/> | |
| 99 | + <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> | |
| 100 | + <prototypes> | |
| 101 | + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MineCell" rowHeight="94" id="rb4-O9-QeW" customClass="MineCell" customModule="HDFwear" customModuleProvider="target"> | |
| 102 | + <rect key="frame" x="0.0" y="50" width="388" height="94"/> | |
| 103 | + <autoresizingMask key="autoresizingMask"/> | |
| 104 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rb4-O9-QeW" id="jNu-Xp-lf8"> | |
| 105 | + <rect key="frame" x="0.0" y="0.0" width="388" height="94"/> | |
| 106 | + <autoresizingMask key="autoresizingMask"/> | |
| 107 | + <subviews> | |
| 108 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7na-uG-ef3"> | |
| 109 | + <rect key="frame" x="20" y="35" width="24" height="24"/> | |
| 110 | + <constraints> | |
| 111 | + <constraint firstAttribute="height" constant="24" id="30I-9p-H4j"/> | |
| 112 | + <constraint firstAttribute="width" constant="24" id="sAS-Op-i7y"/> | |
| 113 | + </constraints> | |
| 114 | + </imageView> | |
| 115 | + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="jec-P7-Dft"> | |
| 116 | + <rect key="frame" x="356" y="41" width="12" height="12"/> | |
| 117 | + <constraints> | |
| 118 | + <constraint firstAttribute="height" constant="12" id="I6i-c6-UL1"/> | |
| 119 | + <constraint firstAttribute="width" constant="12" id="mdj-hT-LnT"/> | |
| 120 | + </constraints> | |
| 121 | + </imageView> | |
| 122 | + <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sCm-Pz-xwe"> | |
| 123 | + <rect key="frame" x="0.0" y="93.5" width="388" height="0.5"/> | |
| 124 | + <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> | |
| 125 | + <constraints> | |
| 126 | + <constraint firstAttribute="height" constant="0.5" id="2C6-85-Ev0"/> | |
| 127 | + </constraints> | |
| 128 | + </view> | |
| 129 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eYs-ZT-PKT"> | |
| 130 | + <rect key="frame" x="62" y="36" width="41.5" height="22.5"/> | |
| 131 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
| 132 | + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> | |
| 133 | + <nil key="highlightedColor"/> | |
| 134 | + </label> | |
| 135 | + </subviews> | |
| 99 | 136 | <constraints> |
| 100 | - <constraint firstAttribute="height" constant="20" id="30I-9p-H4j"/> | |
| 101 | - <constraint firstAttribute="width" constant="20" id="sAS-Op-i7y"/> | |
| 137 | + <constraint firstItem="7na-uG-ef3" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="8re-fq-hu0"/> | |
| 138 | + <constraint firstItem="eYs-ZT-PKT" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="BTH-8e-yNz"/> | |
| 139 | + <constraint firstItem="sCm-Pz-xwe" firstAttribute="leading" secondItem="jNu-Xp-lf8" secondAttribute="leading" id="Hym-GY-xXi"/> | |
| 140 | + <constraint firstAttribute="trailing" secondItem="sCm-Pz-xwe" secondAttribute="trailing" id="hYP-VN-J3q"/> | |
| 141 | + <constraint firstItem="eYs-ZT-PKT" firstAttribute="leading" secondItem="7na-uG-ef3" secondAttribute="trailing" constant="18" id="rLr-dD-BF6"/> | |
| 142 | + <constraint firstItem="jec-P7-Dft" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="sSs-vI-ELb"/> | |
| 143 | + <constraint firstAttribute="trailing" secondItem="jec-P7-Dft" secondAttribute="trailing" constant="20" id="u1r-WO-VDc"/> | |
| 144 | + <constraint firstAttribute="bottom" secondItem="sCm-Pz-xwe" secondAttribute="bottom" id="wLe-ly-qM8"/> | |
| 145 | + <constraint firstItem="7na-uG-ef3" firstAttribute="leading" secondItem="jNu-Xp-lf8" secondAttribute="leading" constant="20" id="yF3-Pb-wCg"/> | |
| 102 | 146 | </constraints> |
| 103 | - </imageView> | |
| 104 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="jec-P7-Dft"> | |
| 105 | - <rect key="frame" x="389" y="40.5" width="13" height="13"/> | |
| 106 | - <constraints> | |
| 107 | - <constraint firstAttribute="height" constant="13" id="I6i-c6-UL1"/> | |
| 108 | - <constraint firstAttribute="width" constant="13" id="mdj-hT-LnT"/> | |
| 109 | - </constraints> | |
| 110 | - </imageView> | |
| 111 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sCm-Pz-xwe"> | |
| 112 | - <rect key="frame" x="0.0" y="93.5" width="414" height="0.5"/> | |
| 113 | - <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> | |
| 114 | - <constraints> | |
| 115 | - <constraint firstAttribute="height" constant="0.5" id="2C6-85-Ev0"/> | |
| 116 | - </constraints> | |
| 117 | - </view> | |
| 118 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eYs-ZT-PKT"> | |
| 119 | - <rect key="frame" x="41.5" y="36.5" width="337.5" height="21"/> | |
| 120 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> | |
| 121 | - <nil key="textColor"/> | |
| 122 | - <nil key="highlightedColor"/> | |
| 123 | - </label> | |
| 124 | - </subviews> | |
| 125 | - <constraints> | |
| 126 | - <constraint firstItem="7na-uG-ef3" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="8re-fq-hu0"/> | |
| 127 | - <constraint firstItem="eYs-ZT-PKT" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="BTH-8e-yNz"/> | |
| 128 | - <constraint firstItem="sCm-Pz-xwe" firstAttribute="leading" secondItem="jNu-Xp-lf8" secondAttribute="leading" id="Hym-GY-xXi"/> | |
| 129 | - <constraint firstItem="jec-P7-Dft" firstAttribute="leading" secondItem="eYs-ZT-PKT" secondAttribute="trailing" constant="10" id="QZr-Zc-24E"/> | |
| 130 | - <constraint firstAttribute="trailing" secondItem="sCm-Pz-xwe" secondAttribute="trailing" id="hYP-VN-J3q"/> | |
| 131 | - <constraint firstItem="eYs-ZT-PKT" firstAttribute="leading" secondItem="7na-uG-ef3" secondAttribute="trailing" constant="9.5" id="rLr-dD-BF6"/> | |
| 132 | - <constraint firstItem="jec-P7-Dft" firstAttribute="centerY" secondItem="jNu-Xp-lf8" secondAttribute="centerY" id="sSs-vI-ELb"/> | |
| 133 | - <constraint firstAttribute="trailing" secondItem="jec-P7-Dft" secondAttribute="trailing" constant="12" id="u1r-WO-VDc"/> | |
| 134 | - <constraint firstAttribute="bottom" secondItem="sCm-Pz-xwe" secondAttribute="bottom" id="wLe-ly-qM8"/> | |
| 135 | - <constraint firstItem="7na-uG-ef3" firstAttribute="leading" secondItem="jNu-Xp-lf8" secondAttribute="leading" constant="12" id="yF3-Pb-wCg"/> | |
| 136 | - </constraints> | |
| 137 | - </tableViewCellContentView> | |
| 138 | - <connections> | |
| 139 | - <outlet property="label" destination="eYs-ZT-PKT" id="uVZ-Ba-njc"/> | |
| 140 | - <outlet property="lineView" destination="sCm-Pz-xwe" id="e2A-cF-bUD"/> | |
| 141 | - <outlet property="setImageView" destination="7na-uG-ef3" id="YtA-j0-ZwJ"/> | |
| 142 | - </connections> | |
| 143 | - </tableViewCell> | |
| 144 | - </prototypes> | |
| 145 | - <connections> | |
| 146 | - <outlet property="dataSource" destination="Y6W-OH-hqX" id="ppV-8x-54N"/> | |
| 147 | - <outlet property="delegate" destination="Y6W-OH-hqX" id="ldw-KU-FQ8"/> | |
| 148 | - </connections> | |
| 149 | - </tableView> | |
| 150 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iHk-MH-NEv"> | |
| 151 | - <rect key="frame" x="12.5" y="183" width="389" height="131"/> | |
| 152 | - <subviews> | |
| 153 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的勋章" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mW3-K3-I3E"> | |
| 154 | - <rect key="frame" x="10" y="10" width="60" height="21"/> | |
| 155 | - <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/> | |
| 156 | - <nil key="textColor"/> | |
| 157 | - <nil key="highlightedColor"/> | |
| 158 | - </label> | |
| 159 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="aHc-6d-5Pf"> | |
| 160 | - <rect key="frame" x="363" y="14" width="13" height="13"/> | |
| 161 | - <constraints> | |
| 162 | - <constraint firstAttribute="height" constant="13" id="WgU-cS-WSW"/> | |
| 163 | - <constraint firstAttribute="width" constant="13" id="uf5-eq-WXI"/> | |
| 164 | - </constraints> | |
| 165 | - </imageView> | |
| 166 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的勋章" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rFY-oT-EBF"> | |
| 167 | - <rect key="frame" x="306" y="12.5" width="44" height="16"/> | |
| 168 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> | |
| 169 | - <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/> | |
| 170 | - <nil key="highlightedColor"/> | |
| 171 | - </label> | |
| 172 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="单日1万步灰" translatesAutoresizingMaskIntoConstraints="NO" id="F25-pC-gan"> | |
| 173 | - <rect key="frame" x="15" y="45" width="64" height="64"/> | |
| 174 | - <constraints> | |
| 175 | - <constraint firstAttribute="width" secondItem="F25-pC-gan" secondAttribute="height" id="KFF-xB-YN8"/> | |
| 176 | - </constraints> | |
| 177 | - </imageView> | |
| 178 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="单日2万步灰" translatesAutoresizingMaskIntoConstraints="NO" id="DYg-Yd-aOo"> | |
| 179 | - <rect key="frame" x="89" y="45" width="63.5" height="64"/> | |
| 180 | - <constraints> | |
| 181 | - <constraint firstAttribute="width" secondItem="DYg-Yd-aOo" secondAttribute="height" id="gjc-tM-yHF"/> | |
| 182 | - </constraints> | |
| 183 | - </imageView> | |
| 184 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="单日3万步灰" translatesAutoresizingMaskIntoConstraints="NO" id="YVf-NP-wJX"> | |
| 185 | - <rect key="frame" x="162.5" y="45" width="64" height="64"/> | |
| 186 | - <constraints> | |
| 187 | - <constraint firstAttribute="width" secondItem="YVf-NP-wJX" secondAttribute="height" id="JG6-fK-fZH"/> | |
| 188 | - </constraints> | |
| 189 | - </imageView> | |
| 190 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="累计5万步灰" translatesAutoresizingMaskIntoConstraints="NO" id="RGM-oo-kz4"> | |
| 191 | - <rect key="frame" x="236.5" y="45" width="63.5" height="64"/> | |
| 192 | - <constraints> | |
| 193 | - <constraint firstAttribute="width" secondItem="RGM-oo-kz4" secondAttribute="height" id="2F9-Ya-Ctd"/> | |
| 194 | - </constraints> | |
| 195 | - </imageView> | |
| 196 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="累计10万步灰" translatesAutoresizingMaskIntoConstraints="NO" id="Ont-aP-ws9"> | |
| 197 | - <rect key="frame" x="310" y="45" width="64" height="64"/> | |
| 198 | - <constraints> | |
| 199 | - <constraint firstAttribute="width" secondItem="Ont-aP-ws9" secondAttribute="height" id="UFa-Q7-6aB"/> | |
| 200 | - </constraints> | |
| 201 | - </imageView> | |
| 202 | - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="viJ-UN-9iI"> | |
| 203 | - <rect key="frame" x="0.0" y="0.0" width="389" height="131"/> | |
| 204 | - <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> | |
| 147 | + </tableViewCellContentView> | |
| 148 | + <connections> | |
| 149 | + <outlet property="label" destination="eYs-ZT-PKT" id="uVZ-Ba-njc"/> | |
| 150 | + <outlet property="lineView" destination="sCm-Pz-xwe" id="e2A-cF-bUD"/> | |
| 151 | + <outlet property="setImageView" destination="7na-uG-ef3" id="YtA-j0-ZwJ"/> | |
| 152 | + </connections> | |
| 153 | + </tableViewCell> | |
| 154 | + </prototypes> | |
| 205 | 155 | <connections> |
| 206 | - <action selector="gotoMedalVC:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="Kn6-PQ-kEC"/> | |
| 156 | + <outlet property="dataSource" destination="Y6W-OH-hqX" id="ppV-8x-54N"/> | |
| 157 | + <outlet property="delegate" destination="Y6W-OH-hqX" id="ldw-KU-FQ8"/> | |
| 207 | 158 | </connections> |
| 208 | - </button> | |
| 159 | + </tableView> | |
| 209 | 160 | </subviews> |
| 210 | - <color key="backgroundColor" systemColor="systemBackgroundColor"/> | |
| 161 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | |
| 211 | 162 | <constraints> |
| 212 | - <constraint firstItem="Ont-aP-ws9" firstAttribute="width" secondItem="Ont-aP-ws9" secondAttribute="height" id="44U-Ua-QR3"/> | |
| 213 | - <constraint firstItem="Ont-aP-ws9" firstAttribute="centerY" secondItem="F25-pC-gan" secondAttribute="centerY" id="47S-VQ-tbR"/> | |
| 214 | - <constraint firstItem="DYg-Yd-aOo" firstAttribute="width" secondItem="F25-pC-gan" secondAttribute="width" id="5h9-KM-Nwy"/> | |
| 215 | - <constraint firstItem="YVf-NP-wJX" firstAttribute="width" secondItem="F25-pC-gan" secondAttribute="width" id="6F3-tU-f3Z"/> | |
| 216 | - <constraint firstAttribute="trailing" secondItem="viJ-UN-9iI" secondAttribute="trailing" id="B6F-m1-KtK"/> | |
| 217 | - <constraint firstItem="RGM-oo-kz4" firstAttribute="width" secondItem="F25-pC-gan" secondAttribute="width" id="DeI-3E-Mgy"/> | |
| 218 | - <constraint firstItem="mW3-K3-I3E" firstAttribute="leading" secondItem="iHk-MH-NEv" secondAttribute="leading" constant="10" id="Hsh-yf-ZXE"/> | |
| 219 | - <constraint firstItem="viJ-UN-9iI" firstAttribute="leading" secondItem="iHk-MH-NEv" secondAttribute="leading" id="IcO-3Q-Ksk"/> | |
| 220 | - <constraint firstItem="aHc-6d-5Pf" firstAttribute="centerY" secondItem="rFY-oT-EBF" secondAttribute="centerY" id="Lmb-1B-JPd"/> | |
| 221 | - <constraint firstItem="RGM-oo-kz4" firstAttribute="leading" secondItem="YVf-NP-wJX" secondAttribute="trailing" constant="10" id="Nvm-Gz-0d9"/> | |
| 222 | - <constraint firstItem="RGM-oo-kz4" firstAttribute="centerY" secondItem="F25-pC-gan" secondAttribute="centerY" id="OBq-qw-TPF"/> | |
| 223 | - <constraint firstItem="aHc-6d-5Pf" firstAttribute="leading" secondItem="rFY-oT-EBF" secondAttribute="trailing" constant="13" id="Qkw-XK-nY7"/> | |
| 224 | - <constraint firstItem="Ont-aP-ws9" firstAttribute="width" secondItem="F25-pC-gan" secondAttribute="width" id="SKR-zD-Xf0"/> | |
| 225 | - <constraint firstItem="F25-pC-gan" firstAttribute="top" secondItem="aHc-6d-5Pf" secondAttribute="bottom" constant="18" id="TP0-9Y-k8C"/> | |
| 226 | - <constraint firstAttribute="trailing" secondItem="Ont-aP-ws9" secondAttribute="trailing" constant="15" id="TT9-Mg-5oj"/> | |
| 227 | - <constraint firstItem="YVf-NP-wJX" firstAttribute="centerY" secondItem="F25-pC-gan" secondAttribute="centerY" id="Wyy-En-15U"/> | |
| 228 | - <constraint firstAttribute="bottom" secondItem="viJ-UN-9iI" secondAttribute="bottom" id="ZT6-MU-vZj"/> | |
| 229 | - <constraint firstItem="F25-pC-gan" firstAttribute="leading" secondItem="iHk-MH-NEv" secondAttribute="leading" constant="15" id="ew0-tT-Y3M"/> | |
| 230 | - <constraint firstItem="aHc-6d-5Pf" firstAttribute="centerY" secondItem="mW3-K3-I3E" secondAttribute="centerY" id="fqP-We-9Wn"/> | |
| 231 | - <constraint firstItem="RGM-oo-kz4" firstAttribute="width" secondItem="RGM-oo-kz4" secondAttribute="height" id="g3i-JY-cqS"/> | |
| 232 | - <constraint firstItem="Ont-aP-ws9" firstAttribute="leading" secondItem="RGM-oo-kz4" secondAttribute="trailing" constant="10" id="ghR-Yt-Lkf"/> | |
| 233 | - <constraint firstItem="DYg-Yd-aOo" firstAttribute="centerY" secondItem="F25-pC-gan" secondAttribute="centerY" id="j28-SF-Ohn"/> | |
| 234 | - <constraint firstItem="DYg-Yd-aOo" firstAttribute="width" secondItem="DYg-Yd-aOo" secondAttribute="height" id="nEp-5a-kk1"/> | |
| 235 | - <constraint firstItem="viJ-UN-9iI" firstAttribute="top" secondItem="iHk-MH-NEv" secondAttribute="top" id="o9T-xj-ETJ"/> | |
| 236 | - <constraint firstItem="mW3-K3-I3E" firstAttribute="top" secondItem="iHk-MH-NEv" secondAttribute="top" constant="10" id="son-sp-5l4"/> | |
| 237 | - <constraint firstAttribute="bottom" secondItem="F25-pC-gan" secondAttribute="bottom" constant="22" id="uZE-zm-bR0"/> | |
| 238 | - <constraint firstItem="YVf-NP-wJX" firstAttribute="width" secondItem="YVf-NP-wJX" secondAttribute="height" id="vAc-rA-xHf"/> | |
| 239 | - <constraint firstItem="YVf-NP-wJX" firstAttribute="leading" secondItem="DYg-Yd-aOo" secondAttribute="trailing" constant="10" id="y6J-FC-3XW"/> | |
| 240 | - <constraint firstItem="DYg-Yd-aOo" firstAttribute="leading" secondItem="F25-pC-gan" secondAttribute="trailing" constant="10" id="z4n-dT-c0u"/> | |
| 241 | - <constraint firstAttribute="trailing" secondItem="aHc-6d-5Pf" secondAttribute="trailing" constant="13" id="zEJ-J4-WSN"/> | |
| 163 | + <constraint firstAttribute="trailing" secondItem="Xjz-yd-s1o" secondAttribute="trailing" id="BMR-QO-P3m"/> | |
| 164 | + <constraint firstItem="i9Q-Ty-Fo0" firstAttribute="leading" secondItem="Z4D-1d-PPy" secondAttribute="leading" id="GUW-6O-bKo"/> | |
| 165 | + <constraint firstItem="Xjz-yd-s1o" firstAttribute="top" secondItem="i9Q-Ty-Fo0" secondAttribute="bottom" constant="10" id="Jb7-ob-3HV"/> | |
| 166 | + <constraint firstAttribute="trailing" secondItem="i9Q-Ty-Fo0" secondAttribute="trailing" id="OlC-66-Xci"/> | |
| 167 | + <constraint firstItem="Xjz-yd-s1o" firstAttribute="leading" secondItem="Z4D-1d-PPy" secondAttribute="leading" id="d0m-Zt-P2I"/> | |
| 168 | + <constraint firstAttribute="bottom" secondItem="Xjz-yd-s1o" secondAttribute="bottom" id="pnt-yE-6TJ"/> | |
| 169 | + <constraint firstItem="i9Q-Ty-Fo0" firstAttribute="top" secondItem="Z4D-1d-PPy" secondAttribute="top" id="u7N-2W-SIK"/> | |
| 242 | 170 | </constraints> |
| 243 | 171 | <userDefinedRuntimeAttributes> |
| 244 | 172 | <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> |
| 245 | - <integer key="value" value="10"/> | |
| 173 | + <integer key="value" value="12"/> | |
| 246 | 174 | </userDefinedRuntimeAttribute> |
| 247 | 175 | </userDefinedRuntimeAttributes> |
| 248 | 176 | </view> |
| 249 | 177 | </subviews> |
| 250 | 178 | <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/> |
| 251 | - <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> | |
| 179 | + <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/> | |
| 252 | 180 | <constraints> |
| 253 | - <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="i9Q-Ty-Fo0" secondAttribute="trailing" id="AuC-nX-mLd"/> | |
| 254 | - <constraint firstItem="Xjz-yd-s1o" firstAttribute="trailing" secondItem="vDu-zF-Fre" secondAttribute="trailing" id="DBK-83-4sB"/> | |
| 255 | - <constraint firstItem="i9Q-Ty-Fo0" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" id="EOE-8Q-VZ4"/> | |
| 256 | - <constraint firstItem="Xjz-yd-s1o" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="KBr-2o-bUb"/> | |
| 257 | - <constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="Xjz-yd-s1o" secondAttribute="bottom" id="NeL-ni-Eu0"/> | |
| 258 | - <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="iHk-MH-NEv" secondAttribute="trailing" constant="12.5" id="S8b-Ng-qGT"/> | |
| 259 | - <constraint firstItem="Xjz-yd-s1o" firstAttribute="top" secondItem="iHk-MH-NEv" secondAttribute="bottom" constant="10" id="dKt-hV-r8Q"/> | |
| 260 | - <constraint firstItem="i9Q-Ty-Fo0" firstAttribute="leading" secondItem="5EZ-qb-Rvc" secondAttribute="leading" id="gfG-uO-Xj5"/> | |
| 261 | - <constraint firstItem="iHk-MH-NEv" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="12.5" id="xPu-FQ-zWZ"/> | |
| 262 | - <constraint firstItem="iHk-MH-NEv" firstAttribute="top" secondItem="i9Q-Ty-Fo0" secondAttribute="bottom" constant="10" id="yKa-Ze-FuM"/> | |
| 181 | + <constraint firstItem="Z4D-1d-PPy" firstAttribute="bottom" secondItem="vDu-zF-Fre" secondAttribute="bottom" id="8Uf-X0-CBn"/> | |
| 182 | + <constraint firstItem="Z4D-1d-PPy" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="20" id="kdt-Ah-t4P"/> | |
| 183 | + <constraint firstItem="Z4D-1d-PPy" firstAttribute="trailing" secondItem="vDu-zF-Fre" secondAttribute="trailing" constant="-13" id="lFM-Sq-jSW"/> | |
| 184 | + <constraint firstItem="Z4D-1d-PPy" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="13" id="qW1-i9-rit"/> | |
| 263 | 185 | </constraints> |
| 264 | 186 | </view> |
| 265 | 187 | <navigationItem key="navigationItem" id="N27-le-g6l"/> |
| 266 | 188 | <connections> |
| 267 | 189 | <outlet property="avatarImageView" destination="2BV-dM-Vd3" id="oAH-2g-dIp"/> |
| 268 | 190 | <outlet property="idLabel" destination="vG3-pq-sfA" id="Wy3-O3-yCn"/> |
| 269 | - <outlet property="locLabel1" destination="mW3-K3-I3E" id="FX6-r6-l7w"/> | |
| 270 | - <outlet property="medalImageView1" destination="F25-pC-gan" id="fHa-IW-Heq"/> | |
| 271 | - <outlet property="medalImageView2" destination="DYg-Yd-aOo" id="1QF-dj-e6Z"/> | |
| 272 | - <outlet property="medalImageView3" destination="YVf-NP-wJX" id="Lnc-hp-aIy"/> | |
| 273 | - <outlet property="medalImageView4" destination="RGM-oo-kz4" id="D2H-GQ-CXW"/> | |
| 274 | - <outlet property="medalImageView5" destination="Ont-aP-ws9" id="l9g-a4-ykD"/> | |
| 275 | - <outlet property="medalNumLabel" destination="rFY-oT-EBF" id="Kkq-aG-yiu"/> | |
| 276 | 191 | <outlet property="nameLabel" destination="WOY-xj-Zeh" id="XeO-S7-UYq"/> |
| 277 | 192 | <outlet property="tableView" destination="Xjz-yd-s1o" id="ykr-HY-Ioc"/> |
| 278 | 193 | </connections> |
| ... | ... | @@ -290,20 +205,20 @@ |
| 290 | 205 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 291 | 206 | <subviews> |
| 292 | 207 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f06-cu-21Z"> |
| 293 | - <rect key="frame" x="182" y="96" width="50" height="35"/> | |
| 208 | + <rect key="frame" x="182" y="100" width="50" height="35"/> | |
| 294 | 209 | <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="25"/> |
| 295 | 210 | <nil key="textColor"/> |
| 296 | 211 | <nil key="highlightedColor"/> |
| 297 | 212 | </label> |
| 298 | 213 | <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CWw-xf-Wvh"> |
| 299 | - <rect key="frame" x="0.0" y="227" width="414" height="216"/> | |
| 214 | + <rect key="frame" x="0.0" y="231" width="414" height="216"/> | |
| 300 | 215 | <connections> |
| 301 | 216 | <outlet property="dataSource" destination="TgS-FM-L3x" id="TQx-fW-O0V"/> |
| 302 | 217 | <outlet property="delegate" destination="TgS-FM-L3x" id="Eb7-BY-hx8"/> |
| 303 | 218 | </connections> |
| 304 | 219 | </pickerView> |
| 305 | 220 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别是计算运动健康的重要因素，为确保数据的准确性，请正确选择自己的性别，不可更改。" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bst-xe-BaN"> |
| 306 | - <rect key="frame" x="60" y="146" width="294" height="31"/> | |
| 221 | + <rect key="frame" x="60" y="150" width="294" height="31"/> | |
| 307 | 222 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> |
| 308 | 223 | <nil key="textColor"/> |
| 309 | 224 | <nil key="highlightedColor"/> |
| ... | ... | @@ -361,7 +276,7 @@ |
| 361 | 276 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 362 | 277 | <subviews> |
| 363 | 278 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Z4n-b1-N8B"> |
| 364 | - <rect key="frame" x="0.0" y="104" width="414" height="758"/> | |
| 279 | + <rect key="frame" x="0.0" y="108" width="414" height="754"/> | |
| 365 | 280 | <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> |
| 366 | 281 | <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="UE6-4e-AR9"> |
| 367 | 282 | <size key="itemSize" width="128" height="128"/> |
| ... | ... | @@ -376,7 +291,7 @@ |
| 376 | 291 | </connections> |
| 377 | 292 | </collectionView> |
| 378 | 293 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Awn-Yw-d82"> |
| 379 | - <rect key="frame" x="12.5" y="54" width="389" height="40"/> | |
| 294 | + <rect key="frame" x="12.5" y="58" width="389" height="40"/> | |
| 380 | 295 | <subviews> |
| 381 | 296 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B4W-7J-Bca"> |
| 382 | 297 | <rect key="frame" x="0.0" y="0.0" width="97.5" height="40"/> |
| ... | ... | @@ -487,11 +402,11 @@ |
| 487 | 402 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 488 | 403 | <subviews> |
| 489 | 404 | <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" usesAttributedText="YES" translatesAutoresizingMaskIntoConstraints="NO" id="REb-I6-wI4"> |
| 490 | - <rect key="frame" x="12" y="49" width="397" height="847"/> | |
| 405 | + <rect key="frame" x="12" y="53" width="397" height="843"/> | |
| 491 | 406 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
| 492 | 407 | <attributedString key="attributedText"> |
| 493 | 408 | <fragment> |
| 494 | - <mutableString key="content">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</mutableString> | |
| 409 | + <string key="content">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string> | |
| 495 | 410 | <attributes> |
| 496 | 411 | <color key="NSColor" systemColor="labelColor"/> |
| 497 | 412 | <font key="NSFont" size="14" name="PingFangSC-Regular"/> |
| ... | ... | @@ -528,7 +443,7 @@ |
| 528 | 443 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 529 | 444 | <subviews> |
| 530 | 445 | <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="2XU-gT-B2h"> |
| 531 | - <rect key="frame" x="0.0" y="44" width="414" height="852"/> | |
| 446 | + <rect key="frame" x="0.0" y="48" width="414" height="848"/> | |
| 532 | 447 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
| 533 | 448 | <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="EAs-HL-tqC"> |
| 534 | 449 | <size key="itemSize" width="128" height="128"/> |
| ... | ... | @@ -570,19 +485,19 @@ |
| 570 | 485 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 571 | 486 | <subviews> |
| 572 | 487 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="VdY-2D-Ro6"> |
| 573 | - <rect key="frame" x="97.5" y="79" width="219" height="219.5"/> | |
| 488 | + <rect key="frame" x="97.5" y="83" width="219" height="219.5"/> | |
| 574 | 489 | <constraints> |
| 575 | 490 | <constraint firstAttribute="width" secondItem="VdY-2D-Ro6" secondAttribute="height" id="ppj-UD-E5R"/> |
| 576 | 491 | </constraints> |
| 577 | 492 | </imageView> |
| 578 | 493 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OyR-9I-yIM"> |
| 579 | - <rect key="frame" x="30" y="339" width="354" height="25.5"/> | |
| 494 | + <rect key="frame" x="30" y="343" width="354" height="25.5"/> | |
| 580 | 495 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/> |
| 581 | 496 | <color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/> |
| 582 | 497 | <nil key="highlightedColor"/> |
| 583 | 498 | </label> |
| 584 | 499 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8K7-42-ifM"> |
| 585 | - <rect key="frame" x="20" y="313.5" width="374" height="25.5"/> | |
| 500 | + <rect key="frame" x="20" y="317.5" width="374" height="25.5"/> | |
| 586 | 501 | <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="18"/> |
| 587 | 502 | <nil key="textColor"/> |
| 588 | 503 | <nil key="highlightedColor"/> |
| ... | ... | @@ -631,13 +546,13 @@ |
| 631 | 546 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 632 | 547 | <subviews> |
| 633 | 548 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="生日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qbi-VZ-ebn"> |
| 634 | - <rect key="frame" x="182" y="96" width="50" height="35"/> | |
| 549 | + <rect key="frame" x="182" y="100" width="50" height="35"/> | |
| 635 | 550 | <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="25"/> |
| 636 | 551 | <nil key="textColor"/> |
| 637 | 552 | <nil key="highlightedColor"/> |
| 638 | 553 | </label> |
| 639 | 554 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="年龄是计算运动健康的重要因素，为了确保数据的准确性，请真实填写自己的出生日期。" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dYh-Nc-fHe"> |
| 640 | - <rect key="frame" x="62" y="146" width="290" height="31"/> | |
| 555 | + <rect key="frame" x="62" y="150" width="290" height="31"/> | |
| 641 | 556 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> |
| 642 | 557 | <nil key="textColor"/> |
| 643 | 558 | <nil key="highlightedColor"/> |
| ... | ... | @@ -701,7 +616,7 @@ |
| 701 | 616 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 702 | 617 | <subviews> |
| 703 | 618 | <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您的昵称" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="fBa-7q-gAE"> |
| 704 | - <rect key="frame" x="12.5" y="44" width="389" height="40"/> | |
| 619 | + <rect key="frame" x="12.5" y="48" width="389" height="40"/> | |
| 705 | 620 | <color key="tintColor" red="0.0" green="0.59999999999999998" blue="0.24313725490196078" alpha="1" colorSpace="calibratedRGB"/> |
| 706 | 621 | <constraints> |
| 707 | 622 | <constraint firstAttribute="height" constant="40" id="quZ-8z-CiA"/> |
| ... | ... | @@ -710,7 +625,7 @@ |
| 710 | 625 | <textInputTraits key="textInputTraits"/> |
| 711 | 626 | </textField> |
| 712 | 627 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IvD-dw-OU9"> |
| 713 | - <rect key="frame" x="12" y="84" width="390" height="0.5"/> | |
| 628 | + <rect key="frame" x="12" y="88" width="390" height="0.5"/> | |
| 714 | 629 | <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> |
| 715 | 630 | <constraints> |
| 716 | 631 | <constraint firstAttribute="height" constant="0.5" id="pKX-cM-OWd"/> |
| ... | ... | @@ -745,11 +660,11 @@ |
| 745 | 660 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 746 | 661 | <subviews> |
| 747 | 662 | <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="hwu-0s-C3m"> |
| 748 | - <rect key="frame" x="0.0" y="44" width="414" height="818"/> | |
| 663 | + <rect key="frame" x="0.0" y="48" width="414" height="814"/> | |
| 749 | 664 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 750 | 665 | <prototypes> |
| 751 | 666 | <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="HealthDataCell" rowHeight="50" id="Puf-oG-383" customClass="HealthDataCell" customModule="HDFwear" customModuleProvider="target"> |
| 752 | - <rect key="frame" x="0.0" y="49.5" width="414" height="50"/> | |
| 667 | + <rect key="frame" x="0.0" y="55.5" width="414" height="50"/> | |
| 753 | 668 | <autoresizingMask key="autoresizingMask"/> |
| 754 | 669 | <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Puf-oG-383" id="CYI-fz-d2Y"> |
| 755 | 670 | <rect key="frame" x="0.0" y="0.0" width="414" height="50"/> |
| ... | ... | @@ -834,7 +749,7 @@ |
| 834 | 749 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 835 | 750 | <subviews> |
| 836 | 751 | <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="nWy-Mh-3Xt"> |
| 837 | - <rect key="frame" x="0.0" y="44" width="414" height="818"/> | |
| 752 | + <rect key="frame" x="0.0" y="48" width="414" height="814"/> | |
| 838 | 753 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 839 | 754 | <connections> |
| 840 | 755 | <outlet property="dataSource" destination="Mhc-JH-wHB" id="baq-B0-Ie2"/> |
| ... | ... | @@ -868,7 +783,7 @@ |
| 868 | 783 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 869 | 784 | <subviews> |
| 870 | 785 | <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="app_icon_1024" translatesAutoresizingMaskIntoConstraints="NO" id="wJo-LU-dTv"> |
| 871 | - <rect key="frame" x="163" y="118" width="88" height="88"/> | |
| 786 | + <rect key="frame" x="163" y="122" width="88" height="88"/> | |
| 872 | 787 | <constraints> |
| 873 | 788 | <constraint firstAttribute="width" constant="88" id="e8F-Mq-6bk"/> |
| 874 | 789 | <constraint firstAttribute="height" constant="88" id="tOq-3U-9Rb"/> |
| ... | ... | @@ -880,7 +795,7 @@ |
| 880 | 795 | </userDefinedRuntimeAttributes> |
| 881 | 796 | </imageView> |
| 882 | 797 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="版本：14.20.1" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nEb-KD-4wv"> |
| 883 | - <rect key="frame" x="80" y="216" width="254" height="20"/> | |
| 798 | + <rect key="frame" x="80" y="220" width="254" height="20"/> | |
| 884 | 799 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> |
| 885 | 800 | <nil key="textColor"/> |
| 886 | 801 | <nil key="highlightedColor"/> |
| ... | ... | @@ -910,7 +825,7 @@ |
| 910 | 825 | <navigationController storyboardIdentifier="nav_mine" automaticallyAdjustsScrollViewInsets="NO" id="zxb-Gc-s9N" customClass="ZCNavigationController" customModule="HDFwear" customModuleProvider="target" sceneMemberID="viewController"> |
| 911 | 826 | <toolbarItems/> |
| 912 | 827 | <navigationBar key="navigationBar" contentMode="scaleToFill" id="T0f-Bu-OCj"> |
| 913 | - <rect key="frame" x="0.0" y="44" width="414" height="44"/> | |
| 828 | + <rect key="frame" x="0.0" y="48" width="414" height="44"/> | |
| 914 | 829 | <autoresizingMask key="autoresizingMask"/> |
| 915 | 830 | </navigationBar> |
| 916 | 831 | <nil name="viewControllers"/> |
| ... | ... | @@ -927,13 +842,8 @@ |
| 927 | 842 | <image name="app_icon_1024" width="512" height="512"/> |
| 928 | 843 | <image name="avatar_male" width="61.5" height="62"/> |
| 929 | 844 | <image name="cell_go" width="13" height="13"/> |
| 930 | - <image name="单日1万步灰" width="200" height="200"/> | |
| 931 | - <image name="单日2万步灰" width="200" height="200"/> | |
| 932 | - <image name="单日3万步灰" width="200" height="200"/> | |
| 933 | - <image name="累计10万步灰" width="200" height="200"/> | |
| 934 | - <image name="累计5万步灰" width="200" height="200"/> | |
| 935 | 845 | <systemColor name="labelColor"> |
| 936 | - <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | |
| 846 | + <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 937 | 847 | </systemColor> |
| 938 | 848 | <systemColor name="systemBackgroundColor"> |
| 939 | 849 | <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ... | ... |
HDFwear/Mine/MineViewController.swift
| ... | ... | @@ -17,15 +17,15 @@ class MineViewController: UIViewController { |
| 17 | 17 | @IBOutlet weak var idLabel: UILabel! |
| 18 | 18 | @IBOutlet weak var nameLabel: UILabel! |
| 19 | 19 | |
| 20 | - @IBOutlet weak var medalNumLabel: UILabel! | |
| 21 | - @IBOutlet weak var medalImageView1: UIImageView! | |
| 22 | - @IBOutlet weak var medalImageView2: UIImageView! | |
| 23 | - @IBOutlet weak var medalImageView3: UIImageView! | |
| 24 | - @IBOutlet weak var medalImageView4: UIImageView! | |
| 25 | - @IBOutlet weak var medalImageView5: UIImageView! | |
| 26 | - @IBOutlet weak var locLabel1: UILabel! | |
| 27 | - private let mineArray = ["健康报告", "我的数据", "个人资料", "隐私政策", "APP检查更新", "关于"] | |
| 28 | - private let mineDic = ["健康报告": "health_report", "我的数据": "mine_data", "个人资料": "personal_info", "设置": "mine_setting", "APP检查更新": "app_update", "关于": "mine_about", "隐私政策": "privacy_policy"] | |
| 20 | +// @IBOutlet weak var medalNumLabel: UILabel! | |
| 21 | +// @IBOutlet weak var medalImageView1: UIImageView! | |
| 22 | +// @IBOutlet weak var medalImageView2: UIImageView! | |
| 23 | +// @IBOutlet weak var medalImageView3: UIImageView! | |
| 24 | +// @IBOutlet weak var medalImageView4: UIImageView! | |
| 25 | +// @IBOutlet weak var medalImageView5: UIImageView! | |
| 26 | +// @IBOutlet weak var locLabel1: UILabel! | |
| 27 | + private let mineArray = ["健康报告", "我的数据", "个人资料", "隐私政策", "APP升级", "关于"] | |
| 28 | + private let mineDic = ["健康报告": "health_report", "我的数据": "mine_data", "个人资料": "personal_info", "设置": "mine_setting", "APP升级": "app_update", "关于": "mine_about", "隐私政策": "privacy_policy"] | |
| 29 | 29 | |
| 30 | 30 | private let user = UserInfo |
| 31 | 31 | |
| ... | ... | @@ -62,24 +62,24 @@ class MineViewController: UIViewController { |
| 62 | 62 | nameLabel.text = user.name |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - idLabel.text = "id：\(user.userId)" | |
| 65 | + idLabel.text = "\(user.gender == 1 ? "男" : "女") \(user.height)cm" | |
| 66 | 66 | |
| 67 | - locLabel1.text = LocString("我的勋章") | |
| 67 | +// locLabel1.text = LocString("我的勋章") | |
| 68 | 68 | |
| 69 | - var medalArray = ["单日10000步灰", "单日10000步灰", "单日10000步灰", "累计5万步灰", "累计10万步灰"] | |
| 70 | - var medalNum: Int = 0 | |
| 71 | - if let array = RealmTools.objectsWithPredicateAndSorted(object: MedalModel.self, predicate: NSPredicate(format: "date != nil"), sortedKey: "date") as? Array<MedalModel>, array.count > 0 { | |
| 72 | - medalNum = array.count | |
| 73 | - for medal in array { | |
| 74 | - medalArray.insert(medal.title, at: 0) | |
| 75 | - } | |
| 76 | - } | |
| 77 | - medalNumLabel.text = LocString("共1") + "\(medalNum)" + LocString("枚1") | |
| 78 | - medalImageView1.image = UIImage(named: medalArray[0]) | |
| 79 | - medalImageView2.image = UIImage(named: medalArray[1]) | |
| 80 | - medalImageView3.image = UIImage(named: medalArray[2]) | |
| 81 | - medalImageView4.image = UIImage(named: medalArray[3]) | |
| 82 | - medalImageView5.image = UIImage(named: medalArray[4]) | |
| 69 | +// var medalArray = ["单日10000步灰", "单日10000步灰", "单日10000步灰", "累计5万步灰", "累计10万步灰"] | |
| 70 | +// var medalNum: Int = 0 | |
| 71 | +// if let array = RealmTools.objectsWithPredicateAndSorted(object: MedalModel.self, predicate: NSPredicate(format: "date != nil"), sortedKey: "date") as? Array<MedalModel>, array.count > 0 { | |
| 72 | +// medalNum = array.count | |
| 73 | +// for medal in array { | |
| 74 | +// medalArray.insert(medal.title, at: 0) | |
| 75 | +// } | |
| 76 | +// } | |
| 77 | +// medalNumLabel.text = LocString("共1") + "\(medalNum)" + LocString("枚1") | |
| 78 | +// medalImageView1.image = UIImage(named: medalArray[0]) | |
| 79 | +// medalImageView2.image = UIImage(named: medalArray[1]) | |
| 80 | +// medalImageView3.image = UIImage(named: medalArray[2]) | |
| 81 | +// medalImageView4.image = UIImage(named: medalArray[3]) | |
| 82 | +// medalImageView5.image = UIImage(named: medalArray[4]) | |
| 83 | 83 | |
| 84 | 84 | } |
| 85 | 85 | |
| ... | ... | @@ -158,7 +158,7 @@ class MineViewController: UIViewController { |
| 158 | 158 | |
| 159 | 159 | extension MineViewController: UITableViewDataSource, UITableViewDelegate { |
| 160 | 160 | func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { |
| 161 | - return 50 | |
| 161 | + return 62 | |
| 162 | 162 | } |
| 163 | 163 | func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { |
| 164 | 164 | return mineArray.count |
| ... | ... | @@ -175,7 +175,7 @@ extension MineViewController: UITableViewDataSource, UITableViewDelegate { |
| 175 | 175 | |
| 176 | 176 | func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { |
| 177 | 177 | switch mineArray[indexPath.row] { |
| 178 | - case "APP检查更新": | |
| 178 | + case "APP升级": | |
| 179 | 179 | checkAppVersion() |
| 180 | 180 | case "个人资料": |
| 181 | 181 | let vc = UIStoryboard.loadViewControllerIdentifier(storyboardName: "Mine", identifier: "UserInfoSettingVC") as! UserInfoSettingVC | ... | ... |
HDFwear/en.lproj/Localizable.strings
| ... | ... | @@ -299,7 +299,7 @@ |
| 299 | 299 | "我的数据" = "My data "; |
| 300 | 300 | "个人资料" = "Personal data"; |
| 301 | 301 | "隐私政策" = "Privacy Policy"; |
| 302 | -"APP检查更新" = "APP check for updates"; | |
| 302 | +"APP升级" = "APP check for updates"; | |
| 303 | 303 | "关于" = "About"; |
| 304 | 304 | "活动统计" = "Activity statistics"; |
| 305 | 305 | "健康状况" = "Health"; | ... | ... |