Skip to content

D
DrWater
Commit 10dde3a5 by 李威
Options

Merge branch 'main' of http://git.imoreme.com/lushaoxiong/DrWater

parents 94ce19aa e1d30ef2
Showing with 675 additions and 308 deletions
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -148,54 +148,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E696F1AC-D39D-4E97-A6FD-B3BA96CC6281"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/View/DXHFXView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "727"
endingLineNumber = "727"
landmarkName = "-setCurrentVideoWithModel:"
landmarkType = "7">
<Locations>
<Location
uuid = "E696F1AC-D39D-4E97-A6FD-B3BA96CC6281 - ba9058f07ff2bab2"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__38-[DXHFXView setCurrentVideoWithModel:]_block_invoke"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/View/DXHFXView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "671"
endingLineNumber = "671"
offsetFromSymbolStart = "56">
</Location>
<Location
uuid = "E696F1AC-D39D-4E97-A6FD-B3BA96CC6281 - d84599e304376003"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXView setCurrentVideoWithModel:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/View/DXHFXView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "671"
endingLineNumber = "671"
offsetFromSymbolStart = "48">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8E79E0B6-5E3A-4942-95A9-4129987DD18C"
shouldBeEnabled = "No"
ignoreCount = "0"
......@@ -301,118 +253,165 @@
endingLineNumber = "575"
offsetFromSymbolStart = "168">
</Location>
<Location
uuid = "8AD93C61-9019-4363-808A-69101A996276 - e19f0f3988c67f27"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[XHParentVC getLocationWithLocality:withLongitude:withLatitude:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "575"
endingLineNumber = "575"
offsetFromSymbolStart = "168">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "36147F0C-831A-458A-9592-31D084BC20DB"
uuid = "E359E523-3519-496C-8634-30B842625020"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "308"
endingLineNumber = "308"
landmarkName = "-machineButton:button:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BF862B8C-C4F8-42EA-923B-656CEBFA3E6B"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1057"
endingLineNumber = "1057"
landmarkName = "-setIsUpdateSucceed:"
startingLineNumber = "921"
endingLineNumber = "921"
landmarkName = "-startAction"
landmarkType = "7">
<Locations>
<Location
uuid = "36147F0C-831A-458A-9592-31D084BC20DB - 500cd1d7a83d4e21"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsUpdateSucceed:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1058"
endingLineNumber = "1058"
offsetFromSymbolStart = "1220">
</Location>
<Location
uuid = "36147F0C-831A-458A-9592-31D084BC20DB - 500cd1d7a83d4e00"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsUpdateSucceed:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1057"
endingLineNumber = "1057"
offsetFromSymbolStart = "1164">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "DD2F5761-4FF1-4D98-AB03-62BFEF9D36B3"
uuid = "C261B36B-9056-4731-B957-88851E89905D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1067"
endingLineNumber = "1067"
landmarkName = "-setIsUpdateSucceed:"
startingLineNumber = "918"
endingLineNumber = "918"
landmarkName = "-startAction"
landmarkType = "7">
<Locations>
<Location
uuid = "DD2F5761-4FF1-4D98-AB03-62BFEF9D36B3 - 500cd1d7a83d4f7f"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsUpdateSucceed:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1068"
endingLineNumber = "1068"
offsetFromSymbolStart = "1600">
</Location>
<Location
uuid = "DD2F5761-4FF1-4D98-AB03-62BFEF9D36B3 - 500cd1d7a83d4f5e"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsUpdateSucceed:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DJMHome(Total_iMorme)/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1067"
endingLineNumber = "1067"
offsetFromSymbolStart = "1540">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E359E523-3519-496C-8634-30B842625020"
uuid = "AF495839-53C7-4AB3-A46C-4727378C1E9A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m"
filePath = "DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "308"
endingLineNumber = "308"
landmarkName = "-machineButton:button:"
startingLineNumber = "915"
endingLineNumber = "915"
landmarkName = "-startAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "01C1E398-0132-40DC-9905-49C2E358CD2B"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "473"
endingLineNumber = "473"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5806CDE6-86DB-461E-AE86-DA9637FB7568"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "476"
endingLineNumber = "476"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0BAFAC0F-9E29-4597-982A-72FDC6A074B9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "483"
endingLineNumber = "483"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "29A8A863-68B3-4B69-9E1E-8B8A95CE11F7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "487"
endingLineNumber = "487"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "18FF4E36-5E4F-4768-BCA4-BC56F0A2BF4C"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Base/Controller/XHParentVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "489"
endingLineNumber = "489"
landmarkName = "-getUseTimes:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
......
DJMHomeTY/Assets.xcassets/HFX/HFX_041_add.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "HFX_041_add@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "HFX_041_add@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/HFX/HFX_041_add_dis.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "HFX_041_add_dis@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "HFX_041_add_dis@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/HFX/HFX_041_lit.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "HFX_041_lit@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "HFX_041_lit@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/HFX/HFX_041_lit_dis.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "HFX_041_lit_dis@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "HFX_041_lit_dis@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/HFX/HFX_041_start.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "HFX_041_start@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "HFX_041_start@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Global/Define/XHCommand.h
......@@ -188,6 +188,12 @@
#define DR04_HFX_send_getEnergy @"05000B330254"//发送获取档位
#define DR04_HFX_send_getUVState @"05000B330256"//发送获取档位
#define DR04_HFX_send_getUpdateVersion @"05000B3102AA"//发送固件升级
#define DR04_HFX_send_pumpStart @"06000B33025701"//发送蠕动泵开启
#define DR04_HFX_send_pumpStop @"06000B33025700"//发送蠕动泵关闭
#define DR04_HFX_send_pumpSpeedChange @"06000B330258"//发送调节蠕动泵速度
#define DR04_HFX_get_DeviceEnergy @"06000B310150"//获取档位
#define DR04_HFX_get_UVState @"06000B330156"//获取UV状态
......
DJMHomeTY/Global/Define/XHConstants.h
......@@ -150,6 +150,7 @@ static NSString *const HJNotificationDisconnect = @"NotificationDisconnect";
#define Dr021DeviceName @"Dr-02-1"//4档
#define Dr022DeviceName @"Dr-02-2"//4档
#define Dr04DeviceName @"Dr-04"
#define Dr041DeviceName @"Dr-04-1"
//SEYO
#define DrSEYOAPDeviceName @"LS02"
......
DJMHomeTY/Global/Manager/HJBluetoothManager.m
......@@ -277,7 +277,7 @@ static HJBluetoothManager *sharedinstance = nil;
break;
case 5://DrWarter
{
self.DeviceArr = @[Dr02DeviceName,Dr04DeviceName];
self.DeviceArr = @[Dr02DeviceName,Dr04DeviceName,Dr041DeviceName];
//,Dr021DeviceName
}
break;
......@@ -295,7 +295,8 @@ static HJBluetoothManager *sharedinstance = nil;
[_centralManager connectPeripheral:peripheral options:nil];
}
}else if (XHGetDataManager.machineIndex == 1){
if ([advertisementData[@"kCBAdvDataLocalName"] isEqualToString:Dr04DeviceName]) {
if ([advertisementData[@"kCBAdvDataLocalName"] isEqualToString:Dr04DeviceName]||
[advertisementData[@"kCBAdvDataLocalName"] isEqualToString:Dr041DeviceName]) {
XHGetDataManager.deviceCode = advertisementData[@"kCBAdvDataLocalName"];
_servicePeripheral = peripheral;
[self stopScanning];
......@@ -550,9 +551,11 @@ static HJBluetoothManager *sharedinstance = nil;
if ([XHGetDataManager.deviceCode isEqualToString:Dr02DeviceName] ||
[XHGetDataManager.deviceCode isEqualToString:Dr021DeviceName] ||
[XHGetDataManager.deviceCode isEqualToString:Dr022DeviceName] ||
[XHGetDataManager.deviceCode isEqualToString:Dr04DeviceName]) {
[XHGetDataManager.deviceCode isEqualToString:Dr04DeviceName]||
[XHGetDataManager.deviceCode isEqualToString:Dr041DeviceName]) {
if ([XHGetDataManager.deviceCode isEqualToString:Dr04DeviceName]) {
if ([XHGetDataManager.deviceCode isEqualToString:Dr04DeviceName]||
[XHGetDataManager.deviceCode isEqualToString:Dr041DeviceName]) {
if([result0 isEqual:@"55504752"]){
if (!isDownload) {
[self checkDeviceVersionWithResult:^(BOOL isUpdate) {
......
DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m
......@@ -26,6 +26,7 @@
@property (nonatomic,strong) DXHFXView *myView;
@property (nonatomic,strong) XHNoConnectView *myNoconnectView;
@property (nonatomic,assign) NSInteger currentStress;
@property (nonatomic,assign) NSInteger currentspeed;
/// 计时器
@property (nonatomic,strong) NSTimer *timer;
......@@ -63,7 +64,7 @@
@property (nonatomic,strong) NSString *localIsupkeep;
@property (nonatomic,assign) BOOL isStrengthen;
@end
......@@ -199,8 +200,9 @@
- (void)initData
{
self.currentStress = 0;
self.currentspeed = 10;
self.isNeedUpkeep = NO;
self.xdtotalTime = 25;
self.isStrengthen = NO;
self.istimeClean = NO;
// self.localIsupkeep = @"0";
}
......@@ -375,6 +377,27 @@
}
break;
case Itemspeeddec:{
if(self.currentspeed>1){
self.currentspeed--;
self.myView.currentSpeed = [NSString stringWithFormat:@"%ld",self.currentspeed];
[self changePumpSpeedWithSize:self.currentspeed];
}
}
break;
case Itemspeedadd:{
if(self.currentspeed<20){
self.currentspeed++;
self.myView.currentSpeed = [NSString stringWithFormat:@"%ld",self.currentspeed];
[self changePumpSpeedWithSize:self.currentspeed];
}
}
break;
case ItemstartOrstop:{
if ([self iSDeviceID]) {
......@@ -384,6 +407,10 @@
[self stopDr04Action];
}else{//
[HJGetBluetoothManager writeStr:[DR04_HFX_send_start withCrc16Modbus]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self pumpStart];
});
}
}else{
......@@ -470,6 +497,9 @@
-(void)stopDr04Action{
HJSelfWeak;
[HJGetBluetoothManager writeStr:[DR04_HFX_send_stop withCrc16Modbus]];//暂停
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self pumpStop];
});
dispatch_async(dispatch_get_main_queue(), ^{
weakSelf.myView.startBtn.selected = false;
});
......@@ -577,7 +607,26 @@
self.deviceid = XHGetDataManager.deviceID.copy;
self.BLEConnect = true;
self.isConnected = true;
if (XHGetDataManager.deviceID) {
if ([XHGetDataManager.deviceCode isEqualToString:@"Dr-04"]) {
self.isStrengthen = NO;
self.myView.is041 = NO;
}else if ([XHGetDataManager.deviceCode isEqualToString:@"Dr-04-1"]){
self.isStrengthen = YES;
self.myView.is041 = YES;
}else{
self.isStrengthen = NO;
self.myView.is041 = NO;
}
if (XHGetDataManager.deviceCode) {
if (self.isStrengthen) {
self.xdtotalTime = 50;
}else {
self.xdtotalTime = 25;
}
[self requestData];
}
......@@ -834,21 +883,54 @@
if(self.currentState == 0){
if (self.xdtotalTime == 25) {
[self alertXDTipsWithString:@"清洁中..." isPop:NO];
}else if (self.xdtotalTime == 0){
[SVProgressHUD showInfoWithStatus:@"请验证耗材有效性"];
return;
}
self.currentStress = 4;
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_energy,[[HJTools shared] ToLongHex:self.currentStress withLength:2]] withCrc16Modbus]];
[HJGetBluetoothManager writeStr:[DR04_HFX_send_xdMode withCrc16Modbus]];
if (self.xdtimer == nil) {
self.xdtimer=[NSTimer scheduledTimerWithTimeInterval:1.0f target:self selector:@selector(xdtimerAction) userInfo:nil repeats:YES];
[[NSRunLoop mainRunLoop] addTimer:self.xdtimer forMode:NSDefaultRunLoopMode];
if (!self.isStrengthen) {
if (self.xdtotalTime == 25) {
[self alertXDTipsWithString:@"清洁中..." isPop:NO];
}else if (self.xdtotalTime == 0){
[SVProgressHUD showInfoWithStatus:@"请验证耗材有效性"];
return;
}
self.currentStress = 4;
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_energy,[[HJTools shared] ToLongHex:self.currentStress withLength:2]] withCrc16Modbus]];
[HJGetBluetoothManager writeStr:[DR04_HFX_send_xdMode withCrc16Modbus]];
if (self.xdtimer == nil) {
self.xdtimer=[NSTimer scheduledTimerWithTimeInterval:1.0f target:self selector:@selector(xdtimerAction) userInfo:nil repeats:YES];
[[NSRunLoop mainRunLoop] addTimer:self.xdtimer forMode:NSDefaultRunLoopMode];
}
}else{
if (self.xdtotalTime == 50) {
[self alertXDTipsWithString:@"清洁中..." isPop:NO];
}else if (self.xdtotalTime == 0){
[SVProgressHUD showInfoWithStatus:@"请验证耗材有效性"];
return;
}
self.currentStress = 4;
[HJGetBluetoothManager writeStr:[DR04_HFX_send_xdMode withCrc16Modbus]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self pumpStart];
});
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_energy,[[HJTools shared] ToLongHex:self.currentStress withLength:2]] withCrc16Modbus]];
});
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.9 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self changePumpSpeedWithSize:100];
});
if (self.xdtimer == nil) {
self.xdtimer=[NSTimer scheduledTimerWithTimeInterval:1.0f target:self selector:@selector(xdtimerAction) userInfo:nil repeats:YES];
[[NSRunLoop mainRunLoop] addTimer:self.xdtimer forMode:NSDefaultRunLoopMode];
}
}
}else{
self.isStartted = true;
//发档位
......@@ -883,16 +965,28 @@
- (void)xdtimerAction{
self.xdtotalTime--;
if(self.xdtotalTime>0){
if (self.xdtotalTime == 8) {
[HJGetBluetoothManager writeStr:[DR04_HFX_send_hlMode withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(200 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
// [HJGetBluetoothManager writeStr:[DR04_HFX_send_start withCrc16Modbus]];
// });
if (self.isStrengthen) {
if (self.xdtotalTime == 35) {
[HJGetBluetoothManager writeStr:[DR04_HFX_send_hlMode withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(200 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
// [HJGetBluetoothManager writeStr:[DR04_HFX_send_start withCrc16Modbus]];
// });
}
}else{
if (self.xdtotalTime == 8) {
[HJGetBluetoothManager writeStr:[DR04_HFX_send_hlMode withCrc16Modbus]];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(200 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
// [HJGetBluetoothManager writeStr:[DR04_HFX_send_start withCrc16Modbus]];
// });
}
}
self.myView.xdtimeLb.text = [[HJTools shared] minusToTime:self.xdtotalTime];
}else{
[self changePumpSpeedWithSize:10];
self.myView.xdtimeLb.text = [[HJTools shared] minusToTime:self.xdtotalTime];
[self.xdtimer invalidate];
self.xdtimer=nil;
......@@ -910,6 +1004,13 @@
self.myView.addBtn.enabled = YES;
self.myView.stressLb.textColor = XHColorRGB_Alpha(0, 0, 0, 1);
self.myView.stressTitleLb.textColor = XHColorRGB_Alpha(0, 0, 0, 1);
self.myView.speedDecBtn.enabled = YES;
self.myView.speedAddBtn.enabled = YES;
self.myView.speedStressLb.textColor = XHColorRGB_Alpha(0, 0, 0, 1);
self.myView.speedStressTitleLb.textColor = XHColorRGB_Alpha(0, 0, 0, 1);
self.currentState = 1;
[self.myView controlWithItem:self.myView.hlBtn];
}
......@@ -1257,7 +1358,24 @@
NSLog(@"value--%@",documentsDirectory);
return documentsDirectory;
}
/// 调节蠕动泵速度
- (void)changePumpSpeedWithSize:(NSInteger)size{
if (size != 100) {
size += 20;
}
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR04_HFX_send_pumpSpeedChange,[[HJTools shared] ToLongHex:size withLength:2]] withCrc16Modbus]];
}
/// 蠕动泵开启
- (void)pumpStart{
[HJGetBluetoothManager writeStr:[DR04_HFX_send_pumpStart withCrc16Modbus]];
}
/// 蠕动泵关闭
- (void)pumpStop{
[HJGetBluetoothManager writeStr:[DR04_HFX_send_pumpStop withCrc16Modbus]];
}
#pragma mark --懒加载
......
DJMHomeTY/Page/DRFacial/View/DXHFXView.h
......@@ -23,6 +23,8 @@ typedef enum : NSUInteger{
Itemadd,
ItemstartOrstop,
ItemClearTime,
Itemspeeddec,
Itemspeedadd,
}itemType;
......@@ -44,6 +46,8 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) NSString *currentStress;
@property (nonatomic,strong) NSString *currentSpeed;
@property (nonatomic,assign) BOOL isStart;
@property (nonatomic,assign) BOOL isUVOpen;
......@@ -72,12 +76,29 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) UILabel *stressTitleLb;
@property (nonatomic,strong) UIView *centerline;
@property (nonatomic,strong) UIButton *speedDecBtn;
@property (nonatomic,strong) UIButton *speedAddBtn;
@property (nonatomic,strong) UILabel *speedStressLb;
@property (nonatomic,strong) UILabel *speedStressTitleLb;
@property (nonatomic,strong) UIView *popBgView;
@property (nonatomic,strong) UIButton *clearTimeBtn;
@property (nonatomic,strong) UIButton *volumeBtn;
@property (nonatomic,assign) BOOL is041;
- (void)controlWithItem:(UIButton *)sender;
@end
......
DJMHomeTY/Page/DRFacial/View/DXHFXView.m
......@@ -70,6 +70,40 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
_currentStress = currentStress;
self.stressLb.text = currentStress;
}
- (void)setCurrentSpeed:(NSString *)currentSpeed{
_currentSpeed = currentSpeed;
self.speedStressLb.text = currentSpeed;
}
- (void)setIs041:(BOOL)is041{
if (is041) {
dispatch_async(dispatch_get_main_queue(), ^{
self.speedDecBtn.hidden = NO;
self.speedAddBtn.hidden = NO;
self.speedStressLb.hidden = NO;
self.speedStressTitleLb.hidden = NO;
[self.timeImg mas_remakeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.decBtn);
make.top.equalTo(self.speedDecBtn.mas_bottom).offset(30*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(22, 22));
}];
});
}else{
dispatch_async(dispatch_get_main_queue(), ^{
self.speedDecBtn.hidden = YES;
self.speedAddBtn.hidden = YES;
self.speedStressLb.hidden = YES;
self.speedStressTitleLb.hidden = YES;
[self.timeImg mas_remakeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.decBtn);
make.top.equalTo(self.decBtn.mas_bottom).offset(60*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(22, 22));
}];
});
}
}
- (void)creatUI{
self.backgroundColor = XHColorRGB(247, 247, 247);
......@@ -95,42 +129,43 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
UIView *centerLine = [UIView new];
[self addSubview:centerLine];
[centerLine mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.byBtn.mas_bottom).offset(30 *IPhone6ScaleHeight);
make.top.equalTo(self.byBtn.mas_bottom).offset(15 *IPhone6ScaleHeight);
make.centerX.equalTo(self);
make.size.mas_equalTo(CGSizeMake(0.1, 0.1));
}];
_xdBtn = [UIButton buttonWithType:UIButtonTypeCustom];
//HFX_xdnomal
[_xdBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdselect"] forState:UIControlStateNormal];
[_xdBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdnomal"] forState:UIControlStateSelected];
[_xdBtn setTitle:HJLocalizedString(@"清洁设备") forState:UIControlStateNormal];
[_xdBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdnomal"] forState:UIControlStateNormal];
[_xdBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdselect"] forState:UIControlStateSelected];
[_xdBtn setTitle:HJLocalizedString(@"1.清洁设备") forState:UIControlStateNormal];
_xdBtn.userInteractionEnabled = NO;
[_xdBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_xdBtn.tag = Itemxiaodu;
[_xdBtn setTitleColor:XHColorRGB(51, 51, 51) forState:UIControlStateNormal];
[_xdBtn setTitleColor:XHColorRGB(255, 255, 255) forState:UIControlStateSelected];
_xdBtn.titleLabel.font = XHFontSize(16);
_xdBtn.titleLabel.font = XHFontSize(12);
// _xdBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 30, 0, 0);
_xdBtn.selected = YES;
[self addSubview:_xdBtn];
[_xdBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(centerLine.mas_left);
make.left.equalTo(@14);
make.centerY.equalTo(centerLine);
}];
_hlBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_hlBtn setBackgroundImage:[UIImage imageNamed:@"HFX_hlnomal"] forState:UIControlStateNormal];
[_hlBtn setBackgroundImage:[UIImage imageNamed:@"HFX_hlselect"] forState:UIControlStateSelected];
[_hlBtn setTitle:HJLocalizedString(@"护理洁面") forState:UIControlStateNormal];
[_hlBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdnomal"] forState:UIControlStateNormal];
[_hlBtn setBackgroundImage:[UIImage imageNamed:@"HFX_xdselect"] forState:UIControlStateSelected];
[_hlBtn setTitle:HJLocalizedString(@"2.面部护理") forState:UIControlStateNormal];
[_hlBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_hlBtn.userInteractionEnabled = NO;
_hlBtn.tag = Itemhuli;
[_hlBtn setTitleColor:XHColorRGB(51, 51, 51) forState:UIControlStateNormal];
[_hlBtn setTitleColor:XHColorRGB(255, 255, 255) forState:UIControlStateSelected];
_hlBtn.titleLabel.font = XHFontSize(16);
_hlBtn.titleLabel.font = XHFontSize(12);
// _hlBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -30, 0, 0);
[self addSubview:_hlBtn];
[_hlBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(centerLine.mas_right).offset(-1);
make.left.equalTo(self.xdBtn.mas_right).offset(-1);
make.centerY.equalTo(centerLine);
}];
......@@ -187,7 +222,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
_containerView = [UIView new];
_containerView.backgroundColor = [UIColor whiteColor];
_containerView.backgroundColor = [UIColor blueColor];
_containerView.layer.cornerRadius = 10.f;
_containerView.layer.masksToBounds = YES;
[self addSubview:_containerView];
......@@ -196,7 +231,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
make.centerX.equalTo(self);
make.height.equalTo(@((HJScreenWidth - 38) * 0.5625));
// make.height.equalTo(@0);
make.top.equalTo(self.allfaceBtn.mas_bottom).offset(20*IPhone6ScaleHeight);
make.top.equalTo(self.xdBtn.mas_bottom).offset(12*IPhone6ScaleHeight);
}];
ZFAVPlayerManager *playerManager = [[ZFAVPlayerManager alloc] init];
playerManager.shouldAutoPlay = YES;
......@@ -276,7 +311,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
[_bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self);
make.bottom.equalTo(@0);
make.top.equalTo(self.containerView.mas_bottom).offset(90*IPhone6ScaleHeight);
make.top.equalTo(self.containerView.mas_bottom).offset(40*IPhone6ScaleHeight);
}];
[self layoutIfNeeded];
......@@ -304,7 +339,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
[self.layer insertSublayer:_bottomlayer below:self.bottomView.layer];
_noChangeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_noChangeBtn setTitle:HJLocalizedString(@"清洁模式不可调节负压") forState:UIControlStateNormal];
[_noChangeBtn setTitle:HJLocalizedString(@"清洁设备不可调节负压、流速") forState:UIControlStateNormal];
[_noChangeBtn setImage:[UIImage imageNamed:@"HFX_nochange"] forState:UIControlStateNormal];
[_noChangeBtn setTitleColor:XHColorRGB_Alpha(0, 0, 0, 0.65) forState:UIControlStateNormal];
_noChangeBtn.titleLabel.font = XHFontSize(12);
......@@ -317,7 +352,8 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
_decBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_decBtn setBackgroundImage:[UIImage imageNamed:@"HFX_lit"] forState:UIControlStateNormal];
[_decBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_lit_dis"] forState:UIControlStateNormal];
[_decBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_lit"] forState:UIControlStateDisabled];
[_decBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_decBtn.tag = Itemdec;
[self.bottomView addSubview:_decBtn];
......@@ -326,7 +362,8 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
make.top.equalTo(@(30 *IPhone6ScaleHeight));
}];
_addBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_addBtn setBackgroundImage:[UIImage imageNamed:@"HFX_add"] forState:UIControlStateNormal];
[_addBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_add_dis"] forState:UIControlStateNormal];
[_addBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_add"] forState:UIControlStateDisabled];
[_addBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_addBtn.tag = Itemadd;
[self.bottomView addSubview:_addBtn];
......@@ -336,7 +373,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
}];
_stressLb = [UILabel new];
_stressLb.text = @"0";
_stressLb.font = [UIFont boldSystemFontOfSize:36];
_stressLb.font = [UIFont boldSystemFontOfSize:29];
_stressLb.textColor = [UIColor blackColor];
[self.bottomView addSubview:_stressLb];
[_stressLb mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -345,7 +382,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
}];
_stressTitleLb = [UILabel new];
_stressTitleLb.text = HJLocalizedString(@"负压调节");
_stressTitleLb.font = XHFontSize(12);
_stressTitleLb.font = XHFontSize(10);
_stressTitleLb.textColor = [UIColor blackColor];
[self.bottomView addSubview:_stressTitleLb];
[_stressTitleLb mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -353,16 +390,88 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
make.top.equalTo(self.stressLb.mas_bottom).offset(5*IPhone6ScaleHeight);
}];
self.centerline = [UIView new];
_centerline.backgroundColor = XHColorRGB(231, 230, 230);
[self.bottomView addSubview:_centerline];
[_centerline mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.decBtn.mas_left).offset(-2);
make.right.equalTo(self.addBtn.mas_right).offset(2);
make.top.equalTo(self.addBtn.mas_bottom).offset(10);
make.height.equalTo(@0.5);
}];
_speedDecBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_speedDecBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_lit_dis"] forState:UIControlStateNormal];
[_speedDecBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_lit"] forState:UIControlStateDisabled];
[_speedDecBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_speedDecBtn.tag = Itemspeeddec;
[self.bottomView addSubview:_speedDecBtn];
[_speedDecBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.decBtn);
make.top.equalTo(self.decBtn.mas_bottom).offset((20 *IPhone6ScaleHeight));
}];
_speedAddBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_speedAddBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_add_dis"] forState:UIControlStateNormal];
[_speedAddBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_add"] forState:UIControlStateDisabled];
[_speedAddBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_speedAddBtn.tag = Itemspeedadd;
[self.bottomView addSubview:_speedAddBtn];
[_speedAddBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.addBtn);
make.top.equalTo(self.decBtn.mas_bottom).offset((20 *IPhone6ScaleHeight));;
}];
_speedStressLb = [UILabel new];
_speedStressLb.text = @"10";
_speedStressLb.font = [UIFont boldSystemFontOfSize:29];
_speedStressLb.textColor = [UIColor blackColor];
[self.bottomView addSubview:_speedStressLb];
[_speedStressLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.bottomView);
make.centerY.equalTo(self.speedDecBtn).multipliedBy(0.9);
}];
_speedStressTitleLb = [UILabel new];
_speedStressTitleLb.text = HJLocalizedString(@"精华液流速");
_speedStressTitleLb.font = XHFontSize(10);
_speedStressTitleLb.textColor = [UIColor blackColor];
[self.bottomView addSubview:_speedStressTitleLb];
[_speedStressTitleLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.bottomView);
make.top.equalTo(self.speedStressLb.mas_bottom).offset(5*IPhone6ScaleHeight);
}];
_timeImg = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"HFX_time"]];
[self.bottomView addSubview:_timeImg];
[_timeImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.decBtn);
make.top.equalTo(self.decBtn.mas_bottom).offset(40*IPhone6ScaleHeight);
make.top.equalTo(self.speedDecBtn.mas_bottom).offset(30*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(22, 22));
}];
_timeLb = [UILabel new];
_timeLb.text = @"00:00";
_timeLb.font = [UIFont boldSystemFontOfSize:28];
_timeLb.font = [UIFont boldSystemFontOfSize:23];
_timeLb.textColor = XHColorRGB(175, 44, 35);
[self.bottomView addSubview:_timeLb];
[_timeLb mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -386,7 +495,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
_startBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_startBtn setBackgroundImage:[UIImage imageNamed:@"HFX_start"] forState:UIControlStateNormal];
[_startBtn setBackgroundImage:[UIImage imageNamed:@"HFX_041_start"] forState:UIControlStateNormal];
[_startBtn setBackgroundImage:[UIImage imageNamed:@"HFX_stop"] forState:UIControlStateSelected];
[_startBtn addTarget:self action:@selector(controlWithItem:) forControlEvents:UIControlEventTouchUpInside];
_startBtn.tag = ItemstartOrstop;
......@@ -440,8 +549,12 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
_hlBtn.selected = NO;
_decBtn.enabled = NO;
_addBtn.enabled = NO;
_stressLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.65);
_stressTitleLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.65);
_speedDecBtn.enabled = NO;
_speedAddBtn.enabled = NO;
_stressLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.35);
_stressTitleLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.35);
_speedStressLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.35);
_speedStressTitleLb.textColor = XHColorRGB_Alpha(0, 0, 0, 0.35);
[self setTimeLineWithString:_currentVideoList[0].describeInfo];
}
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{
......@@ -462,132 +575,131 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
}];
}
- (void)setTimeLineWithString:(NSString *)describeInfo{
self.timesBtnArray = [NSMutableArray array];
// describeInfo = @"额头:180:0,鼻子:240:182,嘴周:60:428,下巴:60:491,脸颊:120:555,苹果肌:60:677,局部加强:180:741";
// describeInfo = [describeInfo stringByReplacingOccurrencesOfString:@":" withString:@"\n"];
NSArray *itemTitleArray = [describeInfo componentsSeparatedByString:@","];
NSMutableArray *titleArray = [NSMutableArray array];
NSMutableArray *titleTimeArray = [NSMutableArray array];
NSMutableArray *timeArray = [NSMutableArray array];
for (int i = 0; i < itemTitleArray.count; i ++) {
NSArray *temparray = [itemTitleArray[i] componentsSeparatedByString:@":"];
[titleArray addObject:temparray[0]];
[titleTimeArray addObject:temparray[1]];
[timeArray addObject:temparray[2]];
}
NSMutableArray *titleTimeArray1 = [NSMutableArray array];
for (__strong NSString *titleTime in titleTimeArray) {
if([titleTime intValue] < 60){
if (!titleTime || [titleTime isEqualToString:@""]) {
titleTime = @"";
// self.timesBtnArray = [NSMutableArray array];
//
// NSArray *itemTitleArray = [describeInfo componentsSeparatedByString:@","];
// NSMutableArray *titleArray = [NSMutableArray array];
// NSMutableArray *titleTimeArray = [NSMutableArray array];
// NSMutableArray *timeArray = [NSMutableArray array];
// for (int i = 0; i < itemTitleArray.count; i ++) {
// NSArray *temparray = [itemTitleArray[i] componentsSeparatedByString:@":"];
// [titleArray addObject:temparray[0]];
// [titleTimeArray addObject:temparray[1]];
// [timeArray addObject:temparray[2]];
// }
// NSMutableArray *titleTimeArray1 = [NSMutableArray array];
// for (__strong NSString *titleTime in titleTimeArray) {
// if([titleTime intValue] < 60){
// if (!titleTime || [titleTime isEqualToString:@""]) {
// titleTime = @"";
//// titleTime = [NSString stringWithFormat:@"%@s",titleTime];
// }else{
// titleTime = [NSString stringWithFormat:@"%@s",titleTime];
}else{
titleTime = [NSString stringWithFormat:@"%@s",titleTime];
}
}else if([titleTime intValue] % 60 == 0){
titleTime = [NSString stringWithFormat:@"%dmin",[titleTime intValue] / 60];
}else{
titleTime = [NSString stringWithFormat:@"%dmins %ds",[titleTime intValue] / 60,[titleTime intValue] % 60];
}
[titleTimeArray1 addObject:titleTime];
}
if(itemTitleArray.count > 1){
_timeScrollView = [[UIScrollView alloc] init];
// _timeScrollView.showsVerticalScrollIndicator = NO;
_timeScrollView.showsHorizontalScrollIndicator = NO;
UIView *contentView = [UIView new];
[self insertSubview:_timeScrollView belowSubview:self.popBgView];
// [self insertSubview:_timeScrollView atIndex:self.subviews.count - 1];
[_timeScrollView addSubview:contentView];
[_timeScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.containerView.mas_bottom).offset(20*IPhone6ScaleHeight);
make.left.equalTo(@18);
make.right.equalTo(self);
make.height.equalTo(@(55*IPhone6ScaleHeight));
}];
[contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.timeScrollView);
make.height.mas_equalTo(self.timeScrollView);
}];
UIButton *lastBtn;
for (int i = 0; i < itemTitleArray.count; i ++) {
UIButton *timeItem = [UIButton buttonWithType:UIButtonTypeCustom];
[timeItem setBackgroundImage:[UIImage imageNamed:@"HFX_timeitemnomal"] forState:UIControlStateNormal];
[timeItem setBackgroundImage:[UIImage imageNamed:@"HFX_timeitemsel"] forState:UIControlStateSelected];
if (!titleTimeArray1[i] || [titleTimeArray1[i] isEqualToString:@""]) {
[timeItem setTitle:[NSString stringWithFormat:@"%@",titleArray[i]] forState:UIControlStateNormal];
}else{
[timeItem setTitle:[NSString stringWithFormat:@"%@\n%@",titleArray[i],titleTimeArray1[i]] forState:UIControlStateNormal];
}
timeItem.titleLabel.font = XHFontSize(12);
timeItem.titleLabel.numberOfLines = 2;
timeItem.titleLabel.lineBreakMode = NSLineBreakByCharWrapping;
timeItem.titleLabel.textAlignment = 1;
[timeItem addTarget:self action:@selector(changeViewPlayTime:) forControlEvents:UIControlEventTouchUpInside];
timeItem.tag = 96110 + [timeArray[i] integerValue];
[timeItem setTitleColor:XHColorRGB(0, 0, 0) forState:UIControlStateNormal];
if(i == 0){
timeItem.selected = YES;
}
[self.timesBtnArray addObject:timeItem];
[contentView addSubview:timeItem];
[timeItem mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(contentView);
if(lastBtn){
make.left.equalTo(lastBtn.mas_right).offset(20);
}else{
make.left.equalTo(@0);
}
make.size.mas_equalTo(CGSizeMake(70, 45*IPhone6ScaleHeight));
}];
lastBtn = timeItem;
[contentView layoutIfNeeded];
CALayer*layer = [CALayer layer];
layer.frame = timeItem.frame;
layer.shadowColor= [UIColor blackColor].CGColor;
layer.shadowOffset = CGSizeMake(1,1);
layer.shadowOpacity = 0.08;
layer.cornerRadius = 8;
CGRect frame = timeItem.bounds;
frame.origin.x= frame.origin.x+5;//向左减 向右加
frame.origin.y= frame.origin.y+5;//向上减 向下加
frame.size.width= frame.size.width;//阴影的宽度
frame.size.height= frame.size.height;//阴影的高度
layer.shadowPath = [[UIBezierPath bezierPathWithRect:frame] CGPath ];
//这里self表示当前自定义的view
[contentView.layer insertSublayer:layer below:timeItem.layer];
}
[contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(lastBtn.mas_right);
}];
[self layoutIfNeeded];
[_timeScrollView setContentSize:CGSizeMake(contentView.size.width, 0)];
_timeScrollView.alwaysBounceVertical = NO;
}
// }
//
// }else if([titleTime intValue] % 60 == 0){
// titleTime = [NSString stringWithFormat:@"%dmin",[titleTime intValue] / 60];
// }else{
// titleTime = [NSString stringWithFormat:@"%dmins %ds",[titleTime intValue] / 60,[titleTime intValue] % 60];
// }
// [titleTimeArray1 addObject:titleTime];
// }
//
// if(itemTitleArray.count > 1){
// _timeScrollView = [[UIScrollView alloc] init];
//
// _timeScrollView.showsHorizontalScrollIndicator = NO;
// UIView *contentView = [UIView new];
// [self insertSubview:_timeScrollView belowSubview:self.popBgView];
//
// [_timeScrollView addSubview:contentView];
// [_timeScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(self.containerView.mas_bottom).offset(20*IPhone6ScaleHeight);
// make.left.equalTo(@18);
// make.right.equalTo(self);
// make.height.equalTo(@(55*IPhone6ScaleHeight));
// }];
// [contentView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.edges.mas_equalTo(self.timeScrollView);
// make.height.mas_equalTo(self.timeScrollView);
// }];
//
// UIButton *lastBtn;
// for (int i = 0; i < itemTitleArray.count; i ++) {
// UIButton *timeItem = [UIButton buttonWithType:UIButtonTypeCustom];
// [timeItem setBackgroundImage:[UIImage imageNamed:@"HFX_timeitemnomal"] forState:UIControlStateNormal];
// [timeItem setBackgroundImage:[UIImage imageNamed:@"HFX_timeitemsel"] forState:UIControlStateSelected];
// if (!titleTimeArray1[i] || [titleTimeArray1[i] isEqualToString:@""]) {
// [timeItem setTitle:[NSString stringWithFormat:@"%@",titleArray[i]] forState:UIControlStateNormal];
// }else{
// [timeItem setTitle:[NSString stringWithFormat:@"%@\n%@",titleArray[i],titleTimeArray1[i]] forState:UIControlStateNormal];
// }
//
// timeItem.titleLabel.font = XHFontSize(12);
// timeItem.titleLabel.numberOfLines = 2;
// timeItem.titleLabel.lineBreakMode = NSLineBreakByCharWrapping;
// timeItem.titleLabel.textAlignment = 1;
// [timeItem addTarget:self action:@selector(changeViewPlayTime:) forControlEvents:UIControlEventTouchUpInside];
// timeItem.tag = 96110 + [timeArray[i] integerValue];
//
// [timeItem setTitleColor:XHColorRGB(0, 0, 0) forState:UIControlStateNormal];
// if(i == 0){
// timeItem.selected = YES;
// }
// [self.timesBtnArray addObject:timeItem];
// [contentView addSubview:timeItem];
// [timeItem mas_makeConstraints:^(MASConstraintMaker *make) {
// make.top.equalTo(contentView);
// if(lastBtn){
// make.left.equalTo(lastBtn.mas_right).offset(20);
// }else{
// make.left.equalTo(@0);
// }
// make.size.mas_equalTo(CGSizeMake(70, 45*IPhone6ScaleHeight));
// }];
// lastBtn = timeItem;
//
// [contentView layoutIfNeeded];
//
// CALayer*layer = [CALayer layer];
//
// layer.frame = timeItem.frame;
// layer.shadowColor= [UIColor blackColor].CGColor;
// layer.shadowOffset = CGSizeMake(1,1);
//
// layer.shadowOpacity = 0.08;
//
// layer.cornerRadius = 8;
// CGRect frame = timeItem.bounds;
//
// frame.origin.x= frame.origin.x+5;//向左减 向右加
//
// frame.origin.y= frame.origin.y+5;//向上减 向下加
//
// frame.size.width= frame.size.width;//阴影的宽度
//
// frame.size.height= frame.size.height;//阴影的高度
// layer.shadowPath = [[UIBezierPath bezierPathWithRect:frame] CGPath ];
// //这里self表示当前自定义的view
//
// [contentView.layer insertSublayer:layer below:timeItem.layer];
// }
// [contentView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.right.equalTo(lastBtn.mas_right);
// }];
//
// [self layoutIfNeeded];
// [_timeScrollView setContentSize:CGSizeMake(contentView.size.width, 0)];
// _timeScrollView.alwaysBounceVertical = NO;
// }
//
//
//
//
//
//
//
//
}
- (void)changeViewPlayTime:(UIButton *)sender{
......@@ -627,12 +739,12 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
make.width.equalTo(@(HJScreenWidth - 38));
make.centerX.equalTo(self);
make.height.equalTo(@((HJScreenWidth - 38) * 0.5625));
make.top.equalTo(self.allfaceBtn.mas_bottom).offset(15*IPhone6ScaleHeight);
make.top.equalTo(self.xdBtn.mas_bottom).offset(12*IPhone6ScaleHeight);
}];
[self layoutIfNeeded];
_bottomlayer.frame = _bottomView.frame;
}else{
_allfaceBtn.hidden = NO;
_allfaceBtn.hidden = YES;
[_allfaceBtn setTitle:_currentVideoList[0].detail forState:UIControlStateNormal];
}
[self setTimeLineWithString:_currentVideoList[0].describeInfo];
......@@ -673,7 +785,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
if(_currentVideoList.count < 2){
self.allfaceBtn.hidden = YES;
}else{
self.allfaceBtn.hidden = NO;
self.allfaceBtn.hidden = YES;
[_allfaceBtn setTitle:_currentVideoList[0].detail forState:UIControlStateNormal];
}
[self.collectionView reloadData];
......@@ -695,7 +807,7 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
if(_currentVideoList.count < 2){
self.allfaceBtn.hidden = YES;
}else{
self.allfaceBtn.hidden = NO;
self.allfaceBtn.hidden = YES;
[_allfaceBtn setTitle:_currentVideoList[0].detail forState:UIControlStateNormal];
}
[self.collectionView reloadData];
......@@ -833,7 +945,4 @@ static NSString *dXHFXVideoCell = @"DXHFXVideoCell";
@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