Skip to content

Commit

Permalink
1.更改分享界面样式 2.更改短信验证 3.增加判断是否为WIFI的字段
Browse files Browse the repository at this point in the history
  • Loading branch information
EZElkins committed Aug 26, 2015
1 parent 856970f commit 3205e32
Show file tree
Hide file tree
Showing 21 changed files with 387 additions and 174 deletions.
38 changes: 38 additions & 0 deletions LIKE/LIKE.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@
134B0B7D1B5656DE00A195BE /* LKSearchHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 134B0B7C1B5656DE00A195BE /* LKSearchHistory.m */; };
134B0B801B5667F200A195BE /* LKHotTagsPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 134B0B7F1B5667F200A195BE /* LKHotTagsPage.m */; };
134B0B831B5688D700A195BE /* LKHotUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = 134B0B821B5688D700A195BE /* LKHotUserView.m */; };
134D92E81B8D6A4A004CFAC8 /* NSArray+Ext.m in Sources */ = {isa = PBXBuildFile; fileRef = 134D92E61B8D6A4A004CFAC8 /* NSArray+Ext.m */; };
134D92F01B8DA8A0004CFAC8 /* 高达.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92E91B8DA8A0004CFAC8 /* 高达.png */; };
134D92F11B8DA8A0004CFAC8 /* 狗.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EA1B8DA8A0004CFAC8 /* 狗.png */; };
134D92F21B8DA8A0004CFAC8 /* 猫.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EB1B8DA8A0004CFAC8 /* 猫.png */; };
134D92F31B8DA8A0004CFAC8 /* 美食.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EC1B8DA8A0004CFAC8 /* 美食.png */; };
134D92F41B8DA8A0004CFAC8 /* 喷漆.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92ED1B8DA8A0004CFAC8 /* 喷漆.png */; };
134D92F51B8DA8A0004CFAC8 /* 摄影.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EE1B8DA8A0004CFAC8 /* 摄影.png */; };
134D92F61B8DA8A0004CFAC8 /* 游戏.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EF1B8DA8A0004CFAC8 /* 游戏.png */; };
134D92F81B8DB18E004CFAC8 /* 手办.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92F71B8DB18E004CFAC8 /* 手办.png */; };
134F929F1AFCB77400784185 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 134F929E1AFCB77400784185 /* [email protected] */; };
134F92A21AFCB84B00784185 /* LKLikesPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 134F92A11AFCB84B00784185 /* LKLikesPage.m */; };
135735191B2EC6FC0032515C /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 135735181B2EC6FC0032515C /* libicucore.dylib */; };
Expand Down Expand Up @@ -858,6 +867,16 @@
134B0B7F1B5667F200A195BE /* LKHotTagsPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKHotTagsPage.m; sourceTree = "<group>"; };
134B0B811B5688D700A195BE /* LKHotUserView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKHotUserView.h; sourceTree = "<group>"; };
134B0B821B5688D700A195BE /* LKHotUserView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKHotUserView.m; sourceTree = "<group>"; };
134D92E61B8D6A4A004CFAC8 /* NSArray+Ext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Ext.m"; sourceTree = "<group>"; };
134D92E71B8D6A4A004CFAC8 /* NSArray+Ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Ext.h"; sourceTree = "<group>"; };
134D92E91B8DA8A0004CFAC8 /* 高达.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "高达.png"; sourceTree = "<group>"; };
134D92EA1B8DA8A0004CFAC8 /* 狗.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "狗.png"; sourceTree = "<group>"; };
134D92EB1B8DA8A0004CFAC8 /* 猫.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "猫.png"; sourceTree = "<group>"; };
134D92EC1B8DA8A0004CFAC8 /* 美食.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "美食.png"; sourceTree = "<group>"; };
134D92ED1B8DA8A0004CFAC8 /* 喷漆.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "喷漆.png"; sourceTree = "<group>"; };
134D92EE1B8DA8A0004CFAC8 /* 摄影.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "摄影.png"; sourceTree = "<group>"; };
134D92EF1B8DA8A0004CFAC8 /* 游戏.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "游戏.png"; sourceTree = "<group>"; };
134D92F71B8DB18E004CFAC8 /* 手办.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "手办.png"; sourceTree = "<group>"; };
134F929E1AFCB77400784185 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
134F92A01AFCB84B00784185 /* LKLikesPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKLikesPage.h; sourceTree = "<group>"; };
134F92A11AFCB84B00784185 /* LKLikesPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKLikesPage.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3465,6 +3484,8 @@
138EDECB1AD7B65B0020957C /* LKUIKit */ = {
isa = PBXGroup;
children = (
134D92E61B8D6A4A004CFAC8 /* NSArray+Ext.m */,
134D92E71B8D6A4A004CFAC8 /* NSArray+Ext.h */,
138EDF101AD7EC330020957C /* LKUIKit.h */,
13FCC08A1ADE4B650008DB41 /* LKUIKit.m */,
13E27F0B1AFA03FE00C17362 /* LKTimestampView.xib */,
Expand Down Expand Up @@ -4616,6 +4637,14 @@
13F505091B0C5EA100D8D484 /* Share */ = {
isa = PBXGroup;
children = (
134D92F71B8DB18E004CFAC8 /* 手办.png */,
134D92E91B8DA8A0004CFAC8 /* 高达.png */,
134D92EA1B8DA8A0004CFAC8 /* 狗.png */,
134D92EB1B8DA8A0004CFAC8 /* 猫.png */,
134D92EC1B8DA8A0004CFAC8 /* 美食.png */,
134D92ED1B8DA8A0004CFAC8 /* 喷漆.png */,
134D92EE1B8DA8A0004CFAC8 /* 摄影.png */,
134D92EF1B8DA8A0004CFAC8 /* 游戏.png */,
1319156A1B8C863100EC0F42 /* 旅行.png */,
131915681B8C625A00EC0F42 /* 二维码.png */,
1387C34F1B316CC400B065A7 /* [email protected] */,
Expand Down Expand Up @@ -4851,6 +4880,7 @@
138EDEFB1AD7DBA00020957C /* [email protected] in Resources */,
135D5C281AE0E37800811B06 /* [email protected] in Resources */,
13E3EE041B60996000A48E76 /* zh2HK.txt in Resources */,
134D92F01B8DA8A0004CFAC8 /* 高达.png in Resources */,
1388B4FD1B01EFFB006F36AB /* [email protected] in Resources */,
13DEEC141AE789E6005E01A6 /* [email protected] in Resources */,
138C84771B6B650C00C2AC62 /* [email protected] in Resources */,
Expand All @@ -4871,6 +4901,7 @@
1377F03D1B5E1240008E21BC /* [email protected] in Resources */,
1377F03A1B5E1240008E21BC /* [email protected] in Resources */,
1387C3441B31508A00B065A7 /* [email protected] in Resources */,
134D92F11B8DA8A0004CFAC8 /* 狗.png in Resources */,
1388B4FE1B01EFFB006F36AB /* [email protected] in Resources */,
1359F4A41B6A24B800A0ABE9 /* [email protected] in Resources */,
13F505151B0C5EAC00D8D484 /* [email protected] in Resources */,
Expand All @@ -4887,8 +4918,11 @@
13E1A2C81AE63BAB00E24C3C /* [email protected] in Resources */,
13DEEC1C1AE789E6005E01A6 /* [email protected] in Resources */,
135735221B2EE7D10032515C /* country.plist in Resources */,
134D92F81B8DB18E004CFAC8 /* 手办.png in Resources */,
13E1A2D11AE644C200E24C3C /* [email protected] in Resources */,
13B6C1961AE8E8EA008912C0 /* [email protected] in Resources */,
134D92F51B8DA8A0004CFAC8 /* 摄影.png in Resources */,
134D92F31B8DA8A0004CFAC8 /* 美食.png in Resources */,
13D9BF271AEB997E0020C94F /* Diana.png in Resources */,
135DBAF71AE60577004AD150 /* [email protected] in Resources */,
1319156B1B8C863100EC0F42 /* 旅行.png in Resources */,
Expand All @@ -4897,6 +4931,7 @@
13B6C19F1AE8FFBE008912C0 /* 1136.jpg in Resources */,
1387C3521B31703300B065A7 /* [email protected] in Resources */,
13DEEC191AE789E6005E01A6 /* LC_WebReload.png in Resources */,
134D92F21B8DA8A0004CFAC8 /* 猫.png in Resources */,
1359F49F1B6A237400A0ABE9 /* GtaTrevor.png in Resources */,
135E8AA01B4511B900C2270C /* AMap.bundle in Resources */,
13E27EED1AF8A67200C17362 /* [email protected] in Resources */,
Expand All @@ -4916,6 +4951,7 @@
13925A6D1B145BCE004D0656 /* [email protected] in Resources */,
138EDED61AD7C5DB0020957C /* [email protected] in Resources */,
131915641B8C267900EC0F42 /* SMS_SDKLocalizable.strings in Resources */,
134D92F61B8DA8A0004CFAC8 /* 游戏.png in Resources */,
135D5C261AE0DA9700811B06 /* [email protected] in Resources */,
134F929F1AFCB77400784185 /* [email protected] in Resources */,
13D9BF291AEB997E0020C94F /* Instant.png in Resources */,
Expand All @@ -4927,6 +4963,7 @@
1387C3501B316CC400B065A7 /* [email protected] in Resources */,
13E27EEA1AF89BDD00C17362 /* [email protected] in Resources */,
134765341AE2564D0055D099 /* [email protected] in Resources */,
134D92F41B8DA8A0004CFAC8 /* 喷漆.png in Resources */,
13892C3D1B1C44780053303E /* [email protected] in Resources */,
135D5C011ADFD21E00811B06 /* [email protected] in Resources */,
13DEEC151AE789E6005E01A6 /* LC_WebBack.png in Resources */,
Expand Down Expand Up @@ -5488,6 +5525,7 @@
138EDE0A1AD7B0A30020957C /* LCDeviceInfo.m in Sources */,
1373C43A1B846FDA00A6C55A /* NSObject+MJCoding.m in Sources */,
138EDBF31AD7B08A0020957C /* main.m in Sources */,
134D92E81B8D6A4A004CFAC8 /* NSArray+Ext.m in Sources */,
13A951A01B4CE528002B73ED /* AFHTTPRequestOperation.m in Sources */,
13BCD8981ADBA92200A0CBF5 /* POPPropertyAnimation.mm in Sources */,
1369AFEC1AEA612F00364602 /* LKWelcome.m in Sources */,
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -141,70 +141,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LIKE/LKApplication/Application/Camera/LKNewPostViewController.m"
timestampString = "455426493.19551"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "282"
endingLineNumber = "282"
landmarkName = "-buildUI"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LIKE/LKApplication/Application/Camera/LKNewPostViewController.m"
timestampString = "455426494.635587"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "286"
endingLineNumber = "286"
landmarkName = "-buildUI"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LIKE/LKApplication/Application/Camera/LKNewPostViewController.m"
timestampString = "455426510.060419"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "319"
endingLineNumber = "319"
landmarkName = "-removeLocation"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LIKE/LKApplication/Application/Camera/LKNewPostViewController.m"
timestampString = "455426531.59288"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "329"
endingLineNumber = "329"
landmarkName = "-becomeFirstResponserAction"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,12 @@ -(void) getCameraRolls

}

/**
* 获取相册图片
*/
-(void) photos
{
// 获取图片
LKUIImagePickerViewController * picker = [[LKUIImagePickerViewController alloc] init];
picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
picker.allowsEditing = NO;
Expand All @@ -212,9 +216,10 @@ -(void) photos

[self presentViewController:picker animated:YES completion:nil];


// 从相册中选择图片的完成回调
picker.finalizationBlock = ^(id _picker, NSDictionary * imageInfo){

// 滤镜控制器
LKImageCropperViewController * cropper = [[LKImageCropperViewController alloc] initWithImage:imageInfo[@"UIImagePickerControllerOriginalImage"]];

[cropper showBackButton];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ - (void)confirm

// [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:NO];

// push 发布控制器
[self.navigationController pushViewController:[[LKNewPostViewController alloc] initWithImage:image] animated:YES];
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ @interface LKNewPostViewController ()
LC_PROPERTY(strong) CLLocation * location;
LC_PROPERTY(strong) NSString * locationName;

@property (nonatomic, strong) NSMutableArray *suggests;


@end

@implementation LKNewPostViewController
Expand Down Expand Up @@ -87,6 +90,7 @@ -(void) viewDidLoad

-(void) buildUI
{
// 格式化当前日期
NSDateFormatter * formatter = [[NSDateFormatter alloc] init];
formatter.dateStyle = kCFDateFormatterMediumStyle;

Expand All @@ -104,6 +108,7 @@ -(void) buildUI
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageWithColor:LKColor.color andSize:CGSizeMake(LC_DEVICE_WIDTH, 64)] forBarMetrics:UIBarMetricsDefault];


// 图片预览
self.preview = LCUIImageView.view;
self.preview.contentMode = UIViewContentModeScaleAspectFill;
self.preview.viewFrameWidth = 100;
Expand All @@ -120,6 +125,7 @@ -(void) buildUI
[self setNavigationBarButton:LCUINavigationBarButtonTypeRight title:LC_LO(@"发布") titleColor:[[UIColor whiteColor] colorWithAlphaComponent:0.8]];


// 顶部提示label
self.recommendLabel = LCUILabel.view;
self.recommendLabel.viewFrameX = 10;
self.recommendLabel.viewFrameY = 10;
Expand All @@ -134,6 +140,7 @@ -(void) buildUI
self.view.ADD(self.recommendLabel);


// 标签所在的view
UIView * becomeFirstResponser = UIView.view;
becomeFirstResponser.viewFrameX = 10;
becomeFirstResponser.viewFrameY = self.recommendLabel.viewBottomY;
Expand All @@ -151,22 +158,28 @@ -(void) buildUI
self.selectedTags.tapRemove = YES;
self.view.ADD(self.selectedTags);

// 推荐列表
self.recommendTags = LKRecommendTagsView.view;
self.recommendTags.viewFrameY = self.selectedTags.viewBottomY;
self.recommendTags.viewFrameWidth = LC_DEVICE_WIDTH;
self.recommendTags.highlight = NO;
self.view.ADD(self.recommendTags);


@weakly(self);

self.selectedTags.itemDidTap = ^(LKRecommendTagItem * item, NSInteger type){

@normally(self);

[self.recommendTags.tags addObjectsFromArray:self.suggests.copy];

[self.recommendTags reloadData:YES];

[self updateSubviewsLayout];
};


// 推荐列表
self.recommendTags = LKRecommendTagsView.view;
self.recommendTags.viewFrameY = self.selectedTags.viewBottomY;
self.recommendTags.viewFrameWidth = LC_DEVICE_WIDTH;
self.recommendTags.highlight = NO;
self.view.ADD(self.recommendTags);


UIView * line = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"TalkLine.png" useCache:YES]];
Expand All @@ -192,6 +205,7 @@ -(void) buildUI

if (type == 1) {

// 点击的是预置标签
[UIView animateWithDuration:0.25 animations:^{

self.recommendTags.alpha = 0;
Expand All @@ -206,7 +220,13 @@ -(void) buildUI

if (tag.type == 1) {

if (self.suggests.count < 16) {

[self.suggests addObject:tag];
}

[tags removeObject:tag];

}
}

Expand Down Expand Up @@ -422,6 +442,9 @@ -(void) finishIt
[self dismissAction];
}

/**
* 点击预览图片执行
*/
-(void) previewTapAction
{
[self.inputView resignFirstResponder];
Expand Down Expand Up @@ -505,4 +528,13 @@ -(void) choosePlaces
}
}

#pragma mark - ***** 懒加载 *****
- (NSMutableArray *)suggests {

if (_suggests == nil) {
_suggests = [NSMutableArray array];
}
return _suggests;
}

@end
Loading

0 comments on commit 3205e32

Please sign in to comment.