0.1.0

liushiyu
1 parent 480e4d11
Showing 6 changed files with 36 additions and 12 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.9'
+  s.version          = '0.1.0'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -609,7 +609,7 @@
     _createModel = createModel;
     if ([createModel.totalFee isNotBlank]
         && [createModel.totalFee integerValue] > 0) {
-        NSString * p = [NSString stringWithFormat:@"%.2f",([createModel.totalFee floatValue]/100)];
+        NSString * p = [NSString stringWithFormat:@"%.2f",([createModel.totalFee integerValue]/100.0)];
         self.amoutField.text = p;
         self.amoutField.enabled = NO;
         self.amoutField.textColor = UIColorHex(#c8c8c8);
@@ -53,7 +53,7 @@
     if (!_evaluaDescLabel) {
         _evaluaDescLabel = [[UILabel alloc] init];
         _evaluaDescLabel.backgroundColor = [UIColor whiteColor];
-        _evaluaDescLabel.font = [UIFont systemFontOfSize:11];
+        _evaluaDescLabel.font = [UIFont systemFontOfSize:13];
         _evaluaDescLabel.numberOfLines = 1;
         _evaluaDescLabel.lineBreakMode = NSLineBreakByTruncatingTail;
     }
@@ -565,6 +565,7 @@
         [_statueButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communt_list_more"] forState:UIControlStateNormal];
         _statueButton.imagePosition = QMUIButtonImagePositionRight;
         _statueButton.spacingBetweenImageAndTitle = 2.5;
+        _statueButton.userInteractionEnabled = NO;
         _statueButton.titleLabel.font = [UIFont systemFontOfSize:12];
         [_statueButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
     }
@@ -51,7 +51,9 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
+    if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
         NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
         for (UIViewController * vc in self.navigationController.viewControllers) {
             if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
@@ -437,18 +437,39 @@
 /// @param completerBlock 返回结果
 +(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave isNew:(BOOL)isNew CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock
 {
-    NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey06",[CNUserInfoManager manager].userInfoModel.uid];
+    NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey07",[CNUserInfoManager manager].userInfoModel.uid];
     if (isSave) {
         if ([userDict allKeys].count > 0 && [userDict allValues].count > 0) {
             NSString * save_string = [NSString stringWithFormat:@"%@",[CNLiveRespCacheManager objectCacheWithFileName:cacheKey]];
             NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:[save_string mj_JSONObject]];
             if (![userDict containsObjectForKey:@"id"] && isNew) {
-                NSString *timeSp = [NSString stringWithFormat:@"%ld",(long)[[NSDate date] timeIntervalSince1970]];
-                NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] initWithDictionary:userDict];
-                [tempDict addString:timeSp forKey:@"id"];
-                [tempArray addObject:tempDict];
-                NSString * user_info = [tempArray mj_JSONString];
-                [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
+                BOOL isEqual = NO;
+                NSString * i_nameString = [userDict stringValueForKey:@"name" default:@""];
+                NSString * i_sexString = [userDict stringValueForKey:@"gender" default:@""];
+                NSString * i_ageString = [userDict stringValueForKey:@"age" default:@""];
+                NSString * i_mobileString = [userDict stringValueForKey:@"mobile" default:@""];
+                for (NSDictionary * subDict in tempArray) {
+                    NSString * o_nameString = [subDict stringValueForKey:@"name" default:@""];
+                    NSString * o_sexString = [subDict stringValueForKey:@"gender" default:@""];
+                    NSString * o_ageString = [subDict stringValueForKey:@"age" default:@""];
+                    NSString * o_mobileString = [subDict stringValueForKey:@"mobile" default:@""];
+                    if ([i_nameString isEqualToString:o_nameString]
+                        && [i_sexString isEqualToString:o_sexString]
+                        && [i_ageString isEqualToString:o_ageString]
+                        && [i_mobileString isEqualToString:o_mobileString]) {
+                        isEqual = YES;
+                        break;
+                    }
+                }
+                if (!isEqual) {
+                    NSString *timeSp = [NSString stringWithFormat:@"%ld",(long)[[NSDate date] timeIntervalSince1970]];
+                    NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] initWithDictionary:userDict];
+                    [tempDict addString:timeSp forKey:@"id"];
+                    [tempArray addObject:tempDict];
+                    NSString * user_info = [tempArray mj_JSONString];
+                    [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
+                }
+                
                 if (completerBlock) completerBlock(@[],isSave);
             }else{
                 NSString * idStr = [userDict stringValueForKey:@"id" default:@""];
@@ -24,7 +24,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
+    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];