0.1.1

liushiyu
1 parent ae9f1922
Showing 9 changed files with 46 additions and 65 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.h
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/main.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -254,7 +254,7 @@ MJCodingImplementation
             [tempDict addString:[NSString stringWithFormat:@"%@~%ld:00",startIntentString,[endIntentString integerValue]+2] forKey:@"value"];
             [self.infoArray addObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"createTime"] && [status isEqualToString:@"0"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"createTime"] && ([status isEqualToString:@"0"] || [status isEqualToString:@"1"] || [status isEqualToString:@"2"] || [status isEqualToString:@"3"])) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -262,7 +262,7 @@ MJCodingImplementation
             [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
             [self.processArray replaceObjectAtIndex:0 withObject:tempDict];
         }
-        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"repairTime"] && [status isEqualToString:@"1"]) {
+        if (![obj isEqualToString:@"<null>"] && [obj isNotBlank] && [key isEqualToString:@"repairTime"] && ([status isEqualToString:@"1"] || [status isEqualToString:@"3"])) {
             NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -292,8 +292,8 @@ MJCodingImplementation
         NSString * key = [subDict stringValueForKey:@"key" default:@""];
         if ([key isEqualToString:@"用户提交报修订单"] ) self.showType = 0;
         if ([key isEqualToString:@"维修人员已接单"]) self.showType = 1;
-        if ([key isEqualToString:@"完成维修并支付"]) self.showType = 2;
-        if ([key isEqualToString:@"用户取消报修订单"]) self.showType = 3;
+        if ([key isEqualToString:@"完成维修并支付"]) self.showType = 3;
+        if ([key isEqualToString:@"用户取消报修订单"]) self.showType = 2;
     }
     self.processArray = [[NSMutableArray alloc] initWithArray:[[self.processArray reverseObjectEnumerator] allObjects]];
 }
@@ -819,7 +819,7 @@
         _qrButton.layer.cornerRadius = 5;
         _qrButton.layer.masksToBounds = YES;
 //        _qrButton.enabled = NO;
-        [_qrButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#FD862E1A)] forState:UIControlStateNormal];
+        [_qrButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#FEF2EA)] forState:UIControlStateNormal];
         [_qrButton addTarget:self action:@selector(qrCreateAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _qrButton;
@@ -835,7 +835,7 @@
         _payButton.layer.cornerRadius = 5;
         _payButton.layer.masksToBounds = YES;
 //        _payButton.enabled = NO;
-        [_payButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#0091FF1A)] forState:UIControlStateNormal];
+        [_payButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#E5F4FF)] forState:UIControlStateNormal];
         [_payButton addTarget:self action:@selector(payCreateAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _payButton;
@@ -495,7 +495,7 @@
     self.lineLabel.hidden = ![repairModel.totalFee isNotBlank] || [repairModel.totalFee isEqualToString:@"0"];
     self.priceLabel.hidden = ![repairModel.totalFee isNotBlank] || [repairModel.totalFee isEqualToString:@"0"];
     self.nameLabel.text = [repairModel.repairName isNotBlank]?repairModel.repairName:@"";
-    self.priceLabel.text = [NSString stringWithFormat:@"合计：¥%.2f",[repairModel.totalFee floatValue]/100];
+    self.priceLabel.text = [NSString stringWithFormat:@"%.2f",([repairModel.totalFee integerValue]/100.0)];;
     self.dateLabel.text = [NSString stringWithFormat:@"下单时间:%@",repairModel.createTimeString];
     [_statueButton setTitle:repairModel.statusString forState:UIControlStateNormal];
     [_statueButton setTitleColor:![repairModel.status isEqualToString:@"3"]?UIColorHex(#FD862E):UIColorHex(#797979) forState:UIControlStateNormal];
@@ -11,8 +11,9 @@
 typedef enum : NSUInteger {
     CNLiveCommuntyOrderShowTypeListYetOrder = 0,//////列表已发起
     CNLiveCommuntyOrderShowTypeListReadyOrder,////列表处理中
-    CNLiveCommuntyOrderShowTypeListCompletOrder,//列表已完成
     CNLiveCommuntyOrderShowTypeListFailureOrder,//列表已失效
+    CNLiveCommuntyOrderShowTypeListCompletOrder,//列表已完成
+
     CNLiveCommuntyOrderShowTypeChatYetOrder,//聊天里面的未接单状态
     CNLiveCommuntyOrderShowTypeChatReadyOrder,//聊天里面的已接单状态
@@ -81,7 +81,7 @@
             if (createModel) {
                 weakSelf.createMdoel = createModel;
                 if (weakSelf.isChat) weakSelf.showType = weakSelf.createMdoel.showType;
-                if ([weakSelf.createMdoel.repairId isNotBlank] && ![weakSelf.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) weakSelf.showType = CNLiveCommuntyOrderShowTypeChatYetOrder;
+                if ([createModel.status isEqualToString:@"0"] && weakSelf.isChat) weakSelf.showType = CNLiveCommuntyOrderShowTypeChatYetOrder;
                 [weakSelf setupWithBottemView];
                 [weakSelf setupWithNaviView];
                 [weakSelf.tableView reloadData];
@@ -91,30 +91,9 @@
 }
 -(void)setupWithNaviView
 {
-    if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
-        NSString * name = @"";
-        UIColor * titleColor = [UIColor whiteColor];
-        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-            && ![self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
-            name = @"咨询电话";
-            titleColor = UIColorHex(#0091FF);
-        }
-        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-            && [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
-            name = @"取消订单";
-            titleColor = UIColorHex(#F5A623FF);
-        }
-        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
-            && [self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
-            name = @"取消订单";
-            titleColor = UIColorHex(#F5A623FF);
-        }
-        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
-            && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
-            return;
-        }
-        if ([self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) return;
+    if (([self.createMdoel.status isEqualToString:@"0"] && [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) || ([self.createMdoel.status isEqualToString:@"1"] && [self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid])) {
+        NSString * name = @"取消订单";
+        UIColor * titleColor = UIColorHex(#F5A623);
         UIButton * submiteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         submiteBtn.frame = CGRectMake(0, 0, 50, 14);
         [submiteBtn setTitle:name forState:UIControlStateNormal];
@@ -123,9 +102,6 @@
         submiteBtn.titleLabel.font = [UIFont systemFontOfSize:14];
         [submiteBtn addTarget:self action:@selector(rightBarButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:submiteBtn];
-        if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
-            self.navigationItem.rightBarButtonItem = nil;
-        }
     }else{
         self.navigationItem.rightBarButtonItem = nil;
     }
@@ -169,7 +145,7 @@
                 make.height.mas_equalTo(36);
             }];
         }
-        if ([self.createMdoel.repairId isNotBlank] && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+        if ([self.createMdoel.status isEqualToString:@"1"] && [self.createMdoel.repairId isNotBlank] && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             payString = @"已接单";
             self.payButton.backgroundColor = UIColorHex(#D7D7D7);
             self.payButton.userInteractionEnabled = NO;
@@ -209,10 +185,11 @@
     if ([button.titleLabel.text isEqualToString:@"取消订单"]) {
         [CNLiveCommuntSignUpView showAlertViewWithMessage:@"确定取消订单后，此订单将失效" CompleterBlock:^{
             [CNLiveCommuntViewModel requestWithCommuntyCancleOrderMentOrderId:weakSelf.createMdoel.idStr CompleterBlock:^{
-                weakSelf.showType = CNLiveCommuntyOrderShowTypeListFailureOrder;
-                [weakSelf setupWithBottemView];
-                [weakSelf setupWithNaviView];
-                [weakSelf.tableView reloadData];
+//                weakSelf.showType = CNLiveCommuntyOrderShowTypeListFailureOrder;
+//                [weakSelf setupWithBottemView];
+//                [weakSelf setupWithNaviView];
+//                [weakSelf.tableView reloadData];
+                [weakSelf reloadDataWithDataSource];
             }];
         }];
     }
@@ -227,9 +204,10 @@
                 weakSelf.showType = CNLiveCommuntyOrderShowTypeChatReadyOrder;
                 [button setTitle:@"取消接单" forState:UIControlStateNormal];
                 [button setTitle:@"取消接单" forState:UIControlStateHighlighted];
-                [weakSelf setupWithBottemView];
-                [weakSelf setupWithNaviView];
-                [weakSelf.tableView reloadData];
+//                [weakSelf setupWithBottemView];
+//                [weakSelf setupWithNaviView];
+//                [weakSelf.tableView reloadData];
+                [weakSelf reloadDataWithDataSource];
             }];
         }];
     }
@@ -239,9 +217,10 @@
                 weakSelf.showType = CNLiveCommuntyOrderShowTypeChatYetOrder;
                 [button setTitle:@"立即接单" forState:UIControlStateNormal];
                 [button setTitle:@"立即接单" forState:UIControlStateHighlighted];
-                [weakSelf setupWithBottemView];
-                [weakSelf setupWithNaviView];
-                [weakSelf.tableView reloadData];
+//                [weakSelf setupWithBottemView];
+//                [weakSelf setupWithNaviView];
+//                [weakSelf.tableView reloadData];
+                [weakSelf reloadDataWithDataSource];
             }];
         }];
     }
@@ -317,7 +296,7 @@
         if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) return 2;
         if (self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) return 2;
         if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3;
-        if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 1;
+        if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2;
         if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1;
         if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) return 2;
         if (self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) return 1;
@@ -328,12 +307,12 @@
 {
     if (self.createMdoel) {
         if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
-            || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder
-            || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
+            || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
             if (section == 0) return self.createMdoel.infoArray.count;
         }
         if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-            || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
+            || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
+            || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
             if (section == 0) return self.createMdoel.infoArray.count;
             if (section == 1) return self.createMdoel.processArray.count;
         }
@@ -352,12 +331,12 @@
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
+        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
         return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:self.createMdoel.infoArray[indexPath.row]];
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder) {
+        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
         if (indexPath.section == 0) return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:self.createMdoel.infoArray[indexPath.row]];
         if (indexPath.section == 1) return [CNLiveCommuntSignUpDetailViewCell setTableView:tableView isTop:indexPath.row == 0 isBottom:indexPath.row == (self.createMdoel.processArray.count - 1) Dict:self.createMdoel.processArray[indexPath.row]];
     }
@@ -378,14 +357,14 @@
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
+        || self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
         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) {
+        || self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
         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;
@@ -414,11 +393,11 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 50 : 0;
+    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 50 : 0;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
+    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
         UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 50)];
         view.backgroundColor = [UIColor clearColor];
@@ -453,11 +432,11 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {
-    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 10 : 0;
+    return section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2) ? 10 : 0;
 }
 -(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {
-    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
+    if (section == 0 || ((self.showType == CNLiveCommuntyOrderShowTypeListReadyOrder || self.showType == CNLiveCommuntyOrderShowTypeListYetOrder || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) && section == 1) || (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder && section == 2)) {
         UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
         view.backgroundColor = [UIColor clearColor];
@@ -286,10 +286,11 @@
         [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
             if (responseObject) {
                 CNLiveCommuntyActivityMaintainsCreateModel * createModel = [CNLiveCommuntyActivityMaintainsCreateModel mj_objectWithKeyValues:responseObject];
+                if (createModel.showType == 1 && [createModel.repairId isNotBlank] && ![createModel.userId isEqualToString:createModel.repairId]) createModel.showType = 0;
                 if (isChat && createModel.showType == 0) createModel.showType = 4;
                 if (isChat && createModel.showType == 1) createModel.showType = 5;
-                if (isChat && createModel.showType == 2) createModel.showType = 6;
                 if (isChat && createModel.showType == 3) createModel.showType = 6;
+//                if (isChat && createModel.showType == 3) createModel.showType = 6;
                 if (completerBlock) completerBlock(createModel);
             }else{
                 if (completerBlock) completerBlock(nil);
@@ -43,7 +43,7 @@
 {
     NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
     [mDict setValue:[CNUserInfoManager manager].userInfoModel.uid forKey:@"loginSid"];
-    [mDict setValue:@"com.cnlive.CNLiveNetAdd.debug" forKey:@"platform_id"];
+    [mDict setValue:@"com.cnlive.CNLiveNetAdd" forKey:@"platform_id"];
     [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
     [mDict setValue:@"i" forKey:@"plat"];
     [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
@@ -12,7 +12,7 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];
+        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveProductionAppStore];//CNLiveDebugAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }