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 481 additions and 112 deletions
DJMHomeTY.xcodeproj/project.pbxproj
......@@ -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>"; };
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>"; };
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>"; };
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>"; };
......@@ -3048,6 +3049,7 @@
children = (
880BFDA729A85D4B00B59CFA /* zh-Hans */,
880BFDAC29A85D4B00B59CFA /* Base */,
39514C652C5A0A1000D785DC /* zh-Hant */,
);
name = Localizable.strings;
sourceTree = "<group>";
......@@ -3171,7 +3173,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
......@@ -3197,7 +3199,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.7;
MARKETING_VERSION = 1.2.8;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......@@ -3217,7 +3219,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
......@@ -3243,7 +3245,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.7;
MARKETING_VERSION = 1.2.8;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......@@ -3263,7 +3265,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
......@@ -3288,7 +3290,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......@@ -3308,7 +3310,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageDR;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
......@@ -3333,7 +3335,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMHomeDR;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -169,6 +169,21 @@
endingLineNumber = "1560"
offsetFromSymbolStart = "24">
</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>
</BreakpointContent>
</BreakpointProxy>
......
DJMHomeTY.xcworkspace/xcuserdata/nana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
......@@ -7,48 +7,32 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "EB862767-11A9-4A08-AD68-EF9112614070"
uuid = "94B0D0F9-380D-4E87-9D9C-DBBCBEB276DF"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Manager/XHHttpRequestManager.m"
filePath = "DJMHomeTY/Global/Base/View/HJVerifyView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "49"
endingLineNumber = "49"
landmarkName = "-getHttpRequestURL:isJson:parameters:success:fail:networkRequestsFail:"
startingLineNumber = "157"
endingLineNumber = "157"
landmarkName = "-initWithFrame:withScanCommandArr:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AA50D0ED-0F14-4D38-9253-455A200313BD"
uuid = "E3A5FF1E-EAAA-42DE-B2F0-5177BF64AA18"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Global/Manager/XHHttpRequestManager.m"
filePath = "DJMHomeTY/Page/SetPage/View/XHResetDeviceNameView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "116"
endingLineNumber = "116"
landmarkName = "-postHttpRequestURL1:isJson:parameters:success:fail:networkRequestsFail:"
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:"
startingLineNumber = "50"
endingLineNumber = "50"
landmarkName = "-createUI"
landmarkType = "7">
</BreakpointContent>
</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)
//自动手动点集合
@property (nonatomic,strong) NSMutableArray *outoOrManRecord;
@property (nonatomic,assign)BOOL issupply;//海菲秀是否强效补给
- (void)exitTips;
-(void)hindenActivityIndicator;
......
DJMHomeTY/Global/Base/Controller/XHParentVC.m
......@@ -448,7 +448,8 @@
@"verification":self.isOrderCommand?@"1234":@"-1",//@"1234"
@"consumableNumber":[NSString isNull:str]?@"-1":str,
@"deviceid":XHGetDataManager.deviceID,
@"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage]
@"language":[NSString stringWithFormat:@"%d",XHGetDataManager.simparlanguage],
@"model":self.issupply?@"1":@"0"
};
HJSelfWeak;
[SVProgressHUD showWithStatus:HJLocalizedString(@"正在验证，请稍后…")];
......@@ -481,11 +482,16 @@
}else{
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];
});
}
if (self.DevicesuccesedBlock) {
self.DevicesuccesedBlock(true,false);
}
......
DJMHomeTY/Global/Define/XHCommand.h
......@@ -217,6 +217,7 @@
#define DR05_HE_get_Version @"0500A6330240"//获取版本
#define DR05_HE_send_getUpdateVersion @"0500a63102aa"//发送固件升级
#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 */
DJMHomeTY/Global/Define/XHURL.h
......@@ -10,7 +10,7 @@
#define XHURL_h
//#define DRURL @"https://testdjm.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
/** 发送验证码 **/
......
DJMHomeTY/Page/DRFacial/Controller/DXHotElectricVC.m
......@@ -257,6 +257,21 @@
[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 {
......@@ -734,9 +749,9 @@
//
//
if (HJStringNSNotFound(value, DR05_HE_back_Version)){//固件版本
NSInteger versions = strtoul([[value substringWithRange:NSMakeRange(16, 1)] UTF8String],0,16);
NSInteger versions1 = strtoul([[value substringWithRange:NSMakeRange(17, 1)] UTF8String],0,16);
XHGetDataManager.machineVersion = [NSString stringWithFormat:@"V%ld.%ld",versions,versions1];
NSInteger versions = 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",versions1,versions1];
NSLog(@"XHGetDataManager.machineVersion:%@",XHGetDataManager.machineVersion);
if(!self.isChecked){
......@@ -848,6 +863,8 @@
[[XHHttpRequestManager shareManager] getHttpRequestURL:UpdateDeviceVersionURL isJson:NO parameters:paramsDic success:^(id responseObject) {
NSDictionary *dict = [responseObject objectForKey:@"data"];
if (![dict isEqual:[NSNull null]] && dict) {
NSString *severVersion = [[responseObject objectForKey:@"data"] objectForKey:@"versionnum"];
NSString *url = [[responseObject objectForKey:@"data"] objectForKey:@"binURL"];
if([self compareVersion2:severVersion to:version] == 1){
......@@ -860,6 +877,9 @@
}];
}
}
NSLog(@"%@",responseObject);
} fail:^(id failMessage) {
......
DJMHomeTY/Page/DRFacial/Model/DXHFXVideoModel.h
......@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong) NSMutableArray <DXHFXVideoDetailsModel *>*maintainanceList;
@property (nonatomic,strong) NSMutableArray <DXHFXVideoDetailsModel *>*supplyList;
@end
......
DJMHomeTY/Page/DRFacial/Model/DXHFXVideoModel.m
......@@ -15,7 +15,8 @@
{
return @{@"disinfectVideoList" : [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{
@property (nonatomic,strong) UIButton *xdBtn;
@property (nonatomic,strong) UIButton *hlBtn;
@property (nonatomic,strong) UIButton *supplyBtn;
@property (nonatomic,strong) UIImageView *supplyImg;
@property (nonatomic,strong) UIButton *decBtn;
......@@ -98,7 +100,8 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) UIButton *volumeBtn;
@property (nonatomic,assign) BOOL is041;
@property (nonatomic,strong) UIButton *noChangeBtn;
@property (nonatomic,assign)BOOL issupply;//海菲秀是否强效补给
- (void)controlWithItem:(UIButton *)sender;
@end
......
DJMHomeTY/Page/DRFacial/View/DXHotElecticView.h
......@@ -31,6 +31,8 @@ typedef enum : NSUInteger{
-(void)palyOrStopDevice:(UIButton *)button;
-(void)deviceNoConnected;
-(void)clearTime;
-(void)sendWaveformType:(NSInteger)type;
@end
@interface DXHotElecticView : UIView
......
DJMHomeTY/Page/DRFacial/View/DXHotElecticView.m
......@@ -46,6 +46,8 @@
@property (nonatomic,assign) CGFloat wdSlidermax;
@property (nonatomic,assign) CGFloat nlSliderMin;
@property (nonatomic,assign) CGFloat nlSlidermax;
@property (nonatomic,strong)UIButton *selectButton;
@property (nonatomic,strong)UIButton *nextButton;
@end
@implementation DXHotElecticView
......@@ -396,12 +398,49 @@
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"]];
[bottomView addSubview:_timeImg];
[_timeImg mas_makeConstraints:^(MASConstraintMaker *make) {
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));
}];
......@@ -611,7 +650,7 @@
if (self.nlSlider == slider) {
float value = _nlSlider.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:)]) {
[self.delegate sendNengLangValue:_nengliangNum];
......@@ -619,7 +658,7 @@
}else {
float value = _wdSlider.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:)]) {
[self.delegate sendwenduValue:_wenduNum];
......@@ -746,6 +785,31 @@
_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.
// An empty implementation adversely affects performance during animation.
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistFirstVC.m
......@@ -36,7 +36,7 @@
[self.view endEditing:true];
NSDictionary *dic;
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};
}else{//简体中文 c
dic = @{@"phone":self.dic[@"phone"],@"code":self.dic[@"code"],@"nickName":str};
......
DJMHomeTY/Page/LoginPage/Controller/XHRegistSecondVC.m
......@@ -37,7 +37,7 @@
- (void)SureBtnAction:(NSString *)str{
NSDictionary *dic;
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};
}else{//简体中文
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 @@
NSDictionary *dic;
[SVProgressHUD show];
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"],
@"nickName":self.myThirdDic[@"nickName"],
@"sex":@([self.myThirdDic[@"sex"] integerValue]),
......
DJMHomeTY/Page/LoginPage/View/XHMSCodeLoginView.m
......@@ -54,10 +54,10 @@
if ([XHGetDataManager.languageName rangeOfString:@"Hans"].location != NSNotFound) {
[XHDataManager sharedManager].simparlanguage = 0; // 简体中文
} else { // zh-Hant\zh-HK\zh-TW
[XHDataManager sharedManager].simparlanguage = 2; // 繁体
[XHDataManager sharedManager].simparlanguage = 1; // 繁体
}
}else{
[XHDataManager sharedManager].simparlanguage = 2; // 英文
[XHDataManager sharedManager].simparlanguage = 1; // 英文
}
NSLog(@"XHGetDataManager.languageName:%d:%d:%@",XHGetDataManager.simparlanguage,([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound),languageName);//中文
if((TargetType == 5)&&([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文// /Hans-CN
......@@ -263,6 +263,114 @@
}
}
-(void)creatMyUI1{
NSArray *Arr = @[@"personal_buy_logo",@"personal_buy_logo_Home",@"personal_buy_logo_Home",@"DR_DeviceListTopImage",@"DrTY_Logo",@"Seyo_login_image",@"Seyo_login_image"];
UIImageView *logoImg = [UIImageView myUIImageViewSuperView:self withImageName:Arr[TargetType-1]];
[logoImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self).offset(55.5*IPhone6ScaleHeight);
}];
NSArray *appLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
// NSString *languageName = [appLanguages objectAtIndex:0];
// NSArray *languageArry = [NSLocale preferredLanguages];
// NSString *languageName = languageArry.firstObject;
NSString *languageName = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
// XHGetDataManager.simparlanguage = ([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound);
XHGetDataManager.languageName = languageName;
if ([XHGetDataManager.languageName hasPrefix:@"zh"]) {
if ([XHGetDataManager.languageName rangeOfString:@"Hans"].location != NSNotFound) {
[XHDataManager sharedManager].simparlanguage = 0; // 简体中文
} else { // zh-Hant\zh-HK\zh-TW
[XHDataManager sharedManager].simparlanguage = 1; // 繁体
}
}else{
[XHDataManager sharedManager].simparlanguage = 1; // 英文
}
if((TargetType == 4)&&([languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文// /Hans-CN
UIImageView *emailImg = [UIImageView myUIImageViewSuperView:self withImageName:@"邮件_mail (1)"];
[emailImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(HJPX(82));
make.top.mas_equalTo(self).offset(227.5*IPhone6ScaleHeight);
}];
self.emailTF = [UITextField myUITextFieldSuperView:self
withDelegate:self
withFont:XHFontSize(HJPX(30))
withTextFieldColor:XHTextFieldTextColor
withNSTextAlignment:NSTextAlignmentLeft
withPlaceholder:HJLocalizedString(@"请输入邮箱号码")
withPlaceholderColor:XHTextFieldTextPlaceholderColor
withVerticalAlignment:UIControlContentVerticalAlignmentCenter];
self.emailTF.keyboardType = UIKeyboardTypeEmailAddress;
self.emailTF.tintColor = XHTextFieldTextColor;
[self.emailTF mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(emailImg.mas_right).offset(HJPX(24));
make.width.mas_equalTo(260*IPhone6ScaleWidth);
make.centerY.mas_equalTo(emailImg);
}];
// self.emailTF.text = XHGetDataManager.phoneNum;
[self.emailTF addTarget:self action:@selector(textFieldValueChange:) forControlEvents:UIControlEventEditingChanged];
UIView *emailLine = [UIView myUIViewSuperView:self withBackgroundColor:XHColorHex(0xABABAB)];
[emailLine mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(HJPX(60));
make.right.mas_equalTo(HJPX(-60));
make.top.mas_equalTo(emailImg.mas_bottom).offset(HJPX(16));
make.height.mas_equalTo(0.5);
}];
self.loginBtn = [UIButton myUIButtonSuperView:self withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(loginBtnTouchUpInside) withTag:0 withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:HJLocalizedString(@"确定") withFont:XHFontSize(20) withTitleNormalColor:XHColorHex(0xffffff) withTitleSelectedColor:XHColorHex(0xffffff)];
self.loginBtn.backgroundColor = XHBtnColor;
self.loginBtn.layer.cornerRadius = 8.0f;
self.loginBtn.userInteractionEnabled = false;
[self.loginBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(emailLine.mas_left);
make.right.mas_equalTo(emailLine.mas_right);
make.height.mas_equalTo(HJPX(86));
make.top.mas_equalTo(emailLine.mas_bottom).offset(45*IPhone6ScaleHeight);
}];
self.agreeBtn = [UIButton myUIButtonSuperView:self
withUIButtonType:UIButtonTypeCustom
withTarget:self
withBction:@selector(agreeBtnTouchUpInside:)
withTag:0
withNormalImg:nil
withSelectedImg:nil
withHighlightedImg:nil
withTitle:HJLocalizedString(@"已阅读并同意")
withFont:XHFontSize(HJPX(22))
withTitleNormalColor:XHColorHex(0X999999)
withTitleSelectedColor:nil];
if(TargetType == 2){
[self.agreeBtn setImage:HJSetImg(@"Set_Slect_model_n") forState:UIControlStateNormal];
[self.agreeBtn setImage:HJSetImg(@"Set_Slect_model_s") forState:UIControlStateSelected];
}else{
[self.agreeBtn setImage:HJSetImg(@"Set_Slect_model_n_r") forState:UIControlStateNormal];
[self.agreeBtn setImage:HJSetImg(@"Set_Slect_model_s_r") forState:UIControlStateSelected];
}
[self.agreeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).offset(100*IPhone6ScaleWidth);
make.top.mas_equalTo(self.loginBtn.mas_bottom).offset(89.5*IPhone6ScaleHeight);
}];
[self.agreeBtn layoutButtonWithEdgeInsetsStyle:HJButtonEdgeInsetsStyleLeft imageTitleSpace:9];
self.agreeBtn.selected = YES;
UIButton *agreementBtn = [UIButton myUIButtonSuperView:self withUIButtonType:UIButtonTypeCustom withTarget:self withBction:@selector(agreementBtnTouchUpInside) withTag:1 withNormalImg:nil withSelectedImg:nil withHighlightedImg:nil withTitle:HJLocalizedString(@"《用户使用协议》") withFont:XHFontSize(HJPX(22)) withTitleNormalColor:XHColorHex(0XEC694A) withTitleSelectedColor:XHColorHex(0XEC694A)];
[agreementBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.agreeBtn.mas_right).offset(2);
make.centerY.mas_equalTo(self.agreeBtn);
}];
}else {
UIImageView *logoImg = [UIImageView myUIImageViewSuperView:self withImageName:@"DR_DeviceListTopImage"];
[logoImg mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
......@@ -270,7 +378,7 @@
}];
UIView *phonebgV = [UIView myUIViewSuperView:self withBackgroundColor:XHColorHex(0xF6F6F6)];
// phonebgV.backgroundColor = [UIColor redColor];
// phonebgV.backgroundColor = [UIColor redColor];
phonebgV.layer.cornerRadius = 22.5*IPhone6ScaleHeight;
[phonebgV mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(HJPX(60));
......@@ -298,6 +406,8 @@
make.height.mas_equalTo(12.5*IPhone6ScaleHeight);
}];
[NSString localizedString:@""];
self.phoneTF = [UITextField myUITextFieldSuperView:self
withDelegate:self
withFont:XHFontSize(HJPX(30))
......@@ -416,10 +526,11 @@
make.left.mas_equalTo(self.agreeBtn.mas_right).offset(2);
make.centerY.mas_equalTo(self.agreeBtn);
}];
}
}
#pragma mark - 登录
-(void)loginBtnTouchUpInside{
if((TargetType == 5)&&([XHGetDataManager.languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文
if((TargetType == 5 || TargetType == 4)&&([XHGetDataManager.languageName rangeOfString:@"zh-Hans"].location ==NSNotFound)){//非简体中文
if (![NSString isNull:self.emailTF.text] && self.agreeBtn.selected == YES ) {
NSDictionary *dic=@{@"email":self.emailTF.text,
@"appType":@(TargetType)
......
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