ios / ytwatch

Commit fc3a80472612238afbbdb80e52ae3e436608ad08

Authored by daifengyi
1 parent 875b68b4

feat:health data page UI

Inline Side-by-side
Showing 44 changed files with 69 additions and 46 deletions
HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "血氧@2x.png",
  8 + "filename" : "my_data_bo@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "血氧@3x.png",
  13 + "filename" : "my_data_bo@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@2x.png 0 → 100644
View file @fc3a804

1.34 KB
HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/my_data_bo@3x.png 0 → 100644
View file @fc3a804

1.04 KB
HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@2x.png deleted
View file @875b68b

1.25 KB
HDFwear/Assets.xcassets/Mine/my_data_bo.imageset/血氧@3x.png deleted
View file @875b68b

2.36 KB
HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "血压@2x.png",
  8 + "filename" : "my_data_bp@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "血压@3x.png",
  13 + "filename" : "my_data_bp@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@2x.png 0 → 100644
View file @fc3a804

2.06 KB
HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/my_data_bp@3x.png 0 → 100644
View file @fc3a804

1.54 KB
HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@2x.png deleted
View file @875b68b

736 Bytes
HDFwear/Assets.xcassets/Mine/my_data_bp.imageset/血压@3x.png deleted
View file @875b68b

1.4 KB
HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "热量@2x.png",
  8 + "filename" : "my_data_calorie@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "热量@3x.png",
  13 + "filename" : "my_data_calorie@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@2x.png 0 → 100644
View file @fc3a804

1.68 KB
HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/my_data_calorie@3x.png 0 → 100644
View file @fc3a804

1.4 KB
HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@2x.png deleted
View file @875b68b

1.47 KB
HDFwear/Assets.xcassets/Mine/my_data_calorie.imageset/热量@3x.png deleted
View file @875b68b

2.74 KB
HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "距离@2x.png",
  8 + "filename" : "my_data_distance@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "距离@3x.png",
  13 + "filename" : "my_data_distance@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@2x.png 0 → 100644
View file @fc3a804

1.92 KB
HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/my_data_distance@3x.png 0 → 100644
View file @fc3a804

1.5 KB
HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@2x.png deleted
View file @875b68b

1.28 KB
HDFwear/Assets.xcassets/Mine/my_data_distance.imageset/距离@3x.png deleted
View file @875b68b

2.42 KB
HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "心率@2x.png",
  8 + "filename" : "my_data_hr@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "心率@3x.png",
  13 + "filename" : "my_data_hr@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@2x.png 0 → 100644
View file @fc3a804

1.42 KB
HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/my_data_hr@3x.png 0 → 100644
View file @fc3a804

1.09 KB
HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@2x.png deleted
View file @875b68b

1.21 KB
HDFwear/Assets.xcassets/Mine/my_data_hr.imageset/心率@3x.png deleted
View file @875b68b

2.2 KB
HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "睡眠@2x.png",
  8 + "filename" : "my_data_sleep@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "睡眠@3x.png",
  13 + "filename" : "my_data_sleep@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@2x.png 0 → 100644
View file @fc3a804

1.82 KB
HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/my_data_sleep@3x.png 0 → 100644
View file @fc3a804

1.42 KB
HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@2x.png deleted
View file @875b68b

1.22 KB
HDFwear/Assets.xcassets/Mine/my_data_sleep.imageset/睡眠@3x.png deleted
View file @875b68b

2.3 KB
HDFwear/Assets.xcassets/Mine/my_data_step.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "步数@2x.png",
  8 + "filename" : "my_data_step@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "步数@3x.png",
  13 + "filename" : "my_data_step@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@2x.png 0 → 100644
View file @fc3a804

1.92 KB
HDFwear/Assets.xcassets/Mine/my_data_step.imageset/my_data_step@3x.png 0 → 100644
View file @fc3a804

1.51 KB
HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@2x.png deleted
View file @875b68b

1.07 KB
HDFwear/Assets.xcassets/Mine/my_data_step.imageset/步数@3x.png deleted
View file @875b68b

2.04 KB
HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/Contents.json
  View file @fc3a804
... ... @@ -5,12 +5,12 @@
5 5 "scale" : "1x"
6 6 },
7 7 {
8   - "filename" : "体重@2x.png",
  8 + "filename" : "my_data_weight@2x.png",
9 9 "idiom" : "universal",
10 10 "scale" : "2x"
11 11 },
12 12 {
13   - "filename" : "体重@3x.png",
  13 + "filename" : "my_data_weight@3x.png",
14 14 "idiom" : "universal",
15 15 "scale" : "3x"
16 16 }
... ...
HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@2x.png 0 → 100644
View file @fc3a804

1.8 KB
HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/my_data_weight@3x.png 0 → 100644
View file @fc3a804

1.41 KB
HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@2x.png deleted
View file @875b68b

764 Bytes
HDFwear/Assets.xcassets/Mine/my_data_weight.imageset/体重@3x.png deleted
View file @875b68b

1.3 KB
HDFwear/Home/StepViewController.swift
  View file @fc3a804
... ... @@ -18,7 +18,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider
18 18 @IBOutlet weak var stepLabel: UILabel!
19 19 @IBOutlet weak var calorieLabel: UILabel!
20 20 @IBOutlet weak var dayStepLabel: UILabel!
21   - @IBOutlet weak var analysisLabel: UILabel!
  21 +// @IBOutlet weak var analysisLabel: UILabel!
22 22 @IBOutlet weak var goButton: UIButton!
23 23  
24 24 @IBOutlet weak var stepsGoalLabel: UILabel!
... ... @@ -164,7 +164,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider
164 164 dayStepLabel.text = "--"
165 165 calorieLabel.text = "--"
166 166 updateProgressView(StepModel())
167   - analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))"
  167 +// analysisLabel.text = "\(LocString("亲，您已超过"))0%\(LocString("的同类用户"))"
168 168 }
169 169  
170 170 private func updateProgressView(_ step: StepModel) {
... ... @@ -231,7 +231,7 @@ class StepViewController: UIViewController, DateSegmentViewDelegate, RangeSlider
231 231 per = "99.9"
232 232 }
233 233  
234   - analysisLabel.text = "\(LocString("亲，您已超过"))\(per)%\(LocString("的同类用户"))"
  234 +// analysisLabel.text = "\(LocString("亲，您已超过"))\(per)%\(LocString("的同类用户"))"
235 235 }
236 236  
237 237 private func updateChartView() {
... ...
HDFwear/Mine/Base.lproj/Mine.storyboard
  View file @fc3a804
... ... @@ -660,40 +660,40 @@
660 660 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
661 661 <subviews>
662 662 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="hwu-0s-C3m">
663   - <rect key="frame" x="0.0" y="48" width="414" height="814"/>
  663 + <rect key="frame" x="13" y="48" width="388" height="814"/>
664 664 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
665 665 <prototypes>
666 666 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="HealthDataCell" rowHeight="50" id="Puf-oG-383" customClass="HealthDataCell" customModule="HDFwear" customModuleProvider="target">
667   - <rect key="frame" x="0.0" y="55.5" width="414" height="50"/>
  667 + <rect key="frame" x="0.0" y="55.5" width="388" height="50"/>
668 668 <autoresizingMask key="autoresizingMask"/>
669 669 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Puf-oG-383" id="CYI-fz-d2Y">
670   - <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
  670 + <rect key="frame" x="0.0" y="0.0" width="388" height="50"/>
671 671 <autoresizingMask key="autoresizingMask"/>
672 672 <subviews>
673 673 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ebg-Ms-OwY">
674   - <rect key="frame" x="35" y="14.5" width="9.5" height="21"/>
675   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
676   - <nil key="textColor"/>
  674 + <rect key="frame" x="46" y="14" width="10" height="22.5"/>
  675 + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
  676 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
677 677 <nil key="highlightedColor"/>
678 678 </label>
679   - <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jyi-K2-lFT">
680   - <rect key="frame" x="12" y="49.5" width="390" height="0.5"/>
  679 + <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jyi-K2-lFT">
  680 + <rect key="frame" x="12" y="49.5" width="364" height="0.5"/>
681 681 <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
682 682 <constraints>
683 683 <constraint firstAttribute="height" constant="0.5" id="AO4-zB-HCC"/>
684 684 </constraints>
685 685 </view>
686 686 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bmr-lP-1va">
687   - <rect key="frame" x="12" y="16" width="18" height="18"/>
  687 + <rect key="frame" x="20" y="15" width="20" height="20"/>
688 688 <constraints>
689   - <constraint firstAttribute="height" constant="18" id="HEV-hd-hQS"/>
690   - <constraint firstAttribute="width" constant="18" id="ZqY-cM-vjl"/>
  689 + <constraint firstAttribute="height" constant="20" id="HEV-hd-hQS"/>
  690 + <constraint firstAttribute="width" constant="20" id="ZqY-cM-vjl"/>
691 691 </constraints>
692 692 </imageView>
693 693 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dvh-My-RpL">
694   - <rect key="frame" x="383.5" y="14.5" width="18.5" height="21"/>
695   - <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
696   - <nil key="textColor"/>
  694 + <rect key="frame" x="356.5" y="14" width="19.5" height="22.5"/>
  695 + <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="16"/>
  696 + <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="0.59933774834437081" colorSpace="custom" customColorSpace="calibratedRGB"/>
697 697 <nil key="highlightedColor"/>
698 698 </label>
699 699 </subviews>
... ... @@ -704,8 +704,8 @@
704 704 <constraint firstItem="Jyi-K2-lFT" firstAttribute="leading" secondItem="CYI-fz-d2Y" secondAttribute="leading" constant="12" id="I9n-g4-e78"/>
705 705 <constraint firstAttribute="trailing" secondItem="Jyi-K2-lFT" secondAttribute="trailing" constant="12" id="KE4-Fz-0sD"/>
706 706 <constraint firstAttribute="trailing" secondItem="dvh-My-RpL" secondAttribute="trailing" constant="12" id="eRf-Hp-xam"/>
707   - <constraint firstItem="Ebg-Ms-OwY" firstAttribute="leading" secondItem="bmr-lP-1va" secondAttribute="trailing" constant="5" id="g4N-TD-M7H"/>
708   - <constraint firstItem="bmr-lP-1va" firstAttribute="leading" secondItem="CYI-fz-d2Y" secondAttribute="leading" constant="12" id="tht-MO-nKt"/>
  707 + <constraint firstItem="Ebg-Ms-OwY" firstAttribute="leading" secondItem="bmr-lP-1va" secondAttribute="trailing" constant="6" id="g4N-TD-M7H"/>
  708 + <constraint firstItem="bmr-lP-1va" firstAttribute="leading" secondItem="CYI-fz-d2Y" secondAttribute="leading" constant="20" id="tht-MO-nKt"/>
709 709 <constraint firstAttribute="bottom" secondItem="Jyi-K2-lFT" secondAttribute="bottom" id="uk0-fh-yP8"/>
710 710 </constraints>
711 711 </tableViewCellContentView>
... ... @@ -728,8 +728,8 @@
728 728 <constraints>
729 729 <constraint firstItem="EQN-Sz-CfA" firstAttribute="bottom" secondItem="hwu-0s-C3m" secondAttribute="bottom" id="07P-Xr-ezH"/>
730 730 <constraint firstItem="hwu-0s-C3m" firstAttribute="top" secondItem="EQN-Sz-CfA" secondAttribute="top" id="8fX-zd-2h6"/>
731   - <constraint firstItem="hwu-0s-C3m" firstAttribute="leading" secondItem="EQN-Sz-CfA" secondAttribute="leading" id="q0Z-el-gfN"/>
732   - <constraint firstItem="EQN-Sz-CfA" firstAttribute="trailing" secondItem="hwu-0s-C3m" secondAttribute="trailing" id="zTu-Et-6mq"/>
  731 + <constraint firstItem="hwu-0s-C3m" firstAttribute="leading" secondItem="EQN-Sz-CfA" secondAttribute="leading" constant="13" id="q0Z-el-gfN"/>
  732 + <constraint firstItem="EQN-Sz-CfA" firstAttribute="trailing" secondItem="hwu-0s-C3m" secondAttribute="trailing" constant="13" id="zTu-Et-6mq"/>
733 733 </constraints>
734 734 </view>
735 735 <connections>
... ...
HDFwear/Mine/HealthDataVC.swift
  View file @fc3a804
... ... @@ -30,10 +30,10 @@ class HealthDataVC: UIViewController {
30 30 super.viewDidLoad()
31 31 title = LocString("我的数据")
32 32  
33   - let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28))
34   - shareButton.setImage(UIImage(named: "share_btn"), for: .normal)
35   - shareButton.addTarget(self, action: #selector(share), for: .touchUpInside)
36   - navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton)
  33 +// let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28))
  34 +// shareButton.setImage(UIImage(named: "share_btn"), for: .normal)
  35 +// shareButton.addTarget(self, action: #selector(share), for: .touchUpInside)
  36 +// navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton)
37 37 if device.platform == ._818 {
38 38 dataArray[1] = ["心率", "血压", "睡眠", "体重"]
39 39 }
... ... @@ -126,9 +126,20 @@ extension HealthDataVC: UITableViewDataSource, UITableViewDelegate {
126 126 func numberOfSections(in tableView: UITableView) -> Int {
127 127 return dataArray.count
128 128 }
  129 + func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
  130 + return 48
  131 + }
  132 +
  133 + func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
  134 + if section == 0 {
  135 + return "活动统计"
  136 + }else {
  137 + return "健康状况"
  138 + }
  139 + }
129 140  
130 141 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
131   - return 50
  142 + return 55
132 143 }
133 144 func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
134 145 return dataArray[section].count
... ... @@ -141,20 +152,32 @@ extension HealthDataVC: UITableViewDataSource, UITableViewDelegate {
141 152 switch text {
142 153 case "体重":
143 154 cell.detailLabel.text = "\(weight)kg"
  155 + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10)
  156 + break
144 157 case "距离":
145 158 cell.detailLabel.text = totalDistance
  159 + break
146 160 case "热量":
147 161 cell.detailLabel.text = totalCalorie
  162 + cell.setCorners(corners: [.bottomLeft, .bottomRight], radio: 10)
  163 + break
148 164 case "血氧":
149 165 cell.detailLabel.text = bo
  166 + break
150 167 case "血压":
151 168 cell.detailLabel.text = bp
  169 + break
152 170 case "心率":
153 171 cell.detailLabel.text = hr
  172 + cell.setCorners(corners: [.topLeft, .topRight], radio: 10)
  173 + break
154 174 case "睡眠":
155 175 cell.detailLabel.text = sleep
  176 + break
156 177 case "步数":
157 178 cell.detailLabel.text = totalSteps
  179 + cell.setCorners(corners: [.topLeft, .topRight], radio: 10)
  180 + break
158 181 default:
159 182 break
160 183 }
... ...
HDFwear/Mine/HealthReportVC.swift
  View file @fc3a804
... ... @@ -25,10 +25,10 @@ class HealthReportVC: UIViewController {
25 25  
26 26 title = LocString("健康报告")
27 27  
28   - let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28))
29   - shareButton.setImage(UIImage(named: "share_btn"), for: .normal)
30   - shareButton.addTarget(self, action: #selector(share), for: .touchUpInside)
31   - navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton)
  28 +// let shareButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28))
  29 +// shareButton.setImage(UIImage(named: "share_btn"), for: .normal)
  30 +// shareButton.addTarget(self, action: #selector(share), for: .touchUpInside)
  31 +// navigationItem.rightBarButtonItem = UIBarButtonItem(customView: shareButton)
32 32  
33 33 if let i = collectArray.firstIndex(of: "MotionRecord") {
34 34 collectArray.remove(at: i)
... ...