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
6fa6dd95
Commit
6fa6dd95
authored
Jun 27, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些细节和bug
parent
c12fe4fa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
66 additions
and
5 deletions
+66
-5
YHInformationAuthorizationStepTwoViewController.swift
...)/C/YHInformationAuthorizationStepTwoViewController.swift
+2
-1
YHMatchUserViewController.swift
...s/Modules/Community(社区)/C/YHMatchUserViewController.swift
+13
-1
YHNameCardViewController.swift
...es/Modules/Community(社区)/C/YHNameCardViewController.swift
+1
-1
YHMatchUserViewModel.swift
...asses/Modules/Community(社区)/VM/YHMatchUserViewModel.swift
+22
-0
YHUserInfoSettingViewController.swift
...Modules/Login(登录)/C/YHUserInfoSettingViewController.swift
+27
-1
YHEditWorkViewController.swift
...es/Mine(我的)/MyCard(我的名片)/C/YHEditWorkViewController.swift
+1
-1
No files found.
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepTwoViewController.swift
View file @
6fa6dd95
...
...
@@ -71,7 +71,7 @@ class YHInformationAuthorizationStepTwoViewController: UIViewController {
button
.
backgroundColor
=
UIColor
.
brandMainColor
button
.
titleLabel
?
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
16
)
button
.
contentHorizontalAlignment
=
.
center
button
.
setTitle
(
"
下一步
"
,
for
:
.
normal
)
button
.
setTitle
(
"
完成
"
,
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
(
hex
:
0xffffff
),
for
:
.
normal
)
button
.
layer
.
cornerRadius
=
kCornerRadius3
button
.
addTarget
(
self
,
action
:
#selector(
nextStep
)
,
for
:
.
touchUpInside
)
...
...
@@ -110,6 +110,7 @@ class YHInformationAuthorizationStepTwoViewController: UIViewController {
make
.
bottom
.
equalTo
(
-
k_Height_safeAreaInsetsBottom
()
-
64
)
make
.
left
.
right
.
equalTo
(
view
)
}
nextButton
.
setTitle
(
"保存"
,
for
:
.
normal
)
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchUserViewController.swift
View file @
6fa6dd95
...
...
@@ -92,6 +92,7 @@ class YHMatchUserViewController: YHBaseViewController {
self
.
rotateLottieView
.
isHidden
=
true
}
}
viewModel
.
requestUserAuthorization
{
success
,
error
in
}
}
func
createUI
()
{
...
...
@@ -169,8 +170,19 @@ class YHMatchUserViewController: YHBaseViewController {
YHOneKeyLoginManager
.
shared
.
oneKeyLogin
()
return
}
if
informationAuthorizeViewModel
.
model
.
is_fillin
==
1
{
startMatchUsers
()
if
viewModel
.
setModel
.
authorization_basic_information
==
2
{
startMatchUsers
()
}
else
{
YHCommonAlertView
.
show
(
""
,
"您暂未开启AI人脉匹配授权"
,
"取消"
,
"去开启"
)
{
}
callBack
:
{
let
vc
=
YHInformationAuthorizationStepTwoViewController
()
vc
.
stepFlag
=
false
self
.
navigationController
?
.
pushViewController
(
vc
)
}
}
}
else
{
let
vc
=
YHInformationAuthorizationStepOneViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
)
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHNameCardViewController.swift
View file @
6fa6dd95
...
...
@@ -234,7 +234,7 @@ extension YHNameCardViewController {
func
requestAuthorization
()
{
self
.
authorModel
.
requestUserAuthorization
{
success
,
error
in
if
self
.
authorModel
.
setModel
.
isclick_card
!=
2
{
if
self
.
authorModel
.
setModel
.
isclick_card
!=
2
&&
self
.
authorModel
.
setModel
.
information_to_card
!=
2
{
YHCommonAlertView
.
show
(
""
,
"授权信息同步至您的名片并对您的好友可见"
,
"取消"
,
"确认"
,
fullGuestureEnable
:
false
)
{
self
.
authorModel
.
requestInformationToCardSubmit
(
agress
:
1
)
{
success
,
error
in
self
.
requestNameCardInfo
()
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHMatchUserViewModel.swift
View file @
6fa6dd95
...
...
@@ -13,6 +13,7 @@ class YHMatchUserViewModel: NSObject {
var
matchUserArr
:[
YHMatchUserInfo
?]
=
[]
var
nameCardInfo
:
YHUserNameCardInfo
=
YHUserNameCardInfo
()
var
friendListModel
:
YHFriendListModel
=
YHFriendListModel
()
var
setModel
:
YHMainUserInformationSetModel
=
YHMainUserInformationSetModel
()
func
getMatchUserlist
(
_
callBack
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
let
params
=
[
"page_size"
:
20
]
...
...
@@ -151,5 +152,26 @@ class YHMatchUserViewModel: NSObject {
}
}
func
requestUserAuthorization
(
callBackBlock
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
People
.
userAuthorization
let
_
=
YHNetRequest
.
getRequest
(
url
:
strUrl
)
{
[
weak
self
]
json
,
code
in
//1. json字符串 转 对象
guard
let
self
=
self
else
{
return
}
if
json
.
code
==
200
{
let
dic
=
json
.
data
guard
let
result
=
YHMainUserInformationSetModel
.
deserialize
(
from
:
dic
as?
Dictionary
)
else
{
callBackBlock
(
false
,
nil
)
return
}
self
.
setModel
=
result
callBackBlock
(
true
,
nil
)
}
else
{
let
error
:
YHErrorModel
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
)
callBackBlock
(
false
,
error
)
}
}
failBlock
:
{
err
in
callBackBlock
(
false
,
err
)
}
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift
View file @
6fa6dd95
...
...
@@ -88,6 +88,7 @@ class YHUserInfoSettingViewController: YHBaseViewController {
nameTextField
=
{
let
textField
=
UITextField
()
textField
.
delegate
=
self
textField
.
textColor
=
UIColor
.
mainTextColor
textField
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
15
)
textField
.
adjustsFontSizeToFitWidth
=
true
...
...
@@ -106,13 +107,15 @@ class YHUserInfoSettingViewController: YHBaseViewController {
nextButton
=
{
let
button
=
UIButton
(
type
:
.
custom
)
button
.
backgroundColor
=
UIColor
.
brandMainColor
//
button.backgroundColor = UIColor.brandMainColor
button
.
titleLabel
?
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
16
)
button
.
contentHorizontalAlignment
=
.
center
button
.
setTitle
(
"下一步"
,
for
:
.
normal
)
button
.
setTitleColor
(
UIColor
(
hex
:
0xffffff
),
for
:
.
normal
)
button
.
layer
.
cornerRadius
=
kCornerRadius3
button
.
addTarget
(
self
,
action
:
#selector(
nextStep
)
,
for
:
.
touchUpInside
)
button
.
isEnabled
=
false
button
.
backgroundColor
=
UIColor
.
brandMainColor
.
withAlphaComponent
(
0.4
)
return
button
}()
view
.
addSubview
(
nextButton
)
...
...
@@ -164,3 +167,26 @@ class YHUserInfoSettingViewController: YHBaseViewController {
}
}
}
extension
YHUserInfoSettingViewController
:
UITextFieldDelegate
{
func
textFieldDidEndEditing
(
_
textField
:
UITextField
)
{
}
func
textField
(
_
textField
:
UITextField
,
shouldChangeCharactersIn
range
:
NSRange
,
replacementString
string
:
String
)
->
Bool
{
let
newText
=
(
textField
.
text
!
as
NSString
)
.
replacingCharacters
(
in
:
range
,
with
:
string
)
if
newText
.
count
>
0
{
nextButton
.
isEnabled
=
true
nextButton
.
backgroundColor
=
UIColor
.
brandMainColor
}
else
{
nextButton
.
isEnabled
=
false
nextButton
.
backgroundColor
=
UIColor
.
brandMainColor
.
withAlphaComponent
(
0.4
)
}
if
newText
.
count
>
20
{
return
false
}
return
true
}
}
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditWorkViewController.swift
View file @
6fa6dd95
...
...
@@ -100,7 +100,7 @@ extension YHEditWorkViewController: UITableViewDelegate, UITableViewDataSource {
cell
.
block
=
{
[
weak
self
]
model
in
guard
let
self
=
self
else
{
return
}
self
.
viewModel
.
updateModel
(
model
)
if
model
.
id
!=
.
id5
||
model
.
id
!=
.
id10
{
if
model
.
id
!=
.
id5
&&
model
.
id
!=
.
id10
{
self
.
getData
()
}
if
self
.
viewModel
.
isCanNext
(
step
:
4
)
{
...
...
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