Skip to content

陈高翔 / DreamSleep-iOS

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

隐藏预览照片原图按钮

1 个父辈 0226a575
内嵌 并排
正在显示 3 个修改的文件 包含 17 行增加 和 18 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -1481,7 +1481,9 @@ ...@@ -1481,7 +1481,9 @@
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 = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要访问您的相机。"; INFOPLIST_KEY_NSCameraUsageDescription = "拍照";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "拍照";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "相册";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
...@@ -1500,7 +1502,7 @@ ...@@ -1500,7 +1502,7 @@
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ",
); );
MARKETING_VERSION = 1.1.2; MARKETING_VERSION = 1.1.3;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -1541,8 +1543,10 @@ ...@@ -1541,8 +1543,10 @@
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 = "小梦睡眠"; INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要访问您的相机。"; INFOPLIST_KEY_NSCameraUsageDescription = "拍照";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "拍照";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "相册";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
...@@ -1561,7 +1565,7 @@ ...@@ -1561,7 +1565,7 @@
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ",
); );
MARKETING_VERSION = 1.1.2; MARKETING_VERSION = 1.1.3;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -1662,8 +1666,10 @@ ...@@ -1662,8 +1666,10 @@
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 = "小梦睡眠-Beta"; INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要访问您的相机。"; INFOPLIST_KEY_NSCameraUsageDescription = "拍照";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "拍照";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "相册";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UIStatusBarHidden = YES;
...@@ -1682,7 +1688,7 @@ ...@@ -1682,7 +1688,7 @@
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/WeChat/WechatSDK",
"$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ", "$(PROJECT_DIR)/DreamSleep/Vendors/UMSocial_6.10.4/SocialLibraries/QQ",
); );
MARKETING_VERSION = 1.1.2; MARKETING_VERSION = 1.1.3;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
......
DreamSleep/DreamSleep/DSConfig/Info.plist
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>拍照</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -87,9 +85,5 @@ ...@@ -87,9 +85,5 @@
</array> </array>
<key>UIStatusBarStyle</key> <key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string> <string>UIStatusBarStyleLightContent</string>
<key>NSCameraUsageDescription</key>
<string>拍照</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>相册</string>
</dict> </dict>
</plist> </plist>
DreamSleep/DreamSleep/Profile/Feedback/FeedbackController.m
...@@ -148,8 +148,8 @@ static int AlbumColumnCount = 4; ...@@ -148,8 +148,8 @@ static int AlbumColumnCount = 4;
TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:(indexPath.row - 1)]; TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithSelectedAssets:_selectedAssets selectedPhotos:_selectedPhotos index:(indexPath.row - 1)];
imagePickerVc.maxImagesCount = MaxUpdateImgCount; imagePickerVc.maxImagesCount = MaxUpdateImgCount;
imagePickerVc.allowPickingOriginalPhoto = YES; imagePickerVc.allowPickingOriginalPhoto = NO;
imagePickerVc.allowPickingMultipleVideo =NO; imagePickerVc.allowPickingMultipleVideo = NO;
imagePickerVc.showSelectedIndex = YES; imagePickerVc.showSelectedIndex = YES;
imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto; imagePickerVc.isSelectOriginalPhoto = _isSelectOriginalPhoto;
WS(weakSelf); WS(weakSelf);
...@@ -179,9 +179,8 @@ static int AlbumColumnCount = 4; ...@@ -179,9 +179,8 @@ static int AlbumColumnCount = 4;
// 设置是否可以选择视频/图片/原图 // 设置是否可以选择视频/图片/原图
imagePickerVc.allowPickingVideo = NO; imagePickerVc.allowPickingVideo = NO;
imagePickerVc.allowPickingImage = YES; imagePickerVc.allowPickingImage = YES;
imagePickerVc.allowPickingOriginalPhoto = YES;
imagePickerVc.allowPickingGif = NO;
imagePickerVc.allowPickingOriginalPhoto = NO; imagePickerVc.allowPickingOriginalPhoto = NO;
imagePickerVc.allowPickingGif = NO;
// 是否可以多选视频 // 是否可以多选视频
imagePickerVc.allowPickingMultipleVideo = NO; imagePickerVc.allowPickingMultipleVideo = NO;
// 照片排列按修改时间升序 // 照片排列按修改时间升序
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!