0.0.7

liushiyu
1 parent 4889f46b
Showing 8 changed files with 40 additions and 15 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntActiviViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntServiceViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommunitModule'
-  s.version          = '0.0.6'
+  s.version          = '0.0.7'
   s.summary          = 'A short description of CNLiveCommunitModule.'
 # This description is used to generate tags and improve search results.
@@ -250,7 +250,7 @@
 }
 -(void)evalContentButton:(UIButton *)button
 {
-    if ([self.recoredModel.index isEqualToString:@"1"]) {
+    if ([self.recoredModel.index isEqualToString:@"3"]) {
         CNLiveCommuntEvaluaViewController * evaluaView = [[CNLiveCommuntEvaluaViewController alloc] initWithRecord:self.recoredModel];
         [[self displayViewController].navigationController pushViewController:evaluaView animated:YES];
     }
@@ -30,12 +30,14 @@
 }
 - (void)dealloc
 {
-    UIViewController *vc = self.childViewControllers[0];
-    if (([self searchProperties:[vc class] string:@"webView"] || [self searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
-        WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
-        if ([webView.scrollView valueForKey:@"mj_header"]) {
-            id header = [webView.scrollView valueForKey:@"mj_header"];
-                [header removeObserver:self forKeyPath:@"state"];
+    if (self.childViewControllers.count > 0) {
+        UIViewController *vc = self.childViewControllers[0];
+        if (([self searchProperties:[vc class] string:@"webView"] || [self searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
+            WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
+            if ([webView.scrollView valueForKey:@"mj_header"]) {
+                id header = [webView.scrollView valueForKey:@"mj_header"];
+                    [header removeObserver:self forKeyPath:@"state"];
+            }
         }
     }
 }
@@ -52,7 +52,10 @@
     }
     return self;
 }
-
+-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self.view endEditing:YES];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -188,6 +191,7 @@
 -(void)submiteAction:(UIButton *)button
 {
     __weak typeof(self) weakSelf = self;
+    [self.view endEditing:YES];
     if (self.imageArray.count == 0) {
         [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:self.recordModel.idStr handworkId:self.recordModel.handworkId comment:self.evaluaView.text imgs:@"" isAnonymity:self.isAnonymity CompleterBlock:^{
             [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
@@ -227,6 +231,7 @@
 {
     if (self.imageArray.count >= index + 1) return;
     __weak typeof(self) weakSelf = self;
+    [self.view endEditing:YES];
     [self.view createAlertViewTitleArray:@[@"拍摄",@"从手机相册选择"] subTitleArr:@[@"",@""] textColor:UIColorMake(40, 40, 40) subTitleColor:UIColorMake(152, 152, 152) font:UIFontMake(15) subFont:UIFontMake(12) actionBlock:^(UIButton *button, NSInteger didRow) {
         switch (didRow) {
             case 0:
@@ -42,7 +42,19 @@
     }
     return self;
 }
-
+- (void)dealloc
+{
+    if (self.childViewControllers.count > 0) {
+        UIViewController *vc = self.childViewControllers[0];
+        if (([self searchProperties:[vc class] string:@"collectionView"] || [self searchProperties:[vc.superclass class] string:@"collectionView"])&&[vc valueForKey:@"collectionView"]&&[[vc valueForKey:@"collectionView"] isKindOfClass:[UICollectionView class]]) {
+            UICollectionView *collectionView = (UICollectionView *)[vc valueForKey:@"collectionView"];
+            if ([collectionView valueForKey:@"mj_header"]) {
+                id header = [collectionView valueForKey:@"mj_header"];
+                    [header removeObserver:self forKeyPath:@"state"];
+            }
+        }
+    }
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -154,7 +154,7 @@
 {
     __weak typeof(self) weakSelf = self;
     [CNLiveCommuntViewModel requestWithCommuntySingUpOrderMentHandworkId:self.detailModel.idStr Ussers:self.userArray CompleterBlock:^(CNLiveCommuntyActivitySignUpModel * _Nonnull signUpModel) {
-        float unitPrice = [weakSelf.detailModel.unitPrice floatValue];
+        float unitPrice = [weakSelf.detailModel.unitPrice floatValue] * weakSelf.userArray.count;
         if (unitPrice == 0.00) {
             NSString * handworkId = weakSelf.detailModel.idStr;
             CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
@@ -128,6 +128,15 @@
     CNLiveCommuntyHomeListModel * listModel = self.dataSource[indexPath.row];
     if (listModel && [listModel.idStr isNotBlank]) {
+        NSMutableArray * tempArray01 = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
+        for (UIViewController * vc in self.navigationController.viewControllers) {
+            if ([vc isKindOfClass:CNLiveCommuntViewController.class]) {
+                [tempArray01 removeObject:vc];
+            }
+        }
+        self.navigationController.viewControllers = tempArray01;
+
+        
         [[NSUserDefaults standardUserDefaults] setObject:listModel.idStr forKey:kCNLiveCommuntyNBhdIdIdentifier];
         [[NSUserDefaults standardUserDefaults] synchronize];
         [[NSUserDefaults standardUserDefaults] setObject:listModel.name forKey:kCNLiveCommuntyNBhdNameIdentifier];
@@ -140,9 +149,6 @@
             if ([vc isKindOfClass:CNLiveCommuntyHomeListViewController.class]) {
                 [tempArray removeObject:vc];
             }
-            if ([vc isKindOfClass:CNLiveCommuntViewController.class]) {
-                [tempArray removeObject:vc];
-            }
         }
         self.navigationController.viewControllers = tempArray;
     }
@@ -68,7 +68,7 @@
             make.height.mas_equalTo(50+kVerticalBottomSafeHeight);
         }];
-        NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: %.2f元",(self.detailModel.signupVoList.count * [self.detailModel.unitPrice floatValue])/2]];
+        NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: %.2f元",(self.detailModel.signupVoList.count * [self.detailModel.unitPrice floatValue])]];
         [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#222833) range:[str.string rangeOfString:@"合计: "]];
         [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
         [str addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];