ios / ytwatch

Commit 8559820362a813793eddb562af843f049c264f2a

Authored by daifengyi
1 parent 2d299afa

feat:unbind page UI

Inline Side-by-side
Showing 6 changed files with 34 additions and 57 deletions
HDFwear/Assets.xcassets/Setting/unbind_icon.imageset/Contents.json
  View file @8559820
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "组 64@2x.png",
  8 + "filename" : "unbind_icon@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "组 64@3x.png",
  13 + "filename" : "unbind_icon@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/unbind_icon.imageset/unbind_icon@2x.png 0 → 100644
View file @8559820

2.25 KB
HDFwear/Assets.xcassets/Setting/unbind_icon.imageset/unbind_icon@3x.png 0 → 100644
View file @8559820

1.71 KB
HDFwear/Assets.xcassets/Setting/unbind_icon.imageset/组 64@2x.png deleted
View file @2d299af

919 Bytes
HDFwear/Assets.xcassets/Setting/unbind_icon.imageset/组 64@3x.png deleted
View file @2d299af

1.59 KB
HDFwear/Setting/Base.lproj/Setting.storyboard
  View file @8559820
... ... @@ -1554,17 +1554,17 @@
1554 1554 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1555 1555 <subviews>
1556 1556 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bracelet_icon" translatesAutoresizingMaskIntoConstraints="NO" id="jyB-II-xf8">
1557   - <rect key="frame" x="97" y="130" width="220" height="220"/>
  1557 + <rect key="frame" x="94" y="130" width="226" height="226"/>
1558 1558 <constraints>
1559   - <constraint firstAttribute="width" constant="220" id="6Wh-Uy-ExE"/>
1560   - <constraint firstAttribute="height" constant="220" id="QFu-aY-AiX"/>
  1559 + <constraint firstAttribute="width" constant="226" id="6Wh-Uy-ExE"/>
  1560 + <constraint firstAttribute="height" constant="226" id="QFu-aY-AiX"/>
1561 1561 </constraints>
1562 1562 </imageView>
1563 1563 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="02G-pG-bUm">
1564   - <rect key="frame" x="23" y="807" width="368" height="40"/>
  1564 + <rect key="frame" x="100" y="801" width="214" height="46"/>
1565 1565 <color key="backgroundColor" red="0.0" green="0.59999999999999998" blue="0.24313725489999999" alpha="1" colorSpace="calibratedRGB"/>
1566 1566 <constraints>
1567   - <constraint firstAttribute="height" constant="40" id="Abv-YX-7xQ"/>
  1567 + <constraint firstAttribute="height" constant="46" id="Abv-YX-7xQ"/>
1568 1568 </constraints>
1569 1569 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
1570 1570 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
... ... @@ -1572,73 +1572,50 @@
1572 1572 <state key="normal" title="解绑设备"/>
1573 1573 <userDefinedRuntimeAttributes>
1574 1574 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
1575   - <integer key="value" value="15"/>
  1575 + <integer key="value" value="23"/>
1576 1576 </userDefinedRuntimeAttribute>
1577 1577 </userDefinedRuntimeAttributes>
1578 1578 <connections>
1579 1579 <action selector="unbind:" destination="fHr-yM-8SJ" eventType="touchUpInside" id="4S6-zX-mG8"/>
1580 1580 </connections>
1581 1581 </button>
1582   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电量:" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="79V-Lr-b6Z">
1583   - <rect key="frame" x="16" y="721.5" width="25" height="15.5"/>
1584   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
1585   - <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/>
  1582 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连接成功" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ad6-E0-qf2">
  1583 + <rect key="frame" x="182" y="448" width="80" height="28"/>
  1584 + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="20"/>
  1585 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
1586 1586 <nil key="highlightedColor"/>
1587 1587 </label>
1588   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="mac:" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lPJ-FQ-FJ1">
1589   - <rect key="frame" x="16" y="703" width="24.5" height="15.5"/>
1590   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
1591   - <color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
  1588 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Iwatch 8s" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yAH-5w-iR1">
  1589 + <rect key="frame" x="161.5" y="380" width="91" height="28"/>
  1590 + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="20"/>
  1591 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
1592 1592 <nil key="highlightedColor"/>
1593 1593 </label>
1594 1594 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unbind_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-cI-S1q">
1595   - <rect key="frame" x="16" y="681" width="16" height="16"/>
  1595 + <rect key="frame" x="152" y="451" width="22" height="22"/>
  1596 + <constraints>
  1597 + <constraint firstAttribute="height" constant="22" id="PoK-md-4Cb"/>
  1598 + <constraint firstAttribute="width" constant="22" id="jkv-fi-Se6"/>
  1599 + </constraints>
1596 1600 </imageView>
1597   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="mac:" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKS-It-CBe">
1598   - <rect key="frame" x="42" y="678.5" width="33.5" height="21"/>
1599   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
1600   - <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1601   - <nil key="highlightedColor"/>
1602   - </label>
1603   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手环信息" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fyc-qa-8Fd">
1604   - <rect key="frame" x="16" y="646.5" width="60" height="21"/>
1605   - <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
1606   - <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1607   - <nil key="highlightedColor"/>
1608   - </label>
1609   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已绑定设备" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yAH-5w-iR1">
1610   - <rect key="frame" x="169.5" y="400" width="75" height="21"/>
1611   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
1612   - <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
1613   - <nil key="highlightedColor"/>
1614   - </label>
1615 1601 </subviews>
1616 1602 <viewLayoutGuide key="safeArea" id="05h-yd-blS"/>
1617 1603 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
1618 1604 <constraints>
1619   - <constraint firstItem="lPJ-FQ-FJ1" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="16" id="42Z-yT-AI0"/>
1620   - <constraint firstItem="DKS-It-CBe" firstAttribute="centerY" secondItem="Abt-cI-S1q" secondAttribute="centerY" id="GHC-lB-OQK"/>
1621   - <constraint firstItem="yAH-5w-iR1" firstAttribute="top" secondItem="jyB-II-xf8" secondAttribute="bottom" constant="50" id="LlZ-Qa-2bz"/>
1622   - <constraint firstItem="79V-Lr-b6Z" firstAttribute="top" secondItem="lPJ-FQ-FJ1" secondAttribute="bottom" constant="3" id="Lmh-p0-FAu"/>
1623   - <constraint firstItem="Abt-cI-S1q" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="16" id="Ne7-Th-t33"/>
  1605 + <constraint firstItem="ad6-E0-qf2" firstAttribute="top" secondItem="yAH-5w-iR1" secondAttribute="bottom" constant="40" id="4Ae-qo-bdj"/>
  1606 + <constraint firstItem="ad6-E0-qf2" firstAttribute="centerX" secondItem="TPM-BM-Lyr" secondAttribute="centerX" constant="15" id="HeN-le-RO4"/>
  1607 + <constraint firstItem="yAH-5w-iR1" firstAttribute="top" secondItem="jyB-II-xf8" secondAttribute="bottom" constant="24" id="LlZ-Qa-2bz"/>
1624 1608 <constraint firstItem="jyB-II-xf8" firstAttribute="top" secondItem="05h-yd-blS" secondAttribute="top" constant="82" id="Nm0-dT-PoC"/>
1625   - <constraint firstItem="lPJ-FQ-FJ1" firstAttribute="top" secondItem="Abt-cI-S1q" secondAttribute="bottom" constant="6" id="O11-4X-dbt"/>
1626   - <constraint firstItem="DKS-It-CBe" firstAttribute="leading" secondItem="Abt-cI-S1q" secondAttribute="trailing" constant="10" id="UWL-5s-eWD"/>
1627   - <constraint firstAttribute="trailing" secondItem="02G-pG-bUm" secondAttribute="trailing" constant="23" id="V8f-8U-vvx"/>
1628   - <constraint firstItem="DKS-It-CBe" firstAttribute="top" secondItem="Fyc-qa-8Fd" secondAttribute="bottom" constant="11" id="a7p-FK-LTQ"/>
  1609 + <constraint firstItem="ad6-E0-qf2" firstAttribute="leading" secondItem="Abt-cI-S1q" secondAttribute="trailing" constant="8" id="RRb-Ib-YyQ"/>
  1610 + <constraint firstAttribute="trailing" secondItem="02G-pG-bUm" secondAttribute="trailing" constant="100" id="V8f-8U-vvx"/>
1629 1611 <constraint firstItem="yAH-5w-iR1" firstAttribute="centerX" secondItem="TPM-BM-Lyr" secondAttribute="centerX" id="bt0-N1-uva"/>
1630 1612 <constraint firstItem="05h-yd-blS" firstAttribute="bottom" secondItem="02G-pG-bUm" secondAttribute="bottom" constant="15" id="dMc-Ob-GKL"/>
1631   - <constraint firstItem="02G-pG-bUm" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="23" id="dTY-YB-M2w"/>
1632   - <constraint firstItem="79V-Lr-b6Z" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="16" id="lsP-1J-isO"/>
1633   - <constraint firstItem="Fyc-qa-8Fd" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="16" id="q4a-IO-3Qx"/>
  1613 + <constraint firstItem="02G-pG-bUm" firstAttribute="leading" secondItem="05h-yd-blS" secondAttribute="leading" constant="100" id="dTY-YB-M2w"/>
  1614 + <constraint firstItem="Abt-cI-S1q" firstAttribute="centerY" secondItem="ad6-E0-qf2" secondAttribute="centerY" id="wWF-IB-hal"/>
1634 1615 <constraint firstItem="jyB-II-xf8" firstAttribute="centerX" secondItem="TPM-BM-Lyr" secondAttribute="centerX" id="yAJ-Nh-MdF"/>
1635   - <constraint firstItem="02G-pG-bUm" firstAttribute="top" secondItem="79V-Lr-b6Z" secondAttribute="bottom" constant="70" id="yWr-3a-oL9"/>
1636 1616 </constraints>
1637 1617 </view>
1638 1618 <connections>
1639   - <outlet property="batteryLabel" destination="79V-Lr-b6Z" id="5qB-SQ-Jnf"/>
1640   - <outlet property="macLabel" destination="lPJ-FQ-FJ1" id="kgs-7j-Zwn"/>
1641   - <outlet property="nameLabel" destination="DKS-It-CBe" id="Cwl-Ii-YUq"/>
1642 1619 <outlet property="watchImageView" destination="jyB-II-xf8" id="CMO-0O-6X9"/>
1643 1620 </connections>
1644 1621 </viewController>
... ... @@ -3538,10 +3515,10 @@
3538 3515 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3539 3516 <subviews>
3540 3517 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9nN-4e-rQ5">
3541   - <rect key="frame" x="23" y="807" width="368" height="40"/>
  3518 + <rect key="frame" x="100" y="801" width="214" height="46"/>
3542 3519 <color key="backgroundColor" red="0.0" green="0.59999999999999998" blue="0.24313725489999999" alpha="1" colorSpace="calibratedRGB"/>
3543 3520 <constraints>
3544   - <constraint firstAttribute="height" constant="40" id="0fC-7X-OFx"/>
  3521 + <constraint firstAttribute="height" constant="46" id="0fC-7X-OFx"/>
3545 3522 </constraints>
3546 3523 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
3547 3524 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
... ... @@ -3549,7 +3526,7 @@
3549 3526 <state key="normal" title="我知道了"/>
3550 3527 <userDefinedRuntimeAttributes>
3551 3528 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
3552   - <integer key="value" value="15"/>
  3529 + <integer key="value" value="23"/>
3553 3530 </userDefinedRuntimeAttribute>
3554 3531 </userDefinedRuntimeAttributes>
3555 3532 <connections>
... ... @@ -3598,10 +3575,10 @@
3598 3575 <constraint firstItem="wVD-2b-H0U" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="18" id="Fdc-kL-i5r"/>
3599 3576 <constraint firstItem="9ST-yj-1Vw" firstAttribute="top" secondItem="wVD-2b-H0U" secondAttribute="bottom" constant="1" id="Osp-2c-EMB"/>
3600 3577 <constraint firstItem="31O-JO-Phk" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="20" id="PxE-yx-ty2"/>
3601   - <constraint firstItem="9nN-4e-rQ5" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="23" id="cFg-Gj-3of"/>
  3578 + <constraint firstItem="9nN-4e-rQ5" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="100" id="cFg-Gj-3of"/>
3602 3579 <constraint firstItem="Yox-EH-BFp" firstAttribute="trailing" secondItem="31O-JO-Phk" secondAttribute="trailing" constant="20" id="cvp-Zu-nFy"/>
3603 3580 <constraint firstItem="9ST-yj-1Vw" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="18" id="d6g-tl-dKG"/>
3604   - <constraint firstItem="Yox-EH-BFp" firstAttribute="trailing" secondItem="9nN-4e-rQ5" secondAttribute="trailing" constant="23" id="epi-wI-pff"/>
  3581 + <constraint firstItem="Yox-EH-BFp" firstAttribute="trailing" secondItem="9nN-4e-rQ5" secondAttribute="trailing" constant="100" id="epi-wI-pff"/>
3605 3582 <constraint firstItem="Yox-EH-BFp" firstAttribute="trailing" secondItem="9ST-yj-1Vw" secondAttribute="trailing" constant="20" id="qx8-bB-zaM"/>
3606 3583 <constraint firstItem="Yox-EH-BFp" firstAttribute="bottom" secondItem="9nN-4e-rQ5" secondAttribute="bottom" constant="15" id="ro0-KS-zrj"/>
3607 3584 <constraint firstItem="tYV-r2-SZf" firstAttribute="leading" secondItem="Yox-EH-BFp" secondAttribute="leading" constant="74" id="wuC-sy-UZY"/>
... ... @@ -5705,7 +5682,7 @@ Cg
5705 5682 <image name="push_other" width="18" height="18"/>
5706 5683 <image name="push_qq" width="18" height="18"/>
5707 5684 <image name="push_wechat" width="18" height="18"/>
5708   - <image name="unbind_icon" width="16" height="16"/>
  5685 + <image name="unbind_icon" width="22" height="22"/>
5709 5686 <image name="unbind_remind_en" width="262.5" height="292.5"/>
5710 5687 <image name="update_0" width="176" height="176"/>
5711 5688 <image name="久坐提醒" width="18" height="18"/>
... ...