feat:sort page UI

daifengyi
1 parent 84bd9999
Showing 8 changed files with 175 additions and 50 deletions
HDFwear.xcodeproj/project.pbxproj
HDFwear/Home/Base.lproj/Home.storyboard
HDFwear/Home/Cell/SortPageCell.swift
HDFwear/Home/Cell/SortPageCell.xib
HDFwear/Home/Cell/SortPageSectionHeader.h
HDFwear/Home/Cell/SortPageSectionHeader.m → HDFwear/Home/Cell/SortPageSectionHeader.swift
HDFwear/Home/Cell/SortPageSectionHeader.xib
HDFwear/Home/HomePageSortVC.swift
@@ -284,8 +284,10 @@
 		6CFEEBC42773355700621863 /* SleepReferenceVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CFEEBC32773355700621863 /* SleepReferenceVC.swift */; };
 		B212F1FD2A14CE0400781D59 /* LaunchSetting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B212F1FF2A14CE0400781D59 /* LaunchSetting.storyboard */; };
 		B212F2052A14D28E00781D59 /* LaunchMyBodySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B212F2042A14D28E00781D59 /* LaunchMyBodySettingVC.swift */; };
-		B23AA1012A1879D100BB3902 /* SortPageSectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = B23AA1002A1879D100BB3902 /* SortPageSectionHeader.m */; };
 		B23AA1032A1879E200BB3902 /* SortPageSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = B23AA1022A1879E200BB3902 /* SortPageSectionHeader.xib */; };
+		B23AA1052A18F22600BB3902 /* SortPageSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B23AA1042A18F22600BB3902 /* SortPageSectionHeader.swift */; };
+		B23AA1082A18F3F100BB3902 /* SortPageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B23AA1062A18F3F100BB3902 /* SortPageCell.swift */; };
+		B23AA1092A18F3F100BB3902 /* SortPageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B23AA1072A18F3F100BB3902 /* SortPageCell.xib */; };
 		B2AF58822A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AF58812A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift */; };
 /* End PBXBuildFile section */
  
@@ -657,9 +659,10 @@
 		B212F2012A14CE0900781D59 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchSetting.strings"; sourceTree = "<group>"; };
 		B212F2032A14CE0A00781D59 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchSetting.strings; sourceTree = "<group>"; };
 		B212F2042A14D28E00781D59 /* LaunchMyBodySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchMyBodySettingVC.swift; sourceTree = "<group>"; };
-		B23AA0FF2A1879D100BB3902 /* SortPageSectionHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SortPageSectionHeader.h; sourceTree = "<group>"; };
-		B23AA1002A1879D100BB3902 /* SortPageSectionHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SortPageSectionHeader.m; sourceTree = "<group>"; };
 		B23AA1022A1879E200BB3902 /* SortPageSectionHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SortPageSectionHeader.xib; sourceTree = "<group>"; };
+		B23AA1042A18F22600BB3902 /* SortPageSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortPageSectionHeader.swift; sourceTree = "<group>"; };
+		B23AA1062A18F3F100BB3902 /* SortPageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortPageCell.swift; sourceTree = "<group>"; };
+		B23AA1072A18F3F100BB3902 /* SortPageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SortPageCell.xib; sourceTree = "<group>"; };
 		B2AF58812A14C4BE0080B464 /* LaunchMyInfoSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchMyInfoSettingVC.swift; sourceTree = "<group>"; };
 		C621CFD20D2BD60CF4F959C3 /* Pods-HDFwear.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HDFwear.release.xcconfig"; path = "Target Support Files/Pods-HDFwear/Pods-HDFwear.release.xcconfig"; sourceTree = "<group>"; };
 		E7F3880C37BC5F6DD15C709D /* Pods-HDFwear.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HDFwear.debug.xcconfig"; path = "Target Support Files/Pods-HDFwear/Pods-HDFwear.debug.xcconfig"; sourceTree = "<group>"; };
@@ -1240,9 +1243,10 @@
 				6C90AD10276B2E9500555FB8 /* MotionRecordCell.swift */,
 				6C28F531278FC68000E74EA5 /* MotionRecordCell.xib */,
 				6CCB7FF7276C6C06009EF617 /* RecordHeaderView.swift */,
-				B23AA0FF2A1879D100BB3902 /* SortPageSectionHeader.h */,
-				B23AA1002A1879D100BB3902 /* SortPageSectionHeader.m */,
+				B23AA1042A18F22600BB3902 /* SortPageSectionHeader.swift */,
 				B23AA1022A1879E200BB3902 /* SortPageSectionHeader.xib */,
+				B23AA1062A18F3F100BB3902 /* SortPageCell.swift */,
+				B23AA1072A18F3F100BB3902 /* SortPageCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -1435,6 +1439,7 @@
 				B23AA1032A1879E200BB3902 /* SortPageSectionHeader.xib in Resources */,
 				6C85FB74278D5CF2007D309A /* StepCircleView.xib in Resources */,
 				6C28F56127901D6800E74EA5 /* SleepReportCell.xib in Resources */,
+				B23AA1092A18F3F100BB3902 /* SortPageCell.xib in Resources */,
 				6C5A978F27CCA03E00221361 /* PressureCell.xib in Resources */,
 				6C0AE81B279149770064D377 /* ShareView.xib in Resources */,
 				6C6505D12799154A0043DB7A /* AddPictureCell.xib in Resources */,
@@ -1531,6 +1536,7 @@
 			files = (
 				6C80540F27699D950083B295 /* UILabel+Extension.swift in Sources */,
 				6C5B545A277569BE007F7901 /* UIView+Extension.swift in Sources */,
+				B23AA1052A18F22600BB3902 /* SortPageSectionHeader.swift in Sources */,
 				6CA862422747710100139069 /* StepViewController.swift in Sources */,
 				6C8F74E72779B8C700B8A1A7 /* SettingCell5.swift in Sources */,
 				6C2081F0277F00A600F6D4B9 /* HomePageSortVC.swift in Sources */,
@@ -1653,7 +1659,6 @@
 				6C6F409027438FBE00F9473C /* Config.swift in Sources */,
 				6CB5416D27E0694C00BAEBD0 /* DialStyleCell.swift in Sources */,
 				6C6505C02798FB030043DB7A /* LTAdvancedManager.swift in Sources */,
-				B23AA1012A1879D100BB3902 /* SortPageSectionHeader.m in Sources */,
 				6CFEEBC02773353700621863 /* BOReferenceVC.swift in Sources */,
 				6CFEEBA42772BAB000621863 /* MBProgressHUD+Extension.swift in Sources */,
 				6CFEEBAE2772F18400621863 /* SettingCell2.swift in Sources */,
@@ -1667,6 +1672,7 @@
 				6C6F40752743828700F9473C /* BloodPressureCell.swift in Sources */,
 				6C5A978E27CCA03E00221361 /* PressureCell.swift in Sources */,
 				6C6505C42798FB030043DB7A /* LTVCExtension.swift in Sources */,
+				B23AA1082A18F3F100BB3902 /* SortPageCell.swift in Sources */,
 				6C5B545827756865007F7901 /* DatePickerView.swift in Sources */,
 				6C5120802797C22F006F8B64 /* CardDetailVC.swift in Sources */,
 				6C1B7EA427B7976600DB9D1C /* NFCDetailVC.swift in Sources */,
@@ -231,7 +231,7 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="6Z7-mM-OZ3">
                                 <rect key="frame" x="0.0" y="48" width="414" height="814"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <outlet property="dataSource" destination="LZY-5e-F4f" id="zjW-kr-4Fc"/>
                                     <outlet property="delegate" destination="LZY-5e-F4f" id="Yfg-fc-rJ3"/>
@@ -239,7 +239,7 @@
                             </tableView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="2FV-p2-Nf3"/>
-                        <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="6Z7-mM-OZ3" firstAttribute="top" secondItem="2FV-p2-Nf3" secondAttribute="top" id="Fdd-eQ-r9S"/>
                             <constraint firstItem="2FV-p2-Nf3" firstAttribute="bottom" secondItem="6Z7-mM-OZ3" secondAttribute="bottom" id="LJq-Yy-oCY"/>
+//
+//  SortPageCell.swift
+//  HDFwear
+//
+//  Created by daifengyi on 2023/5/20.
+//
+
+import UIKit
+
+class SortPageCell: UITableViewCell {
+    @IBOutlet weak var iconVIew: UIImageView!
+    @IBOutlet weak var nameLabel: UILabel!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="SortPageCell" customModule="HDFwear" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="72"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="72"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8zN-lJ-FAh">
+                        <rect key="frame" x="14" y="6" width="292" height="60"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B3X-wx-1YR">
+                                <rect key="frame" x="50" y="21.666666666666668" width="36" height="17.000000000000004"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kns-lj-oFF">
+                                <rect key="frame" x="18" y="18" width="24" height="24"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="24" id="0UN-O2-H6V"/>
+                                    <constraint firstAttribute="width" constant="24" id="X1G-pS-tJM"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="kns-lj-oFF" firstAttribute="centerY" secondItem="8zN-lJ-FAh" secondAttribute="centerY" id="5hk-sT-W8s"/>
+                            <constraint firstItem="kns-lj-oFF" firstAttribute="leading" secondItem="8zN-lJ-FAh" secondAttribute="leading" constant="18" id="6Jm-qs-TTI"/>
+                            <constraint firstItem="B3X-wx-1YR" firstAttribute="leading" secondItem="kns-lj-oFF" secondAttribute="trailing" constant="8" id="bP2-AZ-w5s"/>
+                            <constraint firstItem="B3X-wx-1YR" firstAttribute="centerY" secondItem="8zN-lJ-FAh" secondAttribute="centerY" id="z1m-74-v3v"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="12"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="8zN-lJ-FAh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="cLs-3F-voK"/>
+                    <constraint firstItem="8zN-lJ-FAh" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="6" id="eq5-hG-2IW"/>
+                    <constraint firstAttribute="bottom" secondItem="8zN-lJ-FAh" secondAttribute="bottom" constant="6" id="nwS-c7-2ka"/>
+                    <constraint firstAttribute="trailing" secondItem="8zN-lJ-FAh" secondAttribute="trailing" constant="14" id="yC7-e2-PAp"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="iconVIew" destination="kns-lj-oFF" id="JWR-eA-iGw"/>
+                <outlet property="nameLabel" destination="B3X-wx-1YR" id="gPg-0f-gPM"/>
+            </connections>
+            <point key="canvasLocation" x="-40" y="19"/>
+        </tableViewCell>
+    </objects>
+</document>
-//
-//  SortPageSectionHeader.h
-//  HDFwear
-//
-//  Created by daifengyi on 2023/5/20.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SortPageSectionHeader : UITableViewHeaderFooterView
-
-@end
-
-NS_ASSUME_NONNULL_END
 //
-//  SortPageSectionHeader.m
+//  SortPageSectionHeader.swift
 //  HDFwear
 //
 //  Created by daifengyi on 2023/5/20.
 //
  
-#import "SortPageSectionHeader.h"
+import UIKit
  
-@implementation SortPageSectionHeader
+class SortPageSectionHeader: UITableViewHeaderFooterView {
+    @IBOutlet weak var topLabelTopConstraint: NSLayoutConstraint!
+    @IBOutlet weak var topLabel: UILabel!
+    @IBOutlet weak var bottomLabel: UILabel!
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
  
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
 }
-*/
-
-@end
@@ -11,13 +11,38 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SortPageSectionHeader">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SortPageSectionHeader" customModule="HDFwear" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="57"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0K9-uz-b9z">
+                    <rect key="frame" x="17.999999999999996" y="8" width="40.666666666666657" height="20"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uML-Ve-KX0">
+                    <rect key="frame" x="18" y="31" width="36" height="17"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="0K9-uz-b9z" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="8" id="26u-DR-6wy"/>
+                <constraint firstItem="uML-Ve-KX0" firstAttribute="leading" secondItem="0K9-uz-b9z" secondAttribute="leading" id="BeY-jA-mXK"/>
+                <constraint firstItem="uML-Ve-KX0" firstAttribute="top" secondItem="0K9-uz-b9z" secondAttribute="bottom" constant="3" id="gap-w6-ooD"/>
+                <constraint firstItem="0K9-uz-b9z" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="18" id="huY-rK-ksh"/>
+            </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="47" y="14"/>
+            <connections>
+                <outlet property="bottomLabel" destination="uML-Ve-KX0" id="TWa-gf-RLK"/>
+                <outlet property="topLabel" destination="0K9-uz-b9z" id="UEk-cY-aTS"/>
+                <outlet property="topLabelTopConstraint" destination="26u-DR-6wy" id="MeD-ZM-TJa"/>
+            </connections>
+            <point key="canvasLocation" x="46.564885496183201" y="13.732394366197184"/>
         </view>
     </objects>
     <resources>
@@ -18,6 +18,7 @@ class HomePageSortVC: UIViewController, UITableViewDelegate, UITableViewDataSour
     var ary2 = [String]()
  
     let dic: [String: String] = ["BloodPressure": "血压", "BloodOxygen": "血氧", "HeartRate": "心率", "Sleep": "睡眠", "Train": "训练",  "WomenHealth": "女性健康", "MotionRecord": "运动记录", "Pressure": "压力", "Mett": "梅脱"]
+    let iconDic: [String: String] = ["BloodPressure": "home_bp", "BloodOxygen": "home_bo", "HeartRate": "home_hr", "Sleep": "home_sleep", "Train": "home_train",  "WomenHealth": "home_women_health", "MotionRecord": "home_motion"]
  
     lazy var footerView: UIView = {
        let view = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 200))
@@ -46,10 +47,13 @@ class HomePageSortVC: UIViewController, UITableViewDelegate, UITableViewDataSour
         title = LocString("编辑健康功能")
         tableView.setEditing(true, animated: false)
         tableView.contentInset = UIEdgeInsets.init(top: 5, left: 0, bottom: 0, right: 0)
+        tableView.separatorStyle = .none
+        tableView.register(UINib(nibName: "SortPageSectionHeader", bundle: .main), forHeaderFooterViewReuseIdentifier: "SortPageSectionHeader")
+        tableView.register(UINib(nibName: "SortPageCell", bundle: .main), forCellReuseIdentifier: "SortPageCell")
  
         ary2 = device.allFunctions
         testDate()
-        tableView.tableFooterView = footerView
+//        tableView.tableFooterView = footerView
  
         for a in ary1 {
             if let i = ary2.firstIndex(of: a) {
@@ -81,17 +85,29 @@ class HomePageSortVC: UIViewController, UITableViewDelegate, UITableViewDataSour
     }
  
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        var cell  = tableView.dequeueReusableCell(withIdentifier: "SortCellId")
-        if cell == nil {
-            cell = UITableViewCell.init(style: UITableViewCell.CellStyle.default, reuseIdentifier: "SortCellId")
-        }
-        cell?.textLabel?.font = RegularFont(15)
+        let cell  = tableView.dequeueReusableCell(withIdentifier: "SortPageCell", for: indexPath) as! SortPageCell
         if indexPath.section == 1 {
-            cell?.textLabel?.text = LocString(dic[ary2[indexPath.row]]!)
+            cell.iconVIew.image = UIImage(named: iconDic[ary2[indexPath.row]]!)
+            cell.nameLabel.text = LocString(dic[ary2[indexPath.row]]!)
         } else {
-            cell?.textLabel?.text = LocString(dic[ary1[indexPath.row]]!)
+            cell.iconVIew.image = UIImage(named: iconDic[ary1[indexPath.row]]!)
+            cell.nameLabel.text = LocString(dic[ary1[indexPath.row]]!)
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let header = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SortPageSectionHeader") as! SortPageSectionHeader
+        if section == 0 {
+            header.topLabelTopConstraint.constant = 8
+            header.topLabel.text = LocString("显示在首页")
+            header.bottomLabel.text = LocString("长按并拖拽可调整排序")
+        }else {
+            header.topLabelTopConstraint.constant = 15
+            header.topLabel.text = LocString("不显示在首页")
+            header.bottomLabel.text = ""
         }
-        return cell!
+        return header
     }
  
     func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
@@ -136,13 +152,13 @@ class HomePageSortVC: UIViewController, UITableViewDelegate, UITableViewDataSour
  
  
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
+        return 72
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 35
+        return 0
     }
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 0.5
+        return 57
     }
 //    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
 //        if section == 1 {