Commit c618be59 cgx

修复Bundle_Display_Name在多xcconfig下配置问题

1 个父辈 82636303
...@@ -857,8 +857,6 @@ ...@@ -857,8 +857,6 @@
D0B5ECA327F2D9DE003EDFE3 /* DreamSleep */ = { D0B5ECA327F2D9DE003EDFE3 /* DreamSleep */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D091BBB82809024100487A50 /* DreamSleepBeta.entitlements */,
D0DF90AB28142F1300FC0F64 /* DreamSleepDebug.entitlements */,
D0FAC665281BB8A800D4B859 /* Class */, D0FAC665281BB8A800D4B859 /* Class */,
D0E9408127FE961300D57495 /* Vendors */, D0E9408127FE961300D57495 /* Vendors */,
D0FAC664281BB6FF00D4B859 /* Basement */, D0FAC664281BB6FF00D4B859 /* Basement */,
...@@ -875,6 +873,8 @@ ...@@ -875,6 +873,8 @@
D0B5ECC227F2E25F003EDFE3 /* Beta.xcconfig */, D0B5ECC227F2E25F003EDFE3 /* Beta.xcconfig */,
D0B5ECC427F2E27B003EDFE3 /* Release.xcconfig */, D0B5ECC427F2E27B003EDFE3 /* Release.xcconfig */,
D0B5ECCC27F2EB8B003EDFE3 /* PrefixHeader.pch */, D0B5ECCC27F2EB8B003EDFE3 /* PrefixHeader.pch */,
D091BBB82809024100487A50 /* DreamSleepBeta.entitlements */,
D0DF90AB28142F1300FC0F64 /* DreamSleepDebug.entitlements */,
); );
path = DSConfig; path = DSConfig;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1618,8 +1618,8 @@ ...@@ -1618,8 +1618,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev; ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-Dev"; App_Display_Name = "小梦睡眠-Dev";
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
...@@ -1636,7 +1636,6 @@ ...@@ -1636,7 +1636,6 @@
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_CFBundleDisplayName = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息";
...@@ -1685,7 +1684,7 @@ ...@@ -1685,7 +1684,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-冥想解压助眠健康养生"; App_Display_Name = "小梦睡眠-冥想解压助眠健康养生";
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;
...@@ -1702,7 +1701,6 @@ ...@@ -1702,7 +1701,6 @@
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_CFBundleDisplayName = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息";
...@@ -1811,8 +1809,8 @@ ...@@ -1811,8 +1809,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconBeta; ASSETCATALOG_COMPILER_APPICON_NAME = AppIconBeta;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
Bundle_Display_Name = "小梦睡眠-Beta"; App_Display_Name = "小梦睡眠-Beta";
CODE_SIGN_ENTITLEMENTS = DreamSleep/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 = 1; CURRENT_PROJECT_VERSION = 1;
...@@ -1828,7 +1826,6 @@ ...@@ -1828,7 +1826,6 @@
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_CFBundleDisplayName = "小梦睡眠-Dev";
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传"; INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意,才能使用摄像头,以便于相机拍摄,上传";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的同意,才能访问位置信息";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的同意,才能始终访问位置信息";
......
<?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>com.apple.developer.applesignin</key>
<array>
<string>Default</string>
</array>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:ocusmp.xinstall.com.cn</string>
</array>
</dict>
</plist>
<?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/>
</plist>
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<!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>Bundle_Display_Name</key>
<string>$(App_Display_Name)</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!