0.0.8

liushiyu
1 parent e97fc403
Showing 12 changed files with 65 additions and 15 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
Example/CNLiveCommunitModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommunitModule'
-  s.version          = '0.0.7'
+  s.version          = '0.0.8'
   s.summary          = 'A short description of CNLiveCommunitModule.'
  
 # This description is used to generate tags and improve search results.
@@ -59,5 +59,5 @@
  
 static NSString *const kCNLiveCommuntyNBhdIdIdentifier = @"kCNLiveCommuntyNBhdIdIdentifier";
 static NSString *const kCNLiveCommuntyNBhdNameIdentifier = @"kCNLiveCommuntyNBhdNameIdentifier";
-
+static NSString *const kCNLiveCommuntyNBhdPhoneIdentifier = @"kCNLiveCommuntyNBhdPhoneIdentifier";
 #endif /* CNLiveCommunitHeader_h */
@@ -51,6 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *locality;
 @property (nonatomic, copy) NSString *address;
+@property (nonatomic, copy) NSString *propertyPhone;
 @end
  
 @interface CNLiveCommuntyActivityHomeListModel : NSObject
@@ -126,6 +126,9 @@ MJCodingImplementation
             self.imgUrl = oldValue;
         }
     }
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"amount"]) {
+        oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+    }
     return oldValue;
 }
  
@@ -366,6 +369,9 @@ MJCodingImplementation
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.signupEndTimeString = [dateFormatter stringFromDate:detaildate];
     }
+    if ([oldValue isNotBlank] && [property.name isEqualToString:@"unitPrice"]) {
+        oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+    }
     return oldValue;
 }
  
@@ -542,6 +548,9 @@ MJCodingImplementation
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
             self.updateTimeString = [dateFormatter stringFromDate:detaildate];
         }
+        if ([oldValue isNotBlank] && [property.name isEqualToString:@"unitPrice"]) {
+            oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+        }
     }
  
     return oldValue;
@@ -69,9 +69,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel * cententLabel;
 @property (nonatomic, strong) WKWebView * webView;
  
+@property (nonatomic, copy) void(^reloadWebViewBlock)(CGFloat viewHeight);
 @property (nonatomic, copy) NSString * desc;
  
-+(CNLiveCommuntSignUpTextViewCell *)setTableView:(UITableView *)tableView Desc:(NSString *)desc;
++(CNLiveCommuntSignUpTextViewCell *)setTableView:(UITableView *)tableView Desc:(NSString *)desc ReloadWebViewBlock:(void(^)(CGFloat viewHeight))reloadWebViewBlock;
 @end
  
 @interface CNLiveCommuntSignUpOrderViewCell : UITableViewCell
@@ -357,12 +357,13 @@
  
 @implementation CNLiveCommuntSignUpTextViewCell
  
-+(CNLiveCommuntSignUpTextViewCell *)setTableView:(UITableView *)tableView Desc:(nonnull NSString *)desc
++(CNLiveCommuntSignUpTextViewCell *)setTableView:(UITableView *)tableView Desc:(nonnull NSString *)desc ReloadWebViewBlock:(nonnull void (^)(CGFloat))reloadWebViewBlock
 {
     CNLiveCommuntSignUpTextViewCell * textCell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveCommuntSignUpTextViewCell"];
     if (!textCell) {
         textCell = [[CNLiveCommuntSignUpTextViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveCommuntSignUpTextViewCell"];
     }
+    textCell.reloadWebViewBlock = reloadWebViewBlock;
     textCell.desc = desc;
     return textCell;
 }
@@ -417,7 +418,7 @@
         _webView.allowsBackForwardNavigationGestures = NO;//打开网页间的 滑动返回
         _webView.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal;
         if (@available(iOS 9.0, *)) _webView.allowsLinkPreview = NO;
-        
+        _webView.scrollView.bounces = NO;
     }
     return _webView;
 }
@@ -851,7 +852,16 @@
         [_phoneButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communty_order_phone"] forState:UIControlStateNormal];
         [_phoneButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communty_order_phone"] forState:UIControlStateHighlighted];
     }
-
+}
+-(void)phoneAction
+{
+    UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+    [alert addAction:[UIAlertAction actionWithTitle:self.createModel.mobile style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",self.createModel.mobile];
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str] options:@{} completionHandler:NULL];
+    }]];
+    [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL]];
+    [[self displayViewController] presentViewController:alert animated:YES completion:nil];
 }
 -(void)layoutSubviews
 {
@@ -905,6 +915,7 @@
         _phoneButton.titleLabel.font = [UIFont boldSystemFontOfSize:12];
         _phoneButton.imagePosition = QMUIButtonImagePositionLeft;
         _phoneButton.spacingBetweenImageAndTitle = 3;
+        [_phoneButton addTarget:self action:@selector(phoneAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _phoneButton;
 }
@@ -723,7 +723,7 @@
 {
     NSString * name = [self.subDict stringValueForKey:@"name" default:@""];
     if ([name isEqualToString:@"联系人"] && textField.text.length > 15) {
-        [QMUITips showWithText:@"联系人限制20个以内,超出将进行截取" inView:([UIApplication sharedApplication].delegate).window hideAfterDelay:1.5];
+        [QMUITips showWithText:@"联系人限制15个以内,超出将进行截取" inView:([UIApplication sharedApplication].delegate).window hideAfterDelay:1.5];
         textField.text = [textField.text substringAtRange:NSMakeRange(0, 15)];
     }
     if ([name isEqualToString:@"联系地址"] && textField.text.length > 50) {
@@ -103,7 +103,9 @@
 }
 -(UIView *)setTableViewFooterView
 {
-    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 90)];
+    NSString * phone = [[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdPhoneIdentifier];
+    
+    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, [phone isNotBlank]?90:70)];
     footerView.backgroundColor = [UIColor whiteColor];
  
     YYLabel * phoneLabel = [[YYLabel alloc] initWithFrame:CGRectMake(0, 5, kScreenWidth, 20)];
@@ -111,18 +113,25 @@
     phoneLabel.textAlignment = NSTextAlignmentCenter;
     phoneLabel.textVerticalAlignment = YYTextVerticalAlignmentCenter;
     phoneLabel.numberOfLines = 0;
+    phoneLabel.hidden = ![phone isNotBlank];
     phoneLabel.backgroundColor = [UIColor whiteColor];
-    
-    NSString * string = @"您也可以拨打物业电话 400-9001933";
+
+    NSString * string = [NSString stringWithFormat:@"您也可以拨打物业电话 %@",phone];
     NSMutableAttributedString *textAttributedString = [[NSMutableAttributedString alloc] initWithString:string];
     textAttributedString.yy_font = [UIFont systemFontOfSize:10];
     textAttributedString.yy_color = UIColorHex(#B4B4B4);
     textAttributedString.yy_alignment = NSTextAlignmentCenter;
-    [textAttributedString yy_setTextHighlightRange:[string rangeOfString:@"400-9001933"]
+    [textAttributedString yy_setTextHighlightRange:[string rangeOfString:phone]
                                           color:[UIColor qmui_colorWithHexString:@"0091FF"]
                                 backgroundColor:[UIColor qmui_colorWithHexString:@"0091FF"]
                                       tapAction:^(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect){
-        NSLog(@"点击电话了");
+        UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        [alert addAction:[UIAlertAction actionWithTitle:phone style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",phone];
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str] options:@{} completionHandler:NULL];
+        }]];
+        [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL]];
+        [[self displayViewController] presentViewController:alert animated:YES completion:nil];
                                       }];
     phoneLabel.attributedText = textAttributedString;
     [footerView addSubview:phoneLabel];
@@ -11,6 +11,7 @@
 @property (nonatomic, strong) CNLiveCommuntyActivityDetailModel * detailModel;
 @property (nonatomic, strong) NSMutableArray * userArray;
 @property (nonatomic, copy) NSString * activityId;
+@property (nonatomic, assign) CGFloat viewHeight;
 @end
  
 @implementation CNLiveCommuntSignUpViewController
@@ -21,6 +22,7 @@
 {
     self = [super initWithStyle:style];
     if (self) {
+        _viewHeight = 0.0;
         _activityId = activityId;
     }
     return self;
@@ -160,7 +162,7 @@
             CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
-            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.order.idStr price:weakSelf.detailModel.unitPrice body:weakSelf.detailModel.name];
+            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.order.idStr price:[NSString stringWithFormat:@"%.2f",(weakSelf.userArray.count * [weakSelf.detailModel.unitPrice floatValue])] body:weakSelf.detailModel.name];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payResultSuccessNNotification:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
         }
     }];
@@ -226,7 +228,11 @@
         userView.delegate = self;
         return userView;
     }else{
-        return [CNLiveCommuntSignUpTextViewCell setTableView:tableView Desc:self.detailModel.processDesc];
+        __weak typeof(self) weakSelf = self;
+        return [CNLiveCommuntSignUpTextViewCell setTableView:tableView Desc:self.detailModel.processDesc ReloadWebViewBlock:^(CGFloat viewHeight) {
+            weakSelf.viewHeight = viewHeight;
+            [weakSelf.tableView reloadData];
+        }];
     }
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -141,6 +141,8 @@
         [[NSUserDefaults standardUserDefaults] synchronize];
         [[NSUserDefaults standardUserDefaults] setObject:listModel.name forKey:kCNLiveCommuntyNBhdNameIdentifier];
         [[NSUserDefaults standardUserDefaults] synchronize];
+        [[NSUserDefaults standardUserDefaults] setObject:listModel.propertyPhone forKey:kCNLiveCommuntyNBhdPhoneIdentifier];
+        [[NSUserDefaults standardUserDefaults] synchronize];
         CNLiveCommuntViewController * homeView = [[CNLiveCommuntViewController alloc] initWithNBhdId:listModel.idStr];
         [self.navigationController pushViewController:homeView animated:YES];
  
@@ -161,7 +161,13 @@
 {
     MJWeakSelf
     if ([button.titleLabel.text isEqualToString:@"咨询电话"]) {
-        
+        UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        [alert addAction:[UIAlertAction actionWithTitle:self.createMdoel.phone style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",self.createMdoel.phone];
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str] options:@{} completionHandler:NULL];
+        }]];
+        [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL]];
+        [[self displayViewController] presentViewController:alert animated:YES completion:nil];
     }
     if ([button.titleLabel.text isEqualToString:@"取消订单"]) {
         [CNLiveCommuntSignUpView showAlertViewWithMessage:@"确定取消订单后，此订单将失效" CompleterBlock:^{
@@ -78,6 +78,11 @@
         if (array.count != idx+1) [picString appendString:@","];
     }];
     NSLog(@"===>%@",picString);
+    NSString * oldValue = @"1";
+    oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+    float unitPrice = [oldValue floatValue];
+    NSString * p = [NSString stringWithFormat:@"合计: ¥%.2f",(8 * unitPrice)];
+    NSLog(@"%@  =>%f ==>%@",oldValue,unitPrice,p);
 }
  
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView