Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit bfc2f088 由 cgx
选项

修复H5页面添加蒙版颜色值显示错误问题

1 个父辈 ac367900
内嵌 并排
正在显示 6 个修改的文件 包含 22 行增加 和 18 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -2186,7 +2186,7 @@ ...@@ -2186,7 +2186,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = ""; EXCLUDED_ARCHS = "";
...@@ -2216,6 +2216,7 @@ ...@@ -2216,6 +2216,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -2256,7 +2257,7 @@ ...@@ -2256,7 +2257,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -2285,6 +2286,7 @@ ...@@ -2285,6 +2286,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -2387,7 +2389,7 @@ ...@@ -2387,7 +2389,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -2416,6 +2418,7 @@ ...@@ -2416,6 +2418,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
......
DreamSleep/DreamSleep/Basement/Category/UIView+Extras.m
...@@ -116,8 +116,7 @@ ...@@ -116,8 +116,7 @@
- (void)addMaskWithType:(MaskType)type cornerRadius:(CGFloat)cornerRadius { - (void)addMaskWithType:(MaskType)type cornerRadius:(CGFloat)cornerRadius {
UIView *maskView = [[UIView alloc] initWithFrame:self.bounds]; UIView *maskView = [[UIView alloc] initWithFrame:self.bounds];
maskView.backgroundColor = DSBlack; maskView.backgroundColor = ColorFromHexA(0x161e38, .35);
maskView.alpha = .3;
[self addSubview:maskView]; [self addSubview:maskView];
UIRectCorner rectCorner = UIRectCornerAllCorners; UIRectCorner rectCorner = UIRectCornerAllCorners;
...@@ -135,8 +134,7 @@ ...@@ -135,8 +134,7 @@
[self removeMask]; [self removeMask];
UIView *maskView = [[UIView alloc] initWithFrame:self.bounds]; UIView *maskView = [[UIView alloc] initWithFrame:self.bounds];
maskView.backgroundColor = ColorFromHex(0x6B7485); maskView.backgroundColor = ColorFromHexA(0x161e38, .35);
maskView.alpha = .5;
maskView.tag = 999; maskView.tag = 999;
maskView.userInteractionEnabled = NO; maskView.userInteractionEnabled = NO;
[self addSubview:maskView]; [self addSubview:maskView];
......
DreamSleep/DreamSleep/Basement/H5/DsMaskView.m
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
- (instancetype)initWithSuperView:(UIView *)superView { - (instancetype)initWithSuperView:(UIView *)superView {
if (self = [super init]) { if (self = [super init]) {
self.backgroundColor = ColorFromHex(0x6B7485); self.backgroundColor = ColorFromHexA(0x161e38, .35);
self.alpha = .5;
self.userInteractionEnabled = NO; self.userInteractionEnabled = NO;
UIView *view = superView ? superView : DSKeyWindow; UIView *view = superView ? superView : DSKeyWindow;
......
DreamSleep/DreamSleep/Class/AISleepModule/Controller/AISleepCoachController.m
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
#import "SomeProxy.h" #import "SomeProxy.h"
#import "ThreeMinuteController.h" #import "ThreeMinuteController.h"
#import "UserRequestModel.h" #import "UserRequestModel.h"
#import "DsMaskView.h"
@interface AISleepCoachController () <WKNavigationDelegate, WKScriptMessageHandler, DsWebControllerDelegate, RelaxTrainControllerDelegate> @interface AISleepCoachController () <WKNavigationDelegate, WKScriptMessageHandler, DsWebControllerDelegate, RelaxTrainControllerDelegate>
@property (strong, nonatomic) WKWebView *aiWebView; @property (strong, nonatomic) WKWebView *aiWebView;
@property (strong, nonatomic) NSMutableURLRequest *request; @property (strong, nonatomic) NSMutableURLRequest *request;
@property (strong, nonatomic) UIProgressView *progressView; @property (strong, nonatomic) UIProgressView *progressView;
@property (strong, nonatomic) ExceptionDefaultView *exceptionView; @property (strong, nonatomic) ExceptionDefaultView *exceptionView;
@property (nonatomic, strong) DsMaskView *dsMaskView;
@end @end
@implementation AISleepCoachController @implementation AISleepCoachController
...@@ -44,12 +46,7 @@ ...@@ -44,12 +46,7 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
// 夜间模式 [self.dsMaskView display];
if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[self.aiWebView addMask];
} else {
[self.aiWebView removeMask];
}
} }
#pragma mark - 登录成功后刷新 #pragma mark - 登录成功后刷新
...@@ -236,6 +233,13 @@ ...@@ -236,6 +233,13 @@
return _exceptionView; return _exceptionView;
} }
- (DsMaskView *)dsMaskView {
if (!_dsMaskView) {
_dsMaskView = [[DsMaskView alloc] initWithSuperView:self.view];
}
return _dsMaskView;
}
#pragma mark - 关闭侧滑 #pragma mark - 关闭侧滑
- (BOOL)enableInteractivePopGestureRecognizer { - (BOOL)enableInteractivePopGestureRecognizer {
return NO; return NO;
......
DreamSleep/DreamSleep/Class/HomeModule/Course/View/AudioDetailHeaderView.m
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
// 添加遮罩 // 添加遮罩
if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) { if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[self.bgIV addMaskWithType:MaskTypeCornerBottom cornerRadius:22.0]; [self.bgIV addMaskWithType:MaskTypeCornerBottom cornerRadius:22.0];
[self.audioIV addMaskWithType:MaskTypeAllCorner cornerRadius:15.5]; [self.audioIV addMaskWithType:MaskTypeAllCorner cornerRadius:12.0];
} }
[self.bgIV setCornerRadiusRect:(UIRectCornerBottomLeft | UIRectCornerBottomRight) cornerRadius:22.0]; [self.bgIV setCornerRadiusRect:(UIRectCornerBottomLeft | UIRectCornerBottomRight) cornerRadius:22.0];
} else { } else {
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
- (UIImageView *)audioIV { - (UIImageView *)audioIV {
if (!_audioIV) { if (!_audioIV) {
_audioIV = [UIImageView new]; _audioIV = [UIImageView new];
[_audioIV cornerRadius:15.5]; [_audioIV cornerRadius:12.0];
} }
return _audioIV; return _audioIV;
} }
......
DreamSleep/DreamSleep/Class/Start/Root/BaseNaviController.m
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
UIColor *bgColor = BrandColor; UIColor *bgColor = BrandColor;
UIColor *barTintColor = BrandColor; UIColor *barTintColor = BrandColor;
if (style == NaviStyleLight) { if (style == NaviStyleLight) {
titleColor = ColorFromHex(0x333333); titleColor = MainTextColor;
bgColor = DSWhite; bgColor = DSWhite;
barTintColor = DSWhite; barTintColor = DSWhite;
} else if (style == NaviStyleDark) { } else if (style == NaviStyleDark) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!