Skip to content

G
galaxy-iOS
Commit a3b225ed authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'youhua-dev' into develop 

* youhua-dev:
  完善灰度逻辑
  //  替换framework
  1、删除测试代码 2、替换url
  朋友圈图片替换
  微信分享按钮替换
  删除测试代码
  灰度逻辑
  UI细节
  添加解析字段
  邀请有礼
  忽略 buglybin 文件夹
  修改 一处备注
  完成 灰度功能开发
  test
  添加 获取规则方法
  uat接口调节完成
  订单搜索 uat
parents b69179bf e6aee06c
Show whitespace changes
Inline Side-by-side
Showing with 255 additions and 78 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ a3b225ed
......@@ -4150,7 +4150,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4175,7 +4175,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.3;
MARKETING_VERSION = 0.9.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4291,7 +4291,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4316,7 +4316,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.3;
MARKETING_VERSION = 0.9.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4495,7 +4495,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4520,7 +4520,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.3;
MARKETING_VERSION = 0.9.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -4541,7 +4541,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4566,7 +4566,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.3;
MARKETING_VERSION = 0.9.4;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/AppDelegate.swift
View file @ a3b225ed
......@@ -53,6 +53,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
printLog(string)
}
//灰度规则配置
YHUatHelper.shared.loadUatData()
// 一键登录
YHOneKeyLoginManager.shared.configOneKeyLogin()
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift
View file @ a3b225ed
......@@ -82,6 +82,8 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
needReloadDataFlag = false
homePageVC.requestOrder()
}
getUatRules()
}
override func viewWillDisappear(_ animated: Bool) {
......@@ -122,6 +124,14 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
//MARK: - 内部函数
extension YHHomeHoldViewPageViewController {
func getUatRules() {
DispatchQueue.global().async {
//灰度规则配置
YHUatHelper.shared.loadUatData()
}
}
@objc func clickMsgitem() {
needReloadDataFlag = true
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvitationWithGiftsViewController.swift
View file @ a3b225ed
......@@ -80,7 +80,7 @@ extension YHInvitationWithGiftsViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return KScreenWidth / 1.82
return KScreenWidth * 0.55 + 16.0
} else if indexPath.row == 1 {
if self.viewModel.recordModel.list.count == 0 {
return 345
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsDetailView.swift
View file @ a3b225ed
......@@ -20,7 +20,7 @@ class YHInvitationWithGiftsDetailView: UIView {
var closeButton: UIButton!
var messageLabel: UILabel!
var messageImage: UIImageView!
var bgView: UIView!
var bgView: UIImageView!
override init(frame: CGRect) {
super.init(frame: frame)
......@@ -73,15 +73,16 @@ class YHInvitationWithGiftsDetailView: UIView {
}
bgView = {
let view = UIView()
view.backgroundColor = UIColor(hex: 0xf3f8ff)
return view
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_detail_bg")
imageView.isUserInteractionEnabled = true
return imageView
}()
topView.addSubview(bgView)
topContentView.addSubview(bgView)
bgView.snp.makeConstraints { make in
make.right.equalTo(-12)
make.top.left.equalTo(12)
make.height.equalTo(29)
make.right.bottom.equalTo(-12)
make.left.equalTo(12)
make.top.equalTo(12)
}
topImageView = {
......@@ -99,7 +100,7 @@ class YHInvitationWithGiftsDetailView: UIView {
scrollView = {
let view = UIScrollView()
view.bounds = CGRect(x: 0, y: 0, width: 287, height: 1252)
view.bounds = CGRect(x: 0, y: 0, width: 287, height: 1223)
// 去除弹簧效果
view.bounces = false
......@@ -112,12 +113,14 @@ class YHInvitationWithGiftsDetailView: UIView {
topContentView.addSubview(scrollView)
scrollView.snp.makeConstraints { make in
make.right.bottom.equalTo(-12)
make.top.left.equalTo(12)
make.left.equalTo(12)
make.top.equalTo(41)
}
bgImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_detail_bg")
imageView.isHidden = true
return imageView
}()
scrollView.addSubview(bgImageView)
......@@ -137,7 +140,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.left.equalTo(14)
make.right.equalTo(-14)
make.height.equalTo(21)
make.top.equalTo(38)
make.top.equalTo(9)
}
titleImage = {
......@@ -150,7 +153,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.width.equalTo(259)
make.centerX.equalToSuperview()
make.height.equalTo(681)
make.top.equalTo(71)
make.top.equalTo(42)
}
messageLabel = {
......@@ -165,7 +168,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.left.equalTo(14)
make.right.equalTo(-14)
make.height.equalTo(21)
make.top.equalTo(782)
make.top.equalTo(753)
}
messageImage = {
......@@ -178,7 +181,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.width.equalTo(259)
make.centerX.equalToSuperview()
make.height.equalTo(426)
make.top.equalTo(814)
make.top.equalTo(785)
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsFirstTableViewCell.swift
View file @ a3b225ed
......@@ -33,7 +33,7 @@ class YHInvitationWithGiftsFirstTableViewCell: UITableViewCell {
}
func setupUI() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
centerImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_first")
......@@ -41,10 +41,10 @@ class YHInvitationWithGiftsFirstTableViewCell: UITableViewCell {
}()
contentView.addSubview(centerImageView)
centerImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.bottom.equalTo(-8)
make.left.equalTo(12)
make.right.equalTo(-12)
make.height.equalTo(193)
make.top.equalTo(8)
}
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsHeadView.swift
View file @ a3b225ed
......@@ -66,7 +66,7 @@ class YHInvitationWithGiftsHeadView: UIView {
}
func setUpView() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
let height = KScreenWidth / 0.735
centerImageView = {
let view = UIImageView()
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift
View file @ a3b225ed
......@@ -91,7 +91,7 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
}
func setupUI() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
centerView = {
let view = UIView()
view.layer.cornerRadius = kCornerRadius3
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsShareBottomView.swift
View file @ a3b225ed
......@@ -31,14 +31,17 @@ private extension YHInvitationWithGiftsShareBottomView {
let button = UIButton(type: .custom)
button.adjustsImageWhenHighlighted = false
button.setBackgroundImage(UIImage(named: "invitation_with_gifts_share"), for: .normal)
button.setTitle("立即分享", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 18)
button.setTitleColor(UIColor.white, for: .normal)
button.addTarget(self, action: #selector(save), for: .touchUpInside)
return button
}()
addSubview(saveButton)
saveButton.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.left.equalTo(16)
make.right.equalTo(-16)
make.height.equalTo(58)
make.width.equalTo(343)
make.top.equalTo(5)
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift
View file @ a3b225ed
......@@ -24,6 +24,8 @@ class YHOrderDetailViewController: YHBaseViewController {
viewModel.getWhitelist {[weak self] success, error in
guard let self = self else { return }
if success {
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 7)) == 1 {
let searchButton = {
let button = UIButton(type: .custom)
button.frame = CGRect(x: 0, y: 0, width: 81, height: 21)
......@@ -41,6 +43,8 @@ class YHOrderDetailViewController: YHBaseViewController {
gk_navRightBarButtonItem = rightButtonItem
gk_navItemRightSpace = 16
}
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ a3b225ed
......@@ -622,7 +622,6 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
}
}
}
}
if editType == .delete {
self.showDeleteAlert(model)
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
View file @ a3b225ed
......@@ -295,7 +295,7 @@ extension YHH5WebViewVC {
switch result {
case .success(let value):
self.saveImage(value.image)
case .failure(let value):
case .failure(_):
YHHUD.flash(message: "保存失败")
}
}
......
galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift
View file @ a3b225ed
......@@ -20,11 +20,16 @@ extension YHJsApi {
//保存图片到本地
@objc func saveLocalPictureSyn(_ picUrl: String) {
DispatchQueue.main.async {
self.delegate?.saveLocalPictureSyn(picUrl)
}
}
@objc func setAppNavigation(_ show : Bool) {
printLog(show)
DispatchQueue.main.async {
self.delegate?.setAppNavigation(show)
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ a3b225ed
......@@ -158,6 +158,11 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
@objc func didLogoutBtnClicked() {
//灰度规则配置
YHUatHelper.shared.loadUatData()
YHCommonAlertView.show("", "您确定要退出登录吗？", "取消", "确定",fullGuestureEnable: false) {
} callBack: {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ a3b225ed
......@@ -76,18 +76,20 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
return imgView
}()
lazy var items: [PersonalModuleItem] = {
var arrData = [
PersonalModuleItem(icon: "mine_item_card", title: "我的名片".local, type:.myCard),
PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
PersonalModuleItem(icon: "mine_item_appoint", title: "关于银河湾".local, type:.appointGalaxyBay),
PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity),
PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
]
return arrData
}()
// var items: [PersonalModuleItem] = {
// var arrData = [
// PersonalModuleItem(icon: "mine_item_card", title: "我的名片".local, type:.myCard),
// PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
// PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
// PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
// PersonalModuleItem(icon: "mine_item_appoint", title: "关于银河湾".local, type:.appointGalaxyBay),
// PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity),
// PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
// ]
// return arrData
// }()
var items: [PersonalModuleItem] = []
lazy var headerView: YHUserInfoHeaderView = {
let view = YHUserInfoHeaderView.createView()
......@@ -151,10 +153,13 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
loadItems()
requestLikeCollectionCount()
getTotalUnreadMsgCount()
checkSettingRedPoint()
self.headerView.updateAvatar()
headerView.updateAvatar()
requstUserBasicInfo()
}
......@@ -253,6 +258,49 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
self.tableView .reloadData()
}
}
//uat 添加items
func loadItems() {
items.removeAll()
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 1)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_card", title: "我的名片".local, type:.myCard)
items.append(item)
}
do {
let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage)
items.append(item)
}
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter)
items.append(item)
}
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode)
items.append(item)
}
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 4)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_appoint", title: "关于银河湾".local, type:.appointGalaxyBay)
items.append(item)
}
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity)
items.append(item)
}
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) == 1 {
let item = PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
items.append(item)
}
tableView.reloadData()
}
}
extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
......
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift
View file @ a3b225ed
......@@ -8,6 +8,19 @@
import Foundation
extension Int {
// //1-可见 2-不可见 3-新界面
// var uatValue : Bool {
// if self == 1 {
// return true
// } else if self == 2 {
// return false
// }
// return false
// }
}
enum YHUatModules: Int {
/*
默认展示
......@@ -21,10 +34,11 @@ enum YHUatModules: Int {
默认不展示
7、服务-订单搜索、false
8、更新-强制更新弹窗、false
8、更新-强制更新弹窗、true
9、更新-建议更新弹窗、false
*/
case Mine_Unknow = 0
case Mine_MyCard = 1 // 我的-我的名片
case Mine_IntegralCenter = 2 // 我的-积分中心
case Mine_EvaluationCode = 3 // 我的-我的测评码
......@@ -38,39 +52,42 @@ enum YHUatModules: Int {
case Update_Suggest = 9 //更新-建议更新弹窗
//命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
var defaultValue : Bool {
//1-可见 2-不可见 3-新界面
var defaultValue : Int {
switch self {
case .Mine_MyCard:
return true
return 1
case .Mine_IntegralCenter:
return true
return 1
case .Mine_EvaluationCode:
return true
return 1
case .Mine_AboutYinHeHarbour:
return true
return 1
case .Mine_MyActivity:
return true
return 1
case .Mine_AboutUS:
return true
return 1
case .Service_OrderSearch:
return true
return 2
case .Update_Fource:
return false
return 2
case .Update_Suggest:
return false
return 2
default:
return 2
}
}
}
class YHUatHelper: NSObject {
static let shared = YHUatHelper()
private lazy var viewModel: YHUatHelperViewModel = {
let vm = YHUatHelperViewModel()
return vm
}()
}
// MARK: - 私有方法
......@@ -82,9 +99,43 @@ private extension YHUatHelper {
extension YHUatHelper {
//获取功能模块的展示状态
func getUatModuleStatusBy(module : YHUatModules) -> Bool {
func getUatModuleStatusBy(module : YHUatModules?) -> Int {
guard let module = module else { return 1 }
//1.查找服务端返回的值
if let arr = viewModel.dataList?.list {
for (_,item) in arr.enumerated() {
if item.module_number.int == module.rawValue,item.result == 2 {
if let model = item.show_config {
return model.op
}
return module.defaultValue
}
}
}
return true
//2.返回默认值
return module.defaultValue
}
//加载服务器的uat配置
func loadUatData() {
if !YHNetworkStatusManager.shared.isNetWorkOK {
printLog("网络不可用")
return
}
if !viewModel.isDataOk {
viewModel.getUatList { success, error in
if success {
} else {
}
}
}
}
}
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift
View file @ a3b225ed
......@@ -10,9 +10,31 @@ import Foundation
import HandyJSON
class YHUatModel2 : HandyJSON {
var op : Int = -1 //"op": 1, //1-可见 2-不可见 3-新界面
required init() {
}
}
class YHUatModel : HandyJSON {
/*
默认展示
1、我的-我的名片、 true
2、我的-积分中心、true
3、我的-我的测评码、true
4、我的-银河湾、true
5、我的-我的活动、true
6、我的-关于我们、true
默认不展示
7、服务-订单搜索、false
8、更新-强制更新弹窗、true
9、更新-建议更新弹窗、false
*/
var module_number : String = ""
var result : Int = 0 //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
var show_config : YHUatModel2?
required init() {
}
......@@ -27,15 +49,25 @@ class YHUatListModel : HandyJSON {
class YHUatHelperViewModel : YHBaseViewModel {
var dataList : YHUatListModel?
var isDataOk : Bool = false
}
// 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
func getUatList(callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let params: [String] = ["1", "2","3", "4","5","6", "7","9"]
var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
for (index,item) in params.enumerated() {
if index == 0 {
strUrl = strUrl + "?module_numbers=" + item
} else {
strUrl = strUrl + "&module_numbers=" + item
}
}
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
......@@ -43,10 +75,15 @@ extension YHUatHelperViewModel {
callBackBlock(false,nil)
return
}
self.isDataOk = true
self.dataList = resultModel
callBackBlock(true,nil)
} failBlock: { err in
self.isDataOk = false
callBackBlock(false,err)
}
}
......
galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/M/YHAppVersionManager.swift
View file @ a3b225ed
......@@ -33,6 +33,7 @@ class YHAppVersionManager {
func needShowRedPointOfSuggestVersionUpdate() -> Bool {
var isShowRedPoint = false
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
// 判断版本更新逻辑
if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
if configModel.max_version != UIDevice.appVersion() {
......@@ -47,12 +48,16 @@ class YHAppVersionManager {
}
}
}
}
return isShowRedPoint
}
// 是否需要显示建议版本更新弹窗
func needShowAlertViewOfSuggestVersionUpdate() -> Bool {
var isShow = false
if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
if let alertLatestVersion = UserDefaults.standard.object(forKey: YhConstant.kShowAlertOfSuggestLatestVersion) as? String {
if !configModel.max_version.isEmpty, configModel.max_version != alertLatestVersion {
......@@ -62,6 +67,7 @@ class YHAppVersionManager {
isShow = true
}
}
}
return isShow
}
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ a3b225ed
......@@ -43,11 +43,11 @@ class YHBaseUrlManager {
//隐私协议 PrivacyAgreement
func curPrivacyAgreementUrl() -> String {
return "https://test-hkdiy-h5.galaxy-immi.com/superApp/ganglife"
return curH5URL() + "superApp/ganglife"
}
//用户政策 UserItems
func curUserItemsUrl() -> String {
return "https://test-hkdiy-h5.galaxy-immi.com/superApp/service"
return curH5URL() + "superApp/service"
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ a3b225ed
......@@ -333,6 +333,7 @@ class YHNetRequest: NSObject {
#if DEBUG
printLog("服务器返回数据是：\(obj)")
#endif
if obj.code == YHErrorCode.forceUpdate.rawValue { // 强制版本升级
DispatchQueue.main.async {
YHAppVersionForceUpdateView.alertView().show()
......@@ -346,6 +347,7 @@ class YHNetRequest: NSObject {
return
}
if obj.code == YHErrorCode.tokenInvalidError.rawValue {
DispatchQueue.main.async {
YHLoginManager.shared.clearUserInfo()
......
galaxy/galaxy/Res/Assets.xcassets/Home/Invitationr/invitation_with_gifts_share.imageset/Contents.json
View file @ a3b225ed
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "invitation_with_gifts_share@2x.png",
"filename" : "66_bt_qiangxueche@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "invitation_with_gifts_share@3x.png",
"filename" : "66_bt_qiangxueche@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Home/Invitationr/invitation_with_gifts_share_bg.imageset/Contents.json
View file @ a3b225ed
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "invitation_with_gifts_share_bg@2x.png",
"filename" : "Group 2033195291@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "invitation_with_gifts_share_bg@3x.png",
"filename" : "Group 2033195291@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Home/Invitationr/invitation_with_gifts_share_center.imageset/Contents.json
View file @ a3b225ed
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "invitation_with_gifts_share_center@2x.png",
"filename" : "ic_wxhy@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "invitation_with_gifts_share_center.png",
"filename" : "ic_wxhy@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Home/Invitationr/invitation_with_gifts_share_right.imageset/Contents.json
View file @ a3b225ed
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "invitation_with_gifts_share_right@2x.png",
"filename" : "ic_pyq@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "invitation_with_gifts_share_right.png",
"filename" : "ic_pyq@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