Skip to content

陈高翔 / DreamSleep-iOS

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

关闭部分页面系统侧滑（部分页面是自定义导航栏，待全部页面使用自定义导航栏再开启）； 

优化权限文案；
1 个父辈 ae5a0d37
内嵌 并排
正在显示 4 个修改的文件 包含 29 行增加 和 21 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -2204,12 +2204,12 @@ ...@@ -2204,12 +2204,12 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**"; HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist; INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist;
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用摄像头，以便于相机拍摄，上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能访问相机。";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息。";
INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息。";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册，以便于图片选取、上传"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册。";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
...@@ -2273,12 +2273,12 @@ ...@@ -2273,12 +2273,12 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**"; HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist; INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist;
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用摄像头，以便于相机拍摄，上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能访问相机。";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息。";
INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息。";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册，以便于图片选取、上传"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册。";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
...@@ -2404,12 +2404,12 @@ ...@@ -2404,12 +2404,12 @@
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**"; HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist; INFOPLIST_FILE = DreamSleep/Basement/DSConfig/Info.plist;
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用摄像头，以便于相机拍摄，上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能访问相机。";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意，才能始终访问位置信息。";
INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息"; INFOPLIST_KEY_NSLocationUsageDescription = "APP需要您的同意，才能访问位置信息。";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的同意，才能在使用时获取位置信息。";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册，以便于图片选取、上传"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册。";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
......
DreamSleep/DreamSleep/Basement/DSConfig/Info.plist
...@@ -82,13 +82,11 @@ ...@@ -82,13 +82,11 @@
<true/> <true/>
</dict> </dict>
<key>Privacy - Photo Library Additions Usage Description </key> <key>Privacy - Photo Library Additions Usage Description </key>
<string>APP需要您的同意，才能访问相册，以便于保存图片</string> <string>APP需要您的同意，才能访问相册。</string>
<key>UIBackgroundModes</key> <key>UIBackgroundModes</key>
<array> <array>
<string>audio</string> <string>audio</string>
</array> </array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIStatusBarStyle</key> <key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string> <string>UIStatusBarStyleLightContent</string>
</dict> </dict>
......
DreamSleep/DreamSleep/Class/ProfileModule/Feedback/Controller/FeedbackController.m
...@@ -96,6 +96,11 @@ static int AlbumColumnCount = 4; ...@@ -96,6 +96,11 @@ static int AlbumColumnCount = 4;
return NaviStyleDefault; return NaviStyleDefault;
} }
#pragma mark - 关闭侧滑
- (BOOL)enableInteractivePopGestureRecognizer {
return NO;
}
#pragma mark - Actions #pragma mark - Actions
- (void)myFeedAction { - (void)myFeedAction {
MyFeedListController *myFeedVC = [[MyFeedListController alloc] initWithDelegate:self]; MyFeedListController *myFeedVC = [[MyFeedListController alloc] initWithDelegate:self];
......
DreamSleep/DreamSleep/Class/ProfileModule/SystemSet/SystemSetController.m
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
return NaviStyleDefault; return NaviStyleDefault;
} }
#pragma mark - 关闭侧滑
- (BOOL)enableInteractivePopGestureRecognizer {
return NO;
}
#pragma mark - SetTableViewDelegate #pragma mark - SetTableViewDelegate
- (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
switch (indexPath.row) { switch (indexPath.row) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!