Skip to content

G
galaxy-iOS
Commit 2ab027d9 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 ed53e277 1520a182
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 11 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 2ab027d9
......@@ -586,6 +586,8 @@
A5FF0F3A2C32F20A0069852B /* YHActivityDetailCell0.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F392C32F20A0069852B /* YHActivityDetailCell0.swift */; };
A5FF0F3C2C32F2460069852B /* YHActivityDetailCell1.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F3B2C32F2460069852B /* YHActivityDetailCell1.swift */; };
A5FF0F3E2C32F2590069852B /* YHActivityDetailCell2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FF0F3D2C32F2590069852B /* YHActivityDetailCell2.swift */; };
F8BAADA32C4FB41F0074D6C3 /* YHUatHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BAADA22C4FB41E0074D6C3 /* YHUatHelper.swift */; };
F8BAADA52C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BAADA42C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -1210,6 +1212,8 @@
A5FF0F3D2C32F2590069852B /* YHActivityDetailCell2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell2.swift; sourceTree = "<group>"; };
B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.release.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.release.xcconfig"; sourceTree = "<group>"; };
DF4796A13E2592E1653226DE /* Pods-galaxy.uatrelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.uatrelease.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.uatrelease.xcconfig"; sourceTree = "<group>"; };
F8BAADA22C4FB41E0074D6C3 /* YHUatHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUatHelper.swift; sourceTree = "<group>"; };
F8BAADA42C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUatHelperViewModel.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -3049,6 +3053,7 @@
A5ACE91B2B4564F7002C94D2 /* Modules */ = {
isa = PBXGroup;
children = (
F8BAADA12C4FAE820074D6C3 /* UatModule(灰度功能) */,
044D0BE82C2019AC00C5CF5E /* Community(社区) */,
0499E3012C05B73D0037E646 /* AppleLogin(苹果登录) */,
04D144692C0431F900EE3758 /* AutoLogin(一键登录) */,
......@@ -3168,6 +3173,15 @@
path = radar;
sourceTree = "<group>";
};
F8BAADA12C4FAE820074D6C3 /* UatModule(灰度功能) */ = {
isa = PBXGroup;
children = (
F8BAADA22C4FB41E0074D6C3 /* YHUatHelper.swift */,
F8BAADA42C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift */,
);
path = "UatModule(灰度功能)";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
......@@ -3522,6 +3536,7 @@
045EEF222B9F171A0022A143 /* YHImagePickerView.swift in Sources */,
A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */,
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */,
F8BAADA32C4FB41F0074D6C3 /* YHUatHelper.swift in Sources */,
0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */,
045EEEB22B9F171A0022A143 /* YHWorkActionView.swift in Sources */,
A58AC09F2BAC05BA00A30FA9 /* YHFileListItemsView.swift in Sources */,
......@@ -3801,6 +3816,7 @@
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
045EEEF32B9F171A0022A143 /* YHFamilyMemberInfoListVC.swift in Sources */,
F8BAADA52C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift in Sources */,
0445E6B42BEA15C4003C52F9 /* YHAppVersionManager.swift in Sources */,
04CE1AD92C2AD91F001CB80A /* YHActivityDetailBottomView.swift in Sources */,
04EA230C2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift in Sources */,
......
galaxy/galaxy/Classes/Base/C/YHTabBarViewController.swift
View file @ 2ab027d9
......@@ -89,13 +89,15 @@ extension YHTabBarViewController {
if let model = notification.object as? TabBarShareModel {
shareModel = model
if model.showFlag {
if self.shareView.isHidden {
self.shareView.isHidden = false
self.shareView.layer.opacity = 0.0
UIView.animate(withDuration: 0.25, delay: 0, options: [.curveEaseIn]) {
self.shareView.layer.opacity = 1.0
} completion: { finish in }
}
} else {
if self.shareView.isHidden == false {
shareView.layer.opacity = 1.0
UIView.animate(withDuration: 0.25, delay: 0, options: [.curveEaseOut]) {
self.shareView.layer.opacity = 0.0
......@@ -105,6 +107,7 @@ extension YHTabBarViewController {
}
}
}
}
@objc func clearAllUnreadBadge() {
DispatchQueue.main.async {
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift
View file @ 2ab027d9
......@@ -287,6 +287,13 @@ extension YHHomeHoldViewPageViewController {
extension YHHomeHoldViewPageViewController: JXSegmentedViewDelegate {
func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
if segmentedView.selectedIndex != 1 {
var model = TabBarShareModel()
model.showFlag = false
NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
}
self.segmentedView.reloadDataWithoutListContainer()
if index == 1 { // 点击了身份tab 需要重置二级tab为第一个
......
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift 0 → 100644
View file @ 2ab027d9
//
// YHUatHelper.swift
// galaxy
//
// Created by david on 2024/7/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import Foundation
enum YHUatModules: Int {
/*
默认展示
1、我的-我的名片、 true
2、我的-积分中心、true
3、我的-我的测评码、true
4、我的-关于银河湾、true
5、我的-我的活动、true
6、我的-关于我们、true
默认不展示
7、服务-订单搜索、false
8、更新-强制更新弹窗、false
9、更新-建议更新弹窗、false
*/
case Mine_MyCard = 1 // 我的-我的名片
case Mine_IntegralCenter = 2 // 我的-积分中心
case Mine_EvaluationCode = 3 // 我的-我的测评码
case Mine_AboutYinHeHarbour = 4 // 我的-关于银河湾
case Mine_MyActivity = 5 // 我的-我的活动
case Mine_AboutUS = 6 // 我的-关于我们
case Service_OrderSearch = 7 //服务-订单搜索
case Update_Fource = 8 //更新-强制更新弹窗
case Update_Suggest = 9 //更新-建议更新弹窗
//命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
var defaultValue : Bool {
switch self {
case .Mine_MyCard:
return true
case .Mine_IntegralCenter:
return true
case .Mine_EvaluationCode:
return true
case .Mine_AboutYinHeHarbour:
return true
case .Mine_MyActivity:
return true
case .Mine_AboutUS:
return true
case .Service_OrderSearch:
return true
case .Update_Fource:
return false
case .Update_Suggest:
return false
}
}
}
class YHUatHelper: NSObject {
static let shared = YHUatHelper()
}
// MARK: - 私有方法
private extension YHUatHelper {
}
// MARK: - 公有方法
extension YHUatHelper {
//获取功能模块的展示状态
func getUatModuleStatusBy(module : YHUatModules) -> Bool {
return true
}
}
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift 0 → 100644
View file @ 2ab027d9
//
// YHUatHelperViewModel.swift
// galaxy
//
// Created by david on 2024/7/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import Foundation
import HandyJSON
class YHUatModel : HandyJSON {
var module_number : String = ""
var result : Int = 0 //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
required init() {
}
}
class YHUatListModel : HandyJSON {
var list : [YHUatModel] = []
required init() {
}
}
class YHUatHelperViewModel : YHBaseViewModel {
var dataList : YHUatListModel?
}
// MARK: - 共有方法
extension YHUatHelperViewModel {
//请求灰度功能列表配置
func getUatList(_ id: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHUatListModel.deserialize(from: dic as? Dictionary) else {
callBackBlock(false,nil)
return
}
self.dataList = resultModel
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
}
}
// MARK: - 私有方法
private extension YHUatHelperViewModel {
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 2ab027d9
......@@ -9,6 +9,13 @@
class YHAllApiName {
//灰度功能接口
struct Uat {
//获取 灰度功能列表
static let uatListApi = "super-app/grayscale/match-result-batch"
}
//活动相关接口
struct Activity {
//活动列表
......
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