提交最新更改

ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,53 +13,5 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ColorfulSchool/Classes/JTJY(&#x91d1;&#x56fe;&#x6559;&#x80b2;)/ZXJTJYViewController.m"
-            timestampString = "583656856.343848"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "124"
-            endingLineNumber = "124"
-            landmarkName = "-webView:didFailNavigation:withError:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ColorfulSchool/Classes/NewFirstPage(&#x65b0;&#x7248;&#x9996;&#x9875;)/Controllers/ZTHomeViewController+Extension.m"
-            timestampString = "585484152.378459"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "346"
-            endingLineNumber = "346"
-            landmarkName = "-firstPageJumpActionWithInfo:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ColorfulSchool/Classes/Operation(&#x81ea;&#x52a9;&#x670d;&#x52a1;)/appointmentBath(&#x9884;&#x7ea6;&#x6d17;&#x6d74;)/ViewModel/ZXAppointBathService.m"
-            timestampString = "585499296.668223"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "225"
-            endingLineNumber = "225"
-            landmarkName = "+dealAccountActionWithOperationMode:isBlueBath:completed:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ColorfulSchool/ColorfulSchool/Classes/AD(广告)/ZXAdTool.m

-//
+//
@@ -103,7 +103,9 @@
         [ZXUMStatisticsManager statisticsLauchAdExposeByAdId:model.zx_id source:model.platformSource];
         //外部曝光
         if ([model.showAddressIos containsString:@"http"]) {
-            [ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[ZXTool formatJumpUrl:model.showAddressIos] para:nil completed:nil];
+            [ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodGET url:[ZXTool formatJumpUrl:model.showAddressIos] para:nil completed:^(CommonModel *common, NSString *error) {
+                
+            }];
         }
         if ([[kUserDefaults valueForKey:@"isNeedExposure"] isEqualToString:@"1"]) {
             return;
@@ -115,10 +117,8 @@
         //内部曝光
         NSString *url = [NSString stringWithFormat:@"%@/app/adsenseCollectData/adsenseCollectData4Add",[kUserDefaults valueForKey:@"Ad"]];
         [ZXTool requestDataHideLoadingToastWithType:kXMHTTPMethodPOST url:url para:dic completed:^(CommonModel *common, NSString *error) {
-        }];
-        
-        
             
+        }];
     });
 }
 #pragma mark - 广告的点击

ColorfulSchool/ColorfulSchool/Classes/Config(配置)/APIManager.m

-//
+//
@@ -46,18 +46,22 @@ kSINGLETON_FOR_CLASS(APIManager)
             
             [userDefaults setObject:@"http://192.168.1.173:9091" forKey:@"BOOK"];
             [userDefaults setObject:@"http://ex-dev-dcxy-customer-app.168cad.top" forKey:@"NEW_PAY"];
-//            [userDefaults setObject:@"http://192.168.1.173:9095" forKey:@"SX_MONEY"];
+
             [userDefaults setObject:@"http://ex-dev-dcxy-base-app.168cad.top" forKey:@"SX_MONEY"];
             [userDefaults setValue:@"http://121.15.180.66:801/netpayment/BaseHttp.dll?MB_EUserPay" forKey:@"YWT_PAY"];
-//            [userDefaults setObject:@"http://192.168.3.55:8888" forKey:@"BATH"];
+
             [userDefaults setObject:@"http://ex-shower-app-server.168cad.top" forKey:@"BATH"];
+            //蓝牙洗浴socket连接地址和端口号
+            [userDefaults setObject:@"hard-tcp-server.nat123.net" forKey:@"BATHSocketUrl"];
+            [userDefaults setObject:@"29800" forKey:@"BATHSocketPort"];
+
             [userDefaults setObject:@"http://ex-shower-app-server.168cad.top" forKey:@"AppointBATH"];
-//            [userDefaults setObject:@"http://192.168.3.57:8880" forKey:@"AppointBATH"];
 
             [userDefaults setObject:@"http://ex-dev-dcxy-home-app.168cad.top" forKey:@"HomePage"];
             [userDefaults setObject:@"http://ex-dev-other-device-app.168cad.top" forKey:@"DCWash"];
 //            [userDefaults setObject:@"http://192.168.100.112:8888" forKey:@"DCWash"];
-   
+            [userDefaults setObject:@"8197" forKey:@"DCWashSocketPort"];
+            [userDefaults setObject:@"2081ad8ddc23576.natapp.cc" forKey:@"DCWashSocketUrl"];
             [userDefaults synchronize];
             break;
         }
@@ -87,9 +91,15 @@ kSINGLETON_FOR_CLASS(APIManager)
             [userDefaults setObject:@"http://ex-test-dcxy-base-app.168cad.top" forKey:@"SX_MONEY"];
             [userDefaults setValue:@"https://netpay.cmbchina.com/netpayment/BaseHttp.dll?MB_EUserPay" forKey:@"YWT_PAY"];
             [userDefaults setObject:@"http://in-test-shower-app-server.168cad.top" forKey:@"BATH"];
+            //蓝牙洗浴socket连接地址和端口号
+            [userDefaults setObject:@"b6ece215c693ca21.natapp.cc" forKey:@"BATHSocketUrl"];
+            [userDefaults setObject:@"8192" forKey:@"BATHSocketPort"];
             [userDefaults setObject:@"http://in-test-shower-app-server.168cad.top" forKey:@"AppointBATH"];
             [userDefaults setObject:@"http://ex-test-dcxy-home-app.168cad.top" forKey:@"HomePage"];
             [userDefaults setObject:@"http://ex-test-other-device-app.168cad.top" forKey:@"DCWash"];
+            [userDefaults setObject:@"8197" forKey:@"DCWashSocketPort"];
+            [userDefaults setObject:@"12081ad8ddc23576.natapp.cc" forKey:@"DCWashSocketUrl"];
+            
             [userDefaults synchronize];
             break;
         }
@@ -125,11 +135,15 @@ kSINGLETON_FOR_CLASS(APIManager)
             [userDefaults setObject:@"http://dcxy-base-app.dcrym.com" forKey:@"SX_MONEY"]; //授信保证金
             [userDefaults setValue:@"https://netpay.cmbchina.com/netpayment/BaseHttp.dll?MB_EUserPay" forKey:@"YWT_PAY"];
             [userDefaults setObject:@"http://shower-app-server.dcrym.com" forKey:@"BATH"];
+            //蓝牙洗浴socket连接地址和端口号
+            [userDefaults setObject:@"shower-tcp1.dcrym.com" forKey:@"BATHSocketUrl"];
+            [userDefaults setObject:@"8003" forKey:@"BATHSocketPort"];
      
             [userDefaults setObject:@"http://shower-app-server.dcrym.com" forKey:@"AppointBATH"];
             [userDefaults setObject:@"http://dcxy-home-app.dcrym.com" forKey:@"HomePage"];
-            [userDefaults setObject:@"http://ex-dev-other-device-app.168cad.top" forKey:@"DCWash"];
-        
+            [userDefaults setObject:@"http://other-device-app.dcrym.com" forKey:@"DCWash"];
+            [userDefaults setObject:@"8005" forKey:@"DCWashSocketPort"];
+            [userDefaults setObject:@"other-tcp-mobile.dcrym.com" forKey:@"DCWashSocketUrl"];
 
             [userDefaults synchronize];
             break;

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController+Extension.m

-//
+//
@@ -9,6 +9,7 @@
 #import "ZXHomePageViewController+Extension.h"
 #import "ZXHomePageFouction.h"
 #import "ZXPreOrderModel.h"
+#import "DC_ZXPreOrderModel.h"
 #import "ZXWashTabbarViewController.h"
 #import "UseEquipmentController.h"
 #import "ZXSelfHelpViewController.h"
@@ -81,9 +82,9 @@
         VC.equipItem = item;
         VC.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:VC animated:YES];
-    } else if (operation.serviceId == 22 || operation.serviceId == 24) {
+    } else if (operation.serviceId == 23 || operation.serviceId == 24) {
         //多彩洗衣和烘干
-//        [ZXPreOrderModel clearTable];
+        [DC_ZXPreOrderModel clearTable];
         DC_ZXWashTabbarViewController *tabbarVC = [[DC_ZXWashTabbarViewController alloc] init];
         tabbarVC.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:tabbarVC animated:YES];

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m

-//
+//
@@ -92,14 +92,14 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeUserNameAction:) name:@"changeUserNameNotification" object:nil];
     
     //测试按钮
-    UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(100, kScreenHeight - 100, 80, 80)];
-    [self.view addSubview:btn];
-    btn.backgroundColor = [UIColor orangeColor];
-    [[btn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
-        UIViewController *vc = [[NSClassFromString(@"DC_ZXWashTabbarViewController") alloc] init];
-        vc.hidesBottomBarWhenPushed = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }];
+//    UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(100, kScreenHeight - 150, 80, 80)];
+//    [self.view addSubview:btn];
+//    btn.backgroundColor = [UIColor orangeColor];
+//    [[btn rac_signalForControlEvents:UIControlEventTouchDown] subscribeNext:^(id x) {
+//        UIViewController *vc = [[NSClassFromString(@"DC_ZXWashTabbarViewController") alloc] init];
+//        vc.hidesBottomBarWhenPushed = YES;
+//        [self.navigationController pushViewController:vc animated:YES];
+//    }];
 }
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
@@ -398,7 +398,7 @@
         if (arr.count % 4 != 0) {
             row += 1;
         }
-        return 110 * k6Scale * row;
+        return 100 * k6Scale * row;
     }
     ZXHomeSectionInfo *sec = self.service.dataSource[indexPath.section];
     NSArray *subArray = sec.blockData;
@@ -449,7 +449,7 @@
 }
 - (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
     ZXHomeSectionInfo *sec = self.service.dataSource[section];
-    return section==0?0:(sec.isShow?50.0f:30.0f);
+    return section==0?0:(sec.isShow?50.0f:20.0f);
 }
 - (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     ZXHomeSectionInfo *sec = self.service.dataSource[section];

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageMulityNewsCell.m

-//
+//
@@ -94,15 +94,15 @@
         
         [self.noteCountLabel setContentCompressionResistancePriority:UILayoutPriorityRequired
                                                         forAxis:UILayoutConstraintAxisHorizontal];
-        UIView *line = [[UIView alloc] init];
-        line.backgroundColor = RGB(243, 243, 243);
-        [self.contentView addSubview:line];
-        [line mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
-            make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
-            make.bottom.equalTo(self.contentView.mas_bottom);
-            make.height.mas_equalTo(1);
-        }];
+//        UIView *line = [[UIView alloc] init];
+//        line.backgroundColor = RGB(243, 243, 243);
+//        [self.contentView addSubview:line];
+//        [line mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
+//            make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
+//            make.bottom.equalTo(self.contentView.mas_bottom);
+//            make.height.mas_equalTo(1);
+//        }];
     }
     return self;
 }

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageSingleNewsCell.m

-//
+//
@@ -71,15 +71,15 @@
         self.contentImageView.clipsToBounds = YES;
         self.contentImageView.layer.cornerRadius = 5 * k6Scale;
         
-        UIView *line = [[UIView alloc] init];
-        line.backgroundColor = RGB(243, 243, 243);
-        [self.contentView addSubview:line];
-        [line mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
-            make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
-            make.bottom.equalTo(self.contentView.mas_bottom);
-            make.height.mas_equalTo(1);
-        }];
+//        UIView *line = [[UIView alloc] init];
+//        line.backgroundColor = RGB(243, 243, 243);
+//        [self.contentView addSubview:line];
+//        [line mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
+//            make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
+//            make.bottom.equalTo(self.contentView.mas_bottom);
+//            make.height.mas_equalTo(1);
+//        }];
 //        [self.fromLabel setContentCompressionResistancePriority:UILayoutPriorityRequired
 //                                                        forAxis:UILayoutConstraintAxisHorizontal];
     }

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomeNormalHeader.m

-
+
@@ -17,9 +17,10 @@
         holder.backgroundColor = [UIColor colorWithHexString:@"f6f6f6"];
         [self.contentView addSubview:holder];
         [holder mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.equalTo(self.contentView);
-            make.centerY.equalTo(self.contentView);
-            make.height.mas_equalTo(6);
+            make.left.equalTo(self.contentView.mas_left).offset(20 * k6Scale);
+            make.right.equalTo(self.contentView.mas_right).offset(-20 * k6Scale);
+            make.bottom.equalTo(self.contentView).offset(-5 * k6Scale);
+            make.height.mas_equalTo(2);
         }];
         self.contentView.backgroundColor = [UIColor whiteColor];
         

ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/Operation(自助服务)/bath(洗浴)/ZXBathViewController.m

-//
+//
@@ -18,19 +18,6 @@
 #import "ZXBathShowAccountView.h"
 #import "ZXScannerViewController.h"
 
-//开发
-//#define kSocketUrl @"hard-tcp-server.nat123.net"   //socket连接地址
-//#define kSocketPort 29800                          //socket端口号
-
-//测试
-#define kSocketUrl @"b6ece215c693ca21.natapp.cc"   //socket连接地址
-#define kSocketPort 8192                          //socket端口号
-
-//生产
-//#define kSocketUrl @"shower-tcp1.dcrym.com"   //socket连接地址
-//#define kSocketPort 8003                          //socket端口号
-
-
 #define kScoketSendMsgTime 30                      //发送消息间隔
 @interface ZXBathViewController ()<CBCentralManagerDelegate, CBPeripheralDelegate,GCDAsyncSocketDelegate> {
     enlargeClickRegionBtn *scan;//扫码按钮
@@ -107,7 +94,7 @@
     //初始化socket
     self.clientSocket = [[GCDAsyncSocket alloc]initWithDelegate:self delegateQueue:dispatch_get_main_queue()];
     //开始建立连接
-    [self.clientSocket connectToHost:kSocketUrl onPort:kSocketPort viaInterface:nil withTimeout:-1 error:nil];
+    [self.clientSocket connectToHost:[kUserDefaults objectForKey:@"BATHSocketUrl"] onPort:[[kUserDefaults objectForKey:@"BATHSocketPort"] integerValue] viaInterface:nil withTimeout:-1 error:nil];
     
     
     @weakify(self);
@@ -795,7 +782,7 @@
     }
     if (self.isSocketConnected == NO) {
         //开始建立连接
-        [self.clientSocket connectToHost:kSocketUrl onPort:kSocketPort viaInterface:nil withTimeout:-1 error:nil];
+        [self.clientSocket connectToHost:[kUserDefaults objectForKey:@"BATHSocketUrl"] onPort:[[kUserDefaults objectForKey:@"BATHSocketPort"] integerValue] viaInterface:nil withTimeout:-1 error:nil];
     }
 }
 
@@ -934,10 +921,10 @@
 - (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err{
     //重连
     self.isSocketConnected = NO;
-    NSLog(@"====================socket链接失败或者断开=========================");
+    NSLog(@"==============socket链接失败或者断开===================");
     if (self.isServiceCut == NO) {
         //默认状态下需要重新连接
-        [self.clientSocket connectToHost:kSocketUrl onPort:kSocketPort viaInterface:nil withTimeout:-1 error:nil];
+        [self.clientSocket connectToHost:[kUserDefaults objectForKey:@"BATHSocketUrl"] onPort:[[kUserDefaults objectForKey:@"BATHSocketPort"] integerValue] viaInterface:nil withTimeout:-1 error:nil];
     }
 }
 

ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Register/Controller/ZXChooseSchoolViewController.m

-//
+//
@@ -251,7 +251,7 @@
 #pragma mark -  ========== 下拉刷新 ==========
 - (void) loadNewData {
     field.text = @"";
-    [ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/area/queryAreaList", [kUserDefaults valueForKey:@"SX_MONEY"]] para:nil completed:^(CommonModel *common, NSString *error) {
+    [ZXTool requestDataWithType:kXMHTTPMethodGET url:[NSString stringWithFormat:@"%@/area/queryNewAreaList", [kUserDefaults valueForKey:@"SX_MONEY"]] para:nil completed:^(CommonModel *common, NSString *error) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [ZXTool hideLoadingAnimation];
             if (error) {

ColorfulSchool/ColorfulSchool/Classes/Tool(工具)/ZXTool.m

-//
+//
@@ -776,7 +776,12 @@ void ProviderReleaseData (void *info, const void *data, size_t size){
                 completedBlock(nil, common.msg);
             }
         } onFailure:^(NSError *error) {
-            completedBlock(nil, error.userInfo[@"NSLocalizedDescription"]);
+            if (error.userInfo[@"NSLocalizedDescription"] == nil) {
+                completedBlock(nil, @"error");
+            } else {
+               completedBlock(nil,error.userInfo[@"NSLocalizedDescription"]);
+            }
+            
         } onFinished:^(id responseObject, NSError *error) {
             
         }];

ColorfulSchool/ColorfulSchool/images.xcassets/wash/首页/btn_search.imageset/Contents.json → ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/btn_search.imageset/Contents.json

-{
+{
@@ -2,16 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "ic_kaiqi.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "btn_search@2x.png",
+      "filename" : "ic_kaiqi@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "btn_search@3x.png",
+      "filename" : "ic_kaiqi@3x.png",
       "scale" : "3x"
     }
   ],