Skip to content

D
DrWater
Commit 944d66f6 by 路少雄
Options

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

# Conflicts:
#	DJMHomeTY.xcodeproj/project.pbxproj
#	DJMHomeTY/Global/Define/XHURL.h
parents 720de45f 99da4460
Showing with 384 additions and 126 deletions
DJMHomeTY.xcodeproj/project.pbxproj
...@@ -676,6 +676,7 @@ ...@@ -676,6 +676,7 @@
2DDF3A57856A2F27B92CD379 /* Pods-HJMDrWarter.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HJMDrWarter.debug.xcconfig"; path = "Target Support Files/Pods-HJMDrWarter/Pods-HJMDrWarter.debug.xcconfig"; sourceTree = "<group>"; }; 2DDF3A57856A2F27B92CD379 /* Pods-HJMDrWarter.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HJMDrWarter.debug.xcconfig"; path = "Target Support Files/Pods-HJMDrWarter/Pods-HJMDrWarter.debug.xcconfig"; sourceTree = "<group>"; };
390516C52BAA75D000935EDE /* DXHotElecticView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXHotElecticView.h; sourceTree = "<group>"; }; 390516C52BAA75D000935EDE /* DXHotElecticView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXHotElecticView.h; sourceTree = "<group>"; };
390516C62BAA75D000935EDE /* DXHotElecticView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXHotElecticView.m; sourceTree = "<group>"; }; 390516C62BAA75D000935EDE /* DXHotElecticView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXHotElecticView.m; sourceTree = "<group>"; };
39514C652C5A0A1000D785DC /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
39E082732BB3BA6800786B9D /* DXRDSmartRec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXRDSmartRec.h; sourceTree = "<group>"; }; 39E082732BB3BA6800786B9D /* DXRDSmartRec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXRDSmartRec.h; sourceTree = "<group>"; };
39E082742BB3BA6800786B9D /* DXRDSmartRec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXRDSmartRec.m; sourceTree = "<group>"; }; 39E082742BB3BA6800786B9D /* DXRDSmartRec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXRDSmartRec.m; sourceTree = "<group>"; };
39E1E5FF031957A0EABCCB00 /* Pods-DJMHomeTY.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DJMHomeTY.debug.xcconfig"; path = "Target Support Files/Pods-DJMHomeTY/Pods-DJMHomeTY.debug.xcconfig"; sourceTree = "<group>"; }; 39E1E5FF031957A0EABCCB00 /* Pods-DJMHomeTY.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DJMHomeTY.debug.xcconfig"; path = "Target Support Files/Pods-DJMHomeTY/Pods-DJMHomeTY.debug.xcconfig"; sourceTree = "<group>"; };
...@@ -3048,6 +3049,7 @@ ...@@ -3048,6 +3049,7 @@
children = ( children = (
880BFDA729A85D4B00B59CFA /* zh-Hans */, 880BFDA729A85D4B00B59CFA /* zh-Hans */,
880BFDAC29A85D4B00B59CFA /* Base */, 880BFDAC29A85D4B00B59CFA /* Base */,
39514C652C5A0A1000D785DC /* zh-Hant */,
); );
name = Localizable.strings; name = Localizable.strings;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3171,7 +3173,7 @@ ...@@ -3171,7 +3173,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
...@@ -3197,7 +3199,7 @@ ...@@ -3197,7 +3199,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.7; MARKETING_VERSION = 1.2.8;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -3217,7 +3219,7 @@ ...@@ -3217,7 +3219,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
...@@ -3243,7 +3245,7 @@ ...@@ -3243,7 +3245,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.2.7; MARKETING_VERSION = 1.2.8;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -3263,7 +3265,7 @@ ...@@ -3263,7 +3265,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -3288,7 +3290,7 @@ ...@@ -3288,7 +3290,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.1; MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
...@@ -3308,7 +3310,7 @@ ...@@ -3308,7 +3310,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 8Z4G7AGK6D; DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -3333,7 +3335,7 @@ ...@@ -3333,7 +3335,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.1; MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR; PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
...@@ -169,6 +169,21 @@ ...@@ -169,6 +169,21 @@
endingLineNumber = "1560" endingLineNumber = "1560"
offsetFromSymbolStart = "24"> offsetFromSymbolStart = "24">
</Location> </Location>
<Location
uuid = "C7F8CC65-4282-4316-B969-EF2447928026 - f67225bf6830039d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[DXHFXVC setIsBack:]"
moduleName = "HJMDrWarter"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lushaoxiong/Desktop/%E5%85%AC%E5%8F%B8%E9%A1%B9%E7%9B%AE/DrWater/DJMHomeTY/Page/DRFacial/Controller/DXHFXVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1559"
endingLineNumber = "1559"
offsetFromSymbolStart = "248">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
......
DJMHomeTY.xcworkspace/xcuserdata/nana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
...@@ -7,48 +7,32 @@ ...@@ -7,48 +7,32 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "EB862767-11A9-4A08-AD68-EF9112614070" uuid = "94B0D0F9-380D-4E87-9D9C-DBBCBEB276DF"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Manager/XHHttpRequestManager.m" filePath = "DJMHomeTY/Global/Base/View/HJVerifyView.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "49" startingLineNumber = "157"
endingLineNumber = "49" endingLineNumber = "157"
landmarkName = "-getHttpRequestURL:isJson:parameters:success:fail:networkRequestsFail:" landmarkName = "-initWithFrame:withScanCommandArr:"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
uuid = "AA50D0ED-0F14-4D38-9253-455A200313BD" uuid = "E3A5FF1E-EAAA-42DE-B2F0-5177BF64AA18"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Manager/XHHttpRequestManager.m" filePath = "DJMHomeTY/Page/SetPage/View/XHResetDeviceNameView.m"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "116" startingLineNumber = "50"
endingLineNumber = "116" endingLineNumber = "50"
landmarkName = "-postHttpRequestURL1:isJson:parameters:success:fail:networkRequestsFail:" landmarkName = "-createUI"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "00BDAC4F-446F-445D-A93E-D3B201636F45"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Manager/XHHttpRequestManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "171"
endingLineNumber = "171"
landmarkName = "-postHttpRequestURL:isJson:parameters:success:fail:networkRequestsFail:"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
......
DJMHomeTY/Assets.xcassets/HFX/HFX_supplyImg.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "护理(未改版） 拷贝 6@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "护理(未改版） 拷贝 6@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Global/Base/Controller/XHParentVC.h
...@@ -79,6 +79,7 @@ typedef NS_ENUM(NSInteger, TipsTag) ...@@ -79,6 +79,7 @@ typedef NS_ENUM(NSInteger, TipsTag)
//自动手动点集合 //自动手动点集合
@property (nonatomic,strong) NSMutableArray *outoOrManRecord; @property (nonatomic,strong) NSMutableArray *outoOrManRecord;
@property (nonatomic,assign)BOOL issupply;//海菲秀是否强效补给
- (void)exitTips; - (void)exitTips;
-(void)hindenActivityIndicator; -(void)hindenActivityIndicator;
......
DJMHomeTY/Global/Base/Controller/XHParentVC.m
...@@ -448,7 +448,8 @@ ...@@ -448,7 +448,8 @@
@"verification":self.isOrderCommand?@"1234":@"-1",//@"1234" @"verification":self.isOrderCommand?@"1234":@"-1",//@"1234"
@"consumableNumber":[NSString isNull:str]?@"-1":str, @"consumableNumber":[NSString isNull:str]?@"-1":str,
@"deviceid":XHGetDataManager.deviceID, @"deviceid":XHGetDataManager.deviceID,
@"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage] @"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage],
@"model":self.issupply?@"1":@"0"
}; };
HJSelfWeak; HJSelfWeak;
[SVProgressHUD showWithStatus:HJLocalizedString(@"正在验证，请稍后…")]; [SVProgressHUD showWithStatus:HJLocalizedString(@"正在验证，请稍后…")];
...@@ -481,11 +482,16 @@ ...@@ -481,11 +482,16 @@
}else{ }else{
messages = [NSString stringWithFormat:@"%@",failMessage[@"msg"]]; messages = [NSString stringWithFormat:@"%@",failMessage[@"msg"]];
} }
if (messages.intValue == 13001 || messages.intValue == 13002) {
weakSelf.isVerifySucceed = NO;
}else {
[SVProgressHUD showErrorWithStatus:messages];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
});
}
[SVProgressHUD showErrorWithStatus:messages];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
});
if (self.DevicesuccesedBlock) { if (self.DevicesuccesedBlock) {
self.DevicesuccesedBlock(true,false); self.DevicesuccesedBlock(true,false);
} }
......
DJMHomeTY/Global/Define/XHCommand.h
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
#define DR05_HE_get_Version @"0500A6330240"//获取版本 #define DR05_HE_get_Version @"0500A6330240"//获取版本
#define DR05_HE_send_getUpdateVersion @"0500a63102aa"//发送固件升级 #define DR05_HE_send_getUpdateVersion @"0500a63102aa"//发送固件升级
#define DR05_HE_back_Version @"0700A6330140"//返回版本 #define DR05_HE_back_Version @"0700A6330140"//返回版本
#define DR05_HE_send_UpdateVersion @"0500613102aa"//返回版本 #define DR05_HE_send_UpdateVersion @"0500613102aa"//升级
#define DR05_HE_send_WaveForm @"0600a6310203"//波形
#endif /* XHCommand_h */ #endif /* XHCommand_h */
DJMHomeTY/Global/Define/XHURL.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define XHURL_h #define XHURL_h
//#define DRURL @"https://testdjm.imoreme.com"//测试 //#define DRURL @"https://testdjm.imoreme.com"//测试
#define DRURL @"https://djm.imoreme.com"//正式 #define DRURL @"https://djm.imoreme.com"//正式
//#define URL @"http://192.168.1.168:8080"//luocong //#define DRURL @"http://192.168.1.168:8080"//luocong
//#define URL @"http://192.168.1.66:9012"//luocong //#define URL @"http://192.168.1.66:9012"//luocong
/** 发送验证码 **/ /** 发送验证码 **/
......
DJMHomeTY/Page/DRFacial/Controller/DXHotElectricVC.m
...@@ -257,6 +257,21 @@ ...@@ -257,6 +257,21 @@
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR05_HE_send_nengliang,[[HJTools shared] ToLongHex:self.nengliangNum withLength:2]] withCrc16Modbus]]; [HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR05_HE_send_nengliang,[[HJTools shared] ToLongHex:self.nengliangNum withLength:2]] withCrc16Modbus]];
} }
-(void)sendWaveformType:(NSInteger)type {
if (self.isStart) {
[self stopDr05Action];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
//获取固件版本
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR05_HE_send_WaveForm,[[HJTools shared] ToLongHex:type+1 withLength:2]] withCrc16Modbus]];
});
}else {
[HJGetBluetoothManager writeStr:[[NSString stringWithFormat:@"%@%@",DR05_HE_send_WaveForm,[[HJTools shared] ToLongHex:type+1 withLength:2]] withCrc16Modbus]];
}
}
-(void)palyOrStopDevice:(UIButton *)button { -(void)palyOrStopDevice:(UIButton *)button {
...@@ -734,9 +749,9 @@ ...@@ -734,9 +749,9 @@
// //
// //
if (HJStringNSNotFound(value, DR05_HE_back_Version)){//固件版本 if (HJStringNSNotFound(value, DR05_HE_back_Version)){//固件版本
NSInteger versions = strtoul([[value substringWithRange:NSMakeRange(16, 1)] UTF8String],0,16); NSInteger versions = strtoul([[value substringWithRange:NSMakeRange(17, 1)] UTF8String],0,16);
NSInteger versions1 = strtoul([[value substringWithRange:NSMakeRange(17, 1)] UTF8String],0,16); NSInteger versions1 = strtoul([[value substringWithRange:NSMakeRange(19, 1)] UTF8String],0,16);
XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1]; XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions1,versions1];
NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion); NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
if(!self.isChecked){ if(!self.isChecked){
...@@ -847,19 +862,24 @@ ...@@ -847,19 +862,24 @@
[[XHHttpRequestManager shareManager] getHttpRequestURL:UpdateDeviceVersionURL isJson:NO parameters:paramsDic success:^(id responseObject) { [[XHHttpRequestManager shareManager] getHttpRequestURL:UpdateDeviceVersionURL isJson:NO parameters:paramsDic success:^(id responseObject) {
NSString *severVersion = [[responseObject objectForKey:@"data"] objectForKey:@"versionnum"]; NSDictionary *dict = [responseObject objectForKey:@"data"];
NSString *url = [[responseObject objectForKey:@"data"] objectForKey:@"binURL"]; if (![dict isEqual:[NSNull null]] && dict) {
if([self compareVersion2:severVersion to:version] == 1){ NSString *severVersion = [[responseObject objectForKey:@"data"] objectForKey:@"versionnum"];
isUpdate(YES); NSString *url = [[responseObject objectForKey:@"data"] objectForKey:@"binURL"];
binUrl(url); if([self compareVersion2:severVersion to:version] == 1){
[weakSelf downloadBinWithUrl:url completionHandler:^(BOOL isCompleted) { isUpdate(YES);
if(isCompleted){ binUrl(url);
[weakSelf showUploadAlert]; [weakSelf downloadBinWithUrl:url completionHandler:^(BOOL isCompleted) {
} if(isCompleted){
[weakSelf showUploadAlert];
}]; }
}];
}
} }
NSLog(@"%@",responseObject); NSLog(@"%@",responseObject);
} fail:^(id failMessage) { } fail:^(id failMessage) {
......
DJMHomeTY/Page/DRFacial/Model/DXHFXVideoModel.h
...@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong) NSMutableArray <DXHFXVideoDetailsModel *>*maintainanceList; @property (nonatomic,strong) NSMutableArray <DXHFXVideoDetailsModel *>*maintainanceList;
@property (nonatomic,strong) NSMutableArray <DXHFXVideoDetailsModel *>*supplyList;
@end @end
......
DJMHomeTY/Page/DRFacial/Model/DXHFXVideoModel.m
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
{ {
return @{@"disinfectVideoList" : [DXHFXVideoDetailsModel class], return @{@"disinfectVideoList" : [DXHFXVideoDetailsModel class],
@"careVideoList" : [DXHFXVideoDetailsModel class], @"careVideoList" : [DXHFXVideoDetailsModel class],
@"maintainanceList" : [DXHFXVideoDetailsModel class] @"maintainanceList" : [DXHFXVideoDetailsModel class],
@"supplyList" : [DXHFXVideoDetailsModel class]
}; };
} }
......
DJMHomeTY/Page/DRFacial/View/DXHFXView.h
...@@ -67,6 +67,8 @@ typedef enum : NSUInteger{ ...@@ -67,6 +67,8 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) UIButton *xdBtn; @property (nonatomic,strong) UIButton *xdBtn;
@property (nonatomic,strong) UIButton *hlBtn; @property (nonatomic,strong) UIButton *hlBtn;
@property (nonatomic,strong) UIButton *supplyBtn;
@property (nonatomic,strong) UIImageView *supplyImg;
@property (nonatomic,strong) UIButton *decBtn; @property (nonatomic,strong) UIButton *decBtn;
...@@ -98,7 +100,8 @@ typedef enum : NSUInteger{ ...@@ -98,7 +100,8 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) UIButton *volumeBtn; @property (nonatomic,strong) UIButton *volumeBtn;
@property (nonatomic,assign) BOOL is041; @property (nonatomic,assign) BOOL is041;
@property (nonatomic,strong) UIButton *noChangeBtn;
@property (nonatomic,assign)BOOL issupply;//海菲秀是否强效补给
- (void)controlWithItem:(UIButton *)sender; - (void)controlWithItem:(UIButton *)sender;
@end @end
......
DJMHomeTY/Page/DRFacial/View/DXHotElecticView.h
...@@ -31,6 +31,8 @@ typedef enum : NSUInteger{ ...@@ -31,6 +31,8 @@ typedef enum : NSUInteger{
-(void)palyOrStopDevice:(UIButton *)button; -(void)palyOrStopDevice:(UIButton *)button;
-(void)deviceNoConnected; -(void)deviceNoConnected;
-(void)clearTime; -(void)clearTime;
-(void)sendWaveformType:(NSInteger)type;
@end @end
@interface DXHotElecticView : UIView @interface DXHotElecticView : UIView
......
DJMHomeTY/Page/DRFacial/View/DXHotElecticView.m
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
@property (nonatomic,assign) CGFloat wdSlidermax; @property (nonatomic,assign) CGFloat wdSlidermax;
@property (nonatomic,assign) CGFloat nlSliderMin; @property (nonatomic,assign) CGFloat nlSliderMin;
@property (nonatomic,assign) CGFloat nlSlidermax; @property (nonatomic,assign) CGFloat nlSlidermax;
@property (nonatomic,strong)UIButton *selectButton;
@property (nonatomic,strong)UIButton *nextButton;
@end @end
@implementation DXHotElecticView @implementation DXHotElecticView
...@@ -396,12 +398,49 @@ ...@@ -396,12 +398,49 @@
make.bottom.equalTo(_nlSlider.mas_top).offset(-10); make.bottom.equalTo(_nlSlider.mas_top).offset(-10);
}]; }];
NSArray *array11 = @[@"水电泳",@"模式 M",@"模式 M3",@"模式 M6",@"预留波形"];
for (int i = 0; i<5; i++) {
UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
[button setTitle:[NSString stringWithFormat:@" %@ ",[array11 objectAtIndex:i]] forState:UIControlStateNormal];
if (i == 0) {
[button setBackgroundColor:XHColorRGB(175, 44, 35)];
button.selected = YES;
self.selectButton = button;
}else {
[button setBackgroundColor:XHColorRGB(255, 255, 255)];
}
[button setTitleColor:XHColorRGB(175, 44, 35) forState:UIControlStateNormal];
[button setTitleColor:XHColorRGB(255, 255, 255) forState:UIControlStateSelected];
button.tag = 10000+i;
button.layer.cornerRadius = 5;
button.layer.borderWidth = 1;
button.titleLabel.font = [UIFont systemFontOfSize:13];
button.layer.borderColor = XHColorRGB(175, 44, 35).CGColor;
[button addTarget:self action:@selector(selectModelType:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button];
if (i == 0) {
[button mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(20);
make.top.equalTo(self.xdBtn.mas_bottom).offset(30*IPhone6ScaleHeight);
make.height.mas_equalTo(30);
}];
}else {
[button mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nextButton.mas_right).offset(15);
make.top.equalTo(self.xdBtn.mas_bottom).offset(30*IPhone6ScaleHeight);
make.height.mas_equalTo(30);
}];
}
self.nextButton = button;
}
_timeImg = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"HFX_time"]]; _timeImg = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"HFX_time"]];
[bottomView addSubview:_timeImg]; [bottomView addSubview:_timeImg];
[_timeImg mas_makeConstraints:^(MASConstraintMaker *make) { [_timeImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(65); make.left.mas_equalTo(65);
make.top.equalTo(self.xdBtn.mas_bottom).offset(55*IPhone6ScaleHeight); make.top.equalTo(self.xdBtn.mas_bottom).offset(75*IPhone6ScaleHeight);
make.size.mas_equalTo(CGSizeMake(22, 22)); make.size.mas_equalTo(CGSizeMake(22, 22));
}]; }];
...@@ -611,7 +650,7 @@ ...@@ -611,7 +650,7 @@
if (self.nlSlider == slider) { if (self.nlSlider == slider) {
float value = _nlSlider.value; float value = _nlSlider.value;
_nengliangNum = 100*value; _nengliangNum = 100*value;
_nlNumLabel.text = [NSString stringWithFormat:@"%.f%%",value*100]; _nlNumLabel.text = [NSString stringWithFormat:@"%.f%%",(float)_nengliangNum];
if (self.delegate && [self.delegate respondsToSelector:@selector(sendNengLangValue:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(sendNengLangValue:)]) {
[self.delegate sendNengLangValue:_nengliangNum]; [self.delegate sendNengLangValue:_nengliangNum];
...@@ -619,7 +658,7 @@ ...@@ -619,7 +658,7 @@
}else { }else {
float value = _wdSlider.value; float value = _wdSlider.value;
_wenduNum = 100*value; _wenduNum = 100*value;
_wdNumLabel.text = [NSString stringWithFormat:@"%.f%%",value*100]; _wdNumLabel.text = [NSString stringWithFormat:@"%.f%%",(float)_wenduNum];
if (self.delegate && [self.delegate respondsToSelector:@selector(sendwenduValue:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(sendwenduValue:)]) {
[self.delegate sendwenduValue:_wenduNum]; [self.delegate sendwenduValue:_wenduNum];
...@@ -746,6 +785,31 @@ ...@@ -746,6 +785,31 @@
_playerManager.shouldAutoPlay = YES; _playerManager.shouldAutoPlay = YES;
} }
} }
-(void)selectModelType:(UIButton *)button {
if (button == self.selectButton) {
if (self.delegate && [self.delegate respondsToSelector:@selector(sendWaveformType:)]) {
[self.delegate sendWaveformType:button.tag-10000];
}
return;
}
if (self.isConnected) {
[button setBackgroundColor:XHColorRGB(175, 44, 35)];
[self.selectButton setBackgroundColor:XHColorRGB(255, 255, 255)];
button.selected = !button.selected;
self.selectButton.selected = !self.selectButton.selected;
self.selectButton = button;
if (self.delegate && [self.delegate respondsToSelector:@selector(sendWaveformType:)]) {
[self.delegate sendWaveformType:button.tag-10000];
}
}else {
if (self.delegate && [self.delegate respondsToSelector:@selector(deviceNoConnected)]) {
[self.delegate deviceNoConnected];
}
}
}
/* /*
// Only override drawRect: if you perform custom drawing. // Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation. // An empty implementation adversely affects performance during animation.
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistFirstVC.m
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
[self.view endEditing:true]; [self.view endEditing:true];
NSDictionary *dic; NSDictionary *dic;
NSLog(@"XHGetDataManager.languageName1:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName1:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5 || TargetType == 4)){
dic = @{@"email":self.dic[@"email"],@"nickName":str}; dic = @{@"email":self.dic[@"email"],@"nickName":str};
}else{//简体中文 c }else{//简体中文 c
dic = @{@"phone":self.dic[@"phone"],@"code":self.dic[@"code"],@"nickName":str}; dic = @{@"phone":self.dic[@"phone"],@"code":self.dic[@"code"],@"nickName":str};
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistSecondVC.m
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
- (void)SureBtnAction:(NSString *)str{ - (void)SureBtnAction:(NSString *)str{
NSDictionary *dic; NSDictionary *dic;
NSLog(@"XHGetDataManager.languageName2:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName2:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5 || TargetType == 4)){
dic = @{@"email":self.myDic[@"email"],@"nickName":self.myDic[@"nickName"],@"sex":str}; dic = @{@"email":self.myDic[@"email"],@"nickName":self.myDic[@"nickName"],@"sex":str};
}else{//简体中文 }else{//简体中文
dic = @{@"phone":self.myDic[@"phone"],@"code":self.myDic[@"code"],@"nickName":self.myDic[@"nickName"],@"sex":str}; dic = @{@"phone":self.myDic[@"phone"],@"code":self.myDic[@"code"],@"nickName":self.myDic[@"nickName"],@"sex":str};
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistThirdVC.m
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
NSDictionary *dic; NSDictionary *dic;
[SVProgressHUD show]; [SVProgressHUD show];
NSLog(@"XHGetDataManager.languageName3:%d",XHGetDataManager.simparlanguage);//中文 NSLog(@"XHGetDataManager.languageName3:%d",XHGetDataManager.simparlanguage);//中文
if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5)){ if((XHGetDataManager.simparlanguage==1 ||XHGetDataManager.simparlanguage==2 )&&(TargetType==5 || TargetType == 4)){
dic = @{@"email":self.myThirdDic[@"email"], dic = @{@"email":self.myThirdDic[@"email"],
@"nickName":self.myThirdDic[@"nickName"], @"nickName":self.myThirdDic[@"nickName"],
@"sex":@([self.myThirdDic[@"sex"] integerValue]), @"sex":@([self.myThirdDic[@"sex"] integerValue]),
......
Pods/Pods.xcodeproj/xcuserdata/lushaoxiong.xcuserdatad/xcschemes/YModemLib.xcscheme deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4DE6125F6924398571066BA050276608"
BuildableName = "YModemLib.framework"
BlueprintName = "YModemLib"
ReferencedContainer = "container:Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
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