0.0.4

liushiyu
1 parent 7c71307b
Showing 4 changed files with 22 additions and 19 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -620,9 +620,9 @@
 {
     _userInfo = userInfo;
     self.sex = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"0"]?@"女":@"男";
-    if ([self.nameLabel.text isEqualToString:@"姓名"]) self.contentField.text = [userInfo stringValueForKey:@"name" default:@""];
-    if ([self.nameLabel.text isEqualToString:@"年龄"]) self.contentField.text = [userInfo stringValueForKey:@"age" default:@""];
-    if ([self.nameLabel.text isEqualToString:@"联系方式"]) self.contentField.text = [userInfo stringValueForKey:@"mobile" default:@""];
+    if ([self.nameLabel.text isEqualToString:@"*姓名"]) self.contentField.text = [userInfo stringValueForKey:@"name" default:@""];
+    if ([self.nameLabel.text isEqualToString:@"*年龄"]) self.contentField.text = [userInfo stringValueForKey:@"age" default:@""];
+    if ([self.nameLabel.text isEqualToString:@"*联系方式"]) self.contentField.text = [userInfo stringValueForKey:@"mobile" default:@""];
     self.checkView_m.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"0"];
     self.checkView_w.selectCenterView.hidden = [[userInfo stringValueForKey:@"gender" default:@""] isEqualToString:@"1"];
@@ -634,9 +634,9 @@
     [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#CD0302) range:[nameString.string rangeOfString:@"*"]];
     [nameString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#333333) range:[nameString.string rangeOfString:[subDict stringValueForKey:@"name" default:@""]]];
     self.nameLabel.attributedText = nameString;
-    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"联系电话"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
-    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
-    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
+    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系电话"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
+    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*年龄"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
+    self.contentField.keyboardType = [self.nameLabel.text isEqualToString:@"*联系方式"]?UIKeyboardTypeNumberPad:UIKeyboardTypeDefault;
     self.contentField.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
     self.contentField.hidden = ![subDict boolValueForKey:@"isTextField" default:YES];
     self.descTextView.placeholder = [subDict stringValueForKey:@"placeholder" default:@""];
@@ -205,24 +205,14 @@
     [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenPushWithParamDict:paramDict nbhdId:self.nbhdId CompleterBlock:^(CNLiveCommuntyActivityMaintainsCreateModel * _Nonnull createModel) {
         if (createModel) {
-            NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:weakSelf.navigationController.viewControllers];
-            for (UIViewController * vc in weakSelf.navigationController.viewControllers) {
-                if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
-                    [tempArray removeObject:vc];
-                    break;
-                }
-            }
-            self.navigationController.viewControllers = tempArray;
-            
             CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
             [weakSelf.navigationController pushViewController:vc animated:YES];
-            
+                    
 #ifdef DEBUG
             [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
             [[NSUserDefaults standardUserDefaults] synchronize];
 #else
 #endif
-            
         }
     }];
 }
@@ -48,6 +48,19 @@
     return self;
 }
+-(void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
+    for (UIViewController * vc in self.navigationController.viewControllers) {
+        if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
+            [tempArray removeObject:vc];
+            break;
+        }
+    }
+    self.navigationController.viewControllers = tempArray;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -84,7 +97,7 @@
             titleColor = UIColorHex(#0091FF);
         }
         if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
-            || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+            && [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"取消订单";
             titleColor = UIColorHex(#F5A623FF);
         }