diff --git a/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios.xcodeproj/project.pbxproj index 5b5d182..0ef34a3 100644 --- a/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios.xcodeproj/project.pbxproj @@ -1001,7 +1001,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 14; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -1044,7 +1044,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 14; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_USER_SCRIPT_SANDBOXING = NO; diff --git a/yinmeng-ios/AppDelegate.swift b/yinmeng-ios/AppDelegate.swift index 2088edb..98630b3 100644 --- a/yinmeng-ios/AppDelegate.swift +++ b/yinmeng-ios/AppDelegate.swift @@ -2,7 +2,7 @@ // AppDelegate.swift // yinmeng-ios // -// Created by MaiMang on 2024/1/30. +// Created by yinmeng on 2024/1/30. // import UIKit diff --git a/yinmeng-ios/Base/Hud/HUDTool.swift b/yinmeng-ios/Base/Hud/HUDTool.swift index 92acc1c..532aba9 100644 --- a/yinmeng-ios/Base/Hud/HUDTool.swift +++ b/yinmeng-ios/Base/Hud/HUDTool.swift @@ -2,7 +2,7 @@ // HUDTool.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/23. +// Created by yinmeng on 2024/2/23. // import Foundation diff --git a/yinmeng-ios/Base/Request/Deserialized.swift b/yinmeng-ios/Base/Request/Deserialized.swift index 04855f0..aa709d8 100644 --- a/yinmeng-ios/Base/Request/Deserialized.swift +++ b/yinmeng-ios/Base/Request/Deserialized.swift @@ -2,7 +2,7 @@ // Deserialized.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import Foundation diff --git a/yinmeng-ios/Base/Request/YMNetworkFun.swift b/yinmeng-ios/Base/Request/YMNetworkFun.swift index 5085c27..ca2317a 100644 --- a/yinmeng-ios/Base/Request/YMNetworkFun.swift +++ b/yinmeng-ios/Base/Request/YMNetworkFun.swift @@ -2,7 +2,7 @@ // YMNetworkFun.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import Foundation diff --git a/yinmeng-ios/Base/Request/YMRequestX.swift b/yinmeng-ios/Base/Request/YMRequestX.swift index c59af61..be8b689 100644 --- a/yinmeng-ios/Base/Request/YMRequestX.swift +++ b/yinmeng-ios/Base/Request/YMRequestX.swift @@ -2,7 +2,7 @@ // YMRequestX.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/2. +// Created by yinmeng on 2024/2/2. // import Foundation diff --git a/yinmeng-ios/Base/Security/RecordVoiceManager.h b/yinmeng-ios/Base/Security/RecordVoiceManager.h index 3dbf1eb..373ef66 100644 --- a/yinmeng-ios/Base/Security/RecordVoiceManager.h +++ b/yinmeng-ios/Base/Security/RecordVoiceManager.h @@ -2,7 +2,7 @@ // RecordVoiceManager.h // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // #import diff --git a/yinmeng-ios/Base/Security/RecordVoiceManager.m b/yinmeng-ios/Base/Security/RecordVoiceManager.m index 8ce2103..b8f2ce2 100644 --- a/yinmeng-ios/Base/Security/RecordVoiceManager.m +++ b/yinmeng-ios/Base/Security/RecordVoiceManager.m @@ -2,7 +2,7 @@ // RecordVoiceManager.m // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // #import "RecordVoiceManager.h" diff --git a/yinmeng-ios/Base/Utils/APPUtils.swift b/yinmeng-ios/Base/Utils/APPUtils.swift index ea249f2..822fbea 100644 --- a/yinmeng-ios/Base/Utils/APPUtils.swift +++ b/yinmeng-ios/Base/Utils/APPUtils.swift @@ -2,7 +2,7 @@ // APPUtils.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import Foundation diff --git a/yinmeng-ios/Base/Utils/AppKeys.swift b/yinmeng-ios/Base/Utils/AppKeys.swift index 0a9ba97..6e42024 100644 --- a/yinmeng-ios/Base/Utils/AppKeys.swift +++ b/yinmeng-ios/Base/Utils/AppKeys.swift @@ -2,7 +2,7 @@ // AppKeys.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import Foundation diff --git a/yinmeng-ios/Base/Utils/H5Utils.swift b/yinmeng-ios/Base/Utils/H5Utils.swift index 0271715..8a0f054 100644 --- a/yinmeng-ios/Base/Utils/H5Utils.swift +++ b/yinmeng-ios/Base/Utils/H5Utils.swift @@ -2,7 +2,7 @@ // H5Utils.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/26. +// Created by yinmeng on 2024/2/26. // import Foundation diff --git a/yinmeng-ios/Base/Utils/Utils.swift b/yinmeng-ios/Base/Utils/Utils.swift index d3cb729..22dec89 100644 --- a/yinmeng-ios/Base/Utils/Utils.swift +++ b/yinmeng-ios/Base/Utils/Utils.swift @@ -2,7 +2,7 @@ // Utils.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import Foundation @@ -27,7 +27,7 @@ let SafeAraeBottomHeight = isSafeScreen ? 34.0 : 0.0 let SafeAraeTopmHeight = isSafeScreen ? 24.0 : 0.0 let NavHeight = (StatusBarHeight + 44) let TabHeight = (49) - +let keyWindow = UIApplication.shared.windows.first! let DesKey = "1ea53d260ecf11e7b56e00163e046a26" diff --git a/yinmeng-ios/Base/ViewController/BaseNavigationViewController.swift b/yinmeng-ios/Base/ViewController/BaseNavigationViewController.swift index 887815b..892cdbe 100644 --- a/yinmeng-ios/Base/ViewController/BaseNavigationViewController.swift +++ b/yinmeng-ios/Base/ViewController/BaseNavigationViewController.swift @@ -2,7 +2,7 @@ // BaseNavigationViewController.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit diff --git a/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift b/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift index 2966dd7..b245963 100644 --- a/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift +++ b/yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift @@ -2,7 +2,7 @@ // BaeTabBarViewController.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit diff --git a/yinmeng-ios/Base/ViewController/BaseView.swift b/yinmeng-ios/Base/ViewController/BaseView.swift index cf136cd..3b2b129 100644 --- a/yinmeng-ios/Base/ViewController/BaseView.swift +++ b/yinmeng-ios/Base/ViewController/BaseView.swift @@ -2,7 +2,7 @@ // BaseView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import UIKit diff --git a/yinmeng-ios/Base/ViewController/BaseViewController.swift b/yinmeng-ios/Base/ViewController/BaseViewController.swift index 9c591a0..19037f7 100644 --- a/yinmeng-ios/Base/ViewController/BaseViewController.swift +++ b/yinmeng-ios/Base/ViewController/BaseViewController.swift @@ -2,7 +2,7 @@ // BaseViewController.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit diff --git a/yinmeng-ios/Base/Web/WebViewController.swift b/yinmeng-ios/Base/Web/WebViewController.swift index a568ebb..9fdb925 100644 --- a/yinmeng-ios/Base/Web/WebViewController.swift +++ b/yinmeng-ios/Base/Web/WebViewController.swift @@ -2,7 +2,7 @@ // WebViewController.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/26. +// Created by yinmeng on 2024/2/26. // import UIKit diff --git a/yinmeng-ios/Extension/Color/Color+.swift b/yinmeng-ios/Extension/Color/Color+.swift index 52659ec..ab7d973 100644 --- a/yinmeng-ios/Extension/Color/Color+.swift +++ b/yinmeng-ios/Extension/Color/Color+.swift @@ -2,7 +2,7 @@ // Color+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import Foundation diff --git a/yinmeng-ios/Extension/Date/Date+.swift b/yinmeng-ios/Extension/Date/Date+.swift index e88ca43..5080dfc 100644 --- a/yinmeng-ios/Extension/Date/Date+.swift +++ b/yinmeng-ios/Extension/Date/Date+.swift @@ -2,7 +2,7 @@ // Date+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Extension/List/List+.swift b/yinmeng-ios/Extension/List/List+.swift index 8fe14eb..cc31748 100644 --- a/yinmeng-ios/Extension/List/List+.swift +++ b/yinmeng-ios/Extension/List/List+.swift @@ -2,7 +2,7 @@ // List+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/24. +// Created by yinmeng on 2024/2/24. // import Foundation diff --git a/yinmeng-ios/Extension/String/String+.swift b/yinmeng-ios/Extension/String/String+.swift index 0d26f50..2012d5d 100644 --- a/yinmeng-ios/Extension/String/String+.swift +++ b/yinmeng-ios/Extension/String/String+.swift @@ -2,7 +2,7 @@ // String+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/23. +// Created by yinmeng on 2024/2/23. // import Foundation diff --git a/yinmeng-ios/Extension/UIImage/UIImage+.swift b/yinmeng-ios/Extension/UIImage/UIImage+.swift index bcfcefa..44402ad 100644 --- a/yinmeng-ios/Extension/UIImage/UIImage+.swift +++ b/yinmeng-ios/Extension/UIImage/UIImage+.swift @@ -2,7 +2,7 @@ // UIImage+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import Foundation diff --git a/yinmeng-ios/Extension/UIView/UIView+.swift b/yinmeng-ios/Extension/UIView/UIView+.swift index f610ef9..74fff55 100644 --- a/yinmeng-ios/Extension/UIView/UIView+.swift +++ b/yinmeng-ios/Extension/UIView/UIView+.swift @@ -2,7 +2,7 @@ // UIView+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Info.plist b/yinmeng-ios/Info.plist index f3ae914..7865451 100644 --- a/yinmeng-ios/Info.plist +++ b/yinmeng-ios/Info.plist @@ -2,6 +2,8 @@ + NSLocationWhenInUseUsageDescription + “音萌”需要您的同意,才能进行定位服务,推荐附近好友 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/yinmeng-ios/Modules/Auth/Model/AppConfigObject.swift b/yinmeng-ios/Modules/Auth/Model/AppConfigObject.swift index d7af7ba..b705b1e 100644 --- a/yinmeng-ios/Modules/Auth/Model/AppConfigObject.swift +++ b/yinmeng-ios/Modules/Auth/Model/AppConfigObject.swift @@ -2,7 +2,7 @@ // AppConfigObject.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import Foundation diff --git a/yinmeng-ios/Modules/Auth/VC/AuthFillDataVC.swift b/yinmeng-ios/Modules/Auth/VC/AuthFillDataVC.swift index e2bd8be..c6f432e 100644 --- a/yinmeng-ios/Modules/Auth/VC/AuthFillDataVC.swift +++ b/yinmeng-ios/Modules/Auth/VC/AuthFillDataVC.swift @@ -2,7 +2,7 @@ // AuthFillDataVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import UIKit diff --git a/yinmeng-ios/Modules/Auth/VC/AuthForgetVC.swift b/yinmeng-ios/Modules/Auth/VC/AuthForgetVC.swift index 52320da..530ec58 100644 --- a/yinmeng-ios/Modules/Auth/VC/AuthForgetVC.swift +++ b/yinmeng-ios/Modules/Auth/VC/AuthForgetVC.swift @@ -2,7 +2,7 @@ // AuthForgetVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit diff --git a/yinmeng-ios/Modules/Auth/VC/AuthLaunchVC.swift b/yinmeng-ios/Modules/Auth/VC/AuthLaunchVC.swift index f12fb38..1849212 100644 --- a/yinmeng-ios/Modules/Auth/VC/AuthLaunchVC.swift +++ b/yinmeng-ios/Modules/Auth/VC/AuthLaunchVC.swift @@ -2,7 +2,7 @@ // AuthLaunchVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit @@ -24,7 +24,7 @@ class AuthLaunchVC: BaseViewController, HiddenNavigationBarProtocol { otherStackView.addArrangedSubview(otherLb) otherStackView.addArrangedSubview(rightView) - loginStackView.addArrangedSubview(idView) +// loginStackView.addArrangedSubview(idView) loginStackView.addArrangedSubview(appleView) stackView.addArrangedSubview(boxBtn) @@ -80,10 +80,7 @@ class AuthLaunchVC: BaseViewController, HiddenNavigationBarProtocol { make.bottom.equalTo(stackView.snp.top).offset(-56) } - idView.snp.makeConstraints { make in - make.width.equalTo(47) - make.height.equalTo(70) - } +// appleView.snp.makeConstraints { make in make.width.equalTo(47) @@ -198,7 +195,6 @@ class AuthLaunchVC: BaseViewController, HiddenNavigationBarProtocol { private lazy var appleView: AuthItmeButton = { let view = AuthItmeButton() view.imageName = "auth_login_apple" - view.title = "iPhone登录" view.backgroundColor = .clear view.addTarget(self, action: #selector(appleClick), for: .touchUpInside) return view diff --git a/yinmeng-ios/Modules/Auth/VC/AuthLoginVC.swift b/yinmeng-ios/Modules/Auth/VC/AuthLoginVC.swift index 8dfc3a8..27dce52 100644 --- a/yinmeng-ios/Modules/Auth/VC/AuthLoginVC.swift +++ b/yinmeng-ios/Modules/Auth/VC/AuthLoginVC.swift @@ -2,7 +2,7 @@ // AuthLoginVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/21. +// Created by yinmeng on 2024/2/21. // import UIKit diff --git a/yinmeng-ios/Modules/Auth/VM/AuthAppleManager.swift b/yinmeng-ios/Modules/Auth/VM/AuthAppleManager.swift index 04cf2d9..d82e10a 100644 --- a/yinmeng-ios/Modules/Auth/VM/AuthAppleManager.swift +++ b/yinmeng-ios/Modules/Auth/VM/AuthAppleManager.swift @@ -2,7 +2,7 @@ // AuthAppleManager.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import Foundation @@ -18,7 +18,7 @@ class AuthAppleManager:NSObject,ASAuthorizationControllerDelegate,ASAuthorizatio @available(iOS 13.0, *) func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor { - return UIApplication.shared.keyWindow!; + return keyWindow; } @available(iOS 13.0, *) diff --git a/yinmeng-ios/Modules/Auth/VM/AuthManager.swift b/yinmeng-ios/Modules/Auth/VM/AuthManager.swift index 116b984..2b26b09 100644 --- a/yinmeng-ios/Modules/Auth/VM/AuthManager.swift +++ b/yinmeng-ios/Modules/Auth/VM/AuthManager.swift @@ -2,7 +2,7 @@ // AuthManager.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/24. +// Created by yinmeng on 2024/2/24. // import Foundation diff --git a/yinmeng-ios/Modules/Auth/VM/AuthViewModel.swift b/yinmeng-ios/Modules/Auth/VM/AuthViewModel.swift index 99f4cbd..fb26468 100644 --- a/yinmeng-ios/Modules/Auth/VM/AuthViewModel.swift +++ b/yinmeng-ios/Modules/Auth/VM/AuthViewModel.swift @@ -2,7 +2,7 @@ // AuthViewModel.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import Foundation @@ -57,7 +57,7 @@ class AuthViewModel: NSObject { ///账号密码登录 func authPhoneCode(phone:String, code:String) { if let phoneDes = phone.encrypt() { - MBProgressHUD.showAdded(to: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.showAdded(to: keyWindow, animated: true) let params = ["phone":phoneDes, "code":code, "client_secret":"uyzjdhds", "version":"1", "client_id":"erban-client", "grant_type":"password"] RequestPost(path: "oauth/token", parma: params) { data in if let window = UIApplication.shared.keyWindow{ @@ -88,7 +88,7 @@ class AuthViewModel: NSObject { ///ID登录 func authIDPassword(account:String, password: String) { if let phoneDes = account.encrypt(), let pwdDes = password.encrypt() { - MBProgressHUD.showAdded(to: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.showAdded(to: keyWindow, animated: true) let params = ["phone":phoneDes, "password":pwdDes, "client_secret":"uyzjdhds", "version":"1", "client_id":"erban-client", "grant_type":"password"] RequestPost(path: "oauth/token", parma: params) { data in if let window = UIApplication.shared.keyWindow{ diff --git a/yinmeng-ios/Modules/Auth/VM/UserTokenObject.swift b/yinmeng-ios/Modules/Auth/VM/UserTokenObject.swift index 19f0e20..c47545a 100644 --- a/yinmeng-ios/Modules/Auth/VM/UserTokenObject.swift +++ b/yinmeng-ios/Modules/Auth/VM/UserTokenObject.swift @@ -2,7 +2,7 @@ // UserTokenObject.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/24. +// Created by yinmeng on 2024/2/24. // import Foundation diff --git a/yinmeng-ios/Modules/Auth/View/AuthItmeButton.swift b/yinmeng-ios/Modules/Auth/View/AuthItmeButton.swift index 388b568..5ab4e57 100644 --- a/yinmeng-ios/Modules/Auth/View/AuthItmeButton.swift +++ b/yinmeng-ios/Modules/Auth/View/AuthItmeButton.swift @@ -2,7 +2,7 @@ // AuthItmeButton.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/28. +// Created by yinmeng on 2024/2/28. // import UIKit diff --git a/yinmeng-ios/Modules/Auth/View/AuthPrivacyView.swift b/yinmeng-ios/Modules/Auth/View/AuthPrivacyView.swift index 0926454..3fb37e3 100644 --- a/yinmeng-ios/Modules/Auth/View/AuthPrivacyView.swift +++ b/yinmeng-ios/Modules/Auth/View/AuthPrivacyView.swift @@ -2,7 +2,7 @@ // AuthPrivacyView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/22. +// Created by yinmeng on 2024/2/22. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/ChatListVC.swift b/yinmeng-ios/Modules/Chat/ChatListVC.swift index 7b128f2..284785e 100644 --- a/yinmeng-ios/Modules/Chat/ChatListVC.swift +++ b/yinmeng-ios/Modules/Chat/ChatListVC.swift @@ -2,7 +2,7 @@ // ChatListVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // 回话列表 import UIKit diff --git a/yinmeng-ios/Modules/Chat/ChatVC.swift b/yinmeng-ios/Modules/Chat/ChatVC.swift index 5be5056..aa5c320 100644 --- a/yinmeng-ios/Modules/Chat/ChatVC.swift +++ b/yinmeng-ios/Modules/Chat/ChatVC.swift @@ -2,7 +2,7 @@ // ChatVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // 回话详情 import UIKit diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatGrowingTextView.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatGrowingTextView.swift index d11e2c7..38838ed 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatGrowingTextView.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatGrowingTextView.swift @@ -2,7 +2,7 @@ // ChatGrowingTextView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboard+.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboard+.swift index c79639d..b7f559c 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboard+.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboard+.swift @@ -2,7 +2,7 @@ // ChatKeyboard+.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboardView.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboardView.swift index 3a62720..f98b4bf 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboardView.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboardView.swift @@ -2,7 +2,7 @@ // ChatKeyboardView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit @@ -342,7 +342,7 @@ extension ChatKeyboardView { sendVoiceBtn.isSelected = true // 开始录音 if voiceView.superview == nil { - UIApplication.shared.keyWindow?.addSubview(voiceView) + keyWindow.addSubview(voiceView) voiceView.translatesAutoresizingMaskIntoConstraints = false voiceView.snp.makeConstraints { make in make.center.equalToSuperview() diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuCell.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuCell.swift index 74a317a..23aa3a9 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuCell.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuCell.swift @@ -2,7 +2,7 @@ // ChatMoreMenuCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuView.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuView.swift index 8ed15a2..c40da39 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuView.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuView.swift @@ -2,7 +2,7 @@ // ChatMoreMenuView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMnueConfig.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMnueConfig.swift index 8930c7a..15ad902 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMnueConfig.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMnueConfig.swift @@ -2,7 +2,7 @@ // ChatMoreMnueConfig.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/Keyboard/ChatSendVoiceView.swift b/yinmeng-ios/Modules/Chat/Keyboard/ChatSendVoiceView.swift index ba2c18e..9ca4758 100644 --- a/yinmeng-ios/Modules/Chat/Keyboard/ChatSendVoiceView.swift +++ b/yinmeng-ios/Modules/Chat/Keyboard/ChatSendVoiceView.swift @@ -2,7 +2,7 @@ // ChatSendVoiceView.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/Model/ChatBaseObject.swift b/yinmeng-ios/Modules/Chat/Model/ChatBaseObject.swift index 28983bd..8c0ba6c 100644 --- a/yinmeng-ios/Modules/Chat/Model/ChatBaseObject.swift +++ b/yinmeng-ios/Modules/Chat/Model/ChatBaseObject.swift @@ -2,7 +2,7 @@ // ChatBaseObject.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/Model/ChatUIConfig.swift b/yinmeng-ios/Modules/Chat/Model/ChatUIConfig.swift index 4f0ecd9..29dded7 100644 --- a/yinmeng-ios/Modules/Chat/Model/ChatUIConfig.swift +++ b/yinmeng-ios/Modules/Chat/Model/ChatUIConfig.swift @@ -2,7 +2,7 @@ // ChatUIConfig.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/Tool/ChatAttributeTool.swift b/yinmeng-ios/Modules/Chat/Tool/ChatAttributeTool.swift index 6e60ce1..c66399f 100644 --- a/yinmeng-ios/Modules/Chat/Tool/ChatAttributeTool.swift +++ b/yinmeng-ios/Modules/Chat/Tool/ChatAttributeTool.swift @@ -2,7 +2,7 @@ // ChatAttributeTool.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/VM/ChatViewModel.swift b/yinmeng-ios/Modules/Chat/VM/ChatViewModel.swift index cc479d2..d76cd3f 100644 --- a/yinmeng-ios/Modules/Chat/VM/ChatViewModel.swift +++ b/yinmeng-ios/Modules/Chat/VM/ChatViewModel.swift @@ -2,7 +2,7 @@ // ChatViewModel.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Modules/Chat/View/ChatBaseCell.swift b/yinmeng-ios/Modules/Chat/View/ChatBaseCell.swift index 37c7a14..9fca252 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatBaseCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatBaseCell.swift @@ -2,7 +2,7 @@ // ChatBaseCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/View/ChatImageCell.swift b/yinmeng-ios/Modules/Chat/View/ChatImageCell.swift index 6cebc91..5a4e650 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatImageCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatImageCell.swift @@ -2,7 +2,7 @@ // ChatImageCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/View/ChatList/ChatListCell.swift b/yinmeng-ios/Modules/Chat/View/ChatList/ChatListCell.swift index 990372d..c3a18e5 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatList/ChatListCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatList/ChatListCell.swift @@ -2,7 +2,7 @@ // ChatListCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/View/ChatNavView.swift b/yinmeng-ios/Modules/Chat/View/ChatNavView.swift index f70ff59..46fc387 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatNavView.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatNavView.swift @@ -2,10 +2,11 @@ // ChatNavView.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit +import NIMSDK class ChatNavView: BaseView { var uid:String = "" @@ -96,7 +97,34 @@ class ChatNavView: BaseView { alertController.addAction(UIAlertAction(title: "举报", style: .default, handler: { action in HUDTool.show(with: "举报成功, 我们将尽快处理") })) - + + + if NIMSDK.shared().userManager.isUser(inBlackList: uid){ + alertController.addAction(UIAlertAction(title: "移出黑名单", style: .default, handler: { action in + NIMSDK.shared().userManager.remove(fromBlackBlackList: self.uid ) { error in + if error == nil{ + HUDTool.show(with: "移出黑名单成功") + } + } + })) + }else{ + alertController.addAction(UIAlertAction(title: "加入黑名单", style: .default, handler: { action in + let popUpView = PlanetStarPopUpView.init(frame: CGRect(x: 0, y: 0, width: ScreenWidth, height: ScreenHeight)) + keyWindow.addSubview(popUpView) + popUpView.textView.text = "加入黑名单,你将不再收到对方的消息" + popUpView.senderView.setTitle("确定", for: .normal) + popUpView.bgPointView.isHidden = true + popUpView.pointTextView.isHidden = true + popUpView.clickSendBlcok = {[weak self] in + NIMSDK.shared().userManager.add(toBlackList: self?.uid ?? "") { error in + if error == nil{ + HUDTool.show(with: "加入黑名单成功") + } + } + } + })) + } + alertController.addAction(UIAlertAction(title: "取消", style: .cancel, handler: { action in })) diff --git a/yinmeng-ios/Modules/Chat/View/ChatTextCell.swift b/yinmeng-ios/Modules/Chat/View/ChatTextCell.swift index 2afbd80..1b1926e 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatTextCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatTextCell.swift @@ -2,7 +2,7 @@ // ChatTextCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/View/ChatTimeCell.swift b/yinmeng-ios/Modules/Chat/View/ChatTimeCell.swift index b3b240b..b71485f 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatTimeCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatTimeCell.swift @@ -2,7 +2,7 @@ // ChatTimeCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Chat/View/ChatVoiceCell.swift b/yinmeng-ios/Modules/Chat/View/ChatVoiceCell.swift index 9c3baee..aa907bf 100644 --- a/yinmeng-ios/Modules/Chat/View/ChatVoiceCell.swift +++ b/yinmeng-ios/Modules/Chat/View/ChatVoiceCell.swift @@ -2,7 +2,7 @@ // ChatVoiceCell.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceChooseItemVeiw.swift b/yinmeng-ios/Modules/Home/HomeVoiceChooseItemVeiw.swift index 9bccb7c..fcf1337 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceChooseItemVeiw.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceChooseItemVeiw.swift @@ -2,7 +2,7 @@ // HomeVoiceChooseItemVeiw.swift // yinmeng-ios // -// Created by duoban on 2024/2/28. +// Created by yinmeng on 2024/2/28. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceChooseTypeView.swift b/yinmeng-ios/Modules/Home/HomeVoiceChooseTypeView.swift index a1c9435..368469a 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceChooseTypeView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceChooseTypeView.swift @@ -2,7 +2,7 @@ // HomeVoiceChooseTypeView.swift // yinmeng-ios // -// Created by duoban on 2024/2/28. +// Created by yinmeng on 2024/2/28. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceFollowCell.swift b/yinmeng-ios/Modules/Home/HomeVoiceFollowCell.swift index 5637bc7..f5e3847 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceFollowCell.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceFollowCell.swift @@ -2,7 +2,7 @@ // HomeVoiceFollowCell.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceFollowView.swift b/yinmeng-ios/Modules/Home/HomeVoiceFollowView.swift index 847cae3..5121e4a 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceFollowView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceFollowView.swift @@ -2,7 +2,7 @@ // HomeVoiceFollowView.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceGuideView.swift b/yinmeng-ios/Modules/Home/HomeVoiceGuideView.swift index 95b64d1..489f04a 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceGuideView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceGuideView.swift @@ -2,7 +2,7 @@ // HomeVoiceGuideView.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceModel.swift b/yinmeng-ios/Modules/Home/HomeVoiceModel.swift index afc6da5..df709cb 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceModel.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceModel.swift @@ -2,7 +2,7 @@ // HomeVoiceModel.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoicePlayMusicItemView.swift b/yinmeng-ios/Modules/Home/HomeVoicePlayMusicItemView.swift index a8ab0db..fdacb46 100644 --- a/yinmeng-ios/Modules/Home/HomeVoicePlayMusicItemView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoicePlayMusicItemView.swift @@ -2,7 +2,7 @@ // HomeVoicePlayMusicItemView.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoicePublishView.swift b/yinmeng-ios/Modules/Home/HomeVoicePublishView.swift index caacaba..18c9e3a 100644 --- a/yinmeng-ios/Modules/Home/HomeVoicePublishView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoicePublishView.swift @@ -2,7 +2,7 @@ // HomeVoicePublishView.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceRecordBtnView.swift b/yinmeng-ios/Modules/Home/HomeVoiceRecordBtnView.swift index b240044..c7f851f 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceRecordBtnView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceRecordBtnView.swift @@ -2,7 +2,7 @@ // HomeVoiceRecordBtnView.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceRecordView.swift b/yinmeng-ios/Modules/Home/HomeVoiceRecordView.swift index ce1442f..c24a42c 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceRecordView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceRecordView.swift @@ -2,7 +2,7 @@ // HomeVoiceRecordView.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceUserInfoView.swift b/yinmeng-ios/Modules/Home/HomeVoiceUserInfoView.swift index 23e0f30..2c5e7b7 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceUserInfoView.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceUserInfoView.swift @@ -2,7 +2,7 @@ // HomeVoiceUserInfoView.swift // yinmeng-ios // -// Created by duoban on 2024/2/29. +// Created by yinmeng on 2024/2/29. // import UIKit diff --git a/yinmeng-ios/Modules/Home/HomeVoiceVC.swift b/yinmeng-ios/Modules/Home/HomeVoiceVC.swift index 4d16733..60491d6 100644 --- a/yinmeng-ios/Modules/Home/HomeVoiceVC.swift +++ b/yinmeng-ios/Modules/Home/HomeVoiceVC.swift @@ -2,7 +2,7 @@ // HomeVoiceVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import UIKit @@ -20,7 +20,7 @@ class HomeVoiceVC: BaseViewController,HiddenNavigationBarProtocol { if (UserDefaults.standard.value(forKey:"kIsShowGuide") != nil){return} UserDefaults.standard.setValue("yes", forKey: "kIsShowGuide") let guideVeiw = HomeVoiceGuideView.init(frame: CGRect(x: 0, y: 0, width: ScreenWidth, height: ScreenHeight)) - UIApplication.shared.keyWindow?.addSubview(guideVeiw) + keyWindow.addSubview(guideVeiw) } @objc func userInfoBtnAction(){ let userInfoView:HomeVoiceUserInfoView = HomeVoiceUserInfoView.init(frame: .zero) diff --git a/yinmeng-ios/Modules/Pay/UserPayViewController.swift b/yinmeng-ios/Modules/Pay/UserPayViewController.swift index 7f51ae6..6554bab 100644 --- a/yinmeng-ios/Modules/Pay/UserPayViewController.swift +++ b/yinmeng-ios/Modules/Pay/UserPayViewController.swift @@ -19,9 +19,9 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ NotificationCenter.default.addObserver(self, selector: #selector(receiveInitiatePaymentNot(not:)), name: NSNotification.Name(rawValue: "kInitiatePayment"), object: nil) } @objc func receiveInitiatePaymentNot(not:Notification) { -// -// -// + // + // + // } func requestData(){ RequestGet(path: "chargeprod/list", parma: ["channelType":"8"]) { data in @@ -36,7 +36,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ }else{ view.isHidden = true } - + } } @@ -62,7 +62,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ }else{ view.layer.borderWidth = 0 } - + } } @objc func lookUpTap(){ @@ -96,7 +96,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ } let lookUpTap = UITapGestureRecognizer.init(target: self, action: #selector(lookUpTap)) - payAgreement.addGestureRecognizer(lookUpTap) + payAgreement.addGestureRecognizer(lookUpTap) scrollView.snp.makeConstraints { make in make.edges.equalTo(self.view) } @@ -169,25 +169,25 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ guard let chargeProdId = self.chooseModel?.chargeProdId else{ return } - MBProgressHUD.showAdded(to: UIApplication.shared.keyWindow!, animated: true) - let uid = "\(AuthManager.userUid)" - let ticket = AuthManager.ticket - let deviceInfo = UIDevice.current.identifierForVendor?.uuidString ?? "" - let clientIp = "0.0.0.0" - RequestPost(path: "storeKitV2/placeOrder", parma: ["chargeProdId":chargeProdId,"uid":uid,"ticket":ticket,"deviceInfo":deviceInfo]) { data in + MBProgressHUD.showAdded(to: keyWindow, animated: true) + let uid = "\(AuthManager.userUid)" + let ticket = AuthManager.ticket + let deviceInfo = UIDevice.current.identifierForVendor?.uuidString ?? "" + let clientIp = "0.0.0.0" + RequestPost(path: "storeKitV2/placeOrder", parma: ["chargeProdId":chargeProdId,"uid":uid,"ticket":ticket,"deviceInfo":deviceInfo]) { data in + + + if let _data = data as? [String:Any],let recordId = _data["recordId"] as? String,let appAccountToken = _data["appAccountToken"] as? String{ + self.initiatePaymentAction(recordId: recordId, appAccountToken: appAccountToken) + }else{ + HUDTool.show(with: "购买失败") + MBProgressHUD.hide(for: keyWindow, animated: true) + } + - - if let _data = data as? [String:Any],let recordId = _data["recordId"] as? String,let appAccountToken = _data["appAccountToken"] as? String{ - self.initiatePaymentAction(recordId: recordId, appAccountToken: appAccountToken) - }else{ - HUDTool.show(with: "购买失败") - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) - } - - } fail: { code, data in HUDTool.show(with: data) - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.hide(for: keyWindow, animated: true) } } @@ -199,22 +199,22 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ if #available(iOS 15.0, *) { UserPayViewManager.shared._ConditionBlock = {[weak self] (state , result) in if state == .Pay || state == .Start || state == .VerifiedServer{ - + ScreenWidth }else if state == .Unowned{ HUDTool.show(with: "出现未知错误,请重新尝试") - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.hide(for: keyWindow , animated: true) }else{ HUDTool.show(with: "购买失败") - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.hide(for: keyWindow, animated: true) } if state == .VerifiedServer{ - - + + if let data = result,let transactionId = data["transactionId"]{ self?.paySuccess(transactionId:"\(transactionId)") }else{ HUDTool.show(with: "购买失败") - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) + MBProgressHUD.hide(for: keyWindow, animated: true) } } } @@ -226,7 +226,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ } } - + } else { @@ -237,42 +237,42 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ let uid = "\(AuthManager.userUid)" let ticket = AuthManager.ticket RequestPost(path: "storeKitV2/verifyOrder", parma: ["chargeRecordId":self.orderId,"chooseEnv":"true","uid":uid,"ticket":ticket,"transcationId":transactionId]) { data in - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) - - if #available(iOS 15.0, *) { - Task { - try await UserPayViewManager.shared._verifyBusinessAccomplish(transaction: transactionId) - self.orderId = "" - RequestGet(path: "purse/query", parma: ["channelType":"8"]) { data in - - if let model = Deserialized.toModel(with: data) { - self.pricView.text = model.diamonds - } - - } fail: { code, data in - print(code) - } - } - - } - - - - - } fail: { code, data in - if code == 1444{ - Task { - if #available(iOS 15.0, *) { - try await UserPayViewManager.shared._verifyBusinessAccomplish(transaction: transactionId) - } else { - // Fallback on earlier versions - } - - } - } - HUDTool.show(with: data) - MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true) - } + MBProgressHUD.hide(for: keyWindow, animated: true) + + if #available(iOS 15.0, *) { + Task { + try await UserPayViewManager.shared._verifyBusinessAccomplish(transaction: transactionId) + self.orderId = "" + RequestGet(path: "purse/query", parma: ["channelType":"8"]) { data in + + if let model = Deserialized.toModel(with: data) { + self.pricView.text = model.diamonds + } + + } fail: { code, data in + print(code) + } + } + + } + + + + + } fail: { code, data in + if code == 1444{ + Task { + if #available(iOS 15.0, *) { + try await UserPayViewManager.shared._verifyBusinessAccomplish(transaction: transactionId) + } else { + // Fallback on earlier versions + } + + } + } + HUDTool.show(with: data) + MBProgressHUD.hide(for: keyWindow, animated: true) + } } @objc func backBtnAction(){ self.navigationController?.popViewController(animated: true) @@ -356,7 +356,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{ var publishBtn:UIButton = { let _publishBtn = UIButton() - + _publishBtn.setBackgroundImage(UIImage(named: "yin_hoem_voice_record_publish_btn"), for: .normal) _publishBtn.setTitle("立即充值", for: .normal) _publishBtn.setTitleColor(.white, for: .normal) diff --git a/yinmeng-ios/Modules/Pay/UserPayViewItemView.swift b/yinmeng-ios/Modules/Pay/UserPayViewItemView.swift index e599438..8ee49af 100644 --- a/yinmeng-ios/Modules/Pay/UserPayViewItemView.swift +++ b/yinmeng-ios/Modules/Pay/UserPayViewItemView.swift @@ -2,7 +2,7 @@ // UserPayViewItemView.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Pay/UserPayViewManager.swift b/yinmeng-ios/Modules/Pay/UserPayViewManager.swift index fd5054d..01ac69c 100644 --- a/yinmeng-ios/Modules/Pay/UserPayViewManager.swift +++ b/yinmeng-ios/Modules/Pay/UserPayViewManager.swift @@ -2,7 +2,7 @@ // UserPayViewManager.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Pay/UserPayViewModel.swift b/yinmeng-ios/Modules/Pay/UserPayViewModel.swift index 9391047..cc67a7d 100644 --- a/yinmeng-ios/Modules/Pay/UserPayViewModel.swift +++ b/yinmeng-ios/Modules/Pay/UserPayViewModel.swift @@ -2,7 +2,7 @@ // UserPayViewModel.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import Foundation diff --git a/yinmeng-ios/Modules/Star/PlanetStarClickItemView.swift b/yinmeng-ios/Modules/Star/PlanetStarClickItemView.swift index f36c7f6..fde8242 100644 --- a/yinmeng-ios/Modules/Star/PlanetStarClickItemView.swift +++ b/yinmeng-ios/Modules/Star/PlanetStarClickItemView.swift @@ -2,7 +2,7 @@ // PlanetStarClickItemView.swift // yinmeng-ios // -// Created by duoban on 2024/2/26. +// Created by yinmeng on 2024/2/26. // import UIKit diff --git a/yinmeng-ios/Modules/Star/PlanetStarModel.swift b/yinmeng-ios/Modules/Star/PlanetStarModel.swift index 60e4c22..6e3db86 100644 --- a/yinmeng-ios/Modules/Star/PlanetStarModel.swift +++ b/yinmeng-ios/Modules/Star/PlanetStarModel.swift @@ -2,7 +2,7 @@ // PlanetStarModel.swift // yinmeng-ios // -// Created by duoban on 2024/2/27. +// Created by yinmeng on 2024/2/27. // import Foundation diff --git a/yinmeng-ios/Modules/Star/PlanetStarPopUpView.swift b/yinmeng-ios/Modules/Star/PlanetStarPopUpView.swift index 6eccbe9..d604cde 100644 --- a/yinmeng-ios/Modules/Star/PlanetStarPopUpView.swift +++ b/yinmeng-ios/Modules/Star/PlanetStarPopUpView.swift @@ -2,7 +2,7 @@ // PlanetStarPopUpView.swift // yinmeng-ios // -// Created by duoban on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/Star/PlanetStarVC.swift b/yinmeng-ios/Modules/Star/PlanetStarVC.swift index 71f4359..9fad57c 100644 --- a/yinmeng-ios/Modules/Star/PlanetStarVC.swift +++ b/yinmeng-ios/Modules/Star/PlanetStarVC.swift @@ -2,7 +2,7 @@ // PlanetStarVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import UIKit diff --git a/yinmeng-ios/Modules/User/VC/AboutUsVC.swift b/yinmeng-ios/Modules/User/VC/AboutUsVC.swift index 397feff..5452e0b 100644 --- a/yinmeng-ios/Modules/User/VC/AboutUsVC.swift +++ b/yinmeng-ios/Modules/User/VC/AboutUsVC.swift @@ -2,7 +2,7 @@ // AboutUsVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/26. +// Created by yinmeng on 2024/2/26. // import UIKit diff --git a/yinmeng-ios/Modules/User/VC/BindMobileVC.swift b/yinmeng-ios/Modules/User/VC/BindMobileVC.swift index 3b6c1b0..f7b6523 100644 --- a/yinmeng-ios/Modules/User/VC/BindMobileVC.swift +++ b/yinmeng-ios/Modules/User/VC/BindMobileVC.swift @@ -2,7 +2,7 @@ // BindMobileVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/User/VC/PasswordSetVC.swift b/yinmeng-ios/Modules/User/VC/PasswordSetVC.swift index e4afb21..ebd4fbb 100644 --- a/yinmeng-ios/Modules/User/VC/PasswordSetVC.swift +++ b/yinmeng-ios/Modules/User/VC/PasswordSetVC.swift @@ -2,7 +2,7 @@ // PasswordSetVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/User/VC/UserInfoVC.swift b/yinmeng-ios/Modules/User/VC/UserInfoVC.swift index f16250b..3aba8fd 100644 --- a/yinmeng-ios/Modules/User/VC/UserInfoVC.swift +++ b/yinmeng-ios/Modules/User/VC/UserInfoVC.swift @@ -2,7 +2,7 @@ // UserInfoVC.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import UIKit diff --git a/yinmeng-ios/Modules/User/VM/UserObject.swift b/yinmeng-ios/Modules/User/VM/UserObject.swift index a466303..d01471f 100644 --- a/yinmeng-ios/Modules/User/VM/UserObject.swift +++ b/yinmeng-ios/Modules/User/VM/UserObject.swift @@ -2,7 +2,7 @@ // UserObject.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import Foundation diff --git a/yinmeng-ios/Modules/User/VM/UserViewModel.swift b/yinmeng-ios/Modules/User/VM/UserViewModel.swift index 0890b1a..7277ac4 100644 --- a/yinmeng-ios/Modules/User/VM/UserViewModel.swift +++ b/yinmeng-ios/Modules/User/VM/UserViewModel.swift @@ -2,7 +2,7 @@ // UserViewModel.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/25. +// Created by yinmeng on 2024/2/25. // import Foundation diff --git a/yinmeng-ios/Modules/User/View/PasswordSetView.swift b/yinmeng-ios/Modules/User/View/PasswordSetView.swift index d3cf312..80cdbec 100644 --- a/yinmeng-ios/Modules/User/View/PasswordSetView.swift +++ b/yinmeng-ios/Modules/User/View/PasswordSetView.swift @@ -2,7 +2,7 @@ // PasswordSetView.swift // yinmeng-ios // -// Created by MaiMang on 2024/3/1. +// Created by yinmeng on 2024/3/1. // import UIKit diff --git a/yinmeng-ios/Modules/User/View/UserFunctionView.swift b/yinmeng-ios/Modules/User/View/UserFunctionView.swift index bf1c216..aaa6438 100644 --- a/yinmeng-ios/Modules/User/View/UserFunctionView.swift +++ b/yinmeng-ios/Modules/User/View/UserFunctionView.swift @@ -2,7 +2,7 @@ // UserFunctionView.swift // yinmeng-ios // -// Created by MaiMang on 2024/2/26. +// Created by yinmeng on 2024/2/26. // import UIKit