Commit d63d9f2c authored by lujunye's avatar lujunye

蓝牙界面

parent aad79ca9
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197C5244845FD002B080C /* PersonCenterViewController.xib */; }; E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197C5244845FD002B080C /* PersonCenterViewController.xib */; };
E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D197C824484D90002B080C /* PersonCenterCell.swift */; }; E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D197C824484D90002B080C /* PersonCenterCell.swift */; };
E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197C924484D90002B080C /* PersonCenterCell.xib */; }; E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197C924484D90002B080C /* PersonCenterCell.xib */; };
E0D197CF24485649002B080C /* BluetoothConnectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D197CD24485649002B080C /* BluetoothConnectViewController.swift */; };
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197CE24485649002B080C /* BluetoothConnectViewController.xib */; };
E0D197D5244860B1002B080C /* BlueToothCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D197D3244860B1002B080C /* BlueToothCell.swift */; };
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D197D4244860B1002B080C /* BlueToothCell.xib */; };
E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */; }; E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */; };
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */; }; E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */; };
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4166224483058008DCAB4 /* ChangePassViewController.swift */; }; E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0D4166224483058008DCAB4 /* ChangePassViewController.swift */; };
...@@ -137,6 +141,10 @@ ...@@ -137,6 +141,10 @@
E0D197C5244845FD002B080C /* PersonCenterViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PersonCenterViewController.xib; sourceTree = "<group>"; }; E0D197C5244845FD002B080C /* PersonCenterViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PersonCenterViewController.xib; sourceTree = "<group>"; };
E0D197C824484D90002B080C /* PersonCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonCenterCell.swift; sourceTree = "<group>"; }; E0D197C824484D90002B080C /* PersonCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonCenterCell.swift; sourceTree = "<group>"; };
E0D197C924484D90002B080C /* PersonCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PersonCenterCell.xib; sourceTree = "<group>"; }; E0D197C924484D90002B080C /* PersonCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PersonCenterCell.xib; sourceTree = "<group>"; };
E0D197CD24485649002B080C /* BluetoothConnectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothConnectViewController.swift; sourceTree = "<group>"; };
E0D197CE24485649002B080C /* BluetoothConnectViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BluetoothConnectViewController.xib; sourceTree = "<group>"; };
E0D197D3244860B1002B080C /* BlueToothCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlueToothCell.swift; sourceTree = "<group>"; };
E0D197D4244860B1002B080C /* BlueToothCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BlueToothCell.xib; sourceTree = "<group>"; };
E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; }; E0D4165D24482AAF008DCAB4 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountViewController.xib; sourceTree = "<group>"; }; E0D4165E24482AAF008DCAB4 /* AccountViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountViewController.xib; sourceTree = "<group>"; };
E0D4166224483058008DCAB4 /* ChangePassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePassViewController.swift; sourceTree = "<group>"; }; E0D4166224483058008DCAB4 /* ChangePassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePassViewController.swift; sourceTree = "<group>"; };
...@@ -357,6 +365,7 @@ ...@@ -357,6 +365,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = { E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E0D197CC244855F5002B080C /* 蓝牙连接 */,
E0D197C3244845E3002B080C /* 个人中心 */, E0D197C3244845E3002B080C /* 个人中心 */,
E0D4166124483045008DCAB4 /* 修改密码 */, E0D4166124483045008DCAB4 /* 修改密码 */,
E0D4165C24482A7D008DCAB4 /* 账号信息 */, E0D4165C24482A7D008DCAB4 /* 账号信息 */,
...@@ -439,6 +448,17 @@ ...@@ -439,6 +448,17 @@
path = "个人中心"; path = "个人中心";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
E0D197CC244855F5002B080C /* 蓝牙连接 */ = {
isa = PBXGroup;
children = (
E0D197CD24485649002B080C /* BluetoothConnectViewController.swift */,
E0D197CE24485649002B080C /* BluetoothConnectViewController.xib */,
E0D197D3244860B1002B080C /* BlueToothCell.swift */,
E0D197D4244860B1002B080C /* BlueToothCell.xib */,
);
path = "蓝牙连接";
sourceTree = "<group>";
};
E0D4165C24482A7D008DCAB4 /* 账号信息 */ = { E0D4165C24482A7D008DCAB4 /* 账号信息 */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -570,7 +590,9 @@ ...@@ -570,7 +590,9 @@
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */, E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */, E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
E0516F782448003D00E373CE /* PayViewController.xib in Resources */, E0516F782448003D00E373CE /* PayViewController.xib in Resources */,
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */, E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */, E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */, E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */, E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
...@@ -652,6 +674,7 @@ ...@@ -652,6 +674,7 @@
E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */, E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */,
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */, E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */,
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */, E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */,
E0D197D5244860B1002B080C /* BlueToothCell.swift in Sources */,
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */, E0D197BB2448431C002B080C /* BabyCallback.m in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */, E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */, E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
...@@ -674,6 +697,7 @@ ...@@ -674,6 +697,7 @@
E09B03A72445B04E00211A51 /* BaseViewController.swift in Sources */, E09B03A72445B04E00211A51 /* BaseViewController.swift in Sources */,
E088CC932447124D000DAA8A /* BindViewController.swift in Sources */, E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */, E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */,
E0D197CF24485649002B080C /* BluetoothConnectViewController.swift in Sources */,
E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */, E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
......
...@@ -18,13 +18,6 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -18,13 +18,6 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
@IBOutlet weak var listView: UITableView! @IBOutlet weak var listView: UITableView!
let listArray = ["格利支付","蓝牙打印设置","权限设置"] let listArray = ["格利支付","蓝牙打印设置","权限设置"]
//MARK: -方法
@IBAction func editAction(_ sender: Any) {
print("编辑资料")
}
@IBAction func toMsgCenterAction(_ sender: Any) {
print("跳转消息中心")
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -58,7 +51,13 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -58,7 +51,13 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
} }
*/ */
} }
//MARK: -方法
@IBAction func editAction(_ sender: Any) {
print("编辑资料")
}
@IBAction func toMsgCenterAction(_ sender: Any) {
print("跳转消息中心")
}
//MARK: -Cell delegate方法 //MARK: -Cell delegate方法
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<image name="sekuai" width="375" height="30"/> <image name="sekuai" width="375" height="30"/>
<image name="xiaoxi" width="34" height="36"/> <image name="xiaoxi" width="34" height="36"/>
<namedColor name="个人中心灰色字体"> <namedColor name="个人中心灰色字体">
<color red="0.396078431372549" green="0.396078431372549" blue="0.396078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.39599999785423279" green="0.39599999785423279" blue="0.39599999785423279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
...@@ -17,19 +17,7 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate { ...@@ -17,19 +17,7 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate {
@IBOutlet weak var oldPassTF: UITextField! @IBOutlet weak var oldPassTF: UITextField!
@IBOutlet weak var fisrtView: UIView! @IBOutlet weak var fisrtView: UIView!
@IBOutlet weak var submitBtn: LGButton! @IBOutlet weak var submitBtn: LGButton!
//MARK: -方法
@IBAction func newPassAction(_ sender: UIButton) {
newPBtn.isSelected = !newPBtn.isSelected
newPassTF.isSecureTextEntry = !newPBtn.isSelected
}
@IBAction func oldPassAction(_ sender: UIButton) {
oldPBtn.isSelected = !oldPBtn.isSelected
oldPassTF.isSecureTextEntry = !oldPBtn.isSelected
}
@IBAction func submitAction(_ sender: Any) {
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
let navbar = NavBarView(frame: NavCGRect) let navbar = NavBarView(frame: NavCGRect)
...@@ -51,7 +39,7 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate { ...@@ -51,7 +39,7 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate {
}) })
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
//MARK: -方法
@objc func tfChange(sender:UITextField){ @objc func tfChange(sender:UITextField){
if oldPassTF.text!.count > 0 && newPassTF.text!.count > 0 { if oldPassTF.text!.count > 0 && newPassTF.text!.count > 0 {
submitBtn.alpha = 1 submitBtn.alpha = 1
...@@ -60,6 +48,17 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate { ...@@ -60,6 +48,17 @@ class ChangePassViewController: BaseViewController,NavBarViewDelegate {
} }
} }
@IBAction func newPassAction(_ sender: UIButton) {
newPBtn.isSelected = !newPBtn.isSelected
newPassTF.isSecureTextEntry = !newPBtn.isSelected
}
@IBAction func oldPassAction(_ sender: UIButton) {
oldPBtn.isSelected = !oldPBtn.isSelected
oldPassTF.isSecureTextEntry = !oldPBtn.isSelected
}
@IBAction func submitAction(_ sender: Any) {
}
//MARK: -delegate方法 //MARK: -delegate方法
func backAction() { func backAction() {
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
......
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize"> <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/> <real key="value" value="17"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="MT7-fK-Uew"/> <action selector="submitAction:" destination="-1" eventType="touchUpInside" id="MT7-fK-Uew"/>
......
...@@ -19,15 +19,4 @@ class FgPassViewController: BaseViewController { ...@@ -19,15 +19,4 @@ class FgPassViewController: BaseViewController {
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
} }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</objects> </objects>
<resources> <resources>
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.51700001955032349" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
</resources> </resources>
</document> </document>
...@@ -17,20 +17,7 @@ class BindViewController: BaseViewController,NavBarViewDelegate { ...@@ -17,20 +17,7 @@ class BindViewController: BaseViewController,NavBarViewDelegate {
@IBOutlet weak var phoneTF: UITextField! @IBOutlet weak var phoneTF: UITextField!
@IBOutlet weak var codeTF: UITextField! @IBOutlet weak var codeTF: UITextField!
@IBOutlet weak var topInputView: UIView! @IBOutlet weak var topInputView: UIView!
//MARK: -绑定、获取验证码、忘记手机号码方法
@IBAction func registerPayAccountAction(_ sender: Any) {
print("注册支付账号")
}
@IBAction func getCodeAction(_ sender: Any) {
print("获取验证码")
}
@IBAction func forgetPhoneNumAction(_ sender: Any) {
print("忘记手机号码")
}
@IBAction func submitBindingAction(_ sender: Any) {
print("确认绑定账号")
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -63,7 +50,20 @@ class BindViewController: BaseViewController,NavBarViewDelegate { ...@@ -63,7 +50,20 @@ class BindViewController: BaseViewController,NavBarViewDelegate {
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
//MARK: -绑定、获取验证码、忘记手机号码方法
@IBAction func registerPayAccountAction(_ sender: Any) {
print("注册支付账号")
}
@IBAction func getCodeAction(_ sender: Any) {
print("获取验证码")
}
@IBAction func forgetPhoneNumAction(_ sender: Any) {
print("忘记手机号码")
}
@IBAction func submitBindingAction(_ sender: Any) {
print("确认绑定账号")
}
//MARK: -delegate方法 //MARK: -delegate方法
func backAction() { func backAction() {
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
......
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize"> <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/> <real key="value" value="17"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="submitBindingAction:" destination="-1" eventType="touchUpInside" id="tJT-jq-0cb"/> <action selector="submitBindingAction:" destination="-1" eventType="touchUpInside" id="tJT-jq-0cb"/>
...@@ -280,7 +281,7 @@ ...@@ -280,7 +281,7 @@
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="未登录提示背景色"> <namedColor name="未登录提示背景色">
<color red="1" green="0.43900001049041748" blue="0.43900001049041748" alpha="0.65000000000000002" colorSpace="custom" customColorSpace="sRGB"/> <color red="1" green="0.43900001049041748" blue="0.43900001049041748" alpha="0.64999997615814209" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
...@@ -13,21 +13,7 @@ class PayViewController: BaseViewController,NavBarViewDelegate { ...@@ -13,21 +13,7 @@ class PayViewController: BaseViewController,NavBarViewDelegate {
@IBOutlet weak var pinkView: UIView! @IBOutlet weak var pinkView: UIView!
@IBOutlet weak var passBtn: UIButton! @IBOutlet weak var passBtn: UIButton!
//MARK: -方法
@IBAction func bindAction(_ sender: Any) {
print("换绑账号")
}
@IBAction func passwordAction(_ sender: UIButton) {
if sender.titleLabel?.text == "修改支付密码" {
print("修改支付密码")
}else{
print("设置支付密码")
}
}
@IBAction func enterInGLPayAction(_ sender: Any) {
print("进入格利支付")
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -49,7 +35,21 @@ class PayViewController: BaseViewController,NavBarViewDelegate { ...@@ -49,7 +35,21 @@ class PayViewController: BaseViewController,NavBarViewDelegate {
} }
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
//MARK: -方法
@IBAction func bindAction(_ sender: Any) {
print("换绑账号")
}
@IBAction func passwordAction(_ sender: UIButton) {
if sender.titleLabel?.text == "修改支付密码" {
print("修改支付密码")
}else{
print("设置支付密码")
}
}
@IBAction func enterInGLPayAction(_ sender: Any) {
print("进入格利支付")
}
//MARK: -delegate方法 //MARK: -delegate方法
func backAction() { func backAction() {
......
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize"> <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/> <real key="value" value="17"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="enterInGLPayAction:" destination="-1" eventType="touchUpInside" id="TjF-bZ-Frg"/> <action selector="enterInGLPayAction:" destination="-1" eventType="touchUpInside" id="TjF-bZ-Frg"/>
......
...@@ -49,27 +49,13 @@ ...@@ -49,27 +49,13 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L0Y-lD-jK8"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L0Y-lD-jK8">
<rect key="frame" x="15" y="45" width="315" height="45"/> <rect key="frame" x="15" y="45" width="315" height="45"/>
<attributedString key="attributedText"> <attributedString key="attributedText">
<fragment content="亲爱的格利食品网商户您好,您提交的(六和川香鸡柳"> <fragment content="亲爱的格利食品网商户您好,您提交的(六和川香鸡柳 2.5kg*2)商品已通过审核。">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" size="13" name=".PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="2" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content=" 2.5kg*2">
<attributes> <attributes>
<color key="NSColor" name="标题字颜色"/> <color key="NSColor" name="标题字颜色"/>
<font key="NSFont" metaFont="system"/> <font key="NSFont" metaFont="system"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="2" tighteningFactorForTruncation="0.0"/> <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="2" tighteningFactorForTruncation="0.0"/>
</attributes> </attributes>
</fragment> </fragment>
<fragment content=")商品已通过审核。">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" size="13" name=".PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="2" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString> </attributedString>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
......
...@@ -12,24 +12,6 @@ import CryptoSwift ...@@ -12,24 +12,6 @@ import CryptoSwift
import LGButton import LGButton
class LoginViewController: BaseViewController { class LoginViewController: BaseViewController {
//MARK: -跳转忘记密码,登录
@IBAction func forgetPasswordAction(_ sender: Any) {
let vc = DemoViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func shPassAction(_ sender: UIButton) {
shBtn.isSelected = !shBtn.isSelected
passTF.isSecureTextEntry = !shBtn.isSelected
}
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = PersonCenterViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK: - 输入账号、密码、验证码 //MARK: - 输入账号、密码、验证码
@IBOutlet weak var loginBtn: LGButton! @IBOutlet weak var loginBtn: LGButton!
@IBOutlet weak var codeView: UIView! @IBOutlet weak var codeView: UIView!
...@@ -39,6 +21,7 @@ self.navigationController?.pushViewController(vc, animated: true) ...@@ -39,6 +21,7 @@ self.navigationController?.pushViewController(vc, animated: true)
@IBOutlet weak var bannerImg: UIImageView! @IBOutlet weak var bannerImg: UIImageView!
@IBOutlet weak var topImg: UIImageView! @IBOutlet weak var topImg: UIImageView!
@IBOutlet weak var shBtn: UIButton! @IBOutlet weak var shBtn: UIButton!
//MARK: - viewWillAppear //MARK: - viewWillAppear
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
...@@ -47,7 +30,6 @@ self.navigationController?.pushViewController(vc, animated: true) ...@@ -47,7 +30,6 @@ self.navigationController?.pushViewController(vc, animated: true)
codeView.addSubview(codeV); codeView.addSubview(codeV);
} }
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
let glscale = UIScreen.main.bounds.size.width/375 let glscale = UIScreen.main.bounds.size.width/375
...@@ -63,7 +45,22 @@ self.navigationController?.pushViewController(vc, animated: true) ...@@ -63,7 +45,22 @@ self.navigationController?.pushViewController(vc, animated: true)
} }
//登录中状态 //登录中状态
// loginBtn.isLoading = true // loginBtn.isLoading = true
}
//MARK: -跳转忘记密码,登录
@IBAction func forgetPasswordAction(_ sender: Any) {
let vc = DemoViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func shPassAction(_ sender: UIButton) {
shBtn.isSelected = !shBtn.isSelected
passTF.isSecureTextEntry = !shBtn.isSelected
}
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = BluetoothConnectViewController()
self.navigationController?.pushViewController(vc, animated: true)
} }
} }
...@@ -262,6 +262,7 @@ ...@@ -262,6 +262,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="loadingFontSize"> <userDefinedRuntimeAttribute type="number" keyPath="loadingFontSize">
<real key="value" value="17"/> <real key="value" value="17"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="loginAction:" destination="-1" eventType="touchUpInside" id="jlC-gq-qwQ"/> <action selector="loginAction:" destination="-1" eventType="touchUpInside" id="jlC-gq-qwQ"/>
......
//
// BlueToothCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/16.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class BlueToothCell: UITableViewCell {
@IBOutlet weak var statusIcon: UIImageView!
@IBOutlet weak var contentLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
self.selectionStyle = .none
}
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="15702" 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="15704"/>
<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" rowHeight="49" id="KGk-i7-Jjw" customClass="BlueToothCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
<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="375" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GBVGIVT--JK_bjjkNG55" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j27-uj-mZm">
<rect key="frame" x="15" y="0.0" width="325" height="49"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="xianshi " translatesAutoresizingMaskIntoConstraints="NO" id="lgj-DW-SOJ">
<rect key="frame" x="340" y="14.5" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="CEb-px-b2F"/>
<constraint firstAttribute="width" constant="20" id="j5r-Oc-QD2"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UJr-jg-GxI">
<rect key="frame" x="15" y="48" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="0sm-vO-mgb"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="lgj-DW-SOJ" secondAttribute="trailing" constant="15" id="FkG-RA-PSi"/>
<constraint firstItem="lgj-DW-SOJ" firstAttribute="leading" secondItem="j27-uj-mZm" secondAttribute="trailing" id="HXT-kZ-dFC"/>
<constraint firstItem="UJr-jg-GxI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="JVc-TT-Zlm"/>
<constraint firstItem="lgj-DW-SOJ" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Mb3-PZ-LMH"/>
<constraint firstItem="j27-uj-mZm" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="dZP-DG-RoZ"/>
<constraint firstItem="j27-uj-mZm" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="koc-Uc-sGc"/>
<constraint firstAttribute="trailing" secondItem="UJr-jg-GxI" secondAttribute="trailing" id="mnH-My-3hg"/>
<constraint firstAttribute="bottom" secondItem="j27-uj-mZm" secondAttribute="bottom" id="oAq-BG-czB"/>
<constraint firstAttribute="bottom" secondItem="UJr-jg-GxI" secondAttribute="bottom" id="tBn-t2-jWc"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="contentLbl" destination="j27-uj-mZm" id="CTg-Bo-Z9L"/>
<outlet property="statusIcon" destination="lgj-DW-SOJ" id="Cx7-Rl-As4"/>
</connections>
<point key="canvasLocation" x="171.73913043478262" y="112.16517857142857"/>
</tableViewCell>
</objects>
<resources>
<image name="xianshi " width="37" height="24"/>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92900002002716064" green="0.92900002002716064" blue="0.92900002002716064" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
//
// BluetoothConnectViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/16.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class BluetoothConnectViewController: BaseViewController,NavBarViewDelegate,UITableViewDelegate,UITableViewDataSource {
@IBOutlet weak var bottomView: UIView!
@IBOutlet weak var tableView: UITableView!
override func viewDidLoad() {
super.viewDidLoad()
let navbar = NavBarView(frame: NavCGRect)
navbar.title = "蓝牙打印设置"
navbar.deleagte = self
self.view.addSubview(navbar)
// Do any additional setup after loading the view.
tableView.delegate = self
tableView.dataSource = self
tableView.isScrollEnabled = false
tableView.separatorStyle = .none
tableView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.bottom.equalTo(bottomView.snp_top)
}
tableView?.register(UINib(nibName: "BlueToothCell", bundle: nil), forCellReuseIdentifier: "BlueTooth")
}
//MARK: -方法
@IBAction func searchAction(_ sender: Any) {
print("搜索")
}
//MARK: -Cell delegate
func numberOfSections(in tableView: UITableView) -> Int {
return 2
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
//header
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
switch section {
case 0:
let view = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: 46))
view.backgroundColor = UIColor.clear
let lbl = UILabel(frame: CGRect(x: 15, y: 0, width: self.view.bounds.size.width, height: 46))
lbl.text = "已连接设备"
lbl.font = UIFont.boldSystemFont(ofSize: 15)
lbl.textColor = UIColor(named:"灰色字体颜色")
view.addSubview(lbl)
return view
default:
let view = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: 46))
view.backgroundColor = UIColor.clear
let lbl = UILabel(frame: CGRect(x: 15, y: 0, width: self.view.bounds.size.width, height: 46))
lbl.text = "未连接设备"
lbl.font = UIFont.boldSystemFont(ofSize: 15)
lbl.textColor = UIColor(named:"灰色字体颜色")
view.addSubview(lbl)
return view
}
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 46
}
//footer
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
switch section {
case 0:
let view = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: 46))
view.backgroundColor = UIColor.clear
let lbl = UILabel(frame: CGRect(x: 15, y: 0, width: self.view.bounds.size.width, height: 46))
lbl.text = "选择已经连接的设备作为默认打印设备"
lbl.font = UIFont.boldSystemFont(ofSize: 11)
lbl.textColor = UIColor(named:"灰色字体颜色")
view.addSubview(lbl)
return view
default:
let view = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: 46))
view.backgroundColor = UIColor.clear
let lbl = UILabel(frame: CGRect(x: 15, y: 0, width: self.view.bounds.size.width, height: 46))
lbl.text = "选择设备进行连接"
lbl.font = UIFont.boldSystemFont(ofSize: 11)
lbl.textColor = UIColor(named:"灰色字体颜色")
view.addSubview(lbl)
return view
}
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 46
}
//cell
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "BlueTooth") as! BlueToothCell
if indexPath.section != 0 {
cell.statusIcon.isHidden = true
}
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 49
}
//MARK: -delegate方法
func backAction() {
self.navigationController?.popViewController(animated: true)
}
}
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="15704"/>
<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" customClass="BluetoothConnectViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="z6g-3U-Gjc" id="Kx7-8l-LwL"/>
<outlet property="tableView" destination="IoW-aR-gg0" id="Cxv-cQ-rjJ"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IoW-aR-gg0">
<rect key="frame" x="0.0" y="44" width="414" height="768"/>
<color key="backgroundColor" name="app底色"/>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z6g-3U-Gjc">
<rect key="frame" x="0.0" y="812" width="414" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="搜索" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bS9-xW-ajm">
<rect key="frame" x="207.5" y="15" width="35" height="20.5"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="USO-np-8G1"/>
<constraint firstAttribute="height" constant="20.5" id="Xbv-19-TDF"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guanbi" translatesAutoresizingMaskIntoConstraints="NO" id="zmP-e7-gur">
<rect key="frame" x="179" y="15" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="TmK-Oq-Sof"/>
<constraint firstAttribute="width" constant="20" id="Xi5-pM-tII"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kxt-WC-XyY">
<rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
<connections>
<action selector="searchAction:" destination="-1" eventType="touchUpInside" id="lDV-he-pEz"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="bS9-xW-ajm" firstAttribute="centerY" secondItem="z6g-3U-Gjc" secondAttribute="centerY" id="I5U-kM-DXb"/>
<constraint firstAttribute="height" constant="50" id="LW6-DI-gTT"/>
<constraint firstItem="Kxt-WC-XyY" firstAttribute="top" secondItem="z6g-3U-Gjc" secondAttribute="top" id="NJc-wO-cmv"/>
<constraint firstAttribute="bottom" secondItem="Kxt-WC-XyY" secondAttribute="bottom" id="Vtr-aJ-Rod"/>
<constraint firstItem="Kxt-WC-XyY" firstAttribute="leading" secondItem="z6g-3U-Gjc" secondAttribute="leading" id="WJR-bl-zKg"/>
<constraint firstItem="zmP-e7-gur" firstAttribute="centerX" secondItem="z6g-3U-Gjc" secondAttribute="centerX" constant="-18" id="iwy-LB-WMs"/>
<constraint firstItem="zmP-e7-gur" firstAttribute="centerY" secondItem="z6g-3U-Gjc" secondAttribute="centerY" id="j4R-HR-czB"/>
<constraint firstItem="bS9-xW-ajm" firstAttribute="centerX" secondItem="z6g-3U-Gjc" secondAttribute="centerX" constant="18" id="kn3-Ji-FaK"/>
<constraint firstAttribute="trailing" secondItem="Kxt-WC-XyY" secondAttribute="trailing" id="qu6-u0-3z0"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EhN-in-WvW">
<rect key="frame" x="0.0" y="862" width="414" height="70"/>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstAttribute="height" constant="70" id="5Bl-jC-R6q"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="IoW-aR-gg0" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="1BX-uM-9UQ"/>
<constraint firstItem="EhN-in-WvW" firstAttribute="top" secondItem="z6g-3U-Gjc" secondAttribute="bottom" id="6eJ-il-R2H"/>
<constraint firstAttribute="trailing" secondItem="EhN-in-WvW" secondAttribute="trailing" id="EOz-ma-JQs"/>
<constraint firstItem="IoW-aR-gg0" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Rcf-fQ-pmW"/>
<constraint firstItem="z6g-3U-Gjc" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="SEI-Ob-cTQ"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="z6g-3U-Gjc" secondAttribute="bottom" id="VTm-D3-5xc"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="z6g-3U-Gjc" secondAttribute="trailing" id="Xak-0L-zec"/>
<constraint firstItem="z6g-3U-Gjc" firstAttribute="top" secondItem="IoW-aR-gg0" secondAttribute="bottom" id="aNn-3T-lTt"/>
<constraint firstItem="EhN-in-WvW" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="b7Q-gR-cJG"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="IoW-aR-gg0" secondAttribute="trailing" id="hos-nX-fj1"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="127.53623188405798" y="111.16071428571428"/>
</view>
</objects>
<resources>
<image name="guanbi" width="37" height="18"/>
<namedColor name="app底色">
<color red="0.94900000095367432" green="0.94900000095367432" blue="0.94900000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
...@@ -14,17 +14,7 @@ class AccountViewController: BaseViewController,NavBarViewDelegate{ ...@@ -14,17 +14,7 @@ class AccountViewController: BaseViewController,NavBarViewDelegate{
@IBOutlet weak var accountLbl: UILabel! @IBOutlet weak var accountLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel! @IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var firstView: UIView! @IBOutlet weak var firstView: UIView!
//MARK: -方法
@IBAction func gotoDetailAction(_ sender: Any) {
print("进入商家详情")
}
@IBAction func changPassAction(_ sender: Any) {
print("修改密码")
}
@IBAction func logOutAction(_ sender: Any) {
print("退出登录")
}
override func viewDidLoad() { override func viewDidLoad() {
...@@ -42,7 +32,17 @@ class AccountViewController: BaseViewController,NavBarViewDelegate{ ...@@ -42,7 +32,17 @@ class AccountViewController: BaseViewController,NavBarViewDelegate{
}) })
} }
//MARK: -方法
@IBAction func gotoDetailAction(_ sender: Any) {
print("进入商家详情")
}
@IBAction func changPassAction(_ sender: Any) {
print("修改密码")
}
@IBAction func logOutAction(_ sender: Any) {
print("退出登录")
}
//MARK: -delegate方法 //MARK: -delegate方法
func backAction() { func backAction() {
......
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize"> <userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/> <real key="value" value="17"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="logOutAction:" destination="-1" eventType="touchUpInside" id="6k3-EX-iq5"/> <action selector="logOutAction:" destination="-1" eventType="touchUpInside" id="6k3-EX-iq5"/>
......
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