yinmeng/yingmeng-ios-switf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提审问题修复

Browse Source
This commit is contained in:
liyuhua
2024-03-05 14:04:09 +08:00
parent ea8af59e45
commit cc317acaac
83 changed files with 187 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yinmeng-ios.xcodeproj/project.pbxproj
View File

@@ -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;

2
yinmeng-ios/AppDelegate.swift
View File

@@ -2,7 +2,7 @@
// AppDelegate.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/1/30.
// Created by yinmeng on 2024/1/30.
//
import UIKit

2
yinmeng-ios/Base/Hud/HUDTool.swift
View File

@@ -2,7 +2,7 @@
// HUDTool.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/23.
// Created by yinmeng on 2024/2/23.
//
import Foundation

2
yinmeng-ios/Base/Request/Deserialized.swift
View File

@@ -2,7 +2,7 @@
// Deserialized.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import Foundation

2
yinmeng-ios/Base/Request/YMNetworkFun.swift
View File

@@ -2,7 +2,7 @@
// YMNetworkFun.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
//
import Foundation

2
yinmeng-ios/Base/Request/YMRequestX.swift
View File

@@ -2,7 +2,7 @@
// YMRequestX.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/2.
// Created by yinmeng on 2024/2/2.
//
import Foundation

2
yinmeng-ios/Base/Security/RecordVoiceManager.h
View File

@@ -2,7 +2,7 @@
// RecordVoiceManager.h
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
#import <Foundation/Foundation.h>

2
yinmeng-ios/Base/Security/RecordVoiceManager.m
View File

@@ -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"

2
yinmeng-ios/Base/Utils/APPUtils.swift
View File

@@ -2,7 +2,7 @@
// APPUtils.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import Foundation

2
yinmeng-ios/Base/Utils/AppKeys.swift
View File

@@ -2,7 +2,7 @@
// AppKeys.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import Foundation

2
yinmeng-ios/Base/Utils/H5Utils.swift
View File

@@ -2,7 +2,7 @@
// H5Utils.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/26.
// Created by yinmeng on 2024/2/26.
//
import Foundation

4
yinmeng-ios/Base/Utils/Utils.swift
View File

@@ -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"

2
yinmeng-ios/Base/ViewController/BaseNavigationViewController.swift
View File

@@ -2,7 +2,7 @@
// BaseNavigationViewController.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import UIKit

2
yinmeng-ios/Base/ViewController/BaseTabBarViewController.swift
View File

@@ -2,7 +2,7 @@
// BaeTabBarViewController.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import UIKit

2
yinmeng-ios/Base/ViewController/BaseView.swift
View File

@@ -2,7 +2,7 @@
// BaseView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import UIKit

2
yinmeng-ios/Base/ViewController/BaseViewController.swift
View File

@@ -2,7 +2,7 @@
// BaseViewController.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import UIKit

2
yinmeng-ios/Base/Web/WebViewController.swift
View File

@@ -2,7 +2,7 @@
// WebViewController.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/26.
// Created by yinmeng on 2024/2/26.
//
import UIKit

2
yinmeng-ios/Extension/Color/Color+.swift
View File

@@ -2,7 +2,7 @@
// Color+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import Foundation

2
yinmeng-ios/Extension/Date/Date+.swift
View File

@@ -2,7 +2,7 @@
// Date+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Extension/List/List+.swift
View File

@@ -2,7 +2,7 @@
// List+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/24.
// Created by yinmeng on 2024/2/24.
//
import Foundation

2
yinmeng-ios/Extension/String/String+.swift
View File

@@ -2,7 +2,7 @@
// String+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/23.
// Created by yinmeng on 2024/2/23.
//
import Foundation

2
yinmeng-ios/Extension/UIImage/UIImage+.swift
View File

@@ -2,7 +2,7 @@
// UIImage+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import Foundation

2
yinmeng-ios/Extension/UIView/UIView+.swift
View File

@@ -2,7 +2,7 @@
// UIView+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Info.plist
View File

@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>“音萌”需要您的同意,才能进行定位服务，推荐附近好友</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

2
yinmeng-ios/Modules/Auth/Model/AppConfigObject.swift
View File

@@ -2,7 +2,7 @@
// AppConfigObject.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import Foundation

2
yinmeng-ios/Modules/Auth/VC/AuthFillDataVC.swift
View File

@@ -2,7 +2,7 @@
// AuthFillDataVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import UIKit

2
yinmeng-ios/Modules/Auth/VC/AuthForgetVC.swift
View File

@@ -2,7 +2,7 @@
// AuthForgetVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import UIKit

10
yinmeng-ios/Modules/Auth/VC/AuthLaunchVC.swift
View File

@@ -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

2
yinmeng-ios/Modules/Auth/VC/AuthLoginVC.swift
View File

@@ -2,7 +2,7 @@
// AuthLoginVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/21.
// Created by yinmeng on 2024/2/21.
//
import UIKit

4
yinmeng-ios/Modules/Auth/VM/AuthAppleManager.swift
View File

@@ -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, *)

2
yinmeng-ios/Modules/Auth/VM/AuthManager.swift
View File

@@ -2,7 +2,7 @@
// AuthManager.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/24.
// Created by yinmeng on 2024/2/24.
//
import Foundation

6
yinmeng-ios/Modules/Auth/VM/AuthViewModel.swift
View File

@@ -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{

2
yinmeng-ios/Modules/Auth/VM/UserTokenObject.swift
View File

@@ -2,7 +2,7 @@
// UserTokenObject.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/24.
// Created by yinmeng on 2024/2/24.
//
import Foundation

2
yinmeng-ios/Modules/Auth/View/AuthItmeButton.swift
View File

@@ -2,7 +2,7 @@
// AuthItmeButton.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/28.
// Created by yinmeng on 2024/2/28.
//
import UIKit

2
yinmeng-ios/Modules/Auth/View/AuthPrivacyView.swift
View File

@@ -2,7 +2,7 @@
// AuthPrivacyView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/22.
// Created by yinmeng on 2024/2/22.
//
import UIKit

2
yinmeng-ios/Modules/Chat/ChatListVC.swift
View File

@@ -2,7 +2,7 @@
// ChatListVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
// 回话列表
import UIKit

2
yinmeng-ios/Modules/Chat/ChatVC.swift
View File

@@ -2,7 +2,7 @@
// ChatVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
// 回话详情
import UIKit

2
yinmeng-ios/Modules/Chat/Keyboard/ChatGrowingTextView.swift
View File

@@ -2,7 +2,7 @@
// ChatGrowingTextView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboard+.swift
View File

@@ -2,7 +2,7 @@
// ChatKeyboard+.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import Foundation

4
yinmeng-ios/Modules/Chat/Keyboard/ChatKeyboardView.swift
View File

@@ -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()

2
yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuCell.swift
View File

@@ -2,7 +2,7 @@
// ChatMoreMenuCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMenuView.swift
View File

@@ -2,7 +2,7 @@
// ChatMoreMenuView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Chat/Keyboard/ChatMoreMnueConfig.swift
View File

@@ -2,7 +2,7 @@
// ChatMoreMnueConfig.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import Foundation

2
yinmeng-ios/Modules/Chat/Keyboard/ChatSendVoiceView.swift
View File

@@ -2,7 +2,7 @@
// ChatSendVoiceView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Chat/Model/ChatBaseObject.swift
View File

@@ -2,7 +2,7 @@
// ChatBaseObject.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Modules/Chat/Model/ChatUIConfig.swift
View File

@@ -2,7 +2,7 @@
// ChatUIConfig.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Modules/Chat/Tool/ChatAttributeTool.swift
View File

@@ -2,7 +2,7 @@
// ChatAttributeTool.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Modules/Chat/VM/ChatViewModel.swift
View File

@@ -2,7 +2,7 @@
// ChatViewModel.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Modules/Chat/View/ChatBaseCell.swift
View File

@@ -2,7 +2,7 @@
// ChatBaseCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import UIKit

2
yinmeng-ios/Modules/Chat/View/ChatImageCell.swift
View File

@@ -2,7 +2,7 @@
// ChatImageCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Chat/View/ChatList/ChatListCell.swift
View File

@@ -2,7 +2,7 @@
// ChatListCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

30
yinmeng-ios/Modules/Chat/View/ChatNavView.swift
View File

@@ -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 = ""
@@ -97,6 +98,33 @@ class ChatNavView: BaseView {
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
}))

2
yinmeng-ios/Modules/Chat/View/ChatTextCell.swift
View File

@@ -2,7 +2,7 @@
// ChatTextCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import UIKit

2
yinmeng-ios/Modules/Chat/View/ChatTimeCell.swift
View File

@@ -2,7 +2,7 @@
// ChatTimeCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Chat/View/ChatVoiceCell.swift
View File

@@ -2,7 +2,7 @@
// ChatVoiceCell.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceChooseItemVeiw.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceChooseItemVeiw.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/28.
// Created by yinmeng on 2024/2/28.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceChooseTypeView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceChooseTypeView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/28.
// Created by yinmeng on 2024/2/28.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceFollowCell.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceFollowCell.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceFollowView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceFollowView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceGuideView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceGuideView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceModel.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceModel.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoicePlayMusicItemView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoicePlayMusicItemView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoicePublishView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoicePublishView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceRecordBtnView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceRecordBtnView.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceRecordView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceRecordView.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Home/HomeVoiceUserInfoView.swift
View File

@@ -2,7 +2,7 @@
// HomeVoiceUserInfoView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/29.
// Created by yinmeng on 2024/2/29.
//
import UIKit

4
yinmeng-ios/Modules/Home/HomeVoiceVC.swift
View File

@@ -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)

24
yinmeng-ios/Modules/Pay/UserPayViewController.swift
View File

@@ -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
@@ -169,7 +169,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{
guard let chargeProdId = self.chooseModel?.chargeProdId else{
return
}
MBProgressHUD.showAdded(to: UIApplication.shared.keyWindow!, animated: true)
MBProgressHUD.showAdded(to: keyWindow, animated: true)
let uid = "\(AuthManager.userUid)"
let ticket = AuthManager.ticket
let deviceInfo = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -181,13 +181,13 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{
self.initiatePaymentAction(recordId: recordId, appAccountToken: appAccountToken)
}else{
HUDTool.show(with: "购买失败")
MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true)
MBProgressHUD.hide(for: 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,13 +199,13 @@ 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{
@@ -214,7 +214,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{
self?.paySuccess(transactionId:"\(transactionId)")
}else{
HUDTool.show(with: "购买失败")
MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true)
MBProgressHUD.hide(for: keyWindow, animated: true)
}
}
}
@@ -237,7 +237,7 @@ 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)
MBProgressHUD.hide(for: keyWindow, animated: true)
if #available(iOS 15.0, *) {
Task {
@@ -271,7 +271,7 @@ class UserPayViewController: BaseViewController, HiddenNavigationBarProtocol{
}
}
HUDTool.show(with: data)
MBProgressHUD.hide(for: UIApplication.shared.keyWindow!, animated: true)
MBProgressHUD.hide(for: keyWindow, animated: true)
}
}
@objc func backBtnAction(){

2
yinmeng-ios/Modules/Pay/UserPayViewItemView.swift
View File

@@ -2,7 +2,7 @@
// UserPayViewItemView.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Pay/UserPayViewManager.swift
View File

@@ -2,7 +2,7 @@
// UserPayViewManager.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Pay/UserPayViewModel.swift
View File

@@ -2,7 +2,7 @@
// UserPayViewModel.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import Foundation

2
yinmeng-ios/Modules/Star/PlanetStarClickItemView.swift
View File

@@ -2,7 +2,7 @@
// PlanetStarClickItemView.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/26.
// Created by yinmeng on 2024/2/26.
//
import UIKit

2
yinmeng-ios/Modules/Star/PlanetStarModel.swift
View File

@@ -2,7 +2,7 @@
// PlanetStarModel.swift
// yinmeng-ios
//
// Created by duoban on 2024/2/27.
// Created by yinmeng on 2024/2/27.
//
import Foundation

2
yinmeng-ios/Modules/Star/PlanetStarPopUpView.swift
View File

@@ -2,7 +2,7 @@
// PlanetStarPopUpView.swift
// yinmeng-ios
//
// Created by duoban on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/Star/PlanetStarVC.swift
View File

@@ -2,7 +2,7 @@
// PlanetStarVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
//
import UIKit

2
yinmeng-ios/Modules/User/VC/AboutUsVC.swift
View File

@@ -2,7 +2,7 @@
// AboutUsVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/26.
// Created by yinmeng on 2024/2/26.
//
import UIKit

2
yinmeng-ios/Modules/User/VC/BindMobileVC.swift
View File

@@ -2,7 +2,7 @@
// BindMobileVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/User/VC/PasswordSetVC.swift
View File

@@ -2,7 +2,7 @@
// PasswordSetVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/User/VC/UserInfoVC.swift
View File

@@ -2,7 +2,7 @@
// UserInfoVC.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
//
import UIKit

2
yinmeng-ios/Modules/User/VM/UserObject.swift
View File

@@ -2,7 +2,7 @@
// UserObject.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
//
import Foundation

2
yinmeng-ios/Modules/User/VM/UserViewModel.swift
View File

@@ -2,7 +2,7 @@
// UserViewModel.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/25.
// Created by yinmeng on 2024/2/25.
//
import Foundation

2
yinmeng-ios/Modules/User/View/PasswordSetView.swift
View File

@@ -2,7 +2,7 @@
// PasswordSetView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/3/1.
// Created by yinmeng on 2024/3/1.
//
import UIKit

2
yinmeng-ios/Modules/User/View/UserFunctionView.swift
View File

@@ -2,7 +2,7 @@
// UserFunctionView.swift
// yinmeng-ios
//
// Created by MaiMang on 2024/2/26.
// Created by yinmeng on 2024/2/26.
//
import UIKit