feat:remind page UI

daifengyi
1 parent 072a11e2
Showing 7 changed files with 65 additions and 71 deletions
HDFwear/Setting/BackgroundVC.swift
HDFwear/Setting/Base.lproj/Setting.storyboard
HDFwear/Setting/CardViewController.swift
HDFwear/Setting/PayViewController.swift
HDFwear/Setting/RemindViewController.swift
HDFwear/Setting/VIew/SettingCell3.swift
HDFwear/Setting/VIew/SettingCell3.xib
@@ -98,8 +98,8 @@ extension BackgroundVC: UITableViewDelegate, UITableViewDataSource {
  
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "SettingCell3", for: indexPath) as! SettingCell3
-        cell.widthLayout.constant = 30
-        cell.setImageView.image = UIImage(named: settingArray[indexPath.section][indexPath.row])
+//        cell.widthLayout.constant = 30
+//        cell.setImageView.image = UIImage(named: settingArray[indexPath.section][indexPath.row])
         cell.titleLabel.font = BoldFont(14)
         cell.titleLabel.text = " " + LocString(settingArray[indexPath.section][indexPath.row])
         return cell
@@ -455,32 +455,37 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="find_bracelet" translatesAutoresizingMaskIntoConstraints="NO" id="NdD-L2-TUl">
-                                <rect key="frame" x="122" y="123" width="170" height="170"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NdD-L2-TUl">
+                                <rect key="frame" x="95" y="123" width="224" height="224"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="170" id="1lk-Nq-eVe"/>
-                                    <constraint firstAttribute="height" constant="170" id="VzL-pQ-E5s"/>
+                                    <constraint firstAttribute="width" constant="224" id="1lk-Nq-eVe"/>
+                                    <constraint firstAttribute="height" constant="224" id="VzL-pQ-E5s"/>
                                 </constraints>
                             </imageView>
                             <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="7pq-OV-RtL">
-                                <rect key="frame" x="62" y="318" width="290" height="31"/>
-                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
+                                <rect key="frame" x="62" y="382" width="290" height="42"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nd4-ql-9Sw">
-                                <rect key="frame" x="25" y="727" width="364" height="40"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <rect key="frame" x="100" y="721" width="214" height="46"/>
+                                <color key="backgroundColor" red="0.14117647058823529" green="0.7803921568627451" blue="0.53725490196078429" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="rxi-wl-37g"/>
+                                    <constraint firstAttribute="height" constant="46" id="rxi-wl-37g"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
-                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                <state key="normal" title="查找手环" backgroundImage="button_blue">
+                                <state key="normal" title="查找手环">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
                                 <state key="selected" backgroundImage="button_blue_highlight"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="23"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="findIt:" destination="Fej-rb-Ud8" eventType="touchUpInside" id="HGt-6G-sFX"/>
                                 </connections>
@@ -489,11 +494,11 @@
                         <viewLayoutGuide key="safeArea" id="68f-yx-eJY"/>
                         <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
-                            <constraint firstItem="68f-yx-eJY" firstAttribute="trailing" secondItem="Nd4-ql-9Sw" secondAttribute="trailing" constant="25" id="2Ar-IC-usE"/>
-                            <constraint firstItem="Nd4-ql-9Sw" firstAttribute="leading" secondItem="68f-yx-eJY" secondAttribute="leading" constant="25" id="7C7-aT-iiy"/>
+                            <constraint firstItem="68f-yx-eJY" firstAttribute="trailing" secondItem="Nd4-ql-9Sw" secondAttribute="trailing" constant="100" id="2Ar-IC-usE"/>
+                            <constraint firstItem="Nd4-ql-9Sw" firstAttribute="leading" secondItem="68f-yx-eJY" secondAttribute="leading" constant="100" id="7C7-aT-iiy"/>
                             <constraint firstItem="68f-yx-eJY" firstAttribute="trailing" secondItem="7pq-OV-RtL" secondAttribute="trailing" constant="62" id="B27-a5-fXa"/>
                             <constraint firstItem="7pq-OV-RtL" firstAttribute="leading" secondItem="68f-yx-eJY" secondAttribute="leading" constant="62" id="R5P-Wn-PZ5"/>
-                            <constraint firstItem="7pq-OV-RtL" firstAttribute="top" secondItem="NdD-L2-TUl" secondAttribute="bottom" constant="25" id="Yoh-6w-RN8"/>
+                            <constraint firstItem="7pq-OV-RtL" firstAttribute="top" secondItem="NdD-L2-TUl" secondAttribute="bottom" constant="35" id="Yoh-6w-RN8"/>
                             <constraint firstItem="NdD-L2-TUl" firstAttribute="top" secondItem="68f-yx-eJY" secondAttribute="top" constant="75" id="aAb-dy-b2v"/>
                             <constraint firstItem="NdD-L2-TUl" firstAttribute="centerX" secondItem="AMI-3G-jLh" secondAttribute="centerX" id="jDe-rG-ulj"/>
                             <constraint firstItem="68f-yx-eJY" firstAttribute="bottom" secondItem="Nd4-ql-9Sw" secondAttribute="bottom" constant="95" id="paR-3B-EfN"/>
@@ -807,7 +812,7 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="xEA-8k-ZxB">
                                 <rect key="frame" x="0.0" y="48" width="414" height="848"/>
-                                <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
                                 <connections>
                                     <outlet property="dataSource" destination="uV3-Zo-ebU" id="fgP-Ev-As1"/>
                                     <outlet property="delegate" destination="uV3-Zo-ebU" id="VPN-c8-ADn"/>
@@ -5714,7 +5719,6 @@ Cg
         <image name="battery_100" width="18" height="16"/>
         <image name="bluetooth_disconnected" width="11" height="11"/>
         <image name="bracelet_icon" width="167.5" height="219"/>
-        <image name="button_blue" width="329" height="40"/>
         <image name="button_blue_highlight" width="329" height="40"/>
         <image name="camera_3" width="132" height="188"/>
         <image name="camera_album" width="36" height="36"/>
@@ -5730,7 +5734,6 @@ Cg
         <image name="device_add" width="22" height="22"/>
         <image name="device_add_bg" width="349" height="86"/>
         <image name="dial_color_1" width="46.5" height="20.5"/>
-        <image name="find_bracelet" width="170" height="170"/>
         <image name="motion_underline" width="30" height="2.5"/>
         <image name="no_alarm_clock" width="188.5" height="180.5"/>
         <image name="no_contacts" width="190" height="198"/>
@@ -67,7 +67,7 @@ extension CardViewController: UITableViewDelegate, UITableViewDataSource {
  
         let cardText = cardArray[indexPath.row]
         cell.titleLabel.text = LocString(cardText)
-        cell.setImageView.image = UIImage(named: cardDic[cardText]!)
+//        cell.setImageView.image = UIImage(named: cardDic[cardText]!)
  
         return cell
     }
@@ -84,7 +84,7 @@ extension PayViewController: UITableViewDelegate, UITableViewDataSource {
         let cell = tableView.dequeueReusableCell(withIdentifier: "SettingCell3", for: indexPath) as! SettingCell3
         let payText = payArray[indexPath.row]
         cell.titleLabel.text = LocString(payText)
-        cell.setImageView.image = UIImage(named: payDic[payText]!)
+//        cell.setImageView.image = UIImage(named: payDic[payText]!)
         return cell
     }
  
@@ -47,7 +47,7 @@ extension RemindViewController: UITableViewDelegate, UITableViewDataSource {
  
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let view = UIView()
-        view.backgroundColor = UIColor.rgbColorFromHex(0xF2F2F2)
+        view.backgroundColor = UIColor.rgbColorFromHex(0xFAFAFA)
         return view
     }
  
@@ -56,7 +56,7 @@ extension RemindViewController: UITableViewDelegate, UITableViewDataSource {
     }
  
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
+        return 64
     }
  
     func numberOfSections(in tableView: UITableView) -> Int {
@@ -72,8 +72,6 @@ extension RemindViewController: UITableViewDelegate, UITableViewDataSource {
  
         let remindText = remindArray[indexPath.section]
         cell.titleLabel.text = LocString(remindText)
-        cell.setImageView.image = UIImage(named: remindText)
-        cell.lineView.isHidden = true
  
         switch remindText {
         case "闹钟提醒":
@@ -9,12 +9,8 @@ import UIKit
  
 class SettingCell3: UITableViewCell {
     @IBOutlet weak var detailLabel: UILabel!
-    @IBOutlet weak var setImageView: UIImageView!
     @IBOutlet weak var titleLabel: UILabel!
  
-    @IBOutlet weak var widthLayout: NSLayoutConstraint!
-    @IBOutlet weak var lineView: UIView!
-    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,57 +17,54 @@
                 <rect key="frame" x="0.0" y="0.0" width="349" height="82"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="91L-Ig-xna">
-                        <rect key="frame" x="12" y="32" width="18" height="18"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edL-k5-bKF">
+                        <rect key="frame" x="13" y="4" width="323" height="74"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tyg-g0-1WP">
+                                <rect key="frame" x="18" y="37" width="0.0" height="0.0"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIc-j9-B4E">
+                                <rect key="frame" x="285" y="37" width="0.0" height="0.0"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                                <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="p7a-xA-rxa">
+                                <rect key="frame" x="290" y="30.5" width="13" height="13"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstAttribute="width" secondItem="91L-Ig-xna" secondAttribute="height" multiplier="1:1" id="4bJ-22-3Sa"/>
-                            <constraint firstAttribute="width" constant="18" id="GM4-v7-3hR"/>
-                        </constraints>
-                    </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tyg-g0-1WP">
-                        <rect key="frame" x="35" y="41" width="0.0" height="0.0"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIc-j9-B4E">
-                        <rect key="frame" x="319" y="41" width="0.0" height="0.0"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
-                        <color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cell_go" translatesAutoresizingMaskIntoConstraints="NO" id="p7a-xA-rxa">
-                        <rect key="frame" x="324" y="34.5" width="13" height="13"/>
-                    </imageView>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y5j-aP-nvj">
-                        <rect key="frame" x="12" y="81.5" width="325" height="0.5"/>
-                        <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="0.5" id="Fdg-1J-r7e"/>
+                            <constraint firstItem="p7a-xA-rxa" firstAttribute="leading" secondItem="JIc-j9-B4E" secondAttribute="trailing" constant="5" id="Mj8-rO-peR"/>
+                            <constraint firstItem="JIc-j9-B4E" firstAttribute="centerY" secondItem="edL-k5-bKF" secondAttribute="centerY" id="O43-w2-lZi"/>
+                            <constraint firstAttribute="trailing" secondItem="p7a-xA-rxa" secondAttribute="trailing" constant="20" id="ONU-Ag-8pM"/>
+                            <constraint firstItem="p7a-xA-rxa" firstAttribute="centerY" secondItem="edL-k5-bKF" secondAttribute="centerY" id="S02-wc-f48"/>
+                            <constraint firstItem="tyg-g0-1WP" firstAttribute="leading" secondItem="edL-k5-bKF" secondAttribute="leading" constant="18" id="YYz-2T-Ckx"/>
+                            <constraint firstItem="tyg-g0-1WP" firstAttribute="centerY" secondItem="edL-k5-bKF" secondAttribute="centerY" id="epU-to-pBb"/>
                         </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="10"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="p7a-xA-rxa" firstAttribute="leading" secondItem="JIc-j9-B4E" secondAttribute="trailing" constant="5" id="BIZ-Kj-Yzx"/>
-                    <constraint firstItem="JIc-j9-B4E" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="KI2-cy-A4d"/>
-                    <constraint firstAttribute="trailing" secondItem="y5j-aP-nvj" secondAttribute="trailing" constant="12" id="MoT-gj-A5o"/>
-                    <constraint firstAttribute="bottom" secondItem="y5j-aP-nvj" secondAttribute="bottom" id="NWY-w0-QGC"/>
-                    <constraint firstItem="p7a-xA-rxa" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="NrC-WP-wEb"/>
-                    <constraint firstItem="tyg-g0-1WP" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Nss-89-xXy"/>
-                    <constraint firstItem="tyg-g0-1WP" firstAttribute="leading" secondItem="91L-Ig-xna" secondAttribute="trailing" constant="5" id="TcK-Nw-Xnt"/>
-                    <constraint firstAttribute="trailing" secondItem="p7a-xA-rxa" secondAttribute="trailing" constant="12" id="hKc-CT-uAf"/>
-                    <constraint firstItem="91L-Ig-xna" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="j0R-PD-ZCD"/>
-                    <constraint firstItem="y5j-aP-nvj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="12" id="rnu-3A-MfR"/>
-                    <constraint firstItem="91L-Ig-xna" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="12" id="viD-SO-vst"/>
+                    <constraint firstAttribute="bottom" secondItem="edL-k5-bKF" secondAttribute="bottom" constant="4" id="VqV-PV-iPz"/>
+                    <constraint firstItem="edL-k5-bKF" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="4" id="ceI-8d-LzZ"/>
+                    <constraint firstAttribute="trailing" secondItem="edL-k5-bKF" secondAttribute="trailing" constant="13" id="dRP-4f-ePy"/>
+                    <constraint firstItem="edL-k5-bKF" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="13" id="ntE-2X-TrC"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="detailLabel" destination="JIc-j9-B4E" id="rm6-Y5-FHO"/>
-                <outlet property="lineView" destination="y5j-aP-nvj" id="Uhx-Es-KDn"/>
-                <outlet property="setImageView" destination="91L-Ig-xna" id="Ebm-hn-bQP"/>
                 <outlet property="titleLabel" destination="tyg-g0-1WP" id="LIi-xi-OUB"/>
-                <outlet property="widthLayout" destination="GM4-v7-3hR" id="rPu-cF-o8V"/>
             </connections>
             <point key="canvasLocation" x="158.69565217391306" y="74.330357142857139"/>
         </tableViewCell>