Skip to content

陈高翔 / DreamSleep-iOS

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

修复 iOS 15适配 bug

1 个父辈 3c6bf45e
内嵌 并排
正在显示 6 个修改的文件 包含 23 行增加 和 2 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**"; HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist; INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-Dev"; INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
...@@ -1004,7 +1004,7 @@ ...@@ -1004,7 +1004,7 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**"; HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist; INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-Dev"; INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-Beta";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
......
DreamSleep/DreamSleep.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
DreamSleep/DreamSleep/HomeModule/Home/View/HomeTableView.m
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
self.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG); self.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
self.separatorStyle = UITableViewCellSeparatorStyleNone; self.separatorStyle = UITableViewCellSeparatorStyleNone;
self.showsVerticalScrollIndicator = NO; self.showsVerticalScrollIndicator = NO;
// iOS 15适配UITableView内容自动下移22像素BUG
if (@available(iOS 15.0, *)) {
self.sectionHeaderTopPadding = 0;
}
[self.homeDataSource addDataArray:[SafeSleepModel getDatas]]; [self.homeDataSource addDataArray:[SafeSleepModel getDatas]];
self.mj_header = [DSGifHeader headerWithRefreshingBlock:^{ self.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
dispatch_after(5.0, dispatch_get_main_queue(), ^{ dispatch_after(5.0, dispatch_get_main_queue(), ^{
......
DreamSleep/DreamSleep/Main/AppDelegate.m
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
// self.window.rootViewController = navi; // self.window.rootViewController = navi;
[self initWeChat]; [self initWeChat];
[self initYTKNetwork];
return YES; return YES;
} }
...@@ -47,6 +48,13 @@ ...@@ -47,6 +48,13 @@
// }]; // }];
} }
- (void)initYTKNetwork {
YTKNetworkConfig *config = [YTKNetworkConfig sharedConfig];
config.baseUrl = ServerURL;
config.cdnUrl = @"";
DSLog(@"ServerURL:%@", ServerURL);
}
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options { - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
return [WXApi handleOpenURL:url delegate:self]; return [WXApi handleOpenURL:url delegate:self];
} }
......
DreamSleep/DreamSleep/Utils/PrefixHeader.pch
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#import <DKNightVersion/DKNightVersion.h> #import <DKNightVersion/DKNightVersion.h>
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
#import <YTKNetwork/YTKNetwork.h>
#import "UIView+Extras.h" #import "UIView+Extras.h"
#import "UILabel+Extras.h" #import "UILabel+Extras.h"
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!