Commit 68f8f37f authored by pete谢兆麟's avatar pete谢兆麟

背景替换

parent 1f0ecf1f
...@@ -70,8 +70,8 @@ class YHHomeLottieAnimateContentView: YHBasicContentView { ...@@ -70,8 +70,8 @@ class YHHomeLottieAnimateContentView: YHBasicContentView {
override func deselectAnimation(animated: Bool, completion: (() -> ())?) { override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
super.deselectAnimation(animated: animated, completion: nil) super.deselectAnimation(animated: animated, completion: nil)
lottieView.isHidden = true lottieView.isHidden = true
imageView.isHidden = false
} }
} }
class YHServiceLottieAnimateContentView: YHBasicContentView { class YHServiceLottieAnimateContentView: YHBasicContentView {
...@@ -113,6 +113,7 @@ class YHServiceLottieAnimateContentView: YHBasicContentView { ...@@ -113,6 +113,7 @@ class YHServiceLottieAnimateContentView: YHBasicContentView {
override func deselectAnimation(animated: Bool, completion: (() -> ())?) { override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
super.deselectAnimation(animated: animated, completion: nil) super.deselectAnimation(animated: animated, completion: nil)
lottieView.isHidden = true lottieView.isHidden = true
imageView.isHidden = false
} }
} }
...@@ -155,6 +156,7 @@ class YHCommunityLottieAnimateContentView: YHBasicContentView { ...@@ -155,6 +156,7 @@ class YHCommunityLottieAnimateContentView: YHBasicContentView {
override func deselectAnimation(animated: Bool, completion: (() -> ())?) { override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
super.deselectAnimation(animated: animated, completion: nil) super.deselectAnimation(animated: animated, completion: nil)
lottieView.isHidden = true lottieView.isHidden = true
imageView.isHidden = false
} }
} }
...@@ -198,5 +200,6 @@ class YHMyLottieAnimateContentView: YHBasicContentView { ...@@ -198,5 +200,6 @@ class YHMyLottieAnimateContentView: YHBasicContentView {
override func deselectAnimation(animated: Bool, completion: (() -> ())?) { override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
super.deselectAnimation(animated: animated, completion: nil) super.deselectAnimation(animated: animated, completion: nil)
lottieView.isHidden = true lottieView.isHidden = true
imageView.isHidden = false
} }
} }
...@@ -32,15 +32,15 @@ class YHConfigManager: NSObject { ...@@ -32,15 +32,15 @@ class YHConfigManager: NSObject {
var h5Url : String { var h5Url : String {
var tH5url = reqVM.configModel?.article_h5_url ?? "" var tH5url = reqVM.configModel?.article_h5_url ?? ""
if tH5url.isEmpty { if tH5url.isEmpty {
#if DEBUG //#if DEBUG
tH5url = YHConfigManager.baseH5UrlTest // tH5url = YHConfigManager.baseH5UrlTest
#elseif TESTENV //#elseif TESTENV
tH5url = YHConfigManager.baseH5UrlTest // tH5url = YHConfigManager.baseH5UrlTest
#elseif UATENV //#elseif UATENV
tH5url = YHConfigManager.baseH5UrlRelease tH5url = YHConfigManager.baseH5UrlRelease
#else //#else
tH5url = YHConfigManager.baseH5UrlRelease // tH5url = YHConfigManager.baseH5UrlRelease
#endif //#endif
} }
if !loadNewDataFlag { if !loadNewDataFlag {
...@@ -58,15 +58,15 @@ class YHConfigManager: NSObject { ...@@ -58,15 +58,15 @@ class YHConfigManager: NSObject {
var ossUrl : String { var ossUrl : String {
var tOssUrl = reqVM.configModel?.oss_server ?? "" var tOssUrl = reqVM.configModel?.oss_server ?? ""
if tOssUrl.isEmpty { if tOssUrl.isEmpty {
#if DEBUG //#if DEBUG
tOssUrl = YHConfigManager.baseOSSUrlTest // tOssUrl = YHConfigManager.baseOSSUrlTest
#elseif TESTENV //#elseif TESTENV
tOssUrl = YHConfigManager.baseOSSUrlTest // tOssUrl = YHConfigManager.baseOSSUrlTest
#elseif UATENV //#elseif UATENV
tOssUrl = YHConfigManager.baseOSSUrlRelease
#else
tOssUrl = YHConfigManager.baseOSSUrlRelease tOssUrl = YHConfigManager.baseOSSUrlRelease
#endif //#else
// tOssUrl = YHConfigManager.baseOSSUrlRelease
//#endif
} }
if !loadNewDataFlag { if !loadNewDataFlag {
......
...@@ -75,6 +75,8 @@ class YHHKEventCenterViewController: YHBaseViewController { ...@@ -75,6 +75,8 @@ class YHHKEventCenterViewController: YHBaseViewController {
func getData() { func getData() {
gk_navTitle = "香港办事" gk_navTitle = "香港办事"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
homeViewModel.getHKEvent {[weak self] success, error in homeViewModel.getHKEvent {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.hkList = self.homeViewModel.hkList ?? [] self.hkList = self.homeViewModel.hkList ?? []
......
...@@ -88,6 +88,8 @@ class YHOtherServiceViewController: YHBaseViewController { ...@@ -88,6 +88,8 @@ class YHOtherServiceViewController: YHBaseViewController {
} else if classID == 5 { } else if classID == 5 {
gk_navTitle = "客户心声" gk_navTitle = "客户心声"
} }
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
homeViewModel.getHomeClassify{[weak self] success, error in homeViewModel.getHomeClassify{[weak self] success, error in
guard let self = self, let classify = self.homeViewModel.classify else { return } guard let self = self, let classify = self.homeViewModel.classify else { return }
for item in classify { for item in classify {
......
...@@ -85,6 +85,8 @@ class YHMyLikeActivityViewController: YHBaseViewController { ...@@ -85,6 +85,8 @@ class YHMyLikeActivityViewController: YHBaseViewController {
func getData() { func getData() {
gk_navTitle = "我的足迹" gk_navTitle = "我的足迹"
gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0
} }
func updateViews() { func updateViews() {
......
...@@ -20,15 +20,15 @@ class YHBaseUrlManager { ...@@ -20,15 +20,15 @@ class YHBaseUrlManager {
func curURL() -> String { func curURL() -> String {
#if DEBUG //#if DEBUG
return YHBaseUrlManager.baseUrlForTest + "/" // return YHBaseUrlManager.baseUrlForTest + "/"
#elseif TESTENV //#elseif TESTENV
return YHBaseUrlManager.baseUrlForTest + "/" // return YHBaseUrlManager.baseUrlForTest + "/"
#elseif UATENV //#elseif UATENV
return YHBaseUrlManager.baseUrlForUat + "/" return YHBaseUrlManager.baseUrlForUat + "/"
#else //#else
return YHBaseUrlManager.baseUrlForRelease + "/" // return YHBaseUrlManager.baseUrlForRelease + "/"
#endif //#endif
} }
//ossUrl //ossUrl
......
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