Skip to content

G
galaxy-iOS
Commit 19123379 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

parents 47108aeb f6177e8a
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 15 deletions
galaxy/fastlane/Fastfile
View file @ 19123379
......@@ -17,7 +17,8 @@ platform :ios do
youhua_branch = "youhua-dev"
#打包正使用的分支
myPack_branch = "091"
myPack_branch = youhua_branch
# 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do
......@@ -74,7 +75,6 @@ platform :ios do
# 打realease包 执行命令 fastlane galaxyRelease
lane :galaxyAdhoc do
# add actions here: https://docs.fastlane.tools/actions
......@@ -82,9 +82,9 @@ platform :ios do
# 拉取最新代码
sh "git pull origin #{myPack_branch}"
# 显示git当前分支最新submit id
# sh "git rev-parse HEAD"
sh "git rev-parse HEAD"
# 更新pod第三方库
# cocoapods(use_bundle_exec: true)
cocoapods(use_bundle_exec: true)
gym(
workspace: 'galaxy.xcworkspace',
......@@ -126,4 +126,58 @@ platform :ios do
api_key: "#{release_pgyer_api_key}"
)
end
end
\ No newline at end of file
# 打uat包 执行命令 fastlane galaxyRelease
lane :galaxyUat do
# add actions here: https://docs.fastlane.tools/actions
sh "git checkout #{myPack_branch}"
# 拉取最新代码
sh "git pull origin #{myPack_branch}"
# 显示git当前分支最新submit id
# sh "git rev-parse HEAD"
# 更新pod第三方库
# cocoapods(use_bundle_exec: true)
gym(
workspace: 'galaxy.xcworkspace',
# 每次打包之前clean一下
clean: true,
# 打包出 ipa 文件的路径，我放到了桌面文件夹，你自行更改文件夹
output_directory: './App/uat',
# 打包的名称，可任意取
output_name: 'galaxy-uat.ipa',
# 项目的 scheme，自己项目名 .xcworkspace 前面的项目名就是
scheme: "galaxyForUat",
# 默认 Release，Release or Debug
configuration: 'UatEnv',
# 是否包含 bitcode
include_bitcode: false,
# 是否包含 symbols
include_symbols: true,
# 打包导出方式，包含 app-store, validation, ad-hoc, package, enterprise, development, developer-id and mac-application
export_method: 'ad-hoc',
# 这个设置是为了设置 xcode 自动配置证书和配置文件，当然也可以手动配置，可以参考文档
# export_xcargs: '-allowProvisioningUpdates',
#手动配置证书和配置文件
export_options: {
signingStyle: "manual",
provisioningProfiles: {
"#{bundle_id}" => "#{adhoc_profile_name}",
}
}
)
# mac上的通知弹窗，通知打包完毕
notification(app_icon: "./fastlane/icon.png", title: "manager", subtitle: "打包成功，已导出安装包", message: "准备发布到蒲公英中……")
#配置上传蒲公英账号 蒲公英的 api_key和 user_key 用自己蒲公英账号的，别用我的！！！如果没有可删除
pgyer(
# 蒲公英 API Key
api_key: "#{adhoc_pgyer_api_key}"
)
end
end
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 19123379
......@@ -3831,6 +3831,147 @@
};
name = TestEnv;
};
A54B7CC82C3645ED00BBA593 /* UatRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
VALIDATE_PRODUCT = YES;
};
name = UatRelease;
};
A54B7CC92C3645ED00BBA593 /* UatRelease */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/galaxy/Res/Frameworks",
"$(PROJECT_DIR)/galaxy/Classes/Modules/AutoLogin(一键登录)/framework",
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = galaxy/Res/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Uat";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = UATENV;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = UatRelease;
};
A54B7CCA2C3645ED00BBA593 /* UatRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/galaxy.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/galaxy";
};
name = UatRelease;
};
A54B7CCB2C3645ED00BBA593 /* UatRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = galaxy;
};
name = UatRelease;
};
A5573EF62B317C0100D98EC0 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -4126,6 +4267,7 @@
buildConfigurations = (
A5573EF62B317C0100D98EC0 /* Debug */,
A5573EF72B317C0100D98EC0 /* Release */,
A54B7CC82C3645ED00BBA593 /* UatRelease */,
A53B61132BB19B840010B573 /* TestEnv */,
);
defaultConfigurationIsVisible = 0;
......@@ -4136,6 +4278,7 @@
buildConfigurations = (
A5573EF92B317C0100D98EC0 /* Debug */,
A5573EFA2B317C0100D98EC0 /* Release */,
A54B7CC92C3645ED00BBA593 /* UatRelease */,
A53B61142BB19B840010B573 /* TestEnv */,
);
defaultConfigurationIsVisible = 0;
......@@ -4146,6 +4289,7 @@
buildConfigurations = (
A5573EFC2B317C0100D98EC0 /* Debug */,
A5573EFD2B317C0100D98EC0 /* Release */,
A54B7CCA2C3645ED00BBA593 /* UatRelease */,
A53B61152BB19B840010B573 /* TestEnv */,
);
defaultConfigurationIsVisible = 0;
......@@ -4156,6 +4300,7 @@
buildConfigurations = (
A5573EFF2B317C0100D98EC0 /* Debug */,
A5573F002B317C0100D98EC0 /* Release */,
A54B7CCB2C3645ED00BBA593 /* UatRelease */,
A53B61162BB19B840010B573 /* TestEnv */,
);
defaultConfigurationIsVisible = 0;
......
galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForUat.xcscheme 0 → 100644
View file @ 19123379
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
BuildableName = "galaxy.app"
BlueprintName = "galaxy"
ReferencedContainer = "container:galaxy.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
BuildableName = "galaxy.app"
BlueprintName = "galaxy"
ReferencedContainer = "container:galaxy.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
BuildableName = "galaxy.app"
BlueprintName = "galaxy"
ReferencedContainer = "container:galaxy.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
galaxy/galaxy/Applegate(JPush).swift
View file @ 19123379
......@@ -34,6 +34,8 @@ extension AppDelegate: JPUSHRegisterDelegate {
let isProduction = false
#elseif TESTENV
let isProduction = true
#elseif TESTENV
let isProduction = true
#else
let isProduction = true
#endif
......@@ -49,14 +51,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
print("deviceToken:\(deviceTokenStr)")
JPUSHService.registerDeviceToken(deviceToken)
YHLoginManager.shared.deviceTokenModel.deviceToken = deviceTokenStr
#if DEBUG
// YHHUD.flash(message: deviceTokenStr)
#elseif TESTENV
// YHHUD.flash(message: deviceTokenStr)
#else
#endif
}
//获取token 失败
func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { //可选
......@@ -66,6 +60,7 @@ extension AppDelegate: JPUSHRegisterDelegate {
YHHUD.flash(message: error.localizedDescription)
#elseif TESTENV
YHHUD.flash(message: error.localizedDescription)
#elseif UATENV
#else
#endif
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHConfigManager.swift
View file @ 19123379
......@@ -36,6 +36,8 @@ class YHConfigManager: NSObject {
tH5url = YHConfigManager.baseH5UrlTest
#elseif TESTENV
tH5url = YHConfigManager.baseH5UrlTest
#elseif UATENV
tH5url = YHConfigManager.baseH5UrlRelease
#else
tH5url = YHConfigManager.baseH5UrlRelease
#endif
......@@ -60,6 +62,8 @@ class YHConfigManager: NSObject {
tOssUrl = YHConfigManager.baseOSSUrlTest
#elseif TESTENV
tOssUrl = YHConfigManager.baseOSSUrlTest
#elseif UATENV
tOssUrl = YHConfigManager.baseOSSUrlRelease
#else
tOssUrl = YHConfigManager.baseOSSUrlRelease
#endif
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ 19123379
......@@ -82,6 +82,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
#elseif UATENV
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
PersonalModuleItem(title: "播放设置".local, type:.playSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
#else
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
......@@ -141,8 +149,12 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
#elseif TESTENV
let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
versionLabel.text = version
#elseif UATENV
let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "Uat服"
versionLabel.text = version
versionLabel.isHidden = true
#else
let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "正式服"
versionLabel.text = version
versionLabel.isHidden = true
#endif
......
galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift
View file @ 19123379
......@@ -24,6 +24,12 @@ class YHAnalytics {
//开启log
options.enableLog = true
SensorsAnalyticsSDK.sharedInstance()?.set(["evn" : "test"])
#elseif UATENV
let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForRelease, launchOptions: launchOptions)
//开启log
options.enableLog = false
SensorsAnalyticsSDK.sharedInstance()?.set(["evn" : "uat"])
#else
let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForRelease, launchOptions: launchOptions)
//开启log
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ 19123379
......@@ -23,8 +23,9 @@ class YHBaseUrlManager {
#if DEBUG
return YHBaseUrlManager.baseUrlTest + "/"
#elseif TESTENV
// return YHBaseUrlManager.baseUatUrlTest + "/"
return YHBaseUrlManager.baseUrlTest + "/"
#elseif UATENV
return YHBaseUrlManager.baseUatUrlTest + "/"
#else
return YHBaseUrlManager.baseUrlRelease + "/"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment