Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
bae935e3
Commit
bae935e3
authored
Jan 17, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口逻辑
parent
ef5ceb8e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
11 deletions
+117
-11
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+24
-8
YHHomePageViewModel.swift
...axy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
+7
-2
YHUserModel.swift
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift
+28
-0
YHLoginViewModel.swift
...alaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
+57
-0
NetBaseModel.swift
galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift
+1
-1
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
bae935e3
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
0468D4302B5654B500CFB916
/* SystemConfiguration.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D42F2B5654B500CFB916
/* SystemConfiguration.framework */
;
};
0468D4302B5654B500CFB916
/* SystemConfiguration.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D42F2B5654B500CFB916
/* SystemConfiguration.framework */
;
};
0468D4312B5654C100CFB916
/* libresolv.tbd in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D42C2B56549200CFB916
/* libresolv.tbd */
;
};
0468D4312B5654C100CFB916
/* libresolv.tbd in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D42C2B56549200CFB916
/* libresolv.tbd */
;
};
0468D4342B56587B00CFB916
/* YHOOSManager.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
0468D4332B56587B00CFB916
/* YHOOSManager.swift */
;
};
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 */
;
};
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
,
);
};
};
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 */
;
};
049A48A82B49417300D0C641
/* YHAboutUsViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
049A48A72B49417300D0C641
/* YHAboutUsViewController.swift */
;
};
...
@@ -136,6 +138,8 @@
...
@@ -136,6 +138,8 @@
0468D42D2B5654A500CFB916
/* CoreTelephony.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
CoreTelephony.framework
;
path
=
System/Library/Frameworks/CoreTelephony.framework
;
sourceTree
=
SDKROOT
;
};
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
;
};
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>"
;
};
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>"
;
};
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>"
;
};
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>"
;
};
049A48A72B49417300D0C641
/* YHAboutUsViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHAboutUsViewController.swift
;
sourceTree
=
"<group>"
;
};
...
@@ -265,6 +269,22 @@
...
@@ -265,6 +269,22 @@
path
=
YHOOS
;
path
=
YHOOS
;
sourceTree
=
"<group>"
;
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 */
=
{
04808C022B4686510056D53C
/* Frameworks */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
...
@@ -365,20 +385,14 @@
...
@@ -365,20 +385,14 @@
A5ACE8D82B4564F7002C94D2
/* Login(登录) */
=
{
A5ACE8D82B4564F7002C94D2
/* Login(登录) */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
A5ACE8D92B4564F7002C94D2
/* M */
,
0468D4382B579E9B00CFB916
/* VM */
,
0468D4372B57756300CFB916
/* M */
,
A5ACE8DA2B4564F7002C94D2
/* C */
,
A5ACE8DA2B4564F7002C94D2
/* C */
,
A5ACE8DC2B4564F7002C94D2
/* V */
,
A5ACE8DC2B4564F7002C94D2
/* V */
,
);
);
path
=
"Login(登录)"
;
path
=
"Login(登录)"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
A5ACE8D92B4564F7002C94D2
/* M */
=
{
isa
=
PBXGroup
;
children
=
(
);
path
=
M
;
sourceTree
=
"<group>"
;
};
A5ACE8DA2B4564F7002C94D2
/* C */
=
{
A5ACE8DA2B4564F7002C94D2
/* C */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
...
@@ -857,6 +871,7 @@
...
@@ -857,6 +871,7 @@
04AF58C42B4FC51C0066011A
/* YHLocalizable.swift in Sources */
,
04AF58C42B4FC51C0066011A
/* YHLocalizable.swift in Sources */
,
A5C5B2E82B4EC95600A7C5D1
/* YHDavidTestCollectionViewCell.swift in Sources */
,
A5C5B2E82B4EC95600A7C5D1
/* YHDavidTestCollectionViewCell.swift in Sources */
,
0468D4222B493A5E00CFB916
/* YHPhoneMessageView.swift in Sources */
,
0468D4222B493A5E00CFB916
/* YHPhoneMessageView.swift in Sources */
,
0468D4362B57752F00CFB916
/* YHUserModel.swift in Sources */
,
A5ACE9512B4564F7002C94D2
/* YhConstant.swift in Sources */
,
A5ACE9512B4564F7002C94D2
/* YhConstant.swift in Sources */
,
A5ACE94A2B4564F7002C94D2
/* BsHUDProgressView.swift in Sources */
,
A5ACE94A2B4564F7002C94D2
/* BsHUDProgressView.swift in Sources */
,
A5ACE9442B4564F7002C94D2
/* Array+Extension.swift in Sources */
,
A5ACE9442B4564F7002C94D2
/* Array+Extension.swift in Sources */
,
...
@@ -893,6 +908,7 @@
...
@@ -893,6 +908,7 @@
A5D6AB1B2B46A1CC001C10A5
/* YHHomeModel.swift in Sources */
,
A5D6AB1B2B46A1CC001C10A5
/* YHHomeModel.swift in Sources */
,
A5D6AB1D2B46AAFB001C10A5
/* YHHomePageViewModel.swift in Sources */
,
A5D6AB1D2B46AAFB001C10A5
/* YHHomePageViewModel.swift in Sources */
,
A5ACE9552B4564F7002C94D2
/* YHTabBarViewController.swift in Sources */
,
A5ACE9552B4564F7002C94D2
/* YHTabBarViewController.swift in Sources */
,
0468D43A2B579EAC00CFB916
/* YHLoginViewModel.swift in Sources */
,
A5ACE9402B4564F7002C94D2
/* String+Extension.swift in Sources */
,
A5ACE9402B4564F7002C94D2
/* String+Extension.swift in Sources */
,
A5ACE9482B4564F7002C94D2
/* BsHUDWariningView.swift in Sources */
,
A5ACE9482B4564F7002C94D2
/* BsHUDWariningView.swift in Sources */
,
A5ACE9492B4564F7002C94D2
/* BsHUDSuccessView.swift in Sources */
,
A5ACE9492B4564F7002C94D2
/* BsHUDSuccessView.swift in Sources */
,
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @
bae935e3
...
@@ -18,8 +18,9 @@ extension YHHomePageViewModel {
...
@@ -18,8 +18,9 @@ extension YHHomePageViewModel {
//请求首页的配置
//请求首页的配置
func
getHomeConfig
(
callBackBlock
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
func
getHomeConfig
(
callBackBlock
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
Common
.
homeConfigApi
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字符串 转 对象
//1. json字符串 转 对象
guard
let
self
=
self
else
{
return
}
guard
let
model
=
NetBaseModel
.
deserialize
(
dict
:
json
)
else
{
guard
let
model
=
NetBaseModel
.
deserialize
(
dict
:
json
)
else
{
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
YHErrorCode
.
dictParseError
.
rawValue
,
errorMsg
:
YHErrorCode
.
dictParseError
.
description
())
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
YHErrorCode
.
dictParseError
.
rawValue
,
errorMsg
:
YHErrorCode
.
dictParseError
.
description
())
...
@@ -27,7 +28,11 @@ extension YHHomePageViewModel {
...
@@ -27,7 +28,11 @@ extension YHHomePageViewModel {
return
return
}
}
// printLog("model 是 ==> \(model)")
// 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
)
callBackBlock
(
true
,
nil
)
}
failBlock
:
{
err
in
}
failBlock
:
{
err
in
...
...
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift
0 → 100644
View file @
bae935e3
//
// 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
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
0 → 100644
View file @
bae935e3
//
// 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 @
bae935e3
...
@@ -10,7 +10,7 @@ import Foundation
...
@@ -10,7 +10,7 @@ import Foundation
import
SmartCodable
import
SmartCodable
struct
NetBaseModel
:
SmartCodable
{
struct
NetBaseModel
:
SmartCodable
{
var
data
:
YHHomeCofigMode
?
var
data
:
SmartAny
?
var
code
:
Int
=
-
1
var
code
:
Int
=
-
1
var
msg
:
String
=
""
var
msg
:
String
=
""
// var other : SmartAny?
// var other : SmartAny?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment