0.0.2

liushiyu
1 parent 4cebb17b
Showing 8 changed files with 42 additions and 20 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -231,6 +231,11 @@ MJCodingImplementation
             [tempDict addString:obj forKey:@"value"];
             [self.infoArray addObject:tempDict];
         }
+        if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"remark"]) {//问题描述
+            [tempDict addString:@"问题描述" forKey:@"key"];
+            [tempDict addString:obj forKey:@"value"];
+            [self.infoArray addObject:tempDict];
+        }
         if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"intentBeginTime"]) {//联系地址
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
@@ -493,7 +493,8 @@
     [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
         make.width.mas_equalTo(65);
-        make.top.bottom.mas_equalTo(weakSelf.mainView);
+        make.height.mas_equalTo(30);
+        make.top.mas_equalTo(weakSelf.mainView.mas_top);
     }];
     [self.cententLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(weakSelf.nameLabel.mas_right);
@@ -537,7 +538,7 @@
         _cententLabel.textColor = UIColorHex(#333333);
         _cententLabel.backgroundColor = UIColorHex(#F9F9F9);
         _cententLabel.lineBreakMode = NSLineBreakByCharWrapping;
-        _cententLabel.numberOfLines = 1;
+        _cententLabel.numberOfLines = 0;
         _cententLabel.font = [UIFont systemFontOfSize:15];
         _cententLabel.font = [UIFont boldSystemFontOfSize:15];
@@ -212,7 +212,7 @@
     self.dateLabel.text = recoredModel.createTimeString;
     self.nameLabel.text = recoredModel.handworkName;
     self.descLabel.text = [NSString stringWithFormat:@"%@  %@",recoredModel.name,recoredModel.mobile];
-    self.priceLabel.text = [recoredModel.amount isNotBlank]?[NSString stringWithFormat:@"%@.00",recoredModel.amount]:@"0.00";
+    self.priceLabel.text = [recoredModel.amount isNotBlank]?[NSString stringWithFormat:@"%@.00",recoredModel.amount]:@"";
     if ([recoredModel.index isEqualToString:@"3"]) {
         self.evalButton.layer.cornerRadius = 10;
         self.evalButton.layer.masksToBounds = YES;
@@ -583,7 +583,10 @@
 -(void)setSubDict:(NSDictionary *)subDict
 {
     _subDict = subDict;
-    self.nameLabel.text = [subDict stringValueForKey:@"name" default:@""];
+    NSMutableAttributedString * nameString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"*%@",[subDict stringValueForKey:@"name" default:@""]]];
+    [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;
@@ -649,7 +652,7 @@
     __weak typeof(self) weakSelf = self;
     [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.mas_equalTo(weakSelf.contentView).offset(15);
-        make.width.mas_equalTo(70);
+        make.width.mas_equalTo(75);
     }];
     [self.contentField mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(weakSelf.contentView);
@@ -797,7 +800,6 @@
         _nameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _nameLabel.numberOfLines = 1;
         _nameLabel.font = [UIFont systemFontOfSize:16];
-        _nameLabel.text = @"联系人";
     }
     return _nameLabel;
 }
@@ -162,7 +162,7 @@
         if (i == 1) [paramDict addString:[userCell.contentField.text isNotBlank]?userCell.contentField.text:@"" forKey:@"address"];
         if (i == 2) {
             NSString * phone = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
-            if ([phone isNotBlank]) {
+            if ([phone isNotBlank] && phone.length == 11) {
                 [paramDict addString:phone forKey:@"phone"];
             }else{
                 [QMUITips showWithText:@"联系电话填写错误"];
@@ -332,19 +332,33 @@
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
         || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder
         || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
-        return 30;
+        NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
+        CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
+        return height > 30 ? height : 30;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
         || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
-        if (indexPath.section == 0) return 30;
+        if (indexPath.section == 0) {
+            NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
+            CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
+            return height > 30 ? height : 30;
+        }
         if (indexPath.section == 1) return 70;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
-        if (indexPath.section == 0) return 30;
+        if (indexPath.section == 0) {
+            NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
+            CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
+            return height > 30 ? height : 30;
+        }
         if (indexPath.section == 1) return 130;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) {
-        if (indexPath.section == 0) return 30;
+        if (indexPath.section == 0) {
+            NSDictionary * subDict = self.createMdoel.infoArray[indexPath.row];
+            CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
+            return height > 30 ? height : 30;
+        }
         if (indexPath.section == 1) return 60;
         if (indexPath.section == 2) return 70;
     }
@@ -106,11 +106,11 @@
         }
         if (i == 3) {
             NSString * phone = [userCell.contentField.text isNotBlank]?userCell.contentField.text:@"";
-            if (![phone isNotBlank] || phone.length < 6) {
+            if (![phone isNotBlank] || phone.length == 11) {
+                [paramDict addString:phone forKey:@"mobile"];
+            }else{
                 [QMUITips showWithText:@"联系电话填写错误"];
                 return;
-            }else{
-                [paramDict addString:phone forKey:@"mobile"];
             }
         }
     }
@@ -114,11 +114,11 @@
         [[CNLiveCommuntyModule shareInstance] pushCommuntyHomeViewMethod];
     }
     if (indexPath.row == 1) {
-//        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
-//        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
-//        [self.navigationController pushViewController:recordVC animated:YES];
-        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
+        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
+        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
+        [self.navigationController pushViewController:recordVC animated:YES];
+//        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
     }
     if (indexPath.row == 2) {
         CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];