Commit fc451cf9 authored by 曹云霄's avatar 曹云霄

个人中心的界面搭建

parent c83baa51
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
2970D1AC1D6D991100ADB311 /* UIView+Corners.m in Sources */ = {isa = PBXBuildFile; fileRef = 2970D1AB1D6D991100ADB311 /* UIView+Corners.m */; }; 2970D1AC1D6D991100ADB311 /* UIView+Corners.m in Sources */ = {isa = PBXBuildFile; fileRef = 2970D1AB1D6D991100ADB311 /* UIView+Corners.m */; };
2970D1B01D6D9CB300ADB311 /* palmwms_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 2970D1AF1D6D9CB200ADB311 /* palmwms_objc_json_client.m */; }; 2970D1B01D6D9CB300ADB311 /* palmwms_objc_json_client.m in Sources */ = {isa = PBXBuildFile; fileRef = 2970D1AF1D6D9CB200ADB311 /* palmwms_objc_json_client.m */; };
29CAE1FD1D6EB71B0011CCE6 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE1FC1D6EB71B0011CCE6 /* SearchViewController.m */; }; 29CAE1FD1D6EB71B0011CCE6 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE1FC1D6EB71B0011CCE6 /* SearchViewController.m */; };
29CAE1FF1D6ECB0D0011CCE6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29CAE1FE1D6ECB0D0011CCE6 /* Default-568h@2x.png */; };
29CAE20A1D6ED4BF0011CCE6 /* CustomLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */; }; 29CAE20A1D6ED4BF0011CCE6 /* CustomLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */; };
29CAE20C1D6ED4BF0011CCE6 /* UserPaopaoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2081D6ED4BF0011CCE6 /* UserPaopaoView.m */; }; 29CAE20C1D6ED4BF0011CCE6 /* UserPaopaoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE2081D6ED4BF0011CCE6 /* UserPaopaoView.m */; };
29CAE20F1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE20E1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m */; }; 29CAE20F1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CAE20E1D6EE34E0011CCE6 /* CustomBMKAnnotationView.m */; };
...@@ -29,6 +28,11 @@ ...@@ -29,6 +28,11 @@
29CF917B1D66B8CC00AE13A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CF917A1D66B8CC00AE13A8 /* AppDelegate.m */; }; 29CF917B1D66B8CC00AE13A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CF917A1D66B8CC00AE13A8 /* AppDelegate.m */; };
29CF91831D66B8CC00AE13A8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29CF91821D66B8CC00AE13A8 /* Assets.xcassets */; }; 29CF91831D66B8CC00AE13A8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29CF91821D66B8CC00AE13A8 /* Assets.xcassets */; };
29CF91861D66B8CC00AE13A8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29CF91841D66B8CC00AE13A8 /* LaunchScreen.storyboard */; }; 29CF91861D66B8CC00AE13A8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29CF91841D66B8CC00AE13A8 /* LaunchScreen.storyboard */; };
29D7651B1D6F322A0005CA21 /* UserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D7651A1D6F322A0005CA21 /* UserViewController.m */; };
29D7651F1D6F33800005CA21 /* ChangePasswordTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D7651E1D6F33800005CA21 /* ChangePasswordTableViewCell.m */; };
29D765221D6F33920005CA21 /* LogoutTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D765211D6F33920005CA21 /* LogoutTableViewCell.m */; };
29D765261D6F35570005CA21 /* UserHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D765251D6F35570005CA21 /* UserHeaderView.m */; };
29D765281D6F355F0005CA21 /* UserHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D765271D6F355F0005CA21 /* UserHeaderView.xib */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -58,7 +62,6 @@ ...@@ -58,7 +62,6 @@
2970D1AF1D6D9CB200ADB311 /* palmwms_objc_json_client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = palmwms_objc_json_client.m; sourceTree = "<group>"; }; 2970D1AF1D6D9CB200ADB311 /* palmwms_objc_json_client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = palmwms_objc_json_client.m; sourceTree = "<group>"; };
29CAE1FB1D6EB71B0011CCE6 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; }; 29CAE1FB1D6EB71B0011CCE6 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
29CAE1FC1D6EB71B0011CCE6 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; }; 29CAE1FC1D6EB71B0011CCE6 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
29CAE1FE1D6ECB0D0011CCE6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
29CAE2031D6ED4BF0011CCE6 /* CustomLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomLabel.h; sourceTree = "<group>"; }; 29CAE2031D6ED4BF0011CCE6 /* CustomLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomLabel.h; sourceTree = "<group>"; };
29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomLabel.m; sourceTree = "<group>"; }; 29CAE2041D6ED4BF0011CCE6 /* CustomLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomLabel.m; sourceTree = "<group>"; };
29CAE2071D6ED4BF0011CCE6 /* UserPaopaoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserPaopaoView.h; sourceTree = "<group>"; }; 29CAE2071D6ED4BF0011CCE6 /* UserPaopaoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserPaopaoView.h; sourceTree = "<group>"; };
...@@ -72,6 +75,15 @@ ...@@ -72,6 +75,15 @@
29CF91821D66B8CC00AE13A8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 29CF91821D66B8CC00AE13A8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
29CF91851D66B8CC00AE13A8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 29CF91851D66B8CC00AE13A8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
29CF91871D66B8CC00AE13A8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 29CF91871D66B8CC00AE13A8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29D765191D6F322A0005CA21 /* UserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserViewController.h; sourceTree = "<group>"; };
29D7651A1D6F322A0005CA21 /* UserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserViewController.m; sourceTree = "<group>"; };
29D7651D1D6F33800005CA21 /* ChangePasswordTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangePasswordTableViewCell.h; sourceTree = "<group>"; };
29D7651E1D6F33800005CA21 /* ChangePasswordTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangePasswordTableViewCell.m; sourceTree = "<group>"; };
29D765201D6F33920005CA21 /* LogoutTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogoutTableViewCell.h; sourceTree = "<group>"; };
29D765211D6F33920005CA21 /* LogoutTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogoutTableViewCell.m; sourceTree = "<group>"; };
29D765241D6F35570005CA21 /* UserHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserHeaderView.h; sourceTree = "<group>"; };
29D765251D6F35570005CA21 /* UserHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserHeaderView.m; sourceTree = "<group>"; };
29D765271D6F355F0005CA21 /* UserHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UserHeaderView.xib; sourceTree = "<group>"; };
29FDC0501D6DB20800561E4F /* urlInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = urlInformation.h; sourceTree = "<group>"; }; 29FDC0501D6DB20800561E4F /* urlInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = urlInformation.h; sourceTree = "<group>"; };
2A3092547F488EFD2FBE5F24 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; }; 2A3092547F488EFD2FBE5F24 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
B94AB6672F835AEC7D22B9F4 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; }; B94AB6672F835AEC7D22B9F4 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
...@@ -143,6 +155,10 @@ ...@@ -143,6 +155,10 @@
2970D1911D6D7DB000ADB311 /* User */ = { 2970D1911D6D7DB000ADB311 /* User */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29D765231D6F35370005CA21 /* Views */,
29D7651C1D6F32C00005CA21 /* Cells */,
29D765191D6F322A0005CA21 /* UserViewController.h */,
29D7651A1D6F322A0005CA21 /* UserViewController.m */,
); );
path = User; path = User;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -218,7 +234,6 @@ ...@@ -218,7 +234,6 @@
29CF916A1D66B8CC00AE13A8 = { 29CF916A1D66B8CC00AE13A8 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29CAE1FE1D6ECB0D0011CCE6 /* Default-568h@2x.png */,
2970D1861D6D7BF800ADB311 /* Class */, 2970D1861D6D7BF800ADB311 /* Class */,
2970D1871D6D7BF800ADB311 /* Tools */, 2970D1871D6D7BF800ADB311 /* Tools */,
29CF91751D66B8CC00AE13A8 /* Palmwms */, 29CF91751D66B8CC00AE13A8 /* Palmwms */,
...@@ -261,6 +276,27 @@ ...@@ -261,6 +276,27 @@
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
29D7651C1D6F32C00005CA21 /* Cells */ = {
isa = PBXGroup;
children = (
29D7651D1D6F33800005CA21 /* ChangePasswordTableViewCell.h */,
29D7651E1D6F33800005CA21 /* ChangePasswordTableViewCell.m */,
29D765201D6F33920005CA21 /* LogoutTableViewCell.h */,
29D765211D6F33920005CA21 /* LogoutTableViewCell.m */,
);
path = Cells;
sourceTree = "<group>";
};
29D765231D6F35370005CA21 /* Views */ = {
isa = PBXGroup;
children = (
29D765241D6F35570005CA21 /* UserHeaderView.h */,
29D765251D6F35570005CA21 /* UserHeaderView.m */,
29D765271D6F355F0005CA21 /* UserHeaderView.xib */,
);
path = Views;
sourceTree = "<group>";
};
4D1268B5A77B318DE79E83B0 /* Frameworks */ = { 4D1268B5A77B318DE79E83B0 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -338,10 +374,10 @@ ...@@ -338,10 +374,10 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
29D765281D6F355F0005CA21 /* UserHeaderView.xib in Resources */,
29CF91861D66B8CC00AE13A8 /* LaunchScreen.storyboard in Resources */, 29CF91861D66B8CC00AE13A8 /* LaunchScreen.storyboard in Resources */,
2970D1891D6D7C1000ADB311 /* Images.xcassets in Resources */, 2970D1891D6D7C1000ADB311 /* Images.xcassets in Resources */,
29CF91831D66B8CC00AE13A8 /* Assets.xcassets in Resources */, 29CF91831D66B8CC00AE13A8 /* Assets.xcassets in Resources */,
29CAE1FF1D6ECB0D0011CCE6 /* Default-568h@2x.png in Resources */,
2970D18B1D6D7CFE00ADB311 /* PalmwmsMain.storyboard in Resources */, 2970D18B1D6D7CFE00ADB311 /* PalmwmsMain.storyboard in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -407,9 +443,13 @@ ...@@ -407,9 +443,13 @@
29CAE20C1D6ED4BF0011CCE6 /* UserPaopaoView.m in Sources */, 29CAE20C1D6ED4BF0011CCE6 /* UserPaopaoView.m in Sources */,
290DAADD1D6E8276005F5085 /* CoordinateAcquisitionViewController.m in Sources */, 290DAADD1D6E8276005F5085 /* CoordinateAcquisitionViewController.m in Sources */,
29CF917B1D66B8CC00AE13A8 /* AppDelegate.m in Sources */, 29CF917B1D66B8CC00AE13A8 /* AppDelegate.m in Sources */,
29D7651B1D6F322A0005CA21 /* UserViewController.m in Sources */,
290DAAE01D6E8296005F5085 /* DeliveryTrackingViewController.m in Sources */, 290DAAE01D6E8296005F5085 /* DeliveryTrackingViewController.m in Sources */,
2970D1AC1D6D991100ADB311 /* UIView+Corners.m in Sources */, 2970D1AC1D6D991100ADB311 /* UIView+Corners.m in Sources */,
2970D1B01D6D9CB300ADB311 /* palmwms_objc_json_client.m in Sources */, 2970D1B01D6D9CB300ADB311 /* palmwms_objc_json_client.m in Sources */,
29D765261D6F35570005CA21 /* UserHeaderView.m in Sources */,
29D765221D6F33920005CA21 /* LogoutTableViewCell.m in Sources */,
29D7651F1D6F33800005CA21 /* ChangePasswordTableViewCell.m in Sources */,
290DAAE31D6E9259005F5085 /* MainViewController.m in Sources */, 290DAAE31D6E9259005F5085 /* MainViewController.m in Sources */,
2970D1A61D6D8DBF00ADB311 /* NetworkRequestClassManager.m in Sources */, 2970D1A61D6D8DBF00ADB311 /* NetworkRequestClassManager.m in Sources */,
2970D1A91D6D8F9D00ADB311 /* LoginViewController.m in Sources */, 2970D1A91D6D8F9D00ADB311 /* LoginViewController.m in Sources */,
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- (void)CreateMBProgressHUDLoding:(NSString *)text; - (void)CreateMBProgressHUDLoding:(NSString *)text;
- (void)RemoveMBProgressHUDLoding; - (void)RemoveMBProgressHUDLoding;
- (void)SuccessMBProgressView:(NSString *)successString; - (void)SuccessMBProgressView:(NSString *)successString timeDelay:(NSTimeInterval)time finish:(void(^)())complete;
- (void)ErrorMBProgressView:(NSString *)errorString; - (void)ErrorMBProgressView:(NSString *)errorString;
- (void)ShowProgressView:(double)progress; - (void)ShowProgressView:(double)progress;
- (void)SHOWPrompttext:(NSString *)Text; - (void)SHOWPrompttext:(NSString *)Text;
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
#pragma mark -显示成功的提示框 #pragma mark -显示成功的提示框
- (void)SuccessMBProgressView:(NSString *)successString - (void)SuccessMBProgressView:(NSString *)successString timeDelay:(NSTimeInterval)time finish:(void (^)())complete
{ {
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
...@@ -115,7 +115,13 @@ ...@@ -115,7 +115,13 @@
hud.label.font = [UIFont systemFontOfSize:18]; hud.label.font = [UIFont systemFontOfSize:18];
hud.mode = MBProgressHUDModeCustomView; hud.mode = MBProgressHUDModeCustomView;
hud.label.text = successString; hud.label.text = successString;
[hud hideAnimated:YES afterDelay:2.0f]; [hud hideAnimated:YES afterDelay:time];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (complete) {
complete();
}
});
} }
#pragma mark -显示信息的提示框 #pragma mark -显示信息的提示框
......
...@@ -91,7 +91,9 @@ ...@@ -91,7 +91,9 @@
user.userName = driver[@"name"]; user.userName = driver[@"name"];
user.userCode = driver[@"code"]; user.userCode = driver[@"code"];
user.userUUid = driver[@"id"]; user.userUUid = driver[@"id"];
[weakSelf enterTheMainController]; [weakSelf SuccessMBProgressView:@"登录成功" timeDelay:1.0f finish:^{
[weakSelf enterTheMainController];
}];
}else }else
{ {
[weakSelf SHOWPrompttext:returnValue[@"message"]]; [weakSelf SHOWPrompttext:returnValue[@"message"]];
......
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf SuccessMBProgressView:@"上传成功"]; [weakSelf SuccessMBProgressView:@"上传成功" timeDelay:1.0f finish:nil];
}else }else
{ {
[weakSelf SHOWPrompttext:returnValue[@"message"]]; [weakSelf SHOWPrompttext:returnValue[@"message"]];
......
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
*/ */
@property (weak, nonatomic) IBOutlet UISegmentedControl *segmentControl; @property (weak, nonatomic) IBOutlet UISegmentedControl *segmentControl;
/**
* 用户中心
*/
@property (weak, nonatomic) IBOutlet UIBarButtonItem *userButton;
@end @end
...@@ -79,4 +75,5 @@ ...@@ -79,4 +75,5 @@
} }
@end @end
...@@ -207,4 +207,16 @@ ...@@ -207,4 +207,16 @@
[self.navigationController popViewControllerAnimated:YES]; [self.navigationController popViewControllerAnimated:YES];
} }
#pragma mark - <UITextFieldDelegate>
- (BOOL)textFieldShouldReturn:(UITextField *)textField
{
[textField resignFirstResponder];
self.queryModel.codeEqualsOrNameLike = [textField.text length]?textField.text:nil;
[self.userTableView.mj_header beginRefreshing];
return YES;
}
@end @end
//
// ChangePasswordTableViewCell.h
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ChangePasswordTableViewCell : UITableViewCell
@end
//
// ChangePasswordTableViewCell.m
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ChangePasswordTableViewCell.h"
@implementation ChangePasswordTableViewCell
- (void)awakeFromNib {
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// LogoutTableViewCell.h
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface LogoutTableViewCell : UITableViewCell
@end
//
// LogoutTableViewCell.m
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "LogoutTableViewCell.h"
@implementation LogoutTableViewCell
- (void)awakeFromNib {
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// UserViewController.h
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface UserViewController : BaseViewController
@end
//
// UserViewController.m
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "UserViewController.h"
#import "ChangePasswordTableViewCell.h"
#import "LogoutTableViewCell.h"
#import "UserHeaderView.h"
@interface UserViewController ()<UITableViewDelegate,UITableViewDataSource>
/**
* 用户tableView
*/
@property (weak, nonatomic) IBOutlet UITableView *userTableView;
@end
@implementation UserViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
}
#pragma mark - UI
- (void)uiConfigAction
{
[self customBackButton:@selector(backButtonClick:)];
self.userTableView.tableFooterView = [UIView new];
//headerView
UIView *header = [[UIView alloc]initWithFrame:CGRectMake(0, 0,self.view.mj_w, 180)];
[header addSubview:[UserHeaderView initializeHeaderView]];
self.userTableView.tableHeaderView = header;
}
#pragma mark - <UITableViewDataSource,UITableViewDelegate>
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.row == 0 && indexPath.section == 0) {
ChangePasswordTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ChangePasswordTableViewCell" forIndexPath:indexPath];
return cell;
}
LogoutTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LogoutTableViewCell" forIndexPath:indexPath];
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return 1;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
if (section == 0) {
return 30;
}
return 60;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
if (indexPath.section == 1) {
self.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
[self dismissViewControllerAnimated:YES completion:nil];
}
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 50;
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
#pragma mark - 返回
- (void)backButtonClick:(UIButton *)sender
{
[self.navigationController popViewControllerAnimated:YES];
}
@end
//
// UserHeaderView.h
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface UserHeaderView : UIView
/**
* 初始化
*
*/
+ (instancetype)initializeHeaderView;
@end
//
// UserHeaderView.m
// Palmwms
//
// Created by 曹云霄 on 16/8/25.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "UserHeaderView.h"
@implementation UserHeaderView
+ (instancetype)initializeHeaderView
{
return [[[NSBundle mainBundle] loadNibNamed:@"UserHeaderView" owner:nil options:nil] firstObject];
}
@end
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<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="UserHeaderView">
<rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="headerBackground" id="2eg-cw-XSn">
<rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="header" id="ipn-lt-zTc">
<rect key="frame" x="71" y="60" width="60" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户:admin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7ZS-RI-Qwl">
<rect key="frame" x="157" y="64" width="218" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代码:ssasas" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0i7-Zo-EKp">
<rect key="frame" x="157" y="95" width="218" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="253.5" y="201"/>
</view>
</objects>
<resources>
<image name="header" width="57" height="57"/>
<image name="headerBackground" width="314" height="200"/>
</resources>
</document>
{
"images" : [
{
"idiom" : "universal",
"filename" : "header.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "header@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "header@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "Unknown.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "original"
}
}
\ No newline at end of file
...@@ -118,12 +118,15 @@ ...@@ -118,12 +118,15 @@
<action selector="UISegmentedControlClickAction:" destination="UNG-PL-BVM" eventType="valueChanged" id="bQC-Kl-pcb"/> <action selector="UISegmentedControlClickAction:" destination="UNG-PL-BVM" eventType="valueChanged" id="bQC-Kl-pcb"/>
</connections> </connections>
</segmentedControl> </segmentedControl>
<barButtonItem key="rightBarButtonItem" enabled="NO" image="icon" id="l0E-C3-MY8"/> <barButtonItem key="rightBarButtonItem" image="icon" style="plain" id="l0E-C3-MY8">
<connections>
<segue destination="hau-nI-VMV" kind="push" id="dZn-Cj-5Vf"/>
</connections>
</barButtonItem>
</navigationItem> </navigationItem>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/> <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<connections> <connections>
<outlet property="segmentControl" destination="klb-M3-eUl" id="75F-yB-MrO"/> <outlet property="segmentControl" destination="klb-M3-eUl" id="75F-yB-MrO"/>
<outlet property="userButton" destination="l0E-C3-MY8" id="VgA-DS-D5s"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mtF-IB-njR" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="mtF-IB-njR" userLabel="First Responder" sceneMemberID="firstResponder"/>
...@@ -179,6 +182,72 @@ ...@@ -179,6 +182,72 @@
</objects> </objects>
<point key="canvasLocation" x="1329.5" y="180.5"/> <point key="canvasLocation" x="1329.5" y="180.5"/>
</scene> </scene>
<!--我的-->
<scene sceneID="7ld-nL-Kgi">
<objects>
<viewController storyboardIdentifier="UserViewController" title="我的" id="hau-nI-VMV" customClass="UserViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Jn6-V3-uxA">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="T7Z-mp-WRV">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.9137254901960784" green="0.91764705882352937" blue="0.92156862745098034" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ChangePasswordTableViewCell" rowHeight="50" id="0zn-fl-tTo" customClass="ChangePasswordTableViewCell">
<rect key="frame" x="0.0" y="92" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0zn-fl-tTo" id="ll8-Po-7jK">
<rect key="frame" x="0.0" y="0.0" width="342" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="修改密码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6R9-S2-QDc">
<rect key="frame" x="19" y="15.5" width="78" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="LogoutTableViewCell" rowHeight="50" id="Nq8-rt-cgv" customClass="LogoutTableViewCell">
<rect key="frame" x="0.0" y="142" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Nq8-rt-cgv" id="PRu-JX-c6s">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注销" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="OnJ-Vu-B0n">
<rect key="frame" x="119" y="14" width="137" height="21.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="19"/>
<color key="textColor" red="0.99607843139999996" green="0.12941176469999999" blue="0.16078431369999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
<sections/>
<connections>
<outlet property="dataSource" destination="hau-nI-VMV" id="tE6-72-tGN"/>
<outlet property="delegate" destination="hau-nI-VMV" id="XwQ-qd-OYH"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" title="我的" id="lju-kH-rDj"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<connections>
<outlet property="userTableView" destination="T7Z-mp-WRV" id="Prd-FU-ObY"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KlH-pV-n9a" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="909.5" y="929.5"/>
</scene>
<!--选择客户--> <!--选择客户-->
<scene sceneID="Qh0-gy-bFE"> <scene sceneID="Qh0-gy-bFE">
<objects> <objects>
...@@ -205,7 +274,10 @@ ...@@ -205,7 +274,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits" returnKeyType="search"/>
<connections>
<outlet property="delegate" destination="IIF-95-xsf" id="NkA-yI-7J3"/>
</connections>
</textField> </textField>
</subviews> </subviews>
<color key="backgroundColor" red="0.23137254901960785" green="0.52941176470588236" blue="0.75294117647058822" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.23137254901960785" green="0.52941176470588236" blue="0.75294117647058822" alpha="1" colorSpace="calibratedRGB"/>
...@@ -222,7 +294,7 @@ ...@@ -222,7 +294,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="j6m-Vo-BaH" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="j6m-Vo-BaH" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1336.5" y="923.5"/> <point key="canvasLocation" x="1329.5" y="922.5"/>
</scene> </scene>
<!--Delivery Tracking View Controller--> <!--Delivery Tracking View Controller-->
<scene sceneID="Avb-8J-Nau"> <scene sceneID="Avb-8J-Nau">
......
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