Skip to content

G
GeliBusinessPlatform
Commit 20d094c2 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

新增TitleContentCell和TitleAndTFCell

parent 194edb27
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 1 deletion
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 20d094c2
......@@ -61,6 +61,10 @@
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4166324483058008DCAB4 /* ChangePassViewController.xib */; };
F9023F62244999F500DD5A63 /* WarehoseMangementCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9023F60244999F500DD5A63 /* WarehoseMangementCell.swift */; };
F9023F63244999F500DD5A63 /* WarehoseMangementCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9023F61244999F500DD5A63 /* WarehoseMangementCell.xib */; };
F9023F692449A50900DD5A63 /* TitleContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9023F672449A50900DD5A63 /* TitleContentCell.swift */; };
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9023F682449A50900DD5A63 /* TitleContentCell.xib */; };
F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9023F6B2449A9B100DD5A63 /* TitleAndTFCell.swift */; };
F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9023F6C2449A9B100DD5A63 /* TitleAndTFCell.xib */; };
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */; };
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9B512448530E0080D6E3 /* GeliAlertView.swift */; };
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */; };
......@@ -157,6 +161,10 @@
E0D4166324483058008DCAB4 /* ChangePassViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChangePassViewController.xib; sourceTree = "<group>"; };
F9023F60244999F500DD5A63 /* WarehoseMangementCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarehoseMangementCell.swift; sourceTree = "<group>"; };
F9023F61244999F500DD5A63 /* WarehoseMangementCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WarehoseMangementCell.xib; sourceTree = "<group>"; };
F9023F672449A50900DD5A63 /* TitleContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleContentCell.swift; sourceTree = "<group>"; };
F9023F682449A50900DD5A63 /* TitleContentCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleContentCell.xib; sourceTree = "<group>"; };
F9023F6B2449A9B100DD5A63 /* TitleAndTFCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndTFCell.swift; sourceTree = "<group>"; };
F9023F6C2449A9B100DD5A63 /* TitleAndTFCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndTFCell.xib; sourceTree = "<group>"; };
F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GeliAlertView.xib; sourceTree = "<group>"; };
F95D9B512448530E0080D6E3 /* GeliAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeliAlertView.swift; sourceTree = "<group>"; };
F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopInfoViewController.swift; sourceTree = "<group>"; };
......@@ -369,6 +377,7 @@
E09B03AC2445B0B200211A51 /* View */ = {
isa = PBXGroup;
children = (
F9023F642449A3AE00DD5A63 /* Cell */,
F95D9B4E24484F140080D6E3 /* AlertView */,
E09B03C42445BF4600211A51 /* NavBarView */,
);
......@@ -501,6 +510,17 @@
path = "仓库管理";
sourceTree = "<group>";
};
F9023F642449A3AE00DD5A63 /* Cell */ = {
isa = PBXGroup;
children = (
F9023F672449A50900DD5A63 /* TitleContentCell.swift */,
F9023F682449A50900DD5A63 /* TitleContentCell.xib */,
F9023F6B2449A9B100DD5A63 /* TitleAndTFCell.swift */,
F9023F6C2449A9B100DD5A63 /* TitleAndTFCell.xib */,
);
path = Cell;
sourceTree = "<group>";
};
F95D9B4E24484F140080D6E3 /* AlertView */ = {
isa = PBXGroup;
children = (
......@@ -632,6 +652,8 @@
E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
E0516F782448003D00E373CE /* PayViewController.xib in Resources */,
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
......@@ -711,6 +733,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
E09B03B62445B85A00211A51 /* LoginViewController.swift in Sources */,
E0D197C12448431C002B080C /* BabyToy.m in Sources */,
......@@ -735,6 +758,7 @@
E09B03AB2445B0A300211A51 /* LoginModel.swift in Sources */,
E0D197BE2448431C002B080C /* BabyOptions.m in Sources */,
E0D197C22448431C002B080C /* BabyRhythm.m in Sources */,
F9023F692449A50900DD5A63 /* TitleContentCell.swift in Sources */,
E0D197BF2448431C002B080C /* BabyBluetooth.m in Sources */,
E09B03C82445BF9300211A51 /* SwiftNotice.swift in Sources */,
E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */,
......
GeliBusinessPlatform/View/Cell/TitleAndTFCell.swift 0 → 100644
View file @ 20d094c2
//
// TitleAndTFCell.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/17.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class TitleAndTFCell: UITableViewCell {
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
}
}
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib 0 → 100644
View file @ 20d094c2
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<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="TitleAndTFCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<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="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zvz-cN-gmt">
<rect key="frame" x="15" y="49" width="305" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="qV8-4M-UFb"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6wI-Bk-Hnz">
<rect key="frame" x="15" y="17" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入内容" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q6V-I9-aNd">
<rect key="frame" x="65" y="16.5" width="240" height="17.5"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="Q6V-I9-aNd" secondAttribute="trailing" constant="15" id="91e-XA-Iqf"/>
<constraint firstAttribute="trailing" secondItem="zvz-cN-gmt" secondAttribute="trailing" id="91g-iJ-e2S"/>
<constraint firstItem="zvz-cN-gmt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Mua-VI-kn3"/>
<constraint firstItem="6wI-Bk-Hnz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="OKy-c6-FsX"/>
<constraint firstItem="Q6V-I9-aNd" firstAttribute="leading" secondItem="6wI-Bk-Hnz" secondAttribute="trailing" constant="10" id="RC6-xh-0Q7"/>
<constraint firstItem="6wI-Bk-Hnz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Z1h-nD-Y6S"/>
<constraint firstItem="Q6V-I9-aNd" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="lmF-E2-VqK"/>
<constraint firstAttribute="bottom" secondItem="zvz-cN-gmt" secondAttribute="bottom" id="oe1-RM-1UU"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<point key="canvasLocation" x="133" y="104"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/View/Cell/TitleContentCell.swift 0 → 100644
View file @ 20d094c2
//
// TitleContentCell.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/17.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class TitleContentCell: UITableViewCell {
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
}
}
GeliBusinessPlatform/View/Cell/TitleContentCell.xib 0 → 100644
View file @ 20d094c2
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<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="TitleContentCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<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="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qvt-qW-Tpv">
<rect key="frame" x="15" y="49" width="305" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Xdy-GN-eH7"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3WG-vq-JrT">
<rect key="frame" x="15" y="17" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="内容" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eRf-WZ-Ifb">
<rect key="frame" x="278" y="17" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="eRf-WZ-Ifb" secondAttribute="trailing" constant="15" id="75Z-w0-lcR"/>
<constraint firstItem="3WG-vq-JrT" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Ad2-Rj-i3v"/>
<constraint firstItem="eRf-WZ-Ifb" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="OQR-Fm-k8K"/>
<constraint firstItem="eRf-WZ-Ifb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3WG-vq-JrT" secondAttribute="trailing" constant="10" id="QJP-i1-TK3"/>
<constraint firstAttribute="bottom" secondItem="qvt-qW-Tpv" secondAttribute="bottom" id="gJg-4r-HcX"/>
<constraint firstItem="3WG-vq-JrT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hum-Qs-w0m"/>
<constraint firstItem="qvt-qW-Tpv" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ydk-9O-Y8z"/>
<constraint firstAttribute="trailing" secondItem="qvt-qW-Tpv" secondAttribute="trailing" id="z0s-ES-Qfw"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<point key="canvasLocation" x="131.8840579710145" y="103.79464285714285"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/蓝牙连接/BluetoothConnectViewController.swift
View file @ 20d094c2
......@@ -26,7 +26,8 @@ class BluetoothConnectViewController: BaseViewController,UITableViewDelegate,UIT
make.bottom.equalTo(bottomView.snp_top)
}
tableView?.register(UINib(nibName: "BlueToothCell", bundle: nil), forCellReuseIdentifier: "BlueTooth")
tableView?.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
}
//MARK: -方法
......@@ -95,6 +96,11 @@ class BluetoothConnectViewController: BaseViewController,UITableViewDelegate,UIT
}
//cell
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "BlueTooth") as! BlueToothCell
if indexPath.section != 0 {
cell.statusIcon.isHidden = true
......@@ -102,6 +108,9 @@ class BluetoothConnectViewController: BaseViewController,UITableViewDelegate,UIT
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 {
return 94
}
return 49
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment