Skip to content

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

Merge commit '8d71094d' into davidhuang 

* commit '8d71094d':
  loginModel 添加init
  接口逻辑

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents a4d1d9b5 8d71094d
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 11 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 7c0264d2
......@@ -17,6 +17,8 @@
0468D4302B5654B500CFB916 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */; };
0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
0468D4342B56587B00CFB916 /* YHOOSManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4332B56587B00CFB916 /* YHOOSManager.swift */; };
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
04808C062B4686510056D53C /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04808C042B4686510056D53C /* ATAuthSDK.bundle */; };
04808C082B4686C10056D53C /* ATAuthSDK_D.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
049A48A82B49417300D0C641 /* YHAboutUsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */; };
......@@ -143,6 +145,8 @@
0468D42D2B5654A500CFB916 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
0468D4332B56587B00CFB916 /* YHOOSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOOSManager.swift; sourceTree = "<group>"; };
0468D4352B57752F00CFB916 /* YHUserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHUserModel.swift; path = "galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift"; sourceTree = SOURCE_ROOT; };
0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginViewModel.swift; sourceTree = "<group>"; };
04808C032B4686510056D53C /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; };
04808C042B4686510056D53C /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsViewController.swift; sourceTree = "<group>"; };
......@@ -279,6 +283,22 @@
path = YHOOS;
sourceTree = "<group>";
};
0468D4372B57756300CFB916 /* M */ = {
isa = PBXGroup;
children = (
0468D4352B57752F00CFB916 /* YHUserModel.swift */,
);
path = M;
sourceTree = "<group>";
};
0468D4382B579E9B00CFB916 /* VM */ = {
isa = PBXGroup;
children = (
0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
04808C022B4686510056D53C /* Frameworks */ = {
isa = PBXGroup;
children = (
......@@ -379,20 +399,14 @@
A5ACE8D82B4564F7002C94D2 /* Login(登录) */ = {
isa = PBXGroup;
children = (
A5ACE8D92B4564F7002C94D2 /* M */,
0468D4382B579E9B00CFB916 /* VM */,
0468D4372B57756300CFB916 /* M */,
A5ACE8DA2B4564F7002C94D2 /* C */,
A5ACE8DC2B4564F7002C94D2 /* V */,
);
path = "Login(登录)";
sourceTree = "<group>";
};
A5ACE8D92B4564F7002C94D2 /* M */ = {
isa = PBXGroup;
children = (
);
path = M;
sourceTree = "<group>";
};
A5ACE8DA2B4564F7002C94D2 /* C */ = {
isa = PBXGroup;
children = (
......@@ -878,6 +892,7 @@
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */,
0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */,
A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */,
A5ACE94A2B4564F7002C94D2 /* BsHUDProgressView.swift in Sources */,
A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */,
......@@ -917,6 +932,7 @@
A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */,
A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @ 7c0264d2
......@@ -18,8 +18,9 @@ extension YHHomePageViewModel {
//请求首页的配置
func getHomeConfig(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeConfigApi
let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
......@@ -27,7 +28,11 @@ extension YHHomePageViewModel {
return
}
// printLog("model 是 ==> \(model)")
self.configModel = model.data
let dic = model.data?.peel
guard let resultModel = YHHomeCofigMode.deserialize(dict: dic as? [AnyHashable : Any]) else {
return
}
configModel = resultModel
callBackBlock(true,nil)
} failBlock: { err in
......
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift 0 → 100644
View file @ 7c0264d2
//
// YHUserModel.swift
// galaxy
//
// Created by EDY on 2024/1/17.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
struct YHUserModel: SmartCodable {
var userid: Int?
var nickname: String?
var mobile: String?
var headpic: String?
var sex: Int?
var token: String?
init(userid: Int? = nil, nickname: String? = nil, mobile: String? = nil, headpic: String? = nil, sex: Int? = nil, token: String? = nil) {
self.userid = userid
self.nickname = nickname
self.mobile = mobile
self.headpic = headpic
self.sex = sex
self.token = token
}
init() {
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift 0 → 100644
View file @ 7c0264d2
//
// YHLoginViewModel.swift
// galaxy
//
// Created by EDY on 2024/1/17.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHLoginViewModel: YHBaseViewModel {
var userModel: YHUserModel?
override init() {
super.init()
}
}
//接口
extension YHLoginViewModel {
//发送验证码
func getLoginCode(callBackBlock: @escaping (_ success: Bool)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + "/user/login-code"
let _ = YHNetRequest.postRequest(url: strUrl) {[weak self] json, code in
guard let self = self else { return }
//1. json字符串 转 对象
if code == 200 {
callBackBlock(true)
}
} failBlock: { err in
callBackBlock(false)
}
}
func login(callBackBlock: @escaping (_ success: Bool)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + "/user/userlogin"
let _ = YHNetRequest.postRequest(url: strUrl) {[weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false)
return
}
// printLog("model 是 ==> \(model)")
let dic = model.data?.peel
guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
return
}
self.userModel = resultModel
callBackBlock(true)
} failBlock: { err in
callBackBlock(false)
}
}
}
galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift
View file @ 7c0264d2
......@@ -10,7 +10,7 @@ import Foundation
import SmartCodable
struct NetBaseModel: SmartCodable {
var data : YHHomeCofigMode?
var data : SmartAny?
var code : Int = -1
var msg : String = ""
// var other : SmartAny?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment