Skip to content

G
galaxy-iOS
Commit 63088f8f authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'yinhe-live-1212' of... 

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212
parents 95361c83 75264c6f
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 45 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 63088f8f
......@@ -7211,9 +7211,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = RXHYW88XR7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -7242,6 +7244,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TESTENV;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
......@@ -7255,13 +7258,15 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -7353,9 +7358,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = RXHYW88XR7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -7384,6 +7391,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = UATENV;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
......@@ -7397,13 +7405,15 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -7558,9 +7568,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = RXHYW88XR7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -7589,6 +7601,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0;
......@@ -7605,9 +7618,11 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = RXHYW88XR7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
......@@ -7636,6 +7651,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0;
......@@ -7648,13 +7664,15 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -7667,13 +7685,15 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
......
galaxy/galaxy/AppDelegate.swift
View file @ 63088f8f
......@@ -166,15 +166,6 @@ extension AppDelegate {
#else
Bugly.start(withAppId: YhConstant.Bugly.appidForRelease)
#endif
//3、AGC 短链相关
AGCInstance.startUp()
AGCAppLinking.instance().handle { (link, error) in
let deepLink = link?.deepLink
//TODO: 增加deeplink地址跳转
print(deepLink as Any)
}
}
//2.通用全局UI设置相关
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 63088f8f
......@@ -80,9 +80,10 @@ class YHHomePageViewController: YHBaseViewController {
guard YHPlayerManager.shared.isConfigFloating != false else {
return
}
// guard let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open else {
// return
// }
guard let configModel = YHConfigManager.shared.reqVM.configModel, configModel.is_integral_open else {
// 关闭就不让显示直播浮窗
return
}
viewModel.getHomeFloatingLive { [weak self] success, error in
guard let self = self else {
return
......@@ -221,14 +222,14 @@ private extension YHHomePageViewController {
}
func addDefaultData() {
homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
// if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
// homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
// } else {
// homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner().filter {
// ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
// }
// }
// 关闭就不让显示直播浮窗
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner()
} else {
homeHeaderView.homeBannerView.dataArr = getCacheDataForBanner().filter {
($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
}
}
getCacheDataForHomeNewsData()
}
......@@ -287,14 +288,13 @@ private extension YHHomePageViewController {
self.viewModel.getHomeBanner(0) {[weak self] success, error in
guard let self = self else { return }
DispatchQueue.main.async {
self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
// if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
// self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
// } else {
// self.homeHeaderView.homeBannerView.dataArr = (self.viewModel.banners ?? self.getCacheDataForBanner()).filter {
// ($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
// }
// }
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getCacheDataForBanner()
} else {
self.homeHeaderView.homeBannerView.dataArr = (self.viewModel.banners ?? self.getCacheDataForBanner()).filter {
($0.skip_type != 100) && ($0.skip_type != 101) && ($0.skip_type != 102)
}
}
if let arrB = self.viewModel.banners,arrB.count > 0 {
let arrString = arrB.toJSONString()
......
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHConfigModel.swift
View file @ 63088f8f
......@@ -21,8 +21,8 @@ class YHConfigModel : SmartCodable {
var suggest_updating: Bool = false
var suggest_updating_msg: String = ""
var is_integral_open : Bool = false //条件控制哈 pingguo shenhe
var is_recharge_order_open : Bool = false //双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭',
var is_integral_open : Bool = false //条件控制哈 PingGuoShenHe
// var is_recharge_order_open : Bool = false //双十一banner开关 //`is_recharge_order_open` int NOT NULL DEFAULT '0' COMMENT '1 开启 0关闭',
required init() {
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift
View file @ 63088f8f
......@@ -237,6 +237,8 @@ extension YHSelectViewController: UITableViewDelegate, UITableViewDataSource {
let vc = YHH5WebViewVC()
vc.url = tUrl
vc.isHideNavigationBar = false
// 进详情页关闭小窗
YHPlayerManager.shared.exitFloating()
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 63088f8f
......@@ -284,17 +284,17 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
items.append(item)
}
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
let item = PersonalModuleItem(icon: "mine_item_myOrder", title: "我的订单".local, type:.myOrder)
items.append(item)
}
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
let item = PersonalModuleItem(icon: "mine_item_service_center", title: "服务进度".local, type:.serviceStep)
items.append(item)
}
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_recharge_order_open {
if let configModel = YHConfigManager.shared.reqVM.configModel,configModel.is_integral_open {
let item = PersonalModuleItem(icon: "mine_item_card", title: "购物车".local, type:.mycart)
items.append(item)
}
......
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