Skip to content

陈高翔 / DreamSleep-iOS

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

多环境配置优化

1 个父辈 6dda2266
内嵌 并排
正在显示 24 个修改的文件 包含 158 行增加 和 49 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
......@@ -57,7 +57,7 @@
D0CFD3CF27FB3B920002982B /* launcher@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CC27FB3B910002982B /* launcher@2x.png */; };
D0CFD3D027FB3B920002982B /* launcher@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CD27FB3B910002982B /* launcher@3x.png */; };
D0CFD3D127FB3B920002982B /* launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = D0CFD3CE27FB3B920002982B /* launcher.png */; };
D0E9408927FE96A900D57495 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E9408727FE96A900D57495 /* libWeChatSDK.a */; };
D0E9408927FE96A900D57495 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E9408727FE96A900D57495 /* libWeChatSDK.a */; settings = {ATTRIBUTES = (Required, ); }; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -115,7 +115,7 @@
D0930F172801874B006B497A /* UIViewController+Swizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Swizzling.h"; sourceTree = "<group>"; };
D0930F182801874B006B497A /* UINavigationController+Pop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Pop.m"; sourceTree = "<group>"; };
D0930F192801874B006B497A /* NaviBarHandlerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NaviBarHandlerProtocol.h; sourceTree = "<group>"; };
D0B5ECA127F2D9DE003EDFE3 /* DreamSleep.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DreamSleep.app; sourceTree = BUILT_PRODUCTS_DIR; };
D0B5ECA127F2D9DE003EDFE3 /* DreamSleepDev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DreamSleepDev.app; sourceTree = BUILT_PRODUCTS_DIR; };
D0B5ECA427F2D9DE003EDFE3 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
D0B5ECA527F2D9DE003EDFE3 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
D0B5ECAA27F2D9DE003EDFE3 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
......@@ -346,7 +346,7 @@
D0B5ECA227F2D9DE003EDFE3 /* Products */ = {
isa = PBXGroup;
children = (
D0B5ECA127F2D9DE003EDFE3 /* DreamSleep.app */,
D0B5ECA127F2D9DE003EDFE3 /* DreamSleepDev.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -463,7 +463,7 @@
);
name = DreamSleep;
productName = DreamSleep;
productReference = D0B5ECA127F2D9DE003EDFE3 /* DreamSleep.app */;
productReference = D0B5ECA127F2D9DE003EDFE3 /* DreamSleepDev.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
......@@ -736,6 +736,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
......@@ -745,19 +746,21 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 72E2054B343085AE9898C560 /* Pods-DreamSleep.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-Dev";
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = SPH85C3TWU;
DEVELOPMENT_TEAM = "";
GCC_PREFIX_HEADER = "${SRCROOT}/DreamSleep/Utils/PrefixHeader.pch";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-冥想解压助眠健康养生";
INFOPLIST_KEY_CFBundleDisplayName = "${Bundle_Display_Name}";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
......@@ -778,8 +781,9 @@
"-all_load",
"-l\"c++\"",
);
PRODUCT_BUNDLE_IDENTIFIER = com.aolei.sleep.DreamSleep;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = com.aolei.sleep.dev;
PRODUCT_MODULE_NAME = DreamSleepDev;
PRODUCT_NAME = "$(TARGET_NAME)Dev";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1;
......@@ -792,6 +796,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-冥想解压助眠健康养生";
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
......@@ -802,7 +808,7 @@
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-冥想解压助眠健康养生";
INFOPLIST_KEY_CFBundleDisplayName = "${Bundle_Display_Name}";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
......@@ -824,6 +830,7 @@
"-l\"c++\"",
);
PRODUCT_BUNDLE_IDENTIFIER = com.aolei.sleep;
PRODUCT_MODULE_NAME = DreamSleep;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = xiaomengSleep_dis_profile;
SWIFT_EMIT_LOC_STRINGS = YES;
......@@ -893,8 +900,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D0B5ECC227F2E25F003EDFE3 /* Beta.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconBeta;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-Beta";
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
......@@ -905,7 +914,7 @@
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "$(inherited)/**";
INFOPLIST_FILE = DreamSleep/DSConfig/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "小梦睡眠-冥想解压助眠健康养生";
INFOPLIST_KEY_CFBundleDisplayName = "${Bundle_Display_Name}";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
......@@ -927,7 +936,8 @@
"-l\"c++\"",
);
PRODUCT_BUNDLE_IDENTIFIER = com.aolei.sleep;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_MODULE_NAME = DreamSleepBeta;
PRODUCT_NAME = "$(TARGET_NAME)Beta";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1;
......
DreamSleep/DreamSleep/Home/HomeViewController.m
......@@ -6,7 +6,6 @@
//
#import "HomeViewController.h"
#import "DSGifHeader.h"
#import "HomeTableView.h"
@interface HomeViewController ()
......@@ -23,7 +22,7 @@
[super viewDidLoad];
// 导航栏背景色
// self.navigationController.navigationBar.dk_barTintColorPicker = DKColorPickerWithKey(NaviBG);
// self.navigationController.navigationBar.dk_barTintColorPicker = DKColorPickerWithKey(NaviBG);
// leftItem
UILabel *leftLab = [[UILabel alloc] init];
......@@ -34,34 +33,8 @@
UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:leftLab];
self.navigationItem.leftBarButtonItem = leftItem;
// 隐藏导航栏分割线
// self.navigationController.navigationBar.shadowImage = [UIImage new];
// view背景色
// self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
// self.tableView.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
// dispatch_after(2.0, dispatch_get_main_queue(), ^{
// [self.tableView.mj_header endRefreshing];
// });
// }];
// // 设置导航栏返回按钮颜色
// self.navigationController.navigationBar.tintColor = DSWhite;
// // 设置导航栏背景色、title颜色、隐藏分割线
// NSDictionary *titleTextAttributes = @{NSForegroundColorAttributeName:ColorFromHex(0x333333)};
// if (@available(iOS 13.0, *)) {
// UINavigationBarAppearance *appearance = [UINavigationBarAppearance new];
// appearance.titleTextAttributes = titleTextAttributes;
// appearance.backgroundColor = DSWhite;
// appearance.shadowColor = [UIColor clearColor];
// self.navigationController.navigationBar.standardAppearance = appearance;
// self.navigationController.navigationBar.scrollEdgeAppearance = appearance;
// } else {
// self.navigationController.navigationBar.dk_barTintColorPicker = DKColorPickerWithKey(NaviBG);
// [self.navigationController.navigationBar setTitleTextAttributes:titleTextAttributes];
// self.navigationController.navigationBar.shadowImage = [UIImage new];
// }
// self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
}
#pragma mark - 导航栏日间模式
......
DreamSleep/DreamSleep/Resource/Assets.xcassets/AppIconBeta.appiconset/Contents.json 0 → 100644
{
"images" : [
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "noti@2x.png",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "noti@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "setting@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "setting@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "appIcon@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "appIcon@3x.png",
"scale" : "3x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "appStoreIcon.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/AppIconDev.appiconset/Contents.json 0 → 100644
{
"images" : [
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "noti@2x.png",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "noti@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "setting@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "setting@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "spotlight@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "appIcon@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "appIcon@3x.png",
"scale" : "3x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "appStoreIcon.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
DreamSleep/Pods/Pods.xcodeproj/project.pbxproj
......@@ -448,7 +448,7 @@
1F2A25C4BB0A9B0F296F8DACEB31C15A /* MJRefreshBackFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshBackFooter.h; path = MJRefresh/Base/MJRefreshBackFooter.h; sourceTree = "<group>"; };
1FF0AD71FEBAE2EDDEF3107714DE93EB /* LOTShapeFill.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTShapeFill.h; path = "lottie-ios/Classes/Models/LOTShapeFill.h"; sourceTree = "<group>"; };
1FFD66BC92100926B149C59FEEDEBF33 /* LOTLayerContainer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LOTLayerContainer.h; path = "lottie-ios/Classes/AnimatableLayers/LOTLayerContainer.h"; sourceTree = "<group>"; };
1FFED36A657123030ABB700256D73F15 /* Masonry */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Masonry; path = Masonry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1FFED36A657123030ABB700256D73F15 /* Masonry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Masonry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
20C968A600636E825BD62E66C6C62F15 /* MJRefreshConst.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshConst.h; path = MJRefresh/MJRefreshConst.h; sourceTree = "<group>"; };
20FB54EFACC3366F12145955160C3CA8 /* LOTBezierPath.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = LOTBezierPath.m; path = "lottie-ios/Classes/Extensions/LOTBezierPath.m"; sourceTree = "<group>"; };
212F30C2E5C57C426C1E18DC50E63BF6 /* UICollectionViewLayout+MJRefresh.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UICollectionViewLayout+MJRefresh.h"; path = "MJRefresh/UICollectionViewLayout+MJRefresh.h"; sourceTree = "<group>"; };
......@@ -1421,7 +1421,7 @@
A4FA15D44DF6BAC7550EDEED10862AA3 /* AFNetworking */,
D49390DC16189A74052FAC3455F18249 /* DKNightVersion.framework */,
51BA97E8B5085EFFB47BC9C0B785CEA7 /* Lottie.framework */,
1FFED36A657123030ABB700256D73F15 /* Masonry */,
1FFED36A657123030ABB700256D73F15 /* Masonry.framework */,
E49D6D248DD1CEE584E6776B9164A1B2 /* MJRefresh */,
9BD6F0B21CDAE9FA26016DC870A83047 /* Pods-DreamSleep */,
601EEA66C9A6080A11C1ADE5E2A91AE1 /* YTKNetwork */,
......@@ -1711,7 +1711,7 @@
);
name = Masonry;
productName = Masonry;
productReference = 1FFED36A657123030ABB700256D73F15 /* Masonry */;
productReference = 1FFED36A657123030ABB700256D73F15 /* Masonry.framework */;
productType = "com.apple.product-type.framework";
};
5B27019314D6E0AFC98D212A7729D0CD /* Pods-DreamSleep */ = {
......@@ -2176,7 +2176,7 @@
GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
INFOPLIST_FILE = "Target Support Files/Masonry/Masonry-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -2922,7 +2922,7 @@
GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
INFOPLIST_FILE = "Target Support Files/Masonry/Masonry-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -3018,7 +3018,7 @@
GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
INFOPLIST_FILE = "Target Support Files/Masonry/Masonry-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!