Skip to content

D
DrWater
Commit 6ecc1f98 by 路少雄
Options

1.3.0线上

parent 6a3d576e
Showing with 314 additions and 5 deletions
DJMHomeTY.xcodeproj/project.pbxproj
......@@ -14,6 +14,10 @@
390516C92BAAB95000935EDE /* DXHotElecticView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390516C62BAA75D000935EDE /* DXHotElecticView.m */; };
390516CA2BAAB95100935EDE /* DXHotElecticView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390516C62BAA75D000935EDE /* DXHotElecticView.m */; };
390516CB2BAAB95100935EDE /* DXHotElecticView.m in Sources */ = {isa = PBXBuildFile; fileRef = 390516C62BAA75D000935EDE /* DXHotElecticView.m */; };
390F59A82DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59A92DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59AA2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
390F59AB2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */; };
39D57E752DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
39D57E762DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
39D57E772DD445C400FACDD5 /* DXDRPlusVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */; };
......@@ -704,6 +708,8 @@
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>"; };
390F59A62DF9636A00D6D06C /* JoystickIntroManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JoystickIntroManager.h; sourceTree = "<group>"; };
390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JoystickIntroManager.m; sourceTree = "<group>"; };
39514C652C5A0A1000D785DC /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
39D57E732DD445C400FACDD5 /* DXDRPlusVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DXDRPlusVC.h; sourceTree = "<group>"; };
39D57E742DD445C400FACDD5 /* DXDRPlusVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DXDRPlusVC.m; sourceTree = "<group>"; };
......@@ -1214,6 +1220,8 @@
39D57E842DD5BBED00FACDD5 /* DXDRPlus.json */,
39D57E892DD5C84C00FACDD5 /* DXDRPlusMoel.h */,
39D57E8A2DD5C84C00FACDD5 /* DXDRPlusMoel.m */,
390F59A62DF9636A00D6D06C /* JoystickIntroManager.h */,
390F59A72DF9636A00D6D06C /* JoystickIntroManager.m */,
);
path = Model;
sourceTree = "<group>";
......@@ -2613,6 +2621,7 @@
883150E32A0A2CB70025FDDE /* AppDelegate.m in Sources */,
6CAFE7342AF4C71C00C929A7 /* DXHFXUpkeepVC.m in Sources */,
883150E42A0A2CB70025FDDE /* XHMineViewCell.m in Sources */,
390F59AB2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */,
883150E52A0A2CB70025FDDE /* NSString+HJCRC16Modbus.m in Sources */,
883150E62A0A2CB70025FDDE /* XHSelectCommandModelView.m in Sources */,
883150E72A0A2CB70025FDDE /* XHMineSetSexView.m in Sources */,
......@@ -2768,6 +2777,7 @@
88D323BD2A177CDC00334372 /* XHMineViewCell.m in Sources */,
6CAFE7362AF4C71C00C929A7 /* DXHFXUpkeepVC.m in Sources */,
88D323BE2A177CDC00334372 /* NSString+HJCRC16Modbus.m in Sources */,
390F59A92DF9636A00D6D06C /* JoystickIntroManager.m in Sources */,
88D323BF2A177CDC00334372 /* XHSelectCommandModelView.m in Sources */,
88D323C02A177CDC00334372 /* XHMineSetSexView.m in Sources */,
88D323C12A177CDC00334372 /* XHMineViewModel.m in Sources */,
......@@ -2923,6 +2933,7 @@
88EE69992A04D3C900C37EE2 /* XHTimerActionView.m in Sources */,
6CAFE7352AF4C71C00C929A7 /* DXHFXUpkeepVC.m in Sources */,
88EE699A2A04D3C900C37EE2 /* XHRecordCell.m in Sources */,
390F59AA2DF9636A00D6D06C /* JoystickIntroManager.m in Sources */,
88EE699B2A04D3C900C37EE2 /* UITextView+XHPlaceHolder.m in Sources */,
88EE699C2A04D3C900C37EE2 /* XHMineVC.m in Sources */,
88EE699D2A04D3C900C37EE2 /* NSString+HJExtension.m in Sources */,
......@@ -3078,6 +3089,7 @@
6CAFE7332AF4C71C00C929A7 /* DXHFXUpkeepVC.m in Sources */,
884E463029A600B600A58A9A /* NSString+HJCRC16Modbus.m in Sources */,
880A7BEB29B093BB00B5F4C4 /* XHSelectCommandModelView.m in Sources */,
390F59A82DF9636A00D6D06C /* JoystickIntroManager.m in Sources */,
88EC9D8129BC546400E61419 /* XHMineSetSexView.m in Sources */,
88E8439A29B9B41500263DB0 /* XHMineViewModel.m in Sources */,
6CB327D82AEF8D6E00ABAEC3 /* DXHFXVC.m in Sources */,
......@@ -3287,7 +3299,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
......@@ -3313,7 +3325,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.8;
MARKETING_VERSION = 1.3.0;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......@@ -3333,7 +3345,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImageWater;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8Z4G7AGK6D;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "$(SRCROOT)/DJMHomeTY/Global/Define/PrefixHeader.pch";
......@@ -3359,7 +3371,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.8;
MARKETING_VERSION = 1.3.0;
PRODUCT_BUNDLE_IDENTIFIER = djm.imoreme.com.DJMDrWater;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
......
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_20m_icon_nol.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_20m_icon_nol@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_20m_icon_nol@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_20m_icon_sel.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_20m_icon_sel@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_20m_icon_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_3m_icon_nol.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_3m_icon_nol@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_3m_icon_nol@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_3m_icon_sel.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_3m_icon_sel@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_3m_icon_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_replay.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "dr02d_replay.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_sel_list_nol.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_sel_list_nol@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_sel_list_nol@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_sel_list_sel.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_sel_list_sel@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_sel_list_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Assets.xcassets/Dr02B/dr02d_sjx.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "dr02d_sjx@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "dr02d_sjx@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DJMHomeTY/Global/Base/Controller/XHParentVC.m
......@@ -232,7 +232,7 @@
[paramsDic setObject:@"0" forKey:@"LogEndTag"];
NSLog(@"保存操作记录1：%@",paramsDic);
[[XHHttpRequestManager shareManager] postHttpRequestURL:SaveRecordURL isJson:NO parameters:paramsDic success:^(id responseObject) {
[SVProgressHUD dismiss];
// [SVProgressHUD dismiss];
/// 保存操作记录成功
weakSelf.gestationRecordId = responseObject[@"data"][@"gestationRecordId"];
weakSelf.isUpdate = YES;
......
DJMHomeTY/Global/Define/XHConstants.h
......@@ -144,6 +144,7 @@ static NSString *const HJNotificationDisconnect = @"NotificationDisconnect";
#define DrDeviceFacialName @"Dr-01"//@"DEF01-1"Dr-01
#define DrDeviceDr03Name @"Dr-03"//@Dr-03
#define DrDeviceDr02BName @"K9"//@Dr-03
//#define DrDeviceDr02BName @"Dr-02"//@Dr-03
//Dr水滴-面龄医生Dr
#define Dr02DeviceName @"Dr-02"//10档
......
DJMHomeTY/Page/DRFacial/Model/JoystickIntroManager.h 0 → 100644
//
// JoystickIntroManager.h
// DJMHomeTY
//
// Created by nana on 2025/6/11.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface JoystickIntroManager : NSObject
+ (instancetype)shared;
// 检查是否需要显示介绍页
- (BOOL)shouldShowIntroductionForJoystickID:(NSInteger)joystickID;
// 标记手柄为已操作
- (void)markJoystickAsUsed:(NSInteger)joystickID;
// 重置所有状态（可选）
- (void)resetAllJoystickStatus;
@end
NS_ASSUME_NONNULL_END
DJMHomeTY/Page/DRFacial/Model/JoystickIntroManager.m 0 → 100644
//
// JoystickIntroManager.m
// DJMHomeTY
//
// Created by nana on 2025/6/11.
//
#import "JoystickIntroManager.h"
static NSString *const kUsedJoysticksKey = @"USED_JOYSTICKS_KEY";
@implementation JoystickIntroManager
+ (instancetype)shared {
static dispatch_once_t onceToken;
static JoystickIntroManager *instance;
dispatch_once(&onceToken, ^{
instance = [[JoystickIntroManager alloc] init];
});
return instance;
}
- (NSMutableSet<NSNumber *> *)usedJoystickIDs {
NSArray *savedIDs = [[NSUserDefaults standardUserDefaults] objectForKey:kUsedJoysticksKey];
return savedIDs ? [NSMutableSet setWithArray:savedIDs] : [NSMutableSet new];
}
- (void)saveUsedJoysticks:(NSSet<NSNumber *> *)set {
[[NSUserDefaults standardUserDefaults] setObject:[set allObjects] forKey:kUsedJoysticksKey];
[[NSUserDefaults standardUserDefaults] synchronize];
}
- (BOOL)shouldShowIntroductionForJoystickID:(NSInteger)joystickID {
return ![[self usedJoystickIDs] containsObject:@(joystickID)];
}
- (void)markJoystickAsUsed:(NSInteger)joystickID {
NSMutableSet *usedSet = [self usedJoystickIDs];
[usedSet addObject:@(joystickID)];
[self saveUsedJoysticks:usedSet];
}
- (void)resetAllJoystickStatus {
[self saveUsedJoysticks:[NSSet set]];
}
@end
DJMHomeTY/Page/DRFacial/View/DXDRPlusSelectView.h
......@@ -14,12 +14,15 @@ NS_ASSUME_NONNULL_BEGIN
- (void)touchNextStepWithModel:(DXDRPlusSubModel *)model;
- (void)touchedUV;
@end
@interface DXDRPlusSelectView : XHParentView
@property (nonatomic,assign) id<DXDRPlusSelectViewDelegate>delegate;
@property (nonatomic, strong) DXDRPlusSubModel *selectedModel;
@property (nonatomic,strong) UIButton *uvBtn;
@end
......@@ -30,6 +33,13 @@ NS_ASSUME_NONNULL_BEGIN
@end
@interface DXDRPlusSelectTitleCell : UITableViewCell
@property (nonatomic, strong) UILabel *titleLb;
@end
@interface SegmentButton : UIButton
@property (nonatomic, strong) UIView *indicatorLine;
@end
......
DJMHomeTY/Page/DRFacial/View/DXDRPlusSmartView.h
......@@ -31,6 +31,7 @@ typedef enum : NSUInteger{
- (void)deviceSmartControlWithTag:(Dr02DsmartType)type ;
- (void)changeVideoProgressWithHandelType:(NSInteger )handelType;
@end
......@@ -41,6 +42,7 @@ typedef enum : NSUInteger{
@interface DXDRPlusSmartView : XHParentView
@property (nonatomic,weak) id <DXDRPlusSmartViewDelegate> delegate;
@property (nonatomic,strong) UIButton *volumeBtn;
@property (nonatomic,strong) UIButton *replayBtn;
@property (nonatomic,strong) ZFPlayerController *playerView;
@property (nonatomic, strong) DXDRPlusSubModel *selectedModel;
@property (nonatomic,strong) DXHFXVideoModel *videoModel;
......@@ -57,6 +59,19 @@ typedef enum : NSUInteger{
@property (nonatomic,strong) UIView *stepCenterLine;
@property (nonatomic,strong) UIButton *uvBtn;
@property (nonatomic,strong) UIButton *step1Btn;
//@property (nonatomic,strong) UILabel *step1DetilsLb;
@property (nonatomic,strong) UIButton *step2Btn;
//@property (nonatomic,strong) UILabel *step2DetilsLb;
@property (nonatomic,strong) UIImageView *stepCenterImg;
@property (nonatomic,strong) UIScrollView *timeScrollView;
@end
NS_ASSUME_NONNULL_END
DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m
......@@ -232,7 +232,9 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
NSArray *arr = @[
@{@"DeviceType":@"Dr.水滴高光仪 2.0",
@"DeviceCode":@"Dr-02-D",
// @"DeviceCode":@"Dr-04",
@"DeviceId":@"Dr-02-D",
// @"DeviceId":@"Dr-04",
@"imgName":@"dr_02_d_icon",
@"tag":@(DR02DBtnTag)
},
......
DJMHomeTY/Page/HomePage/Controller/XHMainVC1.m
......@@ -85,6 +85,7 @@
-(NSArray *)programArr{
if (_programArr == nil) {
//0/3/4/5/7
// _programArr = @[
// @[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
// @[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
......@@ -105,6 +106,8 @@
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],// 褪红舒敏
//
// @[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}]// 嫩滑提亮
if(TargetType == 4){
_programArr = @[
@[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@0}],//眼部护理
......@@ -120,6 +123,23 @@
@[@{@"totaltimes":@1800,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}]// 身体淡纹
];
}else{
_programArr = @[
@[@{@"totaltimes":@720,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@15,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@3}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@20,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@15}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@10,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@8}],
@[@{@"totaltimes":@1080,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}],
@[@{@"totaltimes":@1440,@"10MTimes":@3,@"10MEnergy":@7,@"10MTakt":@5,@"3MTimes":@3,@"3MEnergy":@3,@"3MTakt":@5}]
];
}
}
return _programArr;
}
......
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