Skip to content

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

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

parents 8e6715af 829196a1
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 30 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ bff7e6d5
......@@ -3806,7 +3806,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3831,7 +3831,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.2;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -3947,7 +3947,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3972,7 +3972,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.2;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4151,7 +4151,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4176,7 +4176,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.2;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4197,7 +4197,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4222,7 +4222,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.2;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift
View file @ bff7e6d5
......@@ -12,7 +12,7 @@ import JXSegmentedView
//MARK: - 生命周期函数 及变量
class YHHomeHoldViewPageViewController: YHBaseViewController {
let arrItemTitles = ["推荐","身份","生活"]
let arrItemTitles = ["推荐","身份","生活","资讯"]
var arrItemVCs : [YHBaseViewController] = []
......@@ -54,6 +54,8 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
var tapTimestamp : CFAbsoluteTime = -10.0
var needReloadDataFlag : Bool = false
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
......@@ -73,6 +75,12 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
updateDefaultSearchKeyWord()
requestAppNewVersion()
if needReloadDataFlag {
needReloadDataFlag = false
homePageVC.requestOrder()
}
}
override func viewWillDisappear(_ animated: Bool) {
......@@ -113,6 +121,10 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
//MARK: - 内部函数
extension YHHomeHoldViewPageViewController {
@objc func clickMsgitem() {
needReloadDataFlag = true
}
@objc func didRefreshMessageCount() {
getTotalUnreadMsgCount()
}
......@@ -207,10 +219,12 @@ extension YHHomeHoldViewPageViewController {
NotificationCenter.default.addObserver(self, selector: #selector(clearUnreadBadge), name: YhConstant.YhNotification.didMarkAllMessagesReadedNotifiction, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(didRefreshMessageCount), name: YhConstant.YhNotification.didRequestUnreadMsgTotalCountNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(clickMsgitem), name: YhConstant.YhNotification.clickHomeMsgNotifiction, object: nil)
for i in 0..<arrItemTitles.count {
if i == 0 {
//首页
......@@ -224,6 +238,10 @@ extension YHHomeHoldViewPageViewController {
//生活
let vc = YHServerHKLifeViewController()
arrItemVCs.append(vc)
} else if i == 3 {
//资讯
let vc = YHServerHKLifeViewController()
arrItemVCs.append(vc)
}
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ bff7e6d5
......@@ -25,7 +25,6 @@ class YHHomePageViewController: YHBaseViewController {
var homeHeaderViewHeight = YHHomeHeadView.fixViewH
var needReloadDataFlag : Bool = false
lazy var homeCollectView = {
// 设置布局方向
......@@ -56,14 +55,6 @@ class YHHomePageViewController: YHBaseViewController {
getData()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if needReloadDataFlag {
needReloadDataFlag = false
requestOrder()
}
}
lazy var homeHeaderView: YHHomeHeadView = {
let view = YHHomeHeadView()
......@@ -113,10 +104,6 @@ private extension YHHomePageViewController {
getCacheDataForHomeNewsData()
}
@objc func clickMsgitem() {
needReloadDataFlag = true
}
//获取缓存的 banner数据
func getCacheDataForBanner() -> [YHBannerModel] {
let arrString2 = UserDefaults.standard.value(forKey: "homeBannerData")
......@@ -229,7 +216,7 @@ private extension YHHomePageViewController {
func setupUI() {
gk_navigationBar.isHidden = true
NotificationCenter.default.addObserver(self, selector: #selector(clickMsgitem), name: YhConstant.YhNotification.clickHomeMsgNotifiction, object: nil)
view.addSubview(homeCollectView)
homeCollectView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockView.swift
View file @ bff7e6d5
......@@ -20,8 +20,8 @@ class YHHomeKingKongBlockView: UIView {
}
var arrData : [YHHomeKingKongBlockModel] = [
YHHomeKingKongBlockModel(type: "3", iconName: "kingkong_sffl", title: "身份福利"),
YHHomeKingKongBlockModel(type: "4", iconName: "kingkong_blgl", title: "办理攻略"),
YHHomeKingKongBlockModel(type: "3", iconName: "kingkong_sfys", title: "身份优势"),
YHHomeKingKongBlockModel(type: "4", iconName: "kingkong_yqyl", title: "邀请有礼"),
YHHomeKingKongBlockModel(type: "5", iconName: "kingkong_khxs", title: "客户心声"),
YHHomeKingKongBlockModel(type: "6", iconName: "kingkong_xgbs", title: "香港办事"),
]
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHMessageBellView.swift
View file @ bff7e6d5
......@@ -91,6 +91,8 @@ class YHMessageBellView: UIView {
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
NotificationCenter.default.post(name: YhConstant.YhNotification.clickHomeMsgNotifiction, object: nil)
let vc = YHMessageListVC()
UIViewController.current?.navigationController?.pushViewController(vc)
}
......
galaxy/galaxy/Res/Assets.xcassets/Home/kingkong/kingkong_blgl.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Home/kingkong/kingkong_sfys.imageset/Contents.json
View file @ bff7e6d5
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "办理攻略@2x.png",
"filename" : "身份优势@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "办理攻略@3x.png",
"filename" : "身份优势@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Home/kingkong/kingkong_sffl.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Home/kingkong/kingkong_yqyl.imageset/Contents.json
View file @ bff7e6d5
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "身份福利@2x.png",
"filename" : "邀请有礼@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "身份福利@3x.png",
"filename" : "邀请有礼@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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