Commit 66c02729d80fad9d03c517afa7f18944027962d0
1 parent
cf12a6bb
feat:other setting page UI
Showing
4 changed files
with
51 additions
and
86 deletions
HDFwear/Setting/Base.lproj/Setting.storyboard
... | ... | @@ -3953,7 +3953,7 @@ |
3953 | 3953 | <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
3954 | 3954 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
3955 | 3955 | <subviews> |
3956 | - <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="LZJ-wy-ITi"> | |
3956 | + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="LZJ-wy-ITi"> | |
3957 | 3957 | <rect key="frame" x="0.0" y="48" width="414" height="848"/> |
3958 | 3958 | <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> |
3959 | 3959 | <connections> |
... | ... | @@ -5045,64 +5045,24 @@ Cg |
5045 | 5045 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
5046 | 5046 | <subviews> |
5047 | 5047 | <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" bouncesZoom="NO" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="33u-1q-g5S"> |
5048 | - <rect key="frame" x="0.0" y="157.5" width="414" height="704.5"/> | |
5049 | - <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
5048 | + <rect key="frame" x="13" y="103" width="388" height="759"/> | |
5049 | + <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
5050 | 5050 | <connections> |
5051 | 5051 | <outlet property="dataSource" destination="VTf-KR-gVJ" id="GM0-6N-dYl"/> |
5052 | 5052 | <outlet property="delegate" destination="VTf-KR-gVJ" id="Lwe-Ff-K2Q"/> |
5053 | 5053 | </connections> |
5054 | 5054 | </tableView> |
5055 | - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Cm-0U-p56"> | |
5056 | - <rect key="frame" x="0.0" y="53" width="414" height="49.5"/> | |
5057 | - <subviews> | |
5058 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="整点自动测量" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GYY-A8-nzp"> | |
5059 | - <rect key="frame" x="12" y="7.5" width="311" height="21"/> | |
5060 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> | |
5061 | - <nil key="textColor"/> | |
5062 | - <nil key="highlightedColor"/> | |
5063 | - </label> | |
5064 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开启此功能,手表每小时将自动测量健康数据" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YmL-w3-adc"> | |
5065 | - <rect key="frame" x="12" y="29" width="220" height="15.5"/> | |
5066 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/> | |
5067 | - <color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/> | |
5068 | - <nil key="highlightedColor"/> | |
5069 | - </label> | |
5070 | - <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="gbO-7y-MOc"> | |
5071 | - <rect key="frame" x="353" y="9.5" width="51" height="31"/> | |
5072 | - <constraints> | |
5073 | - <constraint firstAttribute="width" constant="49" id="DLr-uT-R9M"/> | |
5074 | - </constraints> | |
5075 | - <connections> | |
5076 | - <action selector="switchAutoMasure:" destination="VTf-KR-gVJ" eventType="valueChanged" id="n8Z-9I-7Aj"/> | |
5077 | - </connections> | |
5078 | - </switch> | |
5079 | - </subviews> | |
5080 | - <color key="backgroundColor" systemColor="systemBackgroundColor"/> | |
5081 | - <constraints> | |
5082 | - <constraint firstItem="gbO-7y-MOc" firstAttribute="leading" secondItem="GYY-A8-nzp" secondAttribute="trailing" constant="30" id="53B-P3-nIK"/> | |
5083 | - <constraint firstAttribute="bottom" secondItem="YmL-w3-adc" secondAttribute="bottom" constant="5" id="Sb6-uD-4Mz"/> | |
5084 | - <constraint firstItem="YmL-w3-adc" firstAttribute="top" secondItem="GYY-A8-nzp" secondAttribute="bottom" constant="0.5" id="cXb-N1-ZRX"/> | |
5085 | - <constraint firstItem="gbO-7y-MOc" firstAttribute="centerY" secondItem="5Cm-0U-p56" secondAttribute="centerY" id="kL0-xt-NG0"/> | |
5086 | - <constraint firstItem="GYY-A8-nzp" firstAttribute="leading" secondItem="5Cm-0U-p56" secondAttribute="leading" constant="12" id="mBG-Jp-hHP"/> | |
5087 | - <constraint firstItem="gbO-7y-MOc" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="YmL-w3-adc" secondAttribute="trailing" constant="12" id="n0i-KZ-X09"/> | |
5088 | - <constraint firstItem="YmL-w3-adc" firstAttribute="leading" secondItem="5Cm-0U-p56" secondAttribute="leading" constant="12" id="uPG-eg-Uzo"/> | |
5089 | - <constraint firstAttribute="trailing" secondItem="gbO-7y-MOc" secondAttribute="trailing" constant="12" id="vK7-Pw-kYX"/> | |
5090 | - <constraint firstItem="GYY-A8-nzp" firstAttribute="top" secondItem="5Cm-0U-p56" secondAttribute="top" constant="7.5" id="vtg-jR-01d"/> | |
5091 | - </constraints> | |
5092 | - </view> | |
5093 | 5055 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Afm-fe-CjY"> |
5094 | - <rect key="frame" x="0.0" y="107.5" width="414" height="50"/> | |
5056 | + <rect key="frame" x="13" y="53" width="388" height="50"/> | |
5095 | 5057 | <subviews> |
5096 | 5058 | <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CUJ-35-ve5"> |
5097 | - <rect key="frame" x="326" y="12" width="75" height="26"/> | |
5098 | - <color key="backgroundColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> | |
5059 | + <rect key="frame" x="304" y="12" width="64" height="26"/> | |
5099 | 5060 | <constraints> |
5100 | - <constraint firstAttribute="width" constant="75" id="6Dw-4a-5V0"/> | |
5101 | 5061 | <constraint firstAttribute="height" constant="26" id="TFw-Ft-hiM"/> |
5102 | 5062 | </constraints> |
5103 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/> | |
5063 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
5104 | 5064 | <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> |
5105 | - <state key="normal" title="同步"> | |
5065 | + <state key="normal" title="点击同步"> | |
5106 | 5066 | <color key="titleColor" red="0.0" green="0.59999999999999998" blue="0.24313725489999999" alpha="1" colorSpace="calibratedRGB"/> |
5107 | 5067 | </state> |
5108 | 5068 | <userDefinedRuntimeAttributes> |
... | ... | @@ -5115,43 +5075,41 @@ Cg |
5115 | 5075 | </connections> |
5116 | 5076 | </button> |
5117 | 5077 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同步系统时间" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rgh-eh-9tS"> |
5118 | - <rect key="frame" x="12" y="14.5" width="294" height="21"/> | |
5119 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> | |
5120 | - <nil key="textColor"/> | |
5078 | + <rect key="frame" x="12" y="14" width="96" height="22.5"/> | |
5079 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
5080 | + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
5121 | 5081 | <nil key="highlightedColor"/> |
5122 | 5082 | </label> |
5123 | 5083 | </subviews> |
5124 | 5084 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
5125 | 5085 | <constraints> |
5126 | 5086 | <constraint firstItem="Rgh-eh-9tS" firstAttribute="centerY" secondItem="Afm-fe-CjY" secondAttribute="centerY" id="38I-TU-VPs"/> |
5127 | - <constraint firstItem="CUJ-35-ve5" firstAttribute="leading" secondItem="Rgh-eh-9tS" secondAttribute="trailing" constant="20" id="Pmr-XO-xMq"/> | |
5128 | - <constraint firstAttribute="trailing" secondItem="CUJ-35-ve5" secondAttribute="trailing" constant="13" id="T4l-Zk-aYK"/> | |
5087 | + <constraint firstAttribute="trailing" secondItem="CUJ-35-ve5" secondAttribute="trailing" constant="20" id="T4l-Zk-aYK"/> | |
5129 | 5088 | <constraint firstItem="Rgh-eh-9tS" firstAttribute="leading" secondItem="Afm-fe-CjY" secondAttribute="leading" constant="12" id="dY8-kX-XCH"/> |
5130 | 5089 | <constraint firstAttribute="height" constant="50" id="kK4-67-nKS"/> |
5131 | 5090 | <constraint firstItem="CUJ-35-ve5" firstAttribute="centerY" secondItem="Afm-fe-CjY" secondAttribute="centerY" id="sY2-zz-3s7"/> |
5132 | 5091 | </constraints> |
5092 | + <userDefinedRuntimeAttributes> | |
5093 | + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
5094 | + <integer key="value" value="10"/> | |
5095 | + </userDefinedRuntimeAttribute> | |
5096 | + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | |
5097 | + </userDefinedRuntimeAttributes> | |
5133 | 5098 | </view> |
5134 | 5099 | </subviews> |
5135 | 5100 | <viewLayoutGuide key="safeArea" id="deo-tW-2os"/> |
5136 | - <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> | |
5101 | + <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/> | |
5137 | 5102 | <constraints> |
5138 | - <constraint firstItem="5Cm-0U-p56" firstAttribute="trailing" secondItem="deo-tW-2os" secondAttribute="trailing" id="3Rm-VK-Opc"/> | |
5139 | - <constraint firstItem="Afm-fe-CjY" firstAttribute="top" secondItem="5Cm-0U-p56" secondAttribute="bottom" constant="5" id="GJ7-7V-Ep1"/> | |
5140 | - <constraint firstItem="33u-1q-g5S" firstAttribute="leading" secondItem="deo-tW-2os" secondAttribute="leading" id="ScD-Ow-0Gb"/> | |
5141 | - <constraint firstItem="5Cm-0U-p56" firstAttribute="leading" secondItem="deo-tW-2os" secondAttribute="leading" id="TFB-sV-meI"/> | |
5142 | - <constraint firstItem="deo-tW-2os" firstAttribute="trailing" secondItem="Afm-fe-CjY" secondAttribute="trailing" id="fFE-5b-YIt"/> | |
5103 | + <constraint firstItem="Afm-fe-CjY" firstAttribute="top" secondItem="deo-tW-2os" secondAttribute="top" constant="5" id="N0I-b7-fGL"/> | |
5104 | + <constraint firstItem="33u-1q-g5S" firstAttribute="leading" secondItem="deo-tW-2os" secondAttribute="leading" constant="13" id="ScD-Ow-0Gb"/> | |
5105 | + <constraint firstItem="deo-tW-2os" firstAttribute="trailing" secondItem="Afm-fe-CjY" secondAttribute="trailing" constant="13" id="fFE-5b-YIt"/> | |
5143 | 5106 | <constraint firstItem="33u-1q-g5S" firstAttribute="top" secondItem="Afm-fe-CjY" secondAttribute="bottom" id="i0U-Fr-L1D"/> |
5144 | - <constraint firstItem="deo-tW-2os" firstAttribute="trailing" secondItem="33u-1q-g5S" secondAttribute="trailing" id="icF-tM-JNs"/> | |
5145 | - <constraint firstItem="5Cm-0U-p56" firstAttribute="top" secondItem="deo-tW-2os" secondAttribute="top" constant="5" id="jOW-g8-OH8"/> | |
5107 | + <constraint firstItem="deo-tW-2os" firstAttribute="trailing" secondItem="33u-1q-g5S" secondAttribute="trailing" constant="13" id="icF-tM-JNs"/> | |
5146 | 5108 | <constraint firstItem="deo-tW-2os" firstAttribute="bottom" secondItem="33u-1q-g5S" secondAttribute="bottom" id="tI8-gM-nmd"/> |
5147 | - <constraint firstItem="Afm-fe-CjY" firstAttribute="leading" secondItem="deo-tW-2os" secondAttribute="leading" id="yv1-KV-nUG"/> | |
5109 | + <constraint firstItem="Afm-fe-CjY" firstAttribute="leading" secondItem="deo-tW-2os" secondAttribute="leading" constant="13" id="yv1-KV-nUG"/> | |
5148 | 5110 | </constraints> |
5149 | 5111 | </view> |
5150 | 5112 | <connections> |
5151 | - <outlet property="autoDetailLabel" destination="YmL-w3-adc" id="RV2-3g-jfk"/> | |
5152 | - <outlet property="autoSwitch" destination="gbO-7y-MOc" id="eNS-bK-hxU"/> | |
5153 | - <outlet property="autoTitleLabel" destination="GYY-A8-nzp" id="ePp-yf-mwY"/> | |
5154 | - <outlet property="autoView" destination="5Cm-0U-p56" id="2aN-UA-ZQ7"/> | |
5155 | 5113 | <outlet property="tableView" destination="33u-1q-g5S" id="g3O-jy-WhU"/> |
5156 | 5114 | </connections> |
5157 | 5115 | </viewController> | ... | ... |
HDFwear/Setting/OtherSettingVC.swift
... | ... | @@ -12,11 +12,11 @@ import MBProgressHUD |
12 | 12 | class OtherSettingVC: UIViewController { |
13 | 13 | |
14 | 14 | @IBOutlet weak var tableView: UITableView! |
15 | - @IBOutlet weak var autoSwitch: UISwitch! | |
15 | +// @IBOutlet weak var autoSwitch: UISwitch! | |
16 | 16 | |
17 | - @IBOutlet weak var autoView: UIView! | |
18 | - @IBOutlet weak var autoTitleLabel: UILabel! | |
19 | - @IBOutlet weak var autoDetailLabel: UILabel! | |
17 | +// @IBOutlet weak var autoView: UIView! | |
18 | +// @IBOutlet weak var autoTitleLabel: UILabel! | |
19 | +// @IBOutlet weak var autoDetailLabel: UILabel! | |
20 | 20 | |
21 | 21 | |
22 | 22 | var unitSettingClosure: ((_ distanceUnit: DistanceUnit) -> ())? |
... | ... | @@ -38,18 +38,18 @@ class OtherSettingVC: UIViewController { |
38 | 38 | override func viewDidLoad() { |
39 | 39 | super.viewDidLoad() |
40 | 40 | title = LocString("其他设置") |
41 | - autoSwitch.isOn = UserInfo.autoMasure | |
41 | +// autoSwitch.isOn = UserInfo.autoMasure | |
42 | 42 | tableView.register(UINib.init(nibName: "SettingCell2", bundle: Bundle.main), forCellReuseIdentifier: "SettingCell2") |
43 | 43 | tableView.tableFooterView = UIView(frame: CGRect.zero) |
44 | 44 | |
45 | - autoTitleLabel.text = LocString("整点自动测量") | |
46 | - autoDetailLabel.text = LocString("开启此功能,手表每小时将自动测量健康数据") | |
45 | +// autoTitleLabel.text = LocString("整点自动测量") | |
46 | +// autoDetailLabel.text = LocString("开启此功能,手表每小时将自动测量健康数据") | |
47 | 47 | |
48 | 48 | |
49 | 49 | if device.name.contains("P8GT") || device.name.contains("S7 NO.1") { |
50 | - autoTitleLabel.text = "" | |
51 | - autoDetailLabel.text = "" | |
52 | - autoView.isHidden = true | |
50 | +// autoTitleLabel.text = "" | |
51 | +// autoDetailLabel.text = "" | |
52 | +// autoView.isHidden = true | |
53 | 53 | } |
54 | 54 | } |
55 | 55 | @IBAction func syncTime(_ sender: Any) { |
... | ... | @@ -80,20 +80,21 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { |
80 | 80 | |
81 | 81 | |
82 | 82 | func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { |
83 | - return 30 | |
83 | + return 44 | |
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | 87 | func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { |
88 | 88 | let view = UIView() |
89 | - view.backgroundColor = UIColor.rgbColorFromHex(0xF2F2F2) | |
89 | + view.backgroundColor = UIColor.rgbColorFromHex(0xFAFAFA) | |
90 | 90 | let label = UILabel() |
91 | - label.font = RegularFont(11) | |
91 | + label.font = UIFont.systemFont(ofSize: 13, weight: .medium) | |
92 | + label.textColor = UIColor.rgbColorFromHex(0x999999) | |
92 | 93 | label.text = LocString(settingArray[section]) |
93 | 94 | view.addSubview(label) |
94 | 95 | label.snp.makeConstraints { make in |
95 | 96 | make.left.equalToSuperview().offset(12) |
96 | - make.top.equalToSuperview().offset(7.5) | |
97 | + make.top.equalToSuperview().offset(10) | |
97 | 98 | } |
98 | 99 | return view |
99 | 100 | } |
... | ... | @@ -103,7 +104,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { |
103 | 104 | } |
104 | 105 | |
105 | 106 | func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { |
106 | - return 50 | |
107 | + return 55 | |
107 | 108 | } |
108 | 109 | |
109 | 110 | func numberOfSections(in tableView: UITableView) -> Int { |
... | ... | @@ -123,12 +124,15 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { |
123 | 124 | switch settingArray[indexPath.section] { |
124 | 125 | case "时间单位设置": |
125 | 126 | if user.timeFormat == 0 && text == "24小时" { |
127 | + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) | |
126 | 128 | cell.selectImageView.image = UIImage(named: "setting_selected") |
127 | 129 | } else if user.timeFormat == 1 && text == "12小时" { |
130 | + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) | |
128 | 131 | cell.selectImageView.image = UIImage(named: "setting_selected") |
129 | 132 | } |
130 | 133 | case "公英制单位设置": |
131 | 134 | if text == "公制" { |
135 | + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) | |
132 | 136 | if user.distanceUnit == 0 { |
133 | 137 | cell.selectImageView.image = UIImage(named: "setting_selected") |
134 | 138 | } |
... | ... | @@ -139,6 +143,7 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { |
139 | 143 | str.addAttributes([.font: RegularFont(11)], range: NSMakeRange(str1.count, str2.count)) |
140 | 144 | cell.label.attributedText = str |
141 | 145 | } else if text == "英制" { |
146 | + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) | |
142 | 147 | if user.distanceUnit == 1 { |
143 | 148 | cell.selectImageView.image = UIImage(named: "setting_selected") |
144 | 149 | } |
... | ... | @@ -152,8 +157,10 @@ extension OtherSettingVC: UITableViewDelegate, UITableViewDataSource { |
152 | 157 | |
153 | 158 | case "温度单位": |
154 | 159 | if user.temperatureUnit == 0 && text == "摄氏度(℃)" { |
160 | + cell.setCorners(corners: [.topLeft, .topRight], radio: 10) | |
155 | 161 | cell.selectImageView.image = UIImage(named: "setting_selected") |
156 | 162 | } else if user.temperatureUnit == 1 && text == "华氏度(℉)" { |
163 | + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10) | |
157 | 164 | cell.selectImageView.image = UIImage(named: "setting_selected") |
158 | 165 | } |
159 | 166 | default: | ... | ... |
HDFwear/Setting/VIew/SettingCell2.xib
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | -<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"> | |
2 | +<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"> | |
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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
9 | 9 | </dependencies> |
... | ... | @@ -25,9 +25,9 @@ |
25 | 25 | </constraints> |
26 | 26 | </imageView> |
27 | 27 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VbS-hV-ehb"> |
28 | - <rect key="frame" x="12" y="22.5" width="38" height="21"/> | |
29 | - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> | |
30 | - <nil key="textColor"/> | |
28 | + <rect key="frame" x="12" y="22" width="41.5" height="22.5"/> | |
29 | + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/> | |
30 | + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
31 | 31 | <nil key="highlightedColor"/> |
32 | 32 | </label> |
33 | 33 | </subviews> | ... | ... |
HDFwear/Setting/zh-Hans.lproj/Setting.strings
... | ... | @@ -409,7 +409,7 @@ |
409 | 409 | //################################################################################## |
410 | 410 | |
411 | 411 | /* Class = "UIButton"; normalTitle = "同步"; ObjectID = "CUJ-35-ve5"; */ |
412 | -"CUJ-35-ve5.normalTitle" = "同步"; | |
412 | +"CUJ-35-ve5.normalTitle" = "点击同步"; | |
413 | 413 | |
414 | 414 | /* Class = "UIButton"; normalTitle = "重试"; ObjectID = "g8A-kR-at7"; */ |
415 | 415 | "g8A-kR-at7.normalTitle" = "重试"; | ... | ... |