iOS Team / CNLiveCommuntyModule · Commits

Commit 2647ce114a41e89d1ce0e7d546201e78f625e43e

Authored by liushiyu
1 parent 7c71307b

0.0.4

Inline Side-by-side
Showing 4 changed files with 22 additions and 19 deletions
CNLiveCommuntyModule.podspec
  View file @2647ce1
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.0.3'
  11 + s.version = '0.0.4'
12 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
  View file @2647ce1
... ... @@ -620,9 +620,9 @@
620 620 {
621 621 _userInfo = userInfo;
622 622 self.sex = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"0"]?@"女":@"男";
623   - if ([self.nameLabel.text isEqualToString:@"姓名"]) self.contentField.text = [userInfo stringValueForKey:@"name" default:@""];
624   - if ([self.nameLabel.text isEqualToString:@"年龄"]) self.contentField.text = [userInfo stringValueForKey:@"age" default:@""];
625   - if ([self.nameLabel.text isEqualToString:@"联系方式"]) self.contentField.text = [userInfo stringValueForKey:@"mobile" default:@""];
  623 + if ([self.nameLabel.text isEqualToString:@"*姓名"]) self.contentField.text = [userInfo stringValueForKey:@"name" default:@""];
  624 + if ([self.nameLabel.text isEqualToString:@"*年龄"]) self.contentField.text = [userInfo stringValueForKey:@"age" default:@""];
  625 + if ([self.nameLabel.text isEqualToString:@"*联系方式"]) self.contentField.text = [userInfo stringValueForKey:@"mobile" default:@""];
626 626  
627 627 self.checkView_m.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"0"];
628 628 self.checkView_w.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"1"];
... ... @@ -634,9 +634,9 @@
634 634 [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#CD0302) range:[nameString.string rangeOfString:@"*"]];
635 635 [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#333333) range:[nameString.string rangeOfString:[subDict stringValueForKey:@"name" default:@""]]];
636 636 self.nameLabel.attributedText = nameString;
637   - self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"联系电话"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
638   - self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
639   - self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
  637 + self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系电话"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
  638 + self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
  639 + self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
640 640 self.contentField.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
641 641 self.contentField.hidden = ![subDict boolValueForKey:@"isTextField" default:YES];
642 642 self.descTextView.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
  View file @2647ce1
... ... @@ -205,24 +205,14 @@
205 205 [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
206 206 if (createModel) {
207 207  
208   - NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:weakSelf.navigationController.viewControllers];
209   - for (UIViewController * vc in weakSelf.navigationController.viewControllers) {
210   - if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
211   - [tempArray removeObject:vc];
212   - break;
213   - }
214   - }
215   - self.navigationController.viewControllers = tempArray;
216   -
217 208 CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
218 209 [weakSelf.navigationController pushViewController:vc animated:YES];
219   -
  210 +
220 211 #ifdef DEBUG
221 212 [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
222 213 [[NSUserDefaults standardUserDefaults] synchronize];
223 214 #else
224 215 #endif
225   -
226 216 }
227 217 }];
228 218 }
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @2647ce1
... ... @@ -48,6 +48,19 @@
48 48 return self;
49 49 }
50 50  
  51 +-(void)viewDidAppear:(BOOL)animated
  52 +{
  53 + [super viewDidAppear:animated];
  54 + NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
  55 + for (UIViewController * vc in self.navigationController.viewControllers) {
  56 + if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
  57 + [tempArray removeObject:vc];
  58 + break;
  59 + }
  60 + }
  61 + self.navigationController.viewControllers = tempArray;
  62 +}
  63 +
51 64 - (void)viewDidLoad {
52 65 [super viewDidLoad];
53 66 // Do any additional setup after loading the view.
... ... @@ -84,7 +97,7 @@
84 97 titleColor = UIColorHex(#0091FF);
85 98 }
86 99 if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
87   - || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
  100 + && [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
88 101 name = @"取消订单";
89 102 titleColor = UIColorHex(#F5A623FF);
90 103 }
... ...