Merge branch 'develop' into duyu

galaxy/Podfile

@@ -16,7 +16,7 @@ target 'galaxy' do
   #异步编程框架
 #  pod 'RxSwift','6.6.0'
 #  pod 'RxCocoa','6.6.0'
-  pod 'RxAlamofire','6.1.1'
+#  pod 'RxAlamofire','6.1.1'
   #数据存储
   pod 'SwiftyUserDefaults','5.3.0'
   #数据加、解密

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0468D41D2B47D20600CFB916 /* YHHomeNetWorkServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41C2B47D20600CFB916 /* YHHomeNetWorkServer.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -116,7 +115,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0468D41C2B47D20600CFB916 /* YHHomeNetWorkServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeNetWorkServer.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -226,14 +224,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0468D41B2B47D1E500CFB916 /* Server */ = {
-			isa = PBXGroup;
-			children = (
-				0468D41C2B47D20600CFB916 /* YHHomeNetWorkServer.swift */,
-			);
-			path = Server;
-			sourceTree = "<group>";
-		};
 		04808C022B4686510056D53C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -573,7 +563,6 @@
 		A5ACE9592B457113002C94D2 /* Home(首页) */ = {
 			isa = PBXGroup;
 			children = (
-				0468D41B2B47D1E500CFB916 /* Server */,
 				A5D6AB192B465DFF001C10A5 /* VM */,
 				A5ACE95C2B457133002C94D2 /* C */,
 				A5ACE95B2B45712D002C94D2 /* V */,
@@ -844,7 +833,6 @@
 				A5ACE94C2B4564F7002C94D2 /* BsHUDErrorView.swift in Sources */,
 				A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
-				0468D41D2B47D20600CFB916 /* YHHomeNetWorkServer.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
 				A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
 				A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */,

galaxy/galaxy/Classes/Modules/Home(首页)/Server/YHHomeNetWorkServer.swift

-//
-//  YHHomeNetWorkServer.swift
-//  galaxy
-//
-//  Created by EDY on 2024/1/5.
-//  Copyright © 2024 www.davidhuang.com. All rights reserved.
-//
-
-import UIKit
-import RxSwift
-
-class YHHomeNetWorkServer {
-    static let share = YHHomeNetWorkServer()
-    func getRequest(_ url: String) -> Single<[String: Any]> {
-        return Single<[String: Any]>.create { single in
-            YHNetRequest.getRequest(url: url) { json, code in
-                //1. json字符串 转 对象
-                guard NetBaseModel.deserialize(dict: json) != nil else {
-                    print("error....底层解析出错了...")
-                    return single(.failure(YHError.net))
-                }
-                return single(.success(json))
-            } failBlock: { err in
-                return single(.failure(YHError.net))
-            } as! any Disposable
-        }
-    }
-}
-
-enum YHError: Error {
-    case net
-    case fail
-}

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeResultViewController.swift

@@ -7,11 +7,8 @@
 //
 
 import UIKit
-import RxSwift
 
 class YHCodeResultViewController: YHBaseViewController {
-    let disposed = DisposeBag()
-    let timer = Observable<Int>.interval(DispatchTimeInterval.seconds(1), scheduler: MainScheduler.instance)
     var time = 60
     
     var bgImageView: UIImageView!

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHLoginViewController.swift

@@ -6,13 +6,10 @@
 //
 
 import UIKit
-import SnapKit
-import RxSwift
-import RxAlamofire
+//import SnapKit
+import DeviceKit
 
 class YHLoginViewController: YHBaseViewController {
-    let disposeBag = DisposeBag()
-
     var bgImageView: UIImageView!
     var loginTitleLabel: UILabel!
     var loginSubTitleLabel: UILabel!
@@ -29,7 +26,7 @@ class YHLoginViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
-        // Do any additional setup after loading the view.
+        
         gk_navBackgroundColor = .clear
         gk_navShadowColor = .clear
         
@@ -207,13 +204,13 @@ extension YHLoginViewController {
     
     @objc func aliCloudLogin() {
         
+        if Device.current.isSimulator == false {
+            
             let handler = TXCommonHandler.sharedInstance()
             handler.accelerateLoginPage(withTimeout:10) { [weak self] dic in
-
-                if dic == nil { return }
                 guard let self = self else { return }
                 
-                let resultCode = dic["resultCode"] as? String
+                let resultCode = dic["resultCode"] as? String ?? ""
                 print("resultCode:\(resultCode)")
             }
             
@@ -233,5 +230,10 @@ extension YHLoginViewController {
                 guard let self = self else { return }
 
             }
+            
+            
+        }
+                
+            
     }
 }