iOS Team / CNLiveCommuntyModule · Commits

Commit ae9f19228bd6e503c9c89a622f5491f0b617e830

Authored by liushiyu
1 parent 480e4d11

0.1.0

Inline Side-by-side
Showing 6 changed files with 36 additions and 12 deletions
CNLiveCommuntyModule.podspec
  View file @ae9f192
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveCommuntyModule'
11   - s.version = '0.0.9'
  11 + s.version = '0.1.0'
12 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
  View file @ae9f192
... ... @@ -609,7 +609,7 @@
609 609 _createModel = createModel;
610 610 if ([createModel.totalFee isNotBlank]
611 611 && [createModel.totalFee integerValue] > 0) {
612   - NSString * p = [NSString stringWithFormat:@"%.2f",([createModel.totalFee floatValue]/100)];
  612 + NSString * p = [NSString stringWithFormat:@"%.2f",([createModel.totalFee integerValue]/100.0)];
613 613 self.amoutField.text = p;
614 614 self.amoutField.enabled = NO;
615 615 self.amoutField.textColor = UIColorHex(#c8c8c8);
... ...
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
  View file @ae9f192
... ... @@ -53,7 +53,7 @@
53 53 if (!_evaluaDescLabel) {
54 54 _evaluaDescLabel = [[UILabel alloc] init];
55 55 _evaluaDescLabel.backgroundColor = [UIColor whiteColor];
56   - _evaluaDescLabel.font = [UIFont systemFontOfSize:11];
  56 + _evaluaDescLabel.font = [UIFont systemFontOfSize:13];
57 57 _evaluaDescLabel.numberOfLines = 1;
58 58 _evaluaDescLabel.lineBreakMode = NSLineBreakByTruncatingTail;
59 59 }
... ... @@ -565,6 +565,7 @@
565 565 [_statueButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communt_list_more"] forState:UIControlStateNormal];
566 566 _statueButton.imagePosition = QMUIButtonImagePositionRight;
567 567 _statueButton.spacingBetweenImageAndTitle = 2.5;
  568 + _statueButton.userInteractionEnabled = NO;
568 569 _statueButton.titleLabel.font = [UIFont systemFontOfSize:12];
569 570 [_statueButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
570 571 }
... ...
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @ae9f192
... ... @@ -51,7 +51,9 @@
51 51 -(void)viewDidAppear:(BOOL)animated
52 52 {
53 53 [super viewDidAppear:animated];
54   - if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
  54 + if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
  55 + || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
  56 + || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
55 57 NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:self.navigationController.viewControllers];
56 58 for (UIViewController * vc in self.navigationController.viewControllers) {
57 59 if ([vc isKindOfClass:CNLiveCommuntInformViewController.class]) {
... ...
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
  View file @ae9f192
... ... @@ -437,18 +437,39 @@
437 437 /// @param completerBlock 返回结果
438 438 +(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave isNew:(BOOL)isNew CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock
439 439 {
440   - NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey06",[CNUserInfoManager manager].userInfoModel.uid];
  440 + NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey07",[CNUserInfoManager manager].userInfoModel.uid];
441 441 if (isSave) {
442 442 if ([userDict allKeys].count > 0 && [userDict allValues].count > 0) {
443 443 NSString * save_string = [NSString stringWithFormat:@"%@",[CNLiveRespCacheManager objectCacheWithFileName:cacheKey]];
444 444 NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:[save_string mj_JSONObject]];
445 445 if (![userDict containsObjectForKey:@"id"] && isNew) {
446   - NSString *timeSp = [NSString stringWithFormat:@"%ld",(long)[[NSDate date] timeIntervalSince1970]];
447   - NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] initWithDictionary:userDict];
448   - [tempDict addString:timeSp forKey:@"id"];
449   - [tempArray addObject:tempDict];
450   - NSString * user_info = [tempArray mj_JSONString];
451   - [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
  446 + BOOL isEqual = NO;
  447 + NSString * i_nameString = [userDict stringValueForKey:@"name" default:@""];
  448 + NSString * i_sexString = [userDict stringValueForKey:@"gender" default:@""];
  449 + NSString * i_ageString = [userDict stringValueForKey:@"age" default:@""];
  450 + NSString * i_mobileString = [userDict stringValueForKey:@"mobile" default:@""];
  451 + for (NSDictionary * subDict in tempArray) {
  452 + NSString * o_nameString = [subDict stringValueForKey:@"name" default:@""];
  453 + NSString * o_sexString = [subDict stringValueForKey:@"gender" default:@""];
  454 + NSString * o_ageString = [subDict stringValueForKey:@"age" default:@""];
  455 + NSString * o_mobileString = [subDict stringValueForKey:@"mobile" default:@""];
  456 + if ([i_nameString isEqualToString:o_nameString]
  457 + && [i_sexString isEqualToString:o_sexString]
  458 + && [i_ageString isEqualToString:o_ageString]
  459 + && [i_mobileString isEqualToString:o_mobileString]) {
  460 + isEqual = YES;
  461 + break;
  462 + }
  463 + }
  464 + if (!isEqual) {
  465 + NSString *timeSp = [NSString stringWithFormat:@"%ld",(long)[[NSDate date] timeIntervalSince1970]];
  466 + NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] initWithDictionary:userDict];
  467 + [tempDict addString:timeSp forKey:@"id"];
  468 + [tempArray addObject:tempDict];
  469 + NSString * user_info = [tempArray mj_JSONString];
  470 + [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
  471 + }
  472 +
452 473 if (completerBlock) completerBlock(@[],isSave);
453 474 }else{
454 475 NSString * idStr = [userDict stringValueForKey:@"id" default:@""];
... ...
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
  View file @ae9f192
... ... @@ -24,7 +24,7 @@
24 24 [IQKeyboardManager sharedManager].enable = YES;
25 25 [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
26 26  
27   - [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
  27 + [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"10458139";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
28 28  
29 29 // [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
30 30 // [[NSUserDefaults standardUserDefaults] synchronize];
... ...