Skip to content

D
DrWater
Commit ff544d2f by 路少雄
Options

1.3.1线上版本

parent 62b6f571
Showing with 99 additions and 203 deletions
DJMHomeTY.xcworkspace/xcuserdata/nana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 14f58d4f479ed9d6" uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 8abfd16435e47c0"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]" symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -66,12 +66,12 @@ ...@@ -66,12 +66,12 @@
endingLineNumber = "719"> endingLineNumber = "719">
</Location> </Location>
<Location <Location
uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 3ad9328a99095e56" uuid = "D6A24779-6660-40D2-BFFD-EC58A7A6F0F0 - 268742d39dc9c040"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_3" symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_3"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -146,12 +146,12 @@ ...@@ -146,12 +146,12 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 14f58d4f479ed3c5" uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 8abfd16435e4dd3"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]" symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -160,12 +160,12 @@ ...@@ -160,12 +160,12 @@
endingLineNumber = "672"> endingLineNumber = "672">
</Location> </Location>
<Location <Location
uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 5a4587bf34656e33" uuid = "726243AE-D041-4708-A980-4AEE9DC209D8 - 461bf7e630a5f025"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke" symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -192,12 +192,12 @@ ...@@ -192,12 +192,12 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 14f58d4f479edefe" uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 8abfd16435e40e8"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "-[XHDRVC setIsVerifySucceed:]" symbolName = "-[XHDRVC setIsVerifySucceed:]"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -206,12 +206,12 @@ ...@@ -206,12 +206,12 @@
endingLineNumber = "695"> endingLineNumber = "695">
</Location> </Location>
<Location <Location
uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 3ad9328a990a593f" uuid = "FBB3579D-0AA4-45CB-8ECE-21B9CCDD4947 - 268742d39dcac729"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_2" symbolName = "__29-[XHDRVC setIsVerifySucceed:]_block_invoke_2"
moduleName = "DJMHomeDR" moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m" urlString = "file:///Users/nana/Desktop/liwei0229/DrWater/DJMHomeTY/Page/DRFacial/Controller/XHDRVC.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
...@@ -330,69 +330,5 @@ ...@@ -330,69 +330,5 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CD7B83B6-97F4-4D23-9290-C097DEC3FFA4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "388"
endingLineNumber = "388"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B43E24FF-EA1A-4A12-9729-DAFA654F7864"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "401"
endingLineNumber = "401"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B0345BE1-A4C2-4D4B-9408-FE1565A9A895"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "390"
endingLineNumber = "390"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E64C4929-C544-4A5B-A026-608E05B6021F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "394"
endingLineNumber = "394"
landmarkName = "-didUpdateValueForCharacteristicValue:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>
DJMHomeTY/Page/DRFacial/Controller/DXDRPlusVC.m
...@@ -1102,8 +1102,10 @@ ...@@ -1102,8 +1102,10 @@
}]; }];
// if ([self.currentModel.pre_parameters.stress20M integerValue] != 0) {
[SVProgressHUD showInfoWithStatus:[NSString stringWithFormat:@"请拿起%@手柄开始操作",self.currentHandle == 20?@"20M白灯":@"3/10M蓝灯"]]; //
// }
[SVProgressHUD showInfoWithStatus:[NSString stringWithFormat:@"请拿起%@手柄开始操作",[self.currentModel.pre_parameters.stress20M integerValue] != 0?@"20M白灯":@"3/10M蓝灯"]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss]; [SVProgressHUD dismiss];
...@@ -1136,53 +1138,61 @@ ...@@ -1136,53 +1138,61 @@
if(self.totalTime>0){ if(self.totalTime>0){
// if (self.isChangeHandle == 0) { if (self.isChangeHandle == 0) {
// if (self.totalTime == [self.currentModel.post_parameters.time integerValue]) { if (self.totalTime == [self.currentModel.post_parameters.time integerValue]) {
//
// self.smartView.step1Lb.backgroundColor = XHColorRGB(230, 230, 230); // self.smartView.step1Lb.backgroundColor = XHColorRGB(230, 230, 230);
// self.smartView.step1Lb.textColor = XHColorRGB(51, 51, 51); // self.smartView.step1Lb.textColor = XHColorRGB(51, 51, 51);
// //
// self.smartView.step2Lb.backgroundColor = XHColorRGB(164, 47, 36); // self.smartView.step2Lb.backgroundColor = XHColorRGB(164, 47, 36);
// self.smartView.step2Lb.textColor = XHColorRGB(255, 255, 255); // self.smartView.step2Lb.textColor = XHColorRGB(255, 255, 255);
// [self stopDr02DAction];
// self.current3MStress = [self.currentModel.post_parameters.stress3M integerValue];
// self.current10MStress = [self.currentModel.post_parameters.stress10M integerValue]; self.smartView.step1Btn.selected = NO;
// self.current20MStress = [self.currentModel.post_parameters.stress20M integerValue]; self.smartView.step2Btn.selected = YES;
//// [HJGetBluetoothManager writeStr:[DR_02_D_send_UltrasoundStop withCrc16Modbus]];//暂停 self.smartView.step1Lb.backgroundColor = XHColorRGB(205, 205, 205);
// if ([self.currentModel.post_parameters.stress20M integerValue] != 0) { self.smartView.step2Lb.backgroundColor = XHColorRGB(164, 47, 36);
// [HJGetBluetoothManager writeStr:[DR_02_D_send_Select20M withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// if (self.isLit) { [self stopDr02DAction];
// [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress]; self.current3MStress = [self.currentModel.post_parameters.stress3M integerValue];
// }else{ self.current10MStress = [self.currentModel.post_parameters.stress10M integerValue];
// [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress]; self.current20MStress = [self.currentModel.post_parameters.stress20M integerValue];
// } // [HJGetBluetoothManager writeStr:[DR_02_D_send_UltrasoundStop withCrc16Modbus]];//暂停
// if ([self.currentModel.post_parameters.stress20M integerValue] != 0) {
// }); [HJGetBluetoothManager writeStr:[DR_02_D_send_Select20M withCrc16Modbus]];
// }else{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [HJGetBluetoothManager writeStr:[DR_02_D_send_Select3And10M withCrc16Modbus]]; if (self.isLit) {
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// if (self.isLit) { }else{
// [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress]; [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// }else{ }
// [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// } });
// }); }else{
// } [HJGetBluetoothManager writeStr:[DR_02_D_send_Select3And10M withCrc16Modbus]];
// HJAlertView *alertView = [[HJAlertView alloc] init]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// alertView.parentView = [UIApplication sharedApplication].keyWindow; if (self.isLit) {
// alertView.title = HJLocalizedString(@"提示"); [self changeLitStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// alertView.message = HJLocalizedString(@"请切换手柄继续护理"); }else{
// [alertView setButtonTitles:[NSMutableArray arrayWithObjects:HJLocalizedString(@"确定"), nil]]; [self changeStressWith3M:self.current3MStress And10M:self.current10MStress And20M:self.current20MStress];
// [alertView show]; }
// alertView.onButtonTouchUpInside = ^(HJAlertView * _Nonnull alertView, NSInteger buttonIndex) { });
// }
// [alertView close]; HJAlertView *alertView = [[HJAlertView alloc] init];
// self.isChangeHandle = 1; alertView.parentView = [UIApplication sharedApplication].keyWindow;
// }; alertView.title = HJLocalizedString(@"提示");
// return; alertView.message = HJLocalizedString(@"请切换手柄继续护理");
// } [alertView setButtonTitles:[NSMutableArray arrayWithObjects:HJLocalizedString(@"确定"), nil]];
// } [alertView show];
alertView.onButtonTouchUpInside = ^(HJAlertView * _Nonnull alertView, NSInteger buttonIndex) {
[alertView close];
self.isChangeHandle = 1;
};
return;
}
}
......
DJMHomeTY/Page/DRFacial/View/DXDRPlusSmartView.m
...@@ -779,16 +779,16 @@ ...@@ -779,16 +779,16 @@
selectedButton.selected = YES; selectedButton.selected = YES;
UIButton *stepBtn = [selectedButton viewWithTag:108]; UIButton *stepBtn = [selectedButton viewWithTag:108];
stepBtn.selected = YES; // stepBtn.selected = YES;
if (self.delegate && [self.delegate respondsToSelector:@selector(changeVideoProgressWithHandelType:)]) { // if (self.delegate && [self.delegate respondsToSelector:@selector(changeVideoProgressWithHandelType:)]) {
NSInteger handel; // NSInteger handel;
if ([selectedButton.titleLabel.text containsString:@"20M"]) { // if ([selectedButton.titleLabel.text containsString:@"20M"]) {
handel = 20; // handel = 20;
}else{ // }else{
handel = 3; // handel = 3;
} // }
[self.delegate changeVideoProgressWithHandelType:handel]; // [self.delegate changeVideoProgressWithHandelType:handel];
} // }
// 3. 自动滚动到可见区域 // 3. 自动滚动到可见区域
[self scrollToMakeButtonVisible:selectedButton]; [self scrollToMakeButtonVisible:selectedButton];
} }
......
DJMHomeTY/Page/HomePage/View/XHCustomView.m
...@@ -161,30 +161,24 @@ ...@@ -161,30 +161,24 @@
make.height.mas_equalTo(10*IPhone6ScaleHeight); make.height.mas_equalTo(10*IPhone6ScaleHeight);
make.width.mas_equalTo(20*IPhone6ScaleHeight); make.width.mas_equalTo(20*IPhone6ScaleHeight);
}];// }];//
UIImageView *faceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain1":@"Main_device"];// UIImageView *faceImg = [UIImageView myUIImageViewSuperView:myView withImageName:(TargetType==5)?@"DrTY_DeviceConnectedImg":(TargetType==4)?@"dr02BMain":@"Main_device"];//
[faceImg mas_makeConstraints:^(MASConstraintMaker *make) { [faceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(myView); make.centerX.mas_equalTo(myView);
make.top.mas_equalTo(strengthLb2Bottom.mas_bottom).offset(53*IPhone6ScaleHeight); make.top.mas_equalTo(strengthLb2Bottom.mas_bottom).offset(53*IPhone6ScaleHeight);
// make.height.mas_equalTo(127.25*IPhone6ScaleHeight); make.height.mas_equalTo(127.25*IPhone6ScaleHeight);
// make.width.mas_equalTo(110*IPhone6ScaleWidth); make.width.mas_equalTo(110*IPhone6ScaleWidth);
make.size.mas_equalTo(CGSizeMake(203, 123));
}]; }];
self.faceImage = faceImg; self.faceImage = faceImg;
// UILabel *rightLb = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentLeft withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSize(16) withTextColor:XHBtnTextColor withResize:true]; UILabel *rightLb = [UILabel myUILabelSuperView:myView withNSTextAlignment:NSTextAlignmentLeft withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSize(16) withTextColor:XHBtnTextColor withResize:true];
// [rightLb mas_makeConstraints:^(MASConstraintMaker *make) { [rightLb mas_makeConstraints:^(MASConstraintMaker *make) {
// make.centerX.mas_equalTo(myView); make.centerX.mas_equalTo(myView);
// make.top.mas_equalTo(faceImg.mas_bottom).offset(15*IPhone6ScaleHeight); make.top.mas_equalTo(faceImg.mas_bottom).offset(15*IPhone6ScaleHeight);
// make.height.mas_equalTo(16.5*IPhone6ScaleHeight); make.height.mas_equalTo(16.5*IPhone6ScaleHeight);
//
// }]; }];
// self.operationTimeLb = rightLb; self.operationTimeLb = rightLb;
UIButton *startBtn = [UIButton myUIButtonSuperView:myView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:Home_StartBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")]; UIButton *startBtn = [UIButton myUIButtonSuperView:myView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:Home_StartBtnTag withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)){ if((TargetType == 2)){
...@@ -201,37 +195,14 @@ ...@@ -201,37 +195,14 @@
[startBtn mas_makeConstraints:^(MASConstraintMaker *make) { [startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self); make.centerX.mas_equalTo(self);
make.height.width.mas_equalTo(85*IPhone6ScaleWidth); make.height.width.mas_equalTo(85*IPhone6ScaleWidth);
// make.top.mas_equalTo(rightLb.mas_bottom).offset(29.5*IPhone6ScaleHeight); make.top.mas_equalTo(rightLb.mas_bottom).offset(29.5*IPhone6ScaleHeight);
make.bottom.mas_equalTo(-110*IPhone6ScaleHeight);
}]; }];
self.strengStartBtn = startBtn; self.strengStartBtn = startBtn;
UILabel *totalTitleLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"剩余总时长")) withFont:XHFontSize(15) withTextColor:XHTextFieldTextPlaceholderColor withResize:true];
[totalTitleLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.bottom.equalTo(self.strengStartBtn.mas_top).offset(-70);
}];
_operationTimeLb = [UILabel myUILabelSuperView:self.SelectModelView withNSTextAlignment:NSTextAlignmentCenter withContent:HJLocalizedString(HJLocalizedString(@"00:12:00")) withFont:XHFontSizeBold(24) withTextColor:XHBtnTextColor withResize:true];
[_operationTimeLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.SelectModelView);
make.top.equalTo(totalTitleLb.mas_bottom).offset(10);
}];
UIButton *disinfectBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000001 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")]; UIButton *disinfectBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000001 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){ if((TargetType == 2)||(TargetType == 4)){
[disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_off") forState:UIControlStateNormal]; [disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_off") forState:UIControlStateNormal];
[disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_on") forState:UIControlStateSelected]; [disinfectBtn setImage:HJSetImg(@"djm_dr02_disinfect_on") forState:UIControlStateSelected];
}else{ }else{
[disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Nor") forState:UIControlStateNormal]; [disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Nor") forState:UIControlStateNormal];
[disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Sel") forState:UIControlStateSelected]; [disinfectBtn setImage:HJSetImg(@"DrTY_Disinfect_Sel") forState:UIControlStateSelected];
...@@ -242,11 +213,7 @@ ...@@ -242,11 +213,7 @@
make.right.mas_equalTo(startBtn.mas_left).offset(-29.5*IPhone6ScaleWidth); make.right.mas_equalTo(startBtn.mas_left).offset(-29.5*IPhone6ScaleWidth);
}]; }];
self.disinfectBtn = disinfectBtn; self.disinfectBtn = disinfectBtn;
if ([XHGetDataManager.deviceCode isEqualToString:@"K9"]) {
self.disinfectBtn.hidden = true;
}else{
self.disinfectBtn.hidden = false;
}
#pragma mark RequirementChangeRecord_h #pragma mark RequirementChangeRecord_h
UIButton *endedBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000002 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")]; UIButton *endedBtn = [UIButton myUIButtonSuperView:self.SelectModelView withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(selectPlanOrSatrtAction:) withTag:10000002 withNormalImg:HJSetImg(@"") withSelectedImg:HJSetImg(@"") withHighlightedImg:HJSetImg(@"")];
if((TargetType == 2)||(TargetType == 4)){ if((TargetType == 2)||(TargetType == 4)){
......
DJMHomeTY/Page/HomePage/View/XHNoConnectView.m
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
[lb mas_makeConstraints:^(MASConstraintMaker *make) { [lb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self); make.centerX.mas_equalTo(self);
if([[UIDevice currentDevice].name containsString:@"14 Pro"]||[[UIDevice currentDevice].name containsString:@"15"]){ if([[UIDevice currentDevice].name containsString:@"14 Pro"]||[[UIDevice currentDevice].name containsString:@"15"]){
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight + 10); make.top.mas_equalTo(self.mas_top).offset(HJNavHeight);
}else{ }else{
make.top.mas_equalTo(self.mas_top).offset(HJNavHeight+10); make.top.mas_equalTo(self.mas_top).offset(HJNavHeight-12);
} }
}]; }];
...@@ -50,10 +50,9 @@ ...@@ -50,10 +50,9 @@
make.top.mas_equalTo(self).mas_equalTo(159*IPhone6ScaleHeight); make.top.mas_equalTo(self).mas_equalTo(159*IPhone6ScaleHeight);
}]; }];
//DrTY_DisconnectLogo //DrTY_DisconnectLogo
UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:img withImageName:(TargetType==5)?@"DrTY_DisconnectLogo":(TargetType==4&&XHGetDataManager.machineIndex==0)?@"Ps2_Device_Img": (TargetType==4&&XHGetDataManager.machineIndex==1)?@"dr02BMain1":@"Home_DeviceLogo"];//Ps2_Device_Img // UIImageView *deviceImg = [UIImageView myUIImageViewSuperView:img withImageName:(TargetType==5)?@"DrTY_DisconnectLogo":(TargetType==4&&XHGetDataManager.machineIndex==0)?@"Ps2_Device_Img": (TargetType==4&&XHGetDataManager.machineIndex==1)?@"dr02BNo":@"Home_DeviceLogo"];//Ps2_Device_Img //
[deviceImg mas_makeConstraints:^(MASConstraintMaker *make) { [deviceImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(statusLb.mas_bottom).offset(40.5*IPhone6ScaleHeight); make.top.mas_equalTo(statusLb.mas_bottom).offset(40.5*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(203, 123));
make.centerX.mas_equalTo(self); make.centerX.mas_equalTo(self);
}]; }];
......
DJMHomeTY/Page/HomePage/View/XHSelectModelView.m
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
bgV.layer.shadowRadius = 20; bgV.layer.shadowRadius = 20;
bgV.layer.cornerRadius = 12; bgV.layer.cornerRadius = 12;
[bgV mas_makeConstraints:^(MASConstraintMaker *make) { [bgV mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).offset(210*IPhone6ScaleHeight); make.top.mas_equalTo(self).offset(160*IPhone6ScaleHeight);
make.left.mas_equalTo(self).offset(15*IPhone6ScaleWidth); make.left.mas_equalTo(self).offset(15*IPhone6ScaleWidth);
make.right.mas_equalTo(self).offset(-15*IPhone6ScaleWidth); make.right.mas_equalTo(self).offset(-15*IPhone6ScaleWidth);
make.bottom.mas_equalTo(self).offset(-35*IPhone6ScaleWidth); make.bottom.mas_equalTo(self).offset(-35*IPhone6ScaleWidth);
...@@ -57,18 +57,9 @@ ...@@ -57,18 +57,9 @@
NSArray *itemSelArrimg; NSArray *itemSelArrimg;
NSArray *itemArr; NSArray *itemArr;
if((TargetType == 2)||(TargetType == 4)){ if((TargetType == 2)||(TargetType == 4)){
// itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_deepGrain_n",@"Home_Slect_up_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_anti-aging_n",@"Home_Slect_absorption_n",@"Home_Slect_acne_n",@"Home_Slect_papules_n"]; itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_deepGrain_n",@"Home_Slect_up_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_anti-aging_n",@"Home_Slect_absorption_n",@"Home_Slect_acne_n",@"Home_Slect_papules_n"];
// itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_deepGrain_s",@"Home_Slect_up_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_anti-aging_s",@"Home_Slect_absorption_s",@"Home_Slect_acne_s",@"Home_Slect_papules_s"]; itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_deepGrain_s",@"Home_Slect_up_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_anti-aging_s",@"Home_Slect_absorption_s",@"Home_Slect_acne_s",@"Home_Slect_papules_s"];
// itemArr = @[HJLocalizedString(@"眼部护理"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"轮廓清晰"),HJLocalizedString(@"面部饱满"),HJLocalizedString(@"褪红舒敏"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"嫩滑提亮"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")]; itemArr = @[HJLocalizedString(@"眼纹"),HJLocalizedString(@"深纹"),HJLocalizedString(@"提升"),HJLocalizedString(@"面部紧致"),HJLocalizedString(@"皮肤焕新"),HJLocalizedString(@"敏感性皮肤焕新"),HJLocalizedString(@"抗衰"),HJLocalizedString(@"辅助面部吸收"),HJLocalizedString(@"粉刺痤疮"),HJLocalizedString(@"丘疹脓疱性痤疮")];
// itemNorArrimg = @[@"Home_Slect_eye_n",@"Home_Slect_face_n",@"Home_Slect_skin_n",@"Home_Slect_newskin_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n",@"Home_Slect_absorption_n"];
// itemSelArrimg = @[@"Home_Slect_eye_s",@"Home_Slect_face_s",@"Home_Slect_skin_s",@"Home_Slect_newskin_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s",@"Home_Slect_absorption_s"];
itemNorArrimg = @[@"k9_yb_nol",@"k9_lk_nol",@"k9_mb_nol",@"k9_sh_nol",@"k9_nh_nol",@"k9_sc_nol",@"k9_st_nol",@"k9_dw_nol"];
itemSelArrimg = @[@"k9_yb_sel",@"k9_lk_sel",@"k9_mb_sel",@"k9_sh_sel",@"k9_nh_sel",@"k9_sc_sel",@"k9_st_sel",@"k9_dw_sel"];
itemArr = @[HJLocalizedString(@"眼部护理"),HJLocalizedString(@"轮廓清晰"),HJLocalizedString(@"面部饱满"),HJLocalizedString(@"褪红舒敏"),HJLocalizedString(@"嫩滑提亮"),HJLocalizedString(@"关节色沉淡化"),HJLocalizedString(@"身体塑形"),HJLocalizedString(@"身体淡纹")];
}else{ }else{
itemNorArrimg = @[@"Home_Slect_eye_n_r",@"Home_Slect_deepGrain_n_r",@"Home_Slect_up_n_r",@"Home_Slect_face_n_r",@"Home_Slect_skin_n_r",@"Home_Slect_newskin_n_r",@"Home_Slect_anti-aging_n_r",@"Home_Slect_absorption_n_r",@"Home_Slect_acne_n_r",@"Home_Slect_papules_n_r"]; itemNorArrimg = @[@"Home_Slect_eye_n_r",@"Home_Slect_deepGrain_n_r",@"Home_Slect_up_n_r",@"Home_Slect_face_n_r",@"Home_Slect_skin_n_r",@"Home_Slect_newskin_n_r",@"Home_Slect_anti-aging_n_r",@"Home_Slect_absorption_n_r",@"Home_Slect_acne_n_r",@"Home_Slect_papules_n_r"];
...@@ -79,7 +70,7 @@ ...@@ -79,7 +70,7 @@
for (int i = 0; i<itemArr.count; i++) { for (int i = 0; i<itemArr.count; i++) {
UIButton *btn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModel1Btntag+i withNormalImg:HJSetImg(itemNorArrimg[i]) withSelectedImg:HJSetImg(itemSelArrimg[i]) withHighlightedImg:nil withTitle:HJLocalizedString(itemArr[i]) withFont:XHFontSize(9) withTitleNormalColor:XHColorHex(0x939393) withTitleSelectedColor:XHColorHex(0x000000)];// UIButton *btn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModel1Btntag+i withNormalImg:HJSetImg(itemNorArrimg[i]) withSelectedImg:HJSetImg(itemSelArrimg[i]) withHighlightedImg:nil withTitle:HJLocalizedString(itemArr[i]) withFont:XHFontSize(9) withTitleNormalColor:XHColorHex(0x939393) withTitleSelectedColor:XHColorHex(0x000000)];//
if((TargetType == 2)||(TargetType == 4)){ if((TargetType == 2)||(TargetType == 4)){
[btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:160.0f]; [btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:85.0f];
}else{ }else{
[btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:160.0f]; [btn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleTop imageTitleSpace:160.0f];
} }
...@@ -95,13 +86,13 @@ ...@@ -95,13 +86,13 @@
make.left.mas_equalTo(self).offset((HJScreenWidth-112*IPhone6ScaleWidth*2-60*IPhone6ScaleWidth)/2 +(60*IPhone6ScaleWidth+52*IPhone6ScaleWidth)*(i%3)); make.left.mas_equalTo(self).offset((HJScreenWidth-112*IPhone6ScaleWidth*2-60*IPhone6ScaleWidth)/2 +(60*IPhone6ScaleWidth+52*IPhone6ScaleWidth)*(i%3));
}]; }];
} }
UIButton *btn = [self viewWithTag:Home_SelectModel8Btntag]; UIButton *btn = [self viewWithTag:Home_SelectModel10Btntag];
UIButton *sureBtn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModelSureBtntag withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:@"确定" withFont:XHFontSize(17) withTitleNormalColor:XHColorHex(0xffffff) withTitleSelectedColor:XHColorHex(0xffffff)]; UIButton *sureBtn = [UIButton myUIButtonSuperView:bgV withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(SelectActionOrSureBtn:) withTag:Home_SelectModelSureBtntag withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:@"确定" withFont:XHFontSize(17) withTitleNormalColor:XHColorHex(0xffffff) withTitleSelectedColor:XHColorHex(0xffffff)];
sureBtn.backgroundColor = XHBtnColor; sureBtn.backgroundColor = XHBtnColor;
sureBtn.layer.cornerRadius = 10.0f; sureBtn.layer.cornerRadius = 10.0f;
[sureBtn mas_makeConstraints:^(MASConstraintMaker *make) { [sureBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(bgV); make.centerX.mas_equalTo(bgV);
make.top.mas_equalTo(btn.mas_bottom).offset(60*IPhone6ScaleHeight); make.top.mas_equalTo(btn.mas_bottom).offset(23*IPhone6ScaleHeight);
make.height.mas_equalTo(45*IPhone6ScaleHeight); make.height.mas_equalTo(45*IPhone6ScaleHeight);
make.width.mas_equalTo(300*IPhone6ScaleWidth); make.width.mas_equalTo(300*IPhone6ScaleWidth);
...@@ -111,8 +102,6 @@ ...@@ -111,8 +102,6 @@
self.selBtn.selected = NO; self.selBtn.selected = NO;
self.selBtn= button; self.selBtn= button;
button.selected = YES; button.selected = YES;
if (self.sendModelBlock) { if (self.sendModelBlock) {
self.sendModelBlock(button); self.sendModelBlock(button);
} }
......
DJMHomeTY/Page/HomePage/View/XHSmartView.h
...@@ -26,11 +26,6 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -26,11 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark RequirementChangeRecord_h #pragma mark RequirementChangeRecord_h
@property (nonatomic,strong) UIButton *endedBtn; @property (nonatomic,strong) UIButton *endedBtn;
@property (nonatomic,strong) UIButton *disinfectBtn;//消毒 @property (nonatomic,strong) UIButton *disinfectBtn;//消毒
@property (nonatomic,strong) UILabel *totalTimeLb;//总时间
@property (nonatomic,strong) UIImageView *faceImage;//
@property (nonatomic,strong) UIButton *selectPlanBtn;
@property (nonatomic,strong) UIView *SelectModelView;//已选择模式
@property (nonatomic,strong) UIView *centerLine;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment