From: liangzhenying <867174124@qq.com> Date: Mon, 30 Mar 2026 04:04:37 +0000 (+0800) Subject: 加了App启动升级提示 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0d7695e5e09b51f698dbf815faf24aa5de6e63ae;p=mirrors%2FShenYin.git 加了App启动升级提示 --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index 0b1a314..e4a92ca 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -1131,7 +1131,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1188,7 +1188,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ShenYin/ShenYin/Cache/LanuageCache.swift b/ShenYin/ShenYin/Cache/LanuageCache.swift deleted file mode 100644 index 68437ca..0000000 --- a/ShenYin/ShenYin/Cache/LanuageCache.swift +++ /dev/null @@ -1,64 +0,0 @@ -// -// LanuageCache.swift -// ShenYin -// -// Created by liangshi on 2025/11/11. -// - -class LanuageCache{ - static let key = "LanuageCache" - static func save(lan:AppSupportLanguage){ - UserDefaults.standard.set(lan.title, forKey: key) - UserDefaults.standard.synchronize() - } - static func get()->AppSupportLanguage{ - if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { - for item in AppSupportLanguage.all { - if item.title == text{ - return item - } - } - } - - - //手机设置的语言 - let list = NSLocale.preferredLanguages - Logger.debug(list) - guard let item = list.first else{ - return .chinse - } - - if item.contains("zh-Hans") { - return .chinse - }else if item.contains("zh-Hant") { - return .Traditional_Chinese - }else if item.hasPrefix("en") { - return .english - }else if item.hasPrefix("ja") { - return .japanese - }else if item.hasSuffix("fr") { - return .french - }else if item == "es" { - return .english - } - else if item == "vi" { - return .vietnam - } - else if item == "th" { - return .thai - } - else if item == "ms" { - return .malay - } - else if item == "tl" { - return .Filipino - } - else if item == "id" { - return .indonesian - } - else if item == "ru" { - return .russian - } - return .english - } -} diff --git a/ShenYin/ShenYin/Cache/BannerCache.swift b/ShenYin/ShenYin/Cache/Model/BannerModel.swift similarity index 58% rename from ShenYin/ShenYin/Cache/BannerCache.swift rename to ShenYin/ShenYin/Cache/Model/BannerModel.swift index 1149cc5..1a7c5d3 100644 --- a/ShenYin/ShenYin/Cache/BannerCache.swift +++ b/ShenYin/ShenYin/Cache/Model/BannerModel.swift @@ -35,22 +35,4 @@ class BannerModel:NSObject,HandyJSON,NSCoding { -class BannerCache { - static let shared = BannerCache() - private let userDefaults = UserDefaults.standard - private let deviceListKey = "BannerCache" - - func saveList(_ list: [BannerModel]) { - let encoder = NSKeyedArchiver.archivedData(withRootObject: list) - userDefaults.set(encoder, forKey: deviceListKey) - userDefaults.synchronize() - } - - func get() -> [BannerModel] { - if let data = userDefaults.data(forKey: deviceListKey), - let deviceList = NSKeyedUnarchiver.unarchiveObject(with: data) as? [BannerModel] { - return deviceList - } - return [] - } -} + diff --git a/ShenYin/ShenYin/Cache/CountryCache.swift b/ShenYin/ShenYin/Cache/Model/CountryModel.swift similarity index 72% rename from ShenYin/ShenYin/Cache/CountryCache.swift rename to ShenYin/ShenYin/Cache/Model/CountryModel.swift index fdf9e9a..ef83c7a 100644 --- a/ShenYin/ShenYin/Cache/CountryCache.swift +++ b/ShenYin/ShenYin/Cache/Model/CountryModel.swift @@ -55,22 +55,3 @@ public class CountryModel: NSObject,HandyJSON,NSCoding { } -class CountryCache { - static let shared = CountryCache() - private let userDefaults = UserDefaults.standard - private let deviceListKey = "CountryCache" - - func saveList(_ list: [CountryModel]) { - let encoder = NSKeyedArchiver.archivedData(withRootObject: list) - userDefaults.set(encoder, forKey: deviceListKey) - userDefaults.synchronize() - } - - func get() -> [CountryModel] { - if let data = userDefaults.data(forKey: deviceListKey), - let deviceList = NSKeyedUnarchiver.unarchiveObject(with: data) as? [CountryModel] { - return deviceList - } - return [] - } -} diff --git a/ShenYin/ShenYin/Cache/RecordDetailModel.swift b/ShenYin/ShenYin/Cache/Model/RecordDetailModel.swift similarity index 100% rename from ShenYin/ShenYin/Cache/RecordDetailModel.swift rename to ShenYin/ShenYin/Cache/Model/RecordDetailModel.swift diff --git a/ShenYin/ShenYin/Cache/SubTitleCache.swift b/ShenYin/ShenYin/Cache/Model/SubTitleCacheModel.swift similarity index 80% rename from ShenYin/ShenYin/Cache/SubTitleCache.swift rename to ShenYin/ShenYin/Cache/Model/SubTitleCacheModel.swift index 1af6607..1970319 100644 --- a/ShenYin/ShenYin/Cache/SubTitleCache.swift +++ b/ShenYin/ShenYin/Cache/Model/SubTitleCacheModel.swift @@ -101,25 +101,3 @@ class SubTitleCacheModel:NSObject,HandyJSON,NSCoding { -class SubTitleCache { - static let shared = SubTitleCache() - private let userDefaults = UserDefaults.standard - private let key = "SubTitleCache" - - func save(_ model: SubTitleCacheModel) { - let encoder = NSKeyedArchiver.archivedData(withRootObject: model) - userDefaults.set(encoder, forKey: key) - userDefaults.synchronize() - } - - func get() -> SubTitleCacheModel { - if let data = userDefaults.data(forKey: key), - let model = NSKeyedUnarchiver.unarchiveObject(with: data) as? SubTitleCacheModel { - return model - } - else{ - let model = SubTitleCacheModel() - return model - } - } -} diff --git a/ShenYin/ShenYin/Cache/UserInfo.swift b/ShenYin/ShenYin/Cache/Model/UserInfo.swift similarity index 100% rename from ShenYin/ShenYin/Cache/UserInfo.swift rename to ShenYin/ShenYin/Cache/Model/UserInfo.swift diff --git a/ShenYin/ShenYin/Cache/UserModel.swift b/ShenYin/ShenYin/Cache/Model/UserModel.swift similarity index 100% rename from ShenYin/ShenYin/Cache/UserModel.swift rename to ShenYin/ShenYin/Cache/Model/UserModel.swift diff --git a/ShenYin/ShenYin/Cache/OthersCache.swift b/ShenYin/ShenYin/Cache/OthersCache.swift new file mode 100644 index 0000000..9b718c3 --- /dev/null +++ b/ShenYin/ShenYin/Cache/OthersCache.swift @@ -0,0 +1,244 @@ +// +// TipsCache.swift +// ShenYin +// +// Created by liangshi on 2025/9/26. +// + +class TipsCache{ + static func needShow(type:RecordTipsType,show:Bool){ + UserDefaults.standard.set(show, forKey: type.title) + UserDefaults.standard.synchronize() + } + static func needShow(type:RecordTipsType)->Bool{ + if let value = UserDefaults.standard.value(forKey: type.title){ + return value as? Bool ?? false + } + return true + } +} + +class CommonTipsCache{ + enum CommonTipsType:Int{ + case light + var title:String{ + switch self { + case .light: + return "亮度" + + } + } + } + static func needShow(type:CommonTipsType,show:Bool){ + UserDefaults.standard.set(show, forKey: type.title) + UserDefaults.standard.synchronize() + } + static func needShow(type:CommonTipsType)->Bool{ + if let value = UserDefaults.standard.value(forKey: type.title){ + return value as? Bool ?? false + } + return true + } +} + +class FontCache{ + static func saveFont(type:FontType){ + UserDefaults.standard.set(type.rawValue, forKey: "FontCache") + UserDefaults.standard.synchronize() + } + static func getFont()->FontType{ + if let value = UserDefaults.standard.value(forKey: "FontCache"),let font = value as? Int { + return FontType(rawValue: font) ?? .stand + } + return FontType.stand + } +} + +class RoleCache{ + static let key = "RoleCache" + static func save(type:String){ + UserDefaults.standard.set(type, forKey: key) + UserDefaults.standard.synchronize() + } + static func get()->String?{ + if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { + return text + } + return nil + } +} +class BackgroundCache{ + static func save(model:BackgroundModel){ + UserDefaults.standard.set(model.bgPath, forKey: "BackgroundCache_url") + UserDefaults.standard.set(model.themeColor, forKey: "BackgroundCache_color") + UserDefaults.standard.synchronize() + } + static func get()->(BackgroundModel)?{ + if let url = UserDefaults.standard.value(forKey: "BackgroundCache_url") as? String , let color = UserDefaults.standard.value(forKey: "BackgroundCache_color") as? String{ + let model = BackgroundModel() + model.themeColor = color + model.bgPath = url + return model + } + return nil + } +} +class RecordTipSaveCache{ + static let key = "AutoRecordCache" + static func save(value:Bool){ + let obj = value ? "1":"0" + UserDefaults.standard.set(obj, forKey: key) + UserDefaults.standard.synchronize() + } + static func get()->Bool{ + if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { + return text == "1" + } + return true + } +} +class FirstLuanceCache{ + static let key = "FirstLuanceCache" + static private func save(){ + let obj = "1" + UserDefaults.standard.set(obj, forKey: key) + UserDefaults.standard.synchronize() + } + static func isFirst()->Bool{ + if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { + return false + } + save() + return true + } +} +class UpdateCache{ + static let key = "UpdateCache" + static func save(version:String){ + UserDefaults.standard.set("1", forKey: key+version) + UserDefaults.standard.synchronize() + } + static func isSkip(version:String)->Bool{ + if UserDefaults.standard.value(forKey: key+version) != nil{ + return true + } + return false + } +} +class LanuageCache{ + static let key = "LanuageCache" + static func save(lan:AppSupportLanguage){ + UserDefaults.standard.set(lan.title, forKey: key) + UserDefaults.standard.synchronize() + } + static func get()->AppSupportLanguage{ + if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { + for item in AppSupportLanguage.all { + if item.title == text{ + return item + } + } + } + + + //手机设置的语言 + let list = NSLocale.preferredLanguages + Logger.debug(list) + guard let item = list.first else{ + return .chinse + } + + if item.contains("zh-Hans") { + return .chinse + }else if item.contains("zh-Hant") { + return .Traditional_Chinese + }else if item.hasPrefix("en") { + return .english + }else if item.hasPrefix("ja") { + return .japanese + }else if item.hasSuffix("fr") { + return .french + }else if item == "es" { + return .english + } + else if item == "vi" { + return .vietnam + } + else if item == "th" { + return .thai + } + else if item == "ms" { + return .malay + } + else if item == "tl" { + return .Filipino + } + else if item == "id" { + return .indonesian + } + else if item == "ru" { + return .russian + } + return .english + } +} +class CountryCache { + static let shared = CountryCache() + private let userDefaults = UserDefaults.standard + private let deviceListKey = "CountryCache" + + func saveList(_ list: [CountryModel]) { + let encoder = NSKeyedArchiver.archivedData(withRootObject: list) + userDefaults.set(encoder, forKey: deviceListKey) + userDefaults.synchronize() + } + + func get() -> [CountryModel] { + if let data = userDefaults.data(forKey: deviceListKey), + let deviceList = NSKeyedUnarchiver.unarchiveObject(with: data) as? [CountryModel] { + return deviceList + } + return [] + } +} +class BannerCache { + static let shared = BannerCache() + private let userDefaults = UserDefaults.standard + private let deviceListKey = "BannerCache" + + func saveList(_ list: [BannerModel]) { + let encoder = NSKeyedArchiver.archivedData(withRootObject: list) + userDefaults.set(encoder, forKey: deviceListKey) + userDefaults.synchronize() + } + + func get() -> [BannerModel] { + if let data = userDefaults.data(forKey: deviceListKey), + let deviceList = NSKeyedUnarchiver.unarchiveObject(with: data) as? [BannerModel] { + return deviceList + } + return [] + } +} +class SubTitleCache { + static let shared = SubTitleCache() + private let userDefaults = UserDefaults.standard + private let key = "SubTitleCache" + + func save(_ model: SubTitleCacheModel) { + let encoder = NSKeyedArchiver.archivedData(withRootObject: model) + userDefaults.set(encoder, forKey: key) + userDefaults.synchronize() + } + + func get() -> SubTitleCacheModel { + if let data = userDefaults.data(forKey: key), + let model = NSKeyedUnarchiver.unarchiveObject(with: data) as? SubTitleCacheModel { + return model + } + else{ + let model = SubTitleCacheModel() + return model + } + } +} diff --git a/ShenYin/ShenYin/Cache/TipsCache.swift b/ShenYin/ShenYin/Cache/TipsCache.swift deleted file mode 100644 index 0a0a917..0000000 --- a/ShenYin/ShenYin/Cache/TipsCache.swift +++ /dev/null @@ -1,114 +0,0 @@ -// -// TipsCache.swift -// ShenYin -// -// Created by liangshi on 2025/9/26. -// - -class TipsCache{ - static func needShow(type:RecordTipsType,show:Bool){ - UserDefaults.standard.set(show, forKey: type.title) - UserDefaults.standard.synchronize() - } - static func needShow(type:RecordTipsType)->Bool{ - if let value = UserDefaults.standard.value(forKey: type.title){ - return value as? Bool ?? false - } - return true - } -} - -class CommonTipsCache{ - enum CommonTipsType:Int{ - case light - var title:String{ - switch self { - case .light: - return "亮度" - - } - } - } - static func needShow(type:CommonTipsType,show:Bool){ - UserDefaults.standard.set(show, forKey: type.title) - UserDefaults.standard.synchronize() - } - static func needShow(type:CommonTipsType)->Bool{ - if let value = UserDefaults.standard.value(forKey: type.title){ - return value as? Bool ?? false - } - return true - } -} - -class FontCache{ - static func saveFont(type:FontType){ - UserDefaults.standard.set(type.rawValue, forKey: "FontCache") - UserDefaults.standard.synchronize() - } - static func getFont()->FontType{ - if let value = UserDefaults.standard.value(forKey: "FontCache"),let font = value as? Int { - return FontType(rawValue: font) ?? .stand - } - return FontType.stand - } -} - -class RoleCache{ - static let key = "RoleCache" - static func save(type:String){ - UserDefaults.standard.set(type, forKey: key) - UserDefaults.standard.synchronize() - } - static func get()->String?{ - if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { - return text - } - return nil - } -} -class BackgroundCache{ - static func save(model:BackgroundModel){ - UserDefaults.standard.set(model.bgPath, forKey: "BackgroundCache_url") - UserDefaults.standard.set(model.themeColor, forKey: "BackgroundCache_color") - UserDefaults.standard.synchronize() - } - static func get()->(BackgroundModel)?{ - if let url = UserDefaults.standard.value(forKey: "BackgroundCache_url") as? String , let color = UserDefaults.standard.value(forKey: "BackgroundCache_color") as? String{ - let model = BackgroundModel() - model.themeColor = color - model.bgPath = url - return model - } - return nil - } -} -class RecordTipSaveCache{ - static let key = "AutoRecordCache" - static func save(value:Bool){ - let obj = value ? "1":"0" - UserDefaults.standard.set(obj, forKey: key) - UserDefaults.standard.synchronize() - } - static func get()->Bool{ - if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { - return text == "1" - } - return true - } -} -class FirstLuanceCache{ - static let key = "FirstLuanceCache" - static private func save(){ - let obj = "1" - UserDefaults.standard.set(obj, forKey: key) - UserDefaults.standard.synchronize() - } - static func isFirst()->Bool{ - if let value = UserDefaults.standard.value(forKey: key),let text = value as? String { - return false - } - save() - return true - } -} diff --git a/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift b/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift index 10a0e1e..035c473 100644 --- a/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift +++ b/ShenYin/ShenYin/Channel/PaXa/Config/CCConfig.swift @@ -35,7 +35,7 @@ class CCConfig{ static let yonghuBaseURL = "https://pub-tos.deepchords.com" - static let revokeText = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策,您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用DeepChords应用过程中产生的数据将被清空;手机中DeepChords应用的缓存数据将被清除。\n\n2.设备解除绑定\nDeepChords账号中,所有设备会与您当前登录的账号解除绑定,并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备,需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意,并退出DeepChords应用。\n\n请您知悉,撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备,需要您重新授权并绑定。请谨慎操作!" + static let revokeText = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策,您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用PAXA应用过程中产生的数据将被清空;手机中PAXA应用的缓存数据将被清除。\n\n2.设备解除绑定\nPAXA账号中,所有设备会与您当前登录的账号解除绑定,并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备,需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意,并退出PAXA应用。\n\n请您知悉,撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备,需要您重新授权并绑定。请谨慎操作!" static let findText = "查找耳机".l10n static let deviceType = "耳机".l10n static let serviceLogo = "logo_2" diff --git a/ShenYin/ShenYin/UI/Launch/AppLaunch.swift b/ShenYin/ShenYin/UI/Launch/AppLaunch.swift index 3e980ab..4ffb9cf 100644 --- a/ShenYin/ShenYin/UI/Launch/AppLaunch.swift +++ b/ShenYin/ShenYin/UI/Launch/AppLaunch.swift @@ -18,7 +18,7 @@ class AppLaunch:NSObject{ LoginVM.fetchCountryList {result in } -// AppUpdateVM.shared.checkedUpdate() + AppUpdateVM.shared.autoCheckedUpdate() } @MainActor static func setupKeyboard(){ diff --git a/ShenYin/ShenYin/UI/Mine/AboutVC.swift b/ShenYin/ShenYin/UI/Mine/AboutVC.swift index 25bb6b0..66e1081 100644 --- a/ShenYin/ShenYin/UI/Mine/AboutVC.swift +++ b/ShenYin/ShenYin/UI/Mine/AboutVC.swift @@ -64,6 +64,17 @@ extension AboutVC:UITableViewDelegate,UITableViewDataSource { cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 12, height: 12)) } + + if list[indexPath.section][indexPath.row] == .update ,let model = AppUpdateVM.shared.updateModel{ + cell.unReadIcon.isHidden = !model.newVersioon + cell.valueLabel.text = "版本:" + model.targetVersion + cell.valueLabel.isHidden = cell.unReadIcon.isHidden + } + else{ + cell.unReadIcon.isHidden = true + cell.valueLabel.isHidden = cell.unReadIcon.isHidden + } + return cell } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { diff --git a/ShenYin/ShenYin/UI/Mine/Root/BannerModel.swift b/ShenYin/ShenYin/UI/Mine/Root/BannerModel.swift deleted file mode 100644 index 3071b3a..0000000 --- a/ShenYin/ShenYin/UI/Mine/Root/BannerModel.swift +++ /dev/null @@ -1,7 +0,0 @@ -// -// BannerModel.swift -// ShenYin -// -// Created by liangshi on 2025/10/21. -// - diff --git a/ShenYin/ShenYin/UI/Mine/Update/AppUpdateModel.swift b/ShenYin/ShenYin/UI/Mine/Update/AppUpdateModel.swift index b7cd027..a88eff1 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/AppUpdateModel.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/AppUpdateModel.swift @@ -18,6 +18,10 @@ class AppUpdateModel:HandyJSON { var description = "" var fileList = [AppUpdateFileModel]() required public init() { } + + var newVersioon:Bool{ + return targetVersion.uppercased() > sourceVersion.uppercased() + } } class AppUpdateFileModel:HandyJSON { var url = "" diff --git a/ShenYin/ShenYin/UI/Mine/Update/AppUpdateVM.swift b/ShenYin/ShenYin/UI/Mine/Update/AppUpdateVM.swift index 7a82dee..62b1869 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/AppUpdateVM.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/AppUpdateVM.swift @@ -7,6 +7,8 @@ class AppUpdateVM:BaseVM{ static let shared = AppUpdateVM() + var updateModel:AppUpdateModel? + func checkedUpdate(){ var params:[String:Any] = [:] params["sourceVersion"] = Bundle.main.appVersion ?? "1.0.0" @@ -16,14 +18,15 @@ class AppUpdateVM:BaseVM{ YLprogressHUD.hidden() guard let self = self else {return} if model.isSuccess{ - if model.data.targetVersion.uppercased() > model.data.sourceVersion.uppercased(){ + self.updateModel = model.data + if model.data.newVersioon{ if model.data.updateType == "0"{ //可选升级 - optionUpdate() + optionUpdate(model: model.data) } else{ //强制升级 - forceUpdate() + forceUpdate(model: model.data) } } else{ @@ -35,8 +38,51 @@ class AppUpdateVM:BaseVM{ } } } - func optionUpdate(){ - CustomAlert.showWith(title: nil, messgage: "检测到新版本,是否前往更新".l10n) { + func autoCheckedUpdate(){ + var params:[String:Any] = [:] + params["sourceVersion"] = Bundle.main.appVersion ?? "1.0.0" + params["platform"] = "iOS" + YLprogressHUD.showLoading() + HttpClient.request(.otaTaskApp(param: params)) {[weak self](model:AppUpdateModelRoot,res) in + YLprogressHUD.hidden() + guard let self = self else {return} + if model.isSuccess{ + self.updateModel = model.data + if model.data.newVersioon{ + if model.data.updateType == "0"{ + autoOptionUpdate(model: model.data) + } + else{ + forceUpdate(model: model.data) + } + } + else{ + YLprogressHUD.showAutoHiden("已经是最新版本".l10n) + } + } + else{ + YLprogressHUD.showAutoHiden("请求失败".l10n) + } + } + } + + + private func autoOptionUpdate(model:AppUpdateModel){ + if !UpdateCache.isSkip(version: model.targetVersion) { + CustomAlert.showWith(title: "发现新版本".l10n, messgage: model.description,cancel:"稍后".l10n,ok: "立即更新".l10n) { + UpdateCache.save(version: model.targetVersion) + } okCallback: { + guard let url = CCConfig.appStoreLink.yc.asUrl else{ + return + } + UIApplication.shared.open(url) + } + } + } + + + private func optionUpdate(model:AppUpdateModel){ + CustomAlert.showWith(title: "发现新版本".l10n, messgage: model.description,cancel:"稍后".l10n,ok: "立即更新".l10n) { } okCallback: { guard let url = CCConfig.appStoreLink.yc.asUrl else{ @@ -46,8 +92,8 @@ class AppUpdateVM:BaseVM{ } } - func forceUpdate(){ - CustomAlert.showWith(title: nil, messgage: "检测到新版本".l10n, ok: "前往更新".l10n,cancelCallback: nil) { + private func forceUpdate(model:AppUpdateModel){ + CustomAlert.showWith(title: "发现新版本".l10n, messgage: model.description, ok: "立即更新".l10n,cancelCallback: nil) { guard let url = CCConfig.appStoreLink.yc.asUrl else{ return } diff --git a/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell.swift b/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell.swift index 5b4a868..40d7460 100644 --- a/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell.swift +++ b/ShenYin/ShenYin/UI/Mine/UserInfo/CustomCell.swift @@ -104,6 +104,7 @@ class CustomCell: BaseTableViewCell { let nextIcon = UIImageView() let valueIcon = UIImageView() let valueLabel = UILabel() + var unReadIcon = UIView() override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) @@ -114,7 +115,7 @@ class CustomCell: BaseTableViewCell { } override func setupViews() { contentView.addSubview(bgView) - bgView.addSubviews([titleLabel,nextIcon,valueIcon,valueLabel]) + bgView.addSubviews([titleLabel,nextIcon,valueIcon,valueLabel,unReadIcon]) backgroundColor = .color(.bgColor) contentView.backgroundColor = .clear @@ -139,6 +140,11 @@ class CustomCell: BaseTableViewCell { v.isHidden = true } nextIcon.image = UIImage(named: "arrow_next") + unReadIcon.do { v in + v.yc.setCornerRadius(3) + v.backgroundColor = .red + v.isHidden = true + } } override func setupLayout() { @@ -169,6 +175,11 @@ class CustomCell: BaseTableViewCell { m.height.equalToSuperview() m.left.equalToSuperview().inset(90) } + unReadIcon.snp.makeConstraints { (m) in + m.size.equalTo(6) + m.right.equalToSuperview().inset(30) + m.centerY.equalToSuperview() + } } } diff --git a/ShenYin/ShenYin/lan/chinese.swift b/ShenYin/ShenYin/lan/chinese.swift index 1169ff9..5ae5d25 100644 --- a/ShenYin/ShenYin/lan/chinese.swift +++ b/ShenYin/ShenYin/lan/chinese.swift @@ -576,5 +576,9 @@ let chineseMap:[String:String] = "用户须知":"", "首次使用请先开启手机蓝牙,搜索并配对设备。然后打开 APP,点击“添加设备”,找到对应产品完成连接,即可正常使用全部功能。":"", "了解并继续":"", + "发现新版本":"", + "立即更新":"", + "稍后":"", + "版本":"", ]