ios / ytwatch

Commit 072a11e2d7de6de63af8936ca5511cdd0ab862c7

Authored by daifengyi
1 parent 1a226870

feat:setting page UI

Inline Side-by-side
Showing 44 changed files with 139 additions and 280 deletions
HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "添加设备背景@2x.png",
  8 + "filename" : "device_add_bg@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "添加设备背景@3x.png",
  13 + "filename" : "device_add_bg@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@2x.png 0 → 100644
View file @072a11e

113 KB
HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@3x.png 0 → 100644
View file @072a11e

220 KB
HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@2x.png deleted
View file @1a22687

14.7 KB
HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@3x.png deleted
View file @1a22687

27.8 KB
HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "抬腕亮屏@2x.png",
  8 + "filename" : "lift_wrist@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "抬腕亮屏@3x.png",
  13 + "filename" : "lift_wrist@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@2x.png 0 → 100644
View file @072a11e

2.62 KB
HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@3x.png 0 → 100644
View file @072a11e

4.16 KB
HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@2x.png deleted
View file @1a22687

3.4 KB
HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@3x.png deleted
View file @1a22687

6.32 KB
HDFwear/Assets.xcassets/Setting/remote_camera.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "遥控拍照@2x.png",
  8 + "filename" : "remote_camera@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "遥控拍照@3x.png",
  13 + "filename" : "remote_camera@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@2x.png 0 → 100644
View file @072a11e

2.81 KB
HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@3x.png 0 → 100644
View file @072a11e

2.03 KB
HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@2x.png deleted
View file @1a22687

3.35 KB
HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@3x.png deleted
View file @1a22687

6.1 KB
HDFwear/Assets.xcassets/Setting/set_find.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "查找手环@2x.png",
  8 + "filename" : "set_find@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "查找手环@3x.png",
  13 + "filename" : "set_find@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@2x.png 0 → 100644
View file @072a11e

3.39 KB
HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@3x.png 0 → 100644
View file @072a11e

2.54 KB
HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@2x.png deleted
View file @1a22687

3.4 KB
HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@3x.png deleted
View file @1a22687

6.52 KB
HDFwear/Assets.xcassets/Setting/set_goals.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "目标设置@2x.png",
  8 + "filename" : "set_goals@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "目标设置@3x.png",
  13 + "filename" : "set_goals@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@2x.png 0 → 100644
View file @072a11e

4.35 KB
HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@3x.png 0 → 100644
View file @072a11e

7.14 KB
HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@2x.png deleted
View file @1a22687

4.51 KB
HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@3x.png deleted
View file @1a22687

8.31 KB
HDFwear/Assets.xcassets/Setting/set_language.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "语言设置@2x.png",
  8 + "filename" : "set_language@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "语言设置@3x.png",
  13 + "filename" : "set_language@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@2x.png 0 → 100644
View file @072a11e

4.91 KB
HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@3x.png 0 → 100644
View file @072a11e

3.66 KB
HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@2x.png deleted
View file @1a22687

3.85 KB
HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@3x.png deleted
View file @1a22687

7.08 KB
HDFwear/Assets.xcassets/Setting/set_other.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "其他设置@2x.png",
  8 + "filename" : "set_other@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "其他设置@3x.png",
  13 + "filename" : "set_other@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@2x.png 0 → 100644
View file @072a11e

3.51 KB
HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@3x.png 0 → 100644
View file @072a11e

5.77 KB
HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@2x.png deleted
View file @1a22687

2.78 KB
HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@3x.png deleted
View file @1a22687

5.22 KB
HDFwear/Assets.xcassets/Setting/set_reminder.imageset/Contents.json
  View file @072a11e
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "提醒功能@2x.png",
  8 + "filename" : "set_reminder@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "提醒功能@3x.png",
  13 + "filename" : "set_reminder@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@2x.png 0 → 100644
View file @072a11e

2.85 KB
HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@3x.png 0 → 100644
View file @072a11e

2.06 KB
HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@2x.png deleted
View file @1a22687

3.6 KB
HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@3x.png deleted
View file @1a22687

6.65 KB
HDFwear/Motion/MotionViewController.swift
  View file @072a11e
... ... @@ -37,7 +37,7 @@ class MotionViewController: UIViewController {
37 37  
38 38 override func viewWillAppear(_ animated: Bool) {
39 39 super.viewWillAppear(animated)
40   - self.navigationController?.setNavigationBarHidden(false, animated: true)
  40 + self.navigationController?.setNavigationBarHidden(true, animated: true)
41 41 user = UserInfo
42 42 getMotionHistory(selectedMode.rawValue)
43 43  
... ...
HDFwear/Setting/Base.lproj/Setting.storyboard
  View file @072a11e
... ... @@ -30,10 +30,10 @@
30 30 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="device_add_bg" translatesAutoresizingMaskIntoConstraints="NO" id="bRx-gI-xUo">
31 31 <rect key="frame" x="0.0" y="0.0" width="389" height="100"/>
32 32 </imageView>
33   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="device_add" translatesAutoresizingMaskIntoConstraints="NO" id="8xF-hb-8dr">
  33 + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="device_add" translatesAutoresizingMaskIntoConstraints="NO" id="8xF-hb-8dr">
34 34 <rect key="frame" x="19.5" y="39" width="22" height="22"/>
35 35 </imageView>
36   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加设备" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b0S-Ew-T3l">
  36 + <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加设备" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b0S-Ew-T3l">
37 37 <rect key="frame" x="50.5" y="38.5" width="64" height="23"/>
38 38 <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
39 39 <nil key="textColor"/>
... ... @@ -157,158 +157,8 @@
157 157 </userDefinedRuntimeAttribute>
158 158 </userDefinedRuntimeAttributes>
159 159 </view>
160   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ryb-md-FfS">
161   - <rect key="frame" x="12.5" y="115.5" width="389" height="50"/>
162   - <subviews>
163   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="frB-nh-9yl">
164   - <rect key="frame" x="194.5" y="0.0" width="0.5" height="50"/>
165   - <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
166   - <constraints>
167   - <constraint firstAttribute="width" constant="0.5" id="HZt-db-b0Q"/>
168   - </constraints>
169   - </view>
170   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="device_calorie" translatesAutoresizingMaskIntoConstraints="NO" id="dHP-6Z-yiy">
171   - <rect key="frame" x="46.5" y="14" width="22" height="22"/>
172   - <constraints>
173   - <constraint firstAttribute="width" constant="22" id="4ET-V4-vNe"/>
174   - <constraint firstAttribute="height" constant="22" id="Hvx-9d-DqT"/>
175   - </constraints>
176   - </imageView>
177   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="device_mileage" translatesAutoresizingMaskIntoConstraints="NO" id="hld-Vs-af9">
178   - <rect key="frame" x="241" y="14" width="22" height="22"/>
179   - <constraints>
180   - <constraint firstAttribute="height" constant="22" id="CMZ-m6-Psh"/>
181   - <constraint firstAttribute="width" constant="22" id="xFu-GJ-0cX"/>
182   - </constraints>
183   - </imageView>
184   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.00千卡" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PCZ-Ac-DiP">
185   - <rect key="frame" x="78.5" y="6.5" width="57" height="20"/>
186   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/>
187   - <nil key="textColor"/>
188   - <nil key="highlightedColor"/>
189   - </label>
190   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消耗卡路里" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lY3-hY-Ffo">
191   - <rect key="frame" x="73.5" y="28" width="67" height="16"/>
192   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
193   - <nil key="textColor"/>
194   - <nil key="highlightedColor"/>
195   - </label>
196   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.00公里" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U5D-A0-GeW">
197   - <rect key="frame" x="273" y="6.5" width="57" height="20"/>
198   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/>
199   - <nil key="textColor"/>
200   - <nil key="highlightedColor"/>
201   - </label>
202   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总里程" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oLo-Aa-tdJ">
203   - <rect key="frame" x="268" y="28" width="67" height="16"/>
204   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
205   - <nil key="textColor"/>
206   - <nil key="highlightedColor"/>
207   - </label>
208   - </subviews>
209   - <color key="backgroundColor" systemColor="systemBackgroundColor"/>
210   - <constraints>
211   - <constraint firstItem="lY3-hY-Ffo" firstAttribute="centerX" secondItem="PCZ-Ac-DiP" secondAttribute="centerX" id="2mQ-jy-90z"/>
212   - <constraint firstItem="PCZ-Ac-DiP" firstAttribute="centerX" secondItem="Ryb-md-FfS" secondAttribute="centerX" multiplier="0.55" id="3Rz-L8-YPD"/>
213   - <constraint firstItem="U5D-A0-GeW" firstAttribute="centerX" secondItem="Ryb-md-FfS" secondAttribute="centerX" multiplier="1.55" id="4MK-pu-YnJ"/>
214   - <constraint firstAttribute="bottom" secondItem="frB-nh-9yl" secondAttribute="bottom" id="Ds9-e8-S3T"/>
215   - <constraint firstItem="frB-nh-9yl" firstAttribute="centerX" secondItem="Ryb-md-FfS" secondAttribute="centerX" id="E8z-GF-94H"/>
216   - <constraint firstItem="dHP-6Z-yiy" firstAttribute="centerY" secondItem="Ryb-md-FfS" secondAttribute="centerY" id="LkW-SW-JUz"/>
217   - <constraint firstItem="U5D-A0-GeW" firstAttribute="top" secondItem="Ryb-md-FfS" secondAttribute="top" constant="6.5" id="MSJ-sH-yek"/>
218   - <constraint firstItem="oLo-Aa-tdJ" firstAttribute="leading" secondItem="hld-Vs-af9" secondAttribute="trailing" constant="5" id="Tng-5k-ME6"/>
219   - <constraint firstItem="PCZ-Ac-DiP" firstAttribute="leading" secondItem="dHP-6Z-yiy" secondAttribute="trailing" constant="10" id="W3B-Xx-i9f"/>
220   - <constraint firstItem="U5D-A0-GeW" firstAttribute="leading" secondItem="hld-Vs-af9" secondAttribute="trailing" constant="10" id="Xji-ja-9sw"/>
221   - <constraint firstItem="hld-Vs-af9" firstAttribute="centerY" secondItem="Ryb-md-FfS" secondAttribute="centerY" id="YSj-We-7kH"/>
222   - <constraint firstItem="lY3-hY-Ffo" firstAttribute="leading" secondItem="dHP-6Z-yiy" secondAttribute="trailing" constant="5" id="dge-wo-NIF"/>
223   - <constraint firstItem="PCZ-Ac-DiP" firstAttribute="top" secondItem="Ryb-md-FfS" secondAttribute="top" constant="6.5" id="kn5-MF-8gC"/>
224   - <constraint firstItem="oLo-Aa-tdJ" firstAttribute="centerX" secondItem="U5D-A0-GeW" secondAttribute="centerX" id="paf-aG-ita"/>
225   - <constraint firstItem="frB-nh-9yl" firstAttribute="top" secondItem="Ryb-md-FfS" secondAttribute="top" id="pnJ-Z1-MUv"/>
226   - <constraint firstAttribute="bottom" secondItem="lY3-hY-Ffo" secondAttribute="bottom" constant="6" id="rGo-2h-6IN"/>
227   - <constraint firstAttribute="height" constant="50" id="sAk-Ux-DXY"/>
228   - <constraint firstAttribute="bottom" secondItem="oLo-Aa-tdJ" secondAttribute="bottom" constant="6" id="tc1-ks-HDw"/>
229   - </constraints>
230   - <userDefinedRuntimeAttributes>
231   - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
232   - <integer key="value" value="10"/>
233   - </userDefinedRuntimeAttribute>
234   - </userDefinedRuntimeAttributes>
235   - </view>
236   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a3g-0q-LSz">
237   - <rect key="frame" x="12.5" y="175.5" width="389" height="150"/>
238   - <subviews>
239   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dail_default_1" translatesAutoresizingMaskIntoConstraints="NO" id="eBA-p0-yJH">
240   - <rect key="frame" x="38" y="50" width="80" height="80"/>
241   - <constraints>
242   - <constraint firstAttribute="height" constant="80" id="0a3-NB-sQr"/>
243   - <constraint firstAttribute="width" constant="80" id="mnL-XP-dxo"/>
244   - </constraints>
245   - </imageView>
246   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dail_default_2" translatesAutoresizingMaskIntoConstraints="NO" id="RQQ-hO-iAI">
247   - <rect key="frame" x="154.5" y="50" width="80" height="80"/>
248   - <constraints>
249   - <constraint firstAttribute="height" constant="80" id="EDb-Nj-i82"/>
250   - <constraint firstAttribute="width" constant="80" id="hJm-bY-rko"/>
251   - </constraints>
252   - </imageView>
253   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dail_default_3" translatesAutoresizingMaskIntoConstraints="NO" id="Oh4-RY-I9t">
254   - <rect key="frame" x="271" y="50" width="80" height="80"/>
255   - <constraints>
256   - <constraint firstAttribute="height" constant="80" id="KZ9-e9-cCU"/>
257   - <constraint firstAttribute="width" constant="80" id="Mah-b8-gLB"/>
258   - </constraints>
259   - </imageView>
260   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="表盘推送" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2hH-rw-7Av">
261   - <rect key="frame" x="20" y="9.5" width="64" height="23"/>
262   - <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
263   - <nil key="textColor"/>
264   - <nil key="highlightedColor"/>
265   - </label>
266   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XSn-nS-bXB">
267   - <rect key="frame" x="331" y="13.5" width="22" height="15.5"/>
268   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
269   - <color key="textColor" red="0.0" green="0.59999999999999998" blue="0.24313725490196078" alpha="1" colorSpace="calibratedRGB"/>
270   - <nil key="highlightedColor"/>
271   - </label>
272   - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dail_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="dwx-au-rNx">
273   - <rect key="frame" x="354" y="16" width="10" height="10"/>
274   - <constraints>
275   - <constraint firstAttribute="height" constant="10" id="3gP-Nq-HFC"/>
276   - <constraint firstAttribute="width" constant="10" id="szP-3s-4n7"/>
277   - </constraints>
278   - </imageView>
279   - <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d3e-dz-lam">
280   - <rect key="frame" x="0.0" y="0.0" width="381" height="150"/>
281   - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
282   - <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
283   - <connections>
284   - <action selector="gotoDailVC:" destination="LPw-cl-Tbn" eventType="touchUpInside" id="NWo-79-ZNV"/>
285   - </connections>
286   - </button>
287   - </subviews>
288   - <color key="backgroundColor" systemColor="systemBackgroundColor"/>
289   - <constraints>
290   - <constraint firstItem="RQQ-hO-iAI" firstAttribute="centerX" secondItem="a3g-0q-LSz" secondAttribute="centerX" id="B0w-8y-obg"/>
291   - <constraint firstItem="RQQ-hO-iAI" firstAttribute="centerY" secondItem="eBA-p0-yJH" secondAttribute="centerY" id="N1d-44-DHm"/>
292   - <constraint firstItem="Oh4-RY-I9t" firstAttribute="centerX" secondItem="a3g-0q-LSz" secondAttribute="centerX" multiplier="1.6" id="Qag-yX-isB"/>
293   - <constraint firstItem="eBA-p0-yJH" firstAttribute="centerX" secondItem="a3g-0q-LSz" secondAttribute="centerX" multiplier="0.4" id="RXS-bX-41T"/>
294   - <constraint firstItem="dwx-au-rNx" firstAttribute="top" secondItem="a3g-0q-LSz" secondAttribute="top" constant="16" id="SjF-Sr-i2H"/>
295   - <constraint firstAttribute="bottom" secondItem="RQQ-hO-iAI" secondAttribute="bottom" constant="20" id="YG7-DC-Bgc"/>
296   - <constraint firstItem="Oh4-RY-I9t" firstAttribute="centerY" secondItem="RQQ-hO-iAI" secondAttribute="centerY" id="elW-ll-A8v"/>
297   - <constraint firstItem="2hH-rw-7Av" firstAttribute="leading" secondItem="a3g-0q-LSz" secondAttribute="leading" constant="20" id="hWS-Ev-Gpj"/>
298   - <constraint firstItem="dwx-au-rNx" firstAttribute="leading" secondItem="XSn-nS-bXB" secondAttribute="trailing" constant="1" id="i45-2h-aHf"/>
299   - <constraint firstAttribute="height" constant="150" id="lCw-GJ-g1r"/>
300   - <constraint firstItem="dwx-au-rNx" firstAttribute="centerY" secondItem="2hH-rw-7Av" secondAttribute="centerY" id="pTf-Kx-ybI"/>
301   - <constraint firstItem="XSn-nS-bXB" firstAttribute="centerY" secondItem="2hH-rw-7Av" secondAttribute="centerY" id="t5y-vp-V3b"/>
302   - <constraint firstAttribute="trailing" secondItem="dwx-au-rNx" secondAttribute="trailing" constant="25" id="tcK-lN-Yej"/>
303   - </constraints>
304   - <userDefinedRuntimeAttributes>
305   - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
306   - <integer key="value" value="10"/>
307   - </userDefinedRuntimeAttribute>
308   - </userDefinedRuntimeAttributes>
309   - </view>
310 160 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Y3j-Nc-W5b">
311   - <rect key="frame" x="12.5" y="335.5" width="389" height="250"/>
  161 + <rect key="frame" x="12.5" y="125.5" width="389" height="250"/>
312 162 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
313 163 <constraints>
314 164 <constraint firstAttribute="height" constant="250" id="539-Yx-xe8"/>
... ... @@ -322,7 +172,7 @@
322 172 <cells/>
323 173 <userDefinedRuntimeAttributes>
324 174 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
325   - <integer key="value" value="10"/>
  175 + <integer key="value" value="12"/>
326 176 </userDefinedRuntimeAttribute>
327 177 </userDefinedRuntimeAttributes>
328 178 <connections>
... ... @@ -330,48 +180,70 @@
330 180 <outlet property="delegate" destination="LPw-cl-Tbn" id="cXb-cd-YYq"/>
331 181 </connections>
332 182 </collectionView>
333   - <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="8ct-2n-4jv">
334   - <rect key="frame" x="12.5" y="595.5" width="389" height="80"/>
  183 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="常用工具" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgA-fE-ckC">
  184 + <rect key="frame" x="32.5" y="145.5" width="82" height="24"/>
  185 + <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
  186 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  187 + <nil key="highlightedColor"/>
  188 + </label>
  189 + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VCo-0H-41p">
  190 + <rect key="frame" x="14" y="385.5" width="386" height="134"/>
  191 + <subviews>
  192 + <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="8ct-2n-4jv">
  193 + <rect key="frame" x="0.0" y="0.0" width="350" height="134"/>
  194 + <color key="backgroundColor" systemColor="systemBackgroundColor"/>
  195 + <constraints>
  196 + <constraint firstAttribute="height" constant="134" id="HXZ-pd-bMM"/>
  197 + <constraint firstAttribute="width" constant="350" id="MKp-3N-led"/>
  198 + </constraints>
  199 + <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="5" id="1jE-ox-clv">
  200 + <size key="itemSize" width="128" height="128"/>
  201 + <size key="headerReferenceSize" width="0.0" height="0.0"/>
  202 + <size key="footerReferenceSize" width="0.0" height="0.0"/>
  203 + <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
  204 + </collectionViewFlowLayout>
  205 + <cells/>
  206 + <userDefinedRuntimeAttributes>
  207 + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
  208 + <integer key="value" value="12"/>
  209 + </userDefinedRuntimeAttribute>
  210 + </userDefinedRuntimeAttributes>
  211 + <connections>
  212 + <outlet property="dataSource" destination="LPw-cl-Tbn" id="KGz-OS-dRI"/>
  213 + <outlet property="delegate" destination="LPw-cl-Tbn" id="Qc4-73-VdW"/>
  214 + </connections>
  215 + </collectionView>
  216 + </subviews>
335 217 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
336 218 <constraints>
337   - <constraint firstAttribute="height" constant="80" id="HXZ-pd-bMM"/>
  219 + <constraint firstItem="8ct-2n-4jv" firstAttribute="leading" secondItem="VCo-0H-41p" secondAttribute="leading" id="SqY-aF-0pZ"/>
  220 + <constraint firstAttribute="bottom" secondItem="8ct-2n-4jv" secondAttribute="bottom" id="b62-rJ-KJR"/>
  221 + <constraint firstItem="8ct-2n-4jv" firstAttribute="top" secondItem="VCo-0H-41p" secondAttribute="top" id="fsl-kZ-27C"/>
338 222 </constraints>
339   - <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="1jE-ox-clv">
340   - <size key="itemSize" width="128" height="128"/>
341   - <size key="headerReferenceSize" width="0.0" height="0.0"/>
342   - <size key="footerReferenceSize" width="0.0" height="0.0"/>
343   - <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
344   - </collectionViewFlowLayout>
345   - <cells/>
346   - <userDefinedRuntimeAttributes>
347   - <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
348   - <integer key="value" value="10"/>
349   - </userDefinedRuntimeAttribute>
350   - </userDefinedRuntimeAttributes>
351   - <connections>
352   - <outlet property="dataSource" destination="LPw-cl-Tbn" id="KGz-OS-dRI"/>
353   - <outlet property="delegate" destination="LPw-cl-Tbn" id="Qc4-73-VdW"/>
354   - </connections>
355   - </collectionView>
  223 + </view>
  224 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="安全升级" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgl-qy-5h0">
  225 + <rect key="frame" x="20" y="395.5" width="82" height="24"/>
  226 + <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
  227 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  228 + <nil key="highlightedColor"/>
  229 + </label>
356 230 </subviews>
357 231 <constraints>
  232 + <constraint firstItem="Y3j-Nc-W5b" firstAttribute="top" secondItem="jWo-K3-C6E" secondAttribute="bottom" constant="20" id="1OJ-hK-CVV"/>
358 233 <constraint firstItem="Y3j-Nc-W5b" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="12.5" id="1zJ-YY-Yzn"/>
359 234 <constraint firstAttribute="trailing" secondItem="Y3j-Nc-W5b" secondAttribute="trailing" constant="12.5" id="5XK-Bo-q4C"/>
  235 + <constraint firstItem="hgA-fE-ckC" firstAttribute="top" secondItem="Y3j-Nc-W5b" secondAttribute="top" constant="20" id="6XZ-pd-Z7m"/>
360 236 <constraint firstItem="jWo-K3-C6E" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="12.5" id="9w0-PQ-yCc"/>
361   - <constraint firstAttribute="bottom" secondItem="8ct-2n-4jv" secondAttribute="bottom" constant="10" id="FhF-DN-Tcf"/>
362   - <constraint firstItem="Y3j-Nc-W5b" firstAttribute="top" secondItem="a3g-0q-LSz" secondAttribute="bottom" constant="10" id="Fsd-nO-Jsg"/>
  237 + <constraint firstItem="hgl-qy-5h0" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="20" id="Fcu-dl-GIG"/>
  238 + <constraint firstItem="hgA-fE-ckC" firstAttribute="leading" secondItem="Y3j-Nc-W5b" secondAttribute="leading" constant="20" id="HAn-w7-5D5"/>
  239 + <constraint firstItem="hgl-qy-5h0" firstAttribute="top" secondItem="Y3j-Nc-W5b" secondAttribute="bottom" constant="20" id="Jo3-8U-Zwu"/>
363 240 <constraint firstItem="jWo-K3-C6E" firstAttribute="top" secondItem="rzd-03-L3U" secondAttribute="top" constant="5.5" id="KuI-AG-0p0"/>
364 241 <constraint firstAttribute="trailing" secondItem="jWo-K3-C6E" secondAttribute="trailing" constant="12.5" id="QqV-3s-D0v"/>
365   - <constraint firstItem="a3g-0q-LSz" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="12.5" id="RQE-qW-ope"/>
366   - <constraint firstItem="8ct-2n-4jv" firstAttribute="top" secondItem="Y3j-Nc-W5b" secondAttribute="bottom" constant="10" id="Vf8-m1-en4"/>
  242 + <constraint firstItem="VCo-0H-41p" firstAttribute="top" secondItem="Y3j-Nc-W5b" secondAttribute="bottom" constant="10" id="TIp-Do-jn6"/>
367 243 <constraint firstItem="jWo-K3-C6E" firstAttribute="centerX" secondItem="rzd-03-L3U" secondAttribute="centerX" id="WSb-jY-NPd"/>
368   - <constraint firstAttribute="trailing" secondItem="8ct-2n-4jv" secondAttribute="trailing" constant="12.5" id="YOC-IW-ebr"/>
369   - <constraint firstItem="Ryb-md-FfS" firstAttribute="top" secondItem="jWo-K3-C6E" secondAttribute="bottom" constant="10" id="h3D-pj-eRp"/>
370   - <constraint firstAttribute="trailing" secondItem="a3g-0q-LSz" secondAttribute="trailing" constant="12.5" id="kTj-fD-Kyr"/>
371   - <constraint firstItem="Ryb-md-FfS" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="12.5" id="n4V-eU-YiK"/>
372   - <constraint firstAttribute="trailing" secondItem="Ryb-md-FfS" secondAttribute="trailing" constant="12.5" id="nSg-ry-3W1"/>
373   - <constraint firstItem="8ct-2n-4jv" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="12.5" id="tLk-AM-4sF"/>
374   - <constraint firstItem="a3g-0q-LSz" firstAttribute="top" secondItem="Ryb-md-FfS" secondAttribute="bottom" constant="10" id="w0N-hw-935"/>
  244 + <constraint firstAttribute="bottom" secondItem="VCo-0H-41p" secondAttribute="bottom" constant="20" id="bTD-eR-SIx"/>
  245 + <constraint firstItem="VCo-0H-41p" firstAttribute="leading" secondItem="rzd-03-L3U" secondAttribute="leading" constant="14" id="hX7-6C-Sz7"/>
  246 + <constraint firstAttribute="trailing" secondItem="VCo-0H-41p" secondAttribute="trailing" constant="14" id="prh-9C-Cwf"/>
375 247 </constraints>
376 248 </scrollView>
377 249 </subviews>
... ... @@ -390,6 +262,7 @@
390 262 <outlet property="batteryBtn" destination="VQZ-KP-Xs6" id="txH-EG-ScT"/>
391 263 <outlet property="collectionView" destination="Y3j-Nc-W5b" id="7PF-5f-gLE"/>
392 264 <outlet property="collectionView1" destination="8ct-2n-4jv" id="HZo-zV-SwK"/>
  265 + <outlet property="collectionView1Width" destination="MKp-3N-led" id="nk4-r7-Usn"/>
393 266 <outlet property="collectionViewFlowLayout" destination="XdO-x8-vzs" id="LJY-9g-YSr"/>
394 267 <outlet property="collectionViewFlowLayout1" destination="1jE-ox-clv" id="dBS-Jz-7GU"/>
395 268 <outlet property="collectionViewHeight" destination="539-Yx-xe8" id="Ln9-c2-DhX"/>
... ... @@ -397,14 +270,9 @@
397 270 <outlet property="connectImageView" destination="EC8-Ue-Qe8" id="2Sj-Pd-cMv"/>
398 271 <outlet property="connectLabel" destination="MEf-bf-RAI" id="hyK-ry-b6R"/>
399 272 <outlet property="connectView" destination="82E-pa-FZa" id="mfJ-Ay-Vbx"/>
400   - <outlet property="dailImageView1" destination="eBA-p0-yJH" id="3gc-gF-FZh"/>
401   - <outlet property="dailImageView2" destination="RQQ-hO-iAI" id="B2m-na-vmL"/>
402   - <outlet property="dailImageView3" destination="Oh4-RY-I9t" id="6FC-3P-aFa"/>
403 273 <outlet property="deleteBtn" destination="u0Z-1d-xhl" id="fP6-cS-gbr"/>
404 274 <outlet property="deviceNameLabel" destination="Qui-LF-uDr" id="0d3-Q2-qXu"/>
405 275 <outlet property="idLabel" destination="3bX-8a-aDD" id="EJQ-nL-u5r"/>
406   - <outlet property="totalCalorieLabel" destination="PCZ-Ac-DiP" id="KMc-s5-TNk"/>
407   - <outlet property="totalDistanceLabel" destination="U5D-A0-GeW" id="w6r-J3-hKB"/>
408 276 <outlet property="watchImageView" destination="jLP-FX-LLf" id="wXB-xB-GuM"/>
409 277 </connections>
410 278 </viewController>
... ... @@ -5857,16 +5725,10 @@ Cg
5857 5725 <image name="cell_go" width="13" height="13"/>
5858 5726 <image name="contacts_search" width="16" height="16"/>
5859 5727 <image name="custom_default" width="120" height="140"/>
5860   - <image name="dail_arrow" width="13" height="13"/>
5861   - <image name="dail_default_1" width="78" height="78"/>
5862   - <image name="dail_default_2" width="69" height="76.5"/>
5863   - <image name="dail_default_3" width="68" height="77"/>
5864 5728 <image name="dail_number_bg" width="75.5" height="32"/>
5865 5729 <image name="delete_device" width="16.5" height="16.5"/>
5866 5730 <image name="device_add" width="22" height="22"/>
5867   - <image name="device_add_bg" width="350" height="100"/>
5868   - <image name="device_calorie" width="22.5" height="22.5"/>
5869   - <image name="device_mileage" width="23" height="22.5"/>
  5731 + <image name="device_add_bg" width="349" height="86"/>
5870 5732 <image name="dial_color_1" width="46.5" height="20.5"/>
5871 5733 <image name="find_bracelet" width="170" height="170"/>
5872 5734 <image name="motion_underline" width="30" height="2.5"/>
... ...
HDFwear/Setting/SettingViewController.swift
  View file @072a11e
... ... @@ -24,6 +24,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
24 24 @IBOutlet weak var collectionView1: UICollectionView!
25 25 @IBOutlet weak var collectionViewFlowLayout1: UICollectionViewFlowLayout!
26 26 @IBOutlet weak var collectionViewHeight1: NSLayoutConstraint!
  27 + @IBOutlet weak var collectionView1Width: NSLayoutConstraint!
27 28  
28 29 @IBOutlet weak var deviceNameLabel: UILabel!
29 30 @IBOutlet weak var batteryBtn: UIButton!
... ... @@ -33,13 +34,13 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
33 34 @IBOutlet weak var idLabel: UILabel!
34 35  
35 36 @IBOutlet weak var watchImageView: UIImageView!
36   - @IBOutlet weak var dailImageView2: UIImageView!
37   - @IBOutlet weak var dailImageView1: UIImageView!
38   - @IBOutlet weak var dailImageView3: UIImageView!
  37 +// @IBOutlet weak var dailImageView2: UIImageView!
  38 +// @IBOutlet weak var dailImageView1: UIImageView!
  39 +// @IBOutlet weak var dailImageView3: UIImageView!
39 40  
40 41  
41   - @IBOutlet weak var totalDistanceLabel: UILabel!
42   - @IBOutlet weak var totalCalorieLabel: UILabel!
  42 +// @IBOutlet weak var totalDistanceLabel: UILabel!
  43 +// @IBOutlet weak var totalCalorieLabel: UILabel!
43 44  
44 45 var scanView: ScanView? = nil
45 46 var scanDeviceMac: String? = nil
... ... @@ -47,12 +48,14 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
47 48  
48 49 private let settingDic: [String: String] = ["遥控拍照": "remote_camera", "查找手环": "set_find", "提醒功能": "set_reminder", "语言设置": "set_language", "其他设置": "set_other", "抬腕亮屏": "lift_wrist", "勿扰模式": "no_disturb", "目标设置": "set_goals", "微信运动": "wechat_sport", "手环说明": "device_desc", "固件升级": "firmware_update", "联系人": "set_contacts", "名片": "set_card", "NFC": "set_nfc", "钱包": "set_wallet", "删除设备": "set_delete", "出厂设置": "set_restore", "后台保护": "set_background"]
49 50  
  51 + // 未连接手表时
  52 + private let setting_all: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "语言设置", "其他设置", "抬腕亮屏", "目标设置"], ["固件升级", "删除设备"]]
50 53  
51   - private let setting_all: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "语言设置", "其他设置", "抬腕亮屏", "勿扰模式", "目标设置", "联系人"], ["固件升级", "删除设备", "后台保护"]]
  54 + // 连接手表时
  55 + private let setting_818: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "语言设置", "其他设置", "抬腕亮屏", "目标设置"], ["固件升级", "删除设备"]]
52 56  
53   - private let setting_818: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "语言设置", "其他设置", "抬腕亮屏", "勿扰模式", "目标设置", "联系人", "名片", "NFC"], ["固件升级", "删除设备", "后台保护"]]
54   -
55   - private let setting_828: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "其他设置", "抬腕亮屏", "目标设置", "联系人", "名片", "NFC", "钱包"], ["固件升级", "删除设备", "后台保护"]]
  57 + // 连接手表时
  58 + private let setting_828: [[String]] = [["遥控拍照", "查找手环", "提醒功能", "语言设置", "其他设置", "抬腕亮屏", "目标设置"], ["固件升级", "删除设备"]]
56 59  
57 60 private let setting_816: [[String]] = [["遥控拍照", "查找手环", "目标设置", "其他设置"], ["删除设备", "后台保护"]]
58 61 var dialWidth: Int = 240
... ... @@ -60,8 +63,11 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
60 63  
61 64 private var settingArray: [[String]] = [] {
62 65 didSet {
63   - collectionViewHeight.constant = CGFloat(77*(settingArray[0].count/4 + (settingArray[0].count%4 == 0 ? 0 : 1)) + 15)
64   - collectionViewHeight1.constant = CGFloat(77*(settingArray[1].count/4 + (settingArray[1].count%4 == 0 ? 0 : 1)) + 15)
  66 + collectionViewHeight.constant = CGFloat(77*(settingArray[0].count/4 + (settingArray[0].count%4 == 0 ? 0 : 1)) + 60)
  67 + collectionViewHeight1.constant = CGFloat(77*(settingArray[1].count/4 + (settingArray[1].count%4 == 0 ? 0 : 1)) + 60)
  68 + let spaceWidth = 5.0 * Double(settingArray[1].count - 1)
  69 + let itemWidth = ((SCREEN_WIDTH-50)/4.0) * Double(settingArray[1].count)
  70 + collectionView1Width.constant = CGFloat(itemWidth + spaceWidth + 10)
65 71 }
66 72 }
67 73  
... ... @@ -76,7 +82,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
76 82 updateBattery(Battery)
77 83 }
78 84 }
79   - updateTotalDataView(DistanceUnit(rawValue: UInt8(admin.userInfo.distanceUnit))!)
  85 +// updateTotalDataView(DistanceUnit(rawValue: UInt8(admin.userInfo.distanceUnit))!)
80 86 let navController = navigationController as? ZCNavigationController
81 87 navController?.enableScreenEdgePanGestureRecognizer(true)
82 88 }
... ... @@ -114,18 +120,18 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
114 120 addDeviceView.addGestureRecognizer(addTap)
115 121  
116 122  
117   - collectionViewFlowLayout.minimumLineSpacing = 5
  123 + collectionViewFlowLayout.minimumLineSpacing = 20
118 124 collectionViewFlowLayout.minimumInteritemSpacing = 5
119   - collectionViewFlowLayout.sectionInset = UIEdgeInsets(top: 12, left: 5, bottom: 7, right: 5)
120   - collectionViewFlowLayout.itemSize = CGSize(width: (SCREEN_WIDTH-50)/4.0, height: 72)
  125 + collectionViewFlowLayout.sectionInset = UIEdgeInsets(top: 60, left: 5, bottom: 7, right: 5)
  126 + collectionViewFlowLayout.itemSize = CGSize(width: (SCREEN_WIDTH-50)/4.0, height: 58)
121 127 collectionView.bounces = false
122 128 collectionView.showsHorizontalScrollIndicator = false
123 129 collectionView.register(UINib.init(nibName: "SettingCell", bundle: .main), forCellWithReuseIdentifier: "SettingCell")
124 130  
125 131 collectionViewFlowLayout1.minimumLineSpacing = 5
126 132 collectionViewFlowLayout1.minimumInteritemSpacing = 5
127   - collectionViewFlowLayout1.sectionInset = UIEdgeInsets(top: 12, left: 5, bottom: 7, right: 5)
128   - collectionViewFlowLayout1.itemSize = CGSize(width: (SCREEN_WIDTH-50)/4.0, height: 72)
  133 + collectionViewFlowLayout1.sectionInset = UIEdgeInsets(top: 60, left: 5, bottom: 7, right: 5)
  134 + collectionViewFlowLayout1.itemSize = CGSize(width: (SCREEN_WIDTH-50)/4.0, height: 58)
129 135 collectionView1.bounces = false
130 136 collectionView1.showsHorizontalScrollIndicator = false
131 137 collectionView1.register(UINib.init(nibName: "SettingCell", bundle: .main), forCellWithReuseIdentifier: "SettingCell")
... ... @@ -133,7 +139,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
133 139  
134 140 idLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(reconnect)))
135 141 updateConnectView(DeviceIsConnected)
136   - updateTotalDataView(DistanceUnit(rawValue: UInt8(UserInfo.distanceUnit))!)
  142 +// updateTotalDataView(DistanceUnit(rawValue: UInt8(UserInfo.distanceUnit))!)
137 143 }
138 144  
139 145 @objc func reconnect() {
... ... @@ -158,9 +164,9 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
158 164 if curDevice.uuid.count == 0 {
159 165 addDeviceView.isHidden = false
160 166 connectView.isHidden = true
161   - dailImageView1.image = UIImage(named: "dail_default_1")
162   - dailImageView2.image = UIImage(named: "dail_default_2")
163   - dailImageView3.image = UIImage(named: "dail_default_3")
  167 +// dailImageView1.image = UIImage(named: "dail_default_1")
  168 +// dailImageView2.image = UIImage(named: "dail_default_2")
  169 +// dailImageView3.image = UIImage(named: "dail_default_3")
164 170 // dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/test2.bmp")
165 171 settingArray = setting_all
166 172 if AppSettings.shared.language != .Chinese {
... ... @@ -174,15 +180,15 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
174 180 if curDevice.platform == ._816 {
175 181 settingArray = setting_816
176 182 dialNum = 9
177   - dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/0/preview_00@2x")
178   - dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/1/preview_01@2x")
179   - dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/2/preview_02@2x")
  183 +// dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/0/preview_00@2x")
  184 +// dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/1/preview_01@2x")
  185 +// dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialpreview280/2/preview_02@2x")
180 186 } else if curDevice.platform == ._818 {
181 187 settingArray = setting_818
182 188 dialNum = 18
183   - dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/0/preview@2x")
184   - dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/1/preview@2x")
185   - dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/2/preview@2x")
  189 +// dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/0/preview@2x")
  190 +// dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/1/preview@2x")
  191 +// dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreview/2/preview@2x")
186 192 // let aimage = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/test2.bmp")!
187 193 // let imagea = removeAlpha(image: aimage)!
188 194 // dailImageView3.image = imagea
... ... @@ -203,7 +209,7 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
203 209 dialWidth = 240
204 210 dialHeight = 280
205 211 if curDevice.name.contains("P8GT") {
206   - settingArray = [["遥控拍照", "查找手环", "提醒功能", "其他设置", "抬腕亮屏", "目标设置", "联系人"], ["固件升级", "删除设备", "后台保护"]]
  212 + settingArray = setting_all
207 213 watchImageView.image = UIImage(named: "P8GT_icon")
208 214 } else if curDevice.name.contains("Watch 8") {
209 215 watchImageView.image = UIImage(named: "Watch7_icon")
... ... @@ -227,9 +233,9 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
227 233 // }
228 234  
229 235 // dailImageView1.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/0/preview")
230   - dailImageView1.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/0/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/0/preview"), options: [.transition(.fade(0.3))])
231   - dailImageView2.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/1/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/1/preview"), options: [.transition(.fade(0.3))])
232   - dailImageView3.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/2/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/2/preview"), options: [.transition(.fade(0.3))])
  236 +// dailImageView1.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/0/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/0/preview"), options: [.transition(.fade(0.3))])
  237 +// dailImageView2.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/1/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/1/preview"), options: [.transition(.fade(0.3))])
  238 +// dailImageView3.kf.setImage(with: URL(string: "http://www.hodafone.com.cn/hodafone/dial/rtl/\(dialWidth)x\(dialHeight)/0/2/preview.png"), placeholder: UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/2/preview"), options: [.transition(.fade(0.3))])
233 239 // dailImageView2.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/1/preview")
234 240 // dailImageView3.image = UIImage(contentsOfFile: "\(Bundle.main.resourcePath!)/dial/dialrtkpreviewHQ7/2/preview")
235 241  
... ... @@ -271,16 +277,16 @@ class SettingViewController: UIViewController, LBXScanViewControllerDelegate {
271 277 idLabel.text = isConnected ? CurDevice.mac : LocString("重新连接")
272 278 }
273 279  
274   - private func updateTotalDataView(_ unit: DistanceUnit) {
275   - let step = StepModel.getRecentSteps()
276   - totalCalorieLabel.text = "\(String(format:"%02d",Int(step.calorie)))\(LocString("千卡"))"
277   - if unit == .foot {
278   - totalDistanceLabel.text = "\(step.distance.mileString())\(LocString("英里"))"
279   - } else {
280   - totalDistanceLabel.text = "\(String(format:"%.2f", step.distance))\(LocString("公里"))"
281   - }
282   -
283   - }
  280 +// private func updateTotalDataView(_ unit: DistanceUnit) {
  281 +// let step = StepModel.getRecentSteps()
  282 +// totalCalorieLabel.text = "\(String(format:"%02d",Int(step.calorie)))\(LocString("千卡"))"
  283 +// if unit == .foot {
  284 +// totalDistanceLabel.text = "\(step.distance.mileString())\(LocString("英里"))"
  285 +// } else {
  286 +// totalDistanceLabel.text = "\(String(format:"%.2f", step.distance))\(LocString("公里"))"
  287 +// }
  288 +//
  289 +// }
284 290  
285 291 private func removeAlpha(image: UIImage) -> UIImage? {
286 292 guard let imageRef = image.cgImage else { return nil }
... ... @@ -702,9 +708,9 @@ extension SettingViewController: UICollectionViewDelegate, UICollectionViewDataS
702 708 }
703 709 case "其他设置":
704 710 let vc = UIStoryboard.loadViewControllerIdentifier(storyboardName: "Setting", identifier: "OtherSettingVC") as! OtherSettingVC
705   - vc.unitSettingClosure = {[weak self] unit in
706   - self?.updateTotalDataView(unit)
707   - }
  711 +// vc.unitSettingClosure = {[weak self] unit in
  712 +// self?.updateTotalDataView(unit)
  713 +// }
708 714 navigationController?.pushViewController(vc, animated: true)
709 715 case "抬腕亮屏":
710 716 let vc = UIStoryboard.loadViewControllerIdentifier(storyboardName: "Setting", identifier: "WristViewController")
... ...
HDFwear/Setting/VIew/SettingCell.xib
  View file @072a11e
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>
... ... @@ -11,32 +11,23 @@
11 11 <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
12 12 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
13 13 <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="SettingCell" customModule="HDFwear" customModuleProvider="target">
14   - <rect key="frame" x="0.0" y="0.0" width="314" height="88"/>
  14 + <rect key="frame" x="0.0" y="0.0" width="314" height="58"/>
15 15 <autoresizingMask key="autoresizingMask"/>
16 16 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
17   - <rect key="frame" x="0.0" y="0.0" width="314" height="88"/>
  17 + <rect key="frame" x="0.0" y="0.0" width="314" height="58"/>
18 18 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
19 19 <subviews>
20   - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YLa-DN-9Xe">
21   - <rect key="frame" x="0.0" y="60.5" width="314" height="13"/>
22   - <attributedString key="attributedText">
23   - <fragment content=" ">
24   - <attributes>
25   - <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
26   - <font key="NSFont" size="11" name="PingFangSC-Regular"/>
27   - <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" maximumLineHeight="13" lineHeightMultiple="1" tighteningFactorForTruncation="0.0"/>
28   - </attributes>
29   - </fragment>
30   - </attributedString>
  20 + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YLa-DN-9Xe">
  21 + <rect key="frame" x="0.0" y="36" width="314" height="18.5"/>
  22 + <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
  23 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
31 24 <nil key="highlightedColor"/>
32 25 </label>
33 26 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hxh-Rx-Rf2">
34   - <rect key="frame" x="137" y="5" width="40" height="40"/>
  27 + <rect key="frame" x="143" y="0.0" width="28" height="28"/>
35 28 <constraints>
36   - <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="KS4-L2-CUB"/>
37   - <constraint firstAttribute="width" constant="40" id="Nbu-6m-Uve"/>
38   - <constraint firstAttribute="height" constant="40" id="T2A-u7-7aC"/>
39   - <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="40" id="dob-FS-PBh"/>
  29 + <constraint firstAttribute="width" constant="28" id="Nbu-6m-Uve"/>
  30 + <constraint firstAttribute="height" constant="28" id="T2A-u7-7aC"/>
40 31 </constraints>
41 32 </imageView>
42 33 </subviews>
... ... @@ -46,8 +37,8 @@
46 37 <constraint firstItem="hxh-Rx-Rf2" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="06L-fc-y5f"/>
47 38 <constraint firstAttribute="trailing" secondItem="YLa-DN-9Xe" secondAttribute="trailing" id="LSM-jE-zT8"/>
48 39 <constraint firstItem="YLa-DN-9Xe" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="awv-gm-bA7"/>
49   - <constraint firstItem="hxh-Rx-Rf2" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="5" id="jLl-xb-Yp9"/>
50   - <constraint firstItem="YLa-DN-9Xe" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" constant="23" id="tNY-hO-Nig"/>
  40 + <constraint firstItem="hxh-Rx-Rf2" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="jLl-xb-Yp9"/>
  41 + <constraint firstItem="YLa-DN-9Xe" firstAttribute="top" secondItem="hxh-Rx-Rf2" secondAttribute="bottom" constant="8" id="uFx-TJ-qcb"/>
51 42 </constraints>
52 43 <size key="customSize" width="314" height="88"/>
53 44 <connections>
... ...