Skip to content

D
DrWater
Commit ce3d07de by 李威
Options

热电

parent cab09589
Showing with 63 additions and 4 deletions
DJMHomeTY/Global/Base/Controller/XHParentVC.m
...@@ -514,6 +514,7 @@ ...@@ -514,6 +514,7 @@
@[@"1800",@"1800",@"1800",@"1800",@"1800"],//ps2 @[@"1800",@"1800",@"1800",@"1800",@"1800"],//ps2
@[@"1800",@"1800",@"1800",@"2700",@"1800",@"1800"],//DJMHome @[@"1800",@"1800",@"1800",@"2700",@"1800",@"1800"],//DJMHome
@[@"1800",@"1800",@"1800",@"1800",@"1800"],//Drfacialage @[@"1800",@"1800",@"1800",@"1800",@"1800"],//Drfacialage
@[@"1800",@"1800",@"1800",@"1800",@"1800"],//Dr热电
@[@"1800",@"1800",@"1800",@"1800",@"1800"],//Dr水滴 @[@"1800",@"1800",@"1800",@"1800",@"1800"],//Dr水滴
@[@"395",@"395",@"395",@"395",@"395"],//SEYOAP @[@"395",@"395",@"395",@"395",@"395"],//SEYOAP
@[@"395",@"395",@"395",@"395",@"395"]//DJM邦颜 @[@"395",@"395",@"395",@"395",@"395"]//DJM邦颜
......
DJMHomeTY/Global/Define/XHCommand.h
...@@ -204,7 +204,14 @@ ...@@ -204,7 +204,14 @@
#define DR04_HFX_get_stop @"06000B31010200"//获取暂停 #define DR04_HFX_get_stop @"06000B31010200"//获取暂停
#define DR04_HFX_get_shortPress @"55AA06000B310102039CC6"//获取短按 #define DR04_HFX_get_shortPress @"55AA06000B310102039CC6"//获取短按
#pragma =--=-==-=-DR04==-=-=--==-=-=-=-
#define DR05_HE_send_PowerOff @"0600a631020100"//发送关机
#define DR05_HE_send_PowerOn @"0600a631020101"//发送开机
#define DR05_HE_send_enterEMS @"0500a6310202"//发送进入EMS
#define DR05_HE_send_stop @"0600a632020900"//发送暂停
#define DR05_HE_send_start @"0600a632020901"//发送开启
#define DR05_HE_send_wendu @"0600a632020b"//发送温度
#define DR05_HE_send_nengliang @"0600a632020a"//发送能量
#endif /* XHCommand_h */ #endif /* XHCommand_h */
DJMHomeTY/Global/Define/XHConstants.h
...@@ -151,6 +151,7 @@ static NSString *const HJNotificationDisconnect = @"NotificationDisconnect"; ...@@ -151,6 +151,7 @@ static NSString *const HJNotificationDisconnect = @"NotificationDisconnect";
#define Dr022DeviceName @"Dr-02-2"//4档 #define Dr022DeviceName @"Dr-02-2"//4档
#define Dr04DeviceName @"Dr-04" #define Dr04DeviceName @"Dr-04"
#define Dr041DeviceName @"Dr-04-1" #define Dr041DeviceName @"Dr-04-1"
#define Dr05DeviceName @"Dr-05"
//SEYO //SEYO
#define DrSEYOAPDeviceName @"LS02" #define DrSEYOAPDeviceName @"LS02"
......
DJMHomeTY/Global/Define/XHURL.h
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef XHURL_h #ifndef XHURL_h
#define XHURL_h #define XHURL_h
//#define URL @"https://testdjm.imoreme.com"//测试 //#define URL @"https://testdjm.imoreme.com"//测试
#define URL @"http://djm.imoreme.com"//正式 #define URL @"https://djm.imoreme.com"//正式
//#define URL @"http://192.168.1.168:8080"//luocong //#define URL @"http://192.168.1.168:8080"//luocong
/** 发送验证码 **/ /** 发送验证码 **/
#define VerifyCodeURL [NSString stringWithFormat:@"%@%@",URL,@"/ldm/api/getVerifyCode"] #define VerifyCodeURL [NSString stringWithFormat:@"%@%@",URL,@"/ldm/api/getVerifyCode"]
......
DJMHomeTY/Global/Manager/HJBluetoothManager.m
...@@ -277,7 +277,7 @@ static HJBluetoothManager *sharedinstance = nil; ...@@ -277,7 +277,7 @@ static HJBluetoothManager *sharedinstance = nil;
break; break;
case 5://DrWarter case 5://DrWarter
{ {
self.DeviceArr = @[Dr02DeviceName,Dr04DeviceName,Dr041DeviceName]; self.DeviceArr = @[Dr02DeviceName,Dr04DeviceName,Dr041DeviceName,Dr05DeviceName];
//,Dr021DeviceName //,Dr021DeviceName
} }
break; break;
...@@ -303,6 +303,14 @@ static HJBluetoothManager *sharedinstance = nil; ...@@ -303,6 +303,14 @@ static HJBluetoothManager *sharedinstance = nil;
[self updateBleStatus:BluetoothStatusFoundPeripheral]; [self updateBleStatus:BluetoothStatusFoundPeripheral];
[_centralManager connectPeripheral:peripheral options:nil]; [_centralManager connectPeripheral:peripheral options:nil];
} }
}else if (XHGetDataManager.machineIndex == 2) {
if ([advertisementData[@"kCBAdvDataLocalName"] isEqualToString:Dr05DeviceName]) {
XHGetDataManager.deviceCode = advertisementData[@"kCBAdvDataLocalName"];
_servicePeripheral = peripheral;
[self stopScanning];
[self updateBleStatus:BluetoothStatusFoundPeripheral];
[_centralManager connectPeripheral:peripheral options:nil];
}
} }
}else{ }else{
if ([advertisementData[@"kCBAdvDataLocalName"] isEqualToString:self.DeviceArr[XHGetDataManager.machineIndex]]) { if ([advertisementData[@"kCBAdvDataLocalName"] isEqualToString:self.DeviceArr[XHGetDataManager.machineIndex]]) {
......
DJMHomeTY/Global/Manager/XHDataManager.h
...@@ -39,7 +39,11 @@ ...@@ -39,7 +39,11 @@
/// 上次操作流速 /// 上次操作流速
@property (nonatomic,assign) NSInteger currentspeed; @property (nonatomic,assign) NSInteger currentspeed;
/// 上次操作温度
@property (nonatomic,assign) NSInteger currentwendu;
/// 上次操作能量
@property (nonatomic,assign) NSInteger currentnengliang;
/// 密码 /// 密码
@property (nonatomic,copy) NSString *passWord; @property (nonatomic,copy) NSString *passWord;
/// 验证码 /// 验证码
......
DJMHomeTY/Global/Manager/XHDataManager.m
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
#define Age @"age" #define Age @"age"
#define Currentspeed @"currentspeed" #define Currentspeed @"currentspeed"
#define CurrentWendu @"currentwendu"
#define CurrentNengliang @"currentnengliang"
#define ClientId @"clientId" #define ClientId @"clientId"
...@@ -157,6 +162,22 @@ ...@@ -157,6 +162,22 @@
return [[self userDefaults] integerForKey:Currentspeed]; return [[self userDefaults] integerForKey:Currentspeed];
} }
-(void)setCurrentwendu:(NSInteger)currentspeed{
[[self userDefaults] setInteger:currentspeed forKey:CurrentWendu];
[[self userDefaults] synchronize];
}
-(NSInteger)currentwendu{
return [[self userDefaults] integerForKey:CurrentWendu];
}
-(void)setCurrentnengliang:(NSInteger)currentspeed{
[[self userDefaults] setInteger:currentspeed forKey:CurrentNengliang];
[[self userDefaults] synchronize];
}
-(NSInteger)currentnengliang{
return [[self userDefaults] integerForKey:CurrentNengliang];
}
-(void)setAge:(NSString *)age{ -(void)setAge:(NSString *)age{
[[self userDefaults] setObject:age forKey:Age]; [[self userDefaults] setObject:age forKey:Age];
......
DJMHomeTY/Global/Manager/XHHttpRequestManager.m
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
manager.responseSerializer = [AFJSONResponseSerializer serializer]; manager.responseSerializer = [AFJSONResponseSerializer serializer];
} }
manager.requestSerializer.timeoutInterval = 50; manager.requestSerializer.timeoutInterval = 50;
[manager.requestSerializer setValue:XHGetDataManager.token forHTTPHeaderField:@"token"];
[manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) { [manager GET:url parameters:updateDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) {
} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
......
DJMHomeTY/Page/DRFacial/Controller/DXHEUpkeepVC.m
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import <ZFPlayer/ZFPlayerControlView.h> #import <ZFPlayer/ZFPlayerControlView.h>
#import <ZFPlayer/ZFAVPlayerManager.h> #import <ZFPlayer/ZFAVPlayerManager.h>
#import "DXHFXVideoModel.h" #import "DXHFXVideoModel.h"
#import "KTVHTTPCache.h" #import <KTVHTTPCache/KTVHTTPCache.h>
@interface DXHEUpkeepVC () @interface DXHEUpkeepVC ()
@property (nonatomic, strong) ZFPlayerControlView *controlView; @property (nonatomic, strong) ZFPlayerControlView *controlView;
......
DJMHomeTY/Page/DRFacial/View/DXHotElecticView.h
...@@ -23,14 +23,30 @@ typedef enum : NSUInteger{ ...@@ -23,14 +23,30 @@ typedef enum : NSUInteger{
ItemHEstartOrstop, ItemHEstartOrstop,
ItemHEClearTime ItemHEClearTime
}itemHotType; }itemHotType;
@protocol DXHotElecticViewDelegate <NSObject>
-(void)sendNengLangValue:(NSInteger)nengliangNum;
-(void)sendwenduValue:(NSInteger)wenduNum;
-(void)palyOrStopDevice:(UIButton *)button;
-(void)deviceNoConnected;
-(void)clearTime;
@end
@interface DXHotElecticView : UIView @interface DXHotElecticView : UIView
@property (nonatomic,strong) ZFPlayerController *playerView; @property (nonatomic,strong) ZFPlayerController *playerView;
@property (nonatomic,strong) DXHFXVideoDetailsModel *videoModel; @property (nonatomic,strong) DXHFXVideoDetailsModel *videoModel;
@property (nonatomic,strong) NSMutableArray <DXRDSmartRec *>*smartRecModelArray; @property (nonatomic,strong) NSMutableArray <DXRDSmartRec *>*smartRecModelArray;
@property (nonatomic,strong) id<DXHotElecticViewDelegate>delegate;
@property (nonatomic,assign) BOOL isConnected;//是否连接蓝牙
@property (nonatomic,strong) UIButton *startBtn;
@property (nonatomic,strong) UILabel *timeLb;
//模式切换 0.智能推荐 1.自定义 //模式切换 0.智能推荐 1.自定义
-(void)switchingModeType:(NSInteger)type; -(void)switchingModeType:(NSInteger)type;
@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