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

DJMHomeTY/Assets.xcassets/HFX/HFX_041_add.imageset/Contents.json

+{
+  "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

+{
+  "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

+{
+  "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

+{
+  "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

+{
+  "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