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
c14fe571
Commit
c14fe571
authored
Jul 04, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
名片返回挽留需求
parent
c4ef856a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
152 additions
and
4 deletions
+152
-4
YHEditBaseUserInfoViewController.swift
...我的)/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift
+25
-0
YHEditHonorViewController.swift
...s/Mine(我的)/MyCard(我的名片)/C/YHEditHonorViewController.swift
+24
-1
YHEditInterestViewController.swift
...ine(我的)/MyCard(我的名片)/C/YHEditInterestViewController.swift
+29
-2
YHEditPersonalProfileViewController.swift
.../MyCard(我的名片)/C/YHEditPersonalProfileViewController.swift
+26
-1
YHEditSchoolViewController.swift
.../Mine(我的)/MyCard(我的名片)/C/YHEditSchoolViewController.swift
+23
-0
YHEditWorkViewController.swift
...es/Mine(我的)/MyCard(我的名片)/C/YHEditWorkViewController.swift
+23
-0
YHEditViewModel.swift
...es/Modules/Mine(我的)/MyCard(我的名片)/VM/YHEditViewModel.swift
+2
-0
No files found.
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift
View file @
c14fe571
...
@@ -172,6 +172,31 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
...
@@ -172,6 +172,31 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
}
}
}
}
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditBaseUserInfoViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHEditBaseUserInfoViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditHonorViewController.swift
View file @
c14fe571
...
@@ -125,6 +125,29 @@ class YHEditHonorViewController: YHBaseViewController {
...
@@ -125,6 +125,29 @@ class YHEditHonorViewController: YHBaseViewController {
}
}
}
}
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditHonorViewController
:
UITextViewDelegate
{
extension
YHEditHonorViewController
:
UITextViewDelegate
{
...
@@ -138,7 +161,7 @@ extension YHEditHonorViewController: UITextViewDelegate {
...
@@ -138,7 +161,7 @@ extension YHEditHonorViewController: UITextViewDelegate {
}
}
func
textView
(
_
textView
:
UITextView
,
shouldChangeTextIn
range
:
NSRange
,
replacementText
text
:
String
)
->
Bool
{
func
textView
(
_
textView
:
UITextView
,
shouldChangeTextIn
range
:
NSRange
,
replacementText
text
:
String
)
->
Bool
{
let
newLength
=
(
textView
.
text
as
NSString
)
.
length
+
text
.
count
-
range
.
length
let
newLength
=
(
textView
.
text
as
NSString
)
.
length
+
text
.
count
-
range
.
length
viewModel
.
didChange
=
true
return
newLength
<=
200
return
newLength
<=
200
}
}
}
}
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditInterestViewController.swift
View file @
c14fe571
...
@@ -114,13 +114,15 @@ class YHEditInterestViewController: YHBaseViewController {
...
@@ -114,13 +114,15 @@ class YHEditInterestViewController: YHBaseViewController {
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
if
let
text
=
text
{
if
let
text
=
text
{
if
let
index
=
normalItems
.
firstIndex
(
where
:
{
$0
.
name
==
text
})
{
if
let
_
=
normalItems
.
firstIndex
(
where
:
{
$0
.
name
==
text
})
{
YHHUD
.
flash
(
message
:
"请不要添加重复的标签噢"
)
YHHUD
.
flash
(
message
:
"请不要添加重复的标签噢"
)
return
return
}
}
if
let
index
=
likeItems
.
firstIndex
(
where
:
{
$0
.
name
==
text
})
{
YHHUD
.
flash
(
message
:
"请不要添加重复的标签噢"
)
if
let
_
=
likeItems
.
firstIndex
(
where
:
{
$0
.
name
==
text
})
{
YHHUD
.
flash
(
message
:
"请不要添加重复的标签噢"
)
return
return
}
}
self
.
viewModel
.
didChange
=
true
let
model
=
YHInterestModel
(
name
:
text
,
isNormal
:
false
,
isSelect
:
false
)
let
model
=
YHInterestModel
(
name
:
text
,
isNormal
:
false
,
isSelect
:
false
)
self
.
likeItems
.
insert
(
model
,
at
:
0
)
self
.
likeItems
.
insert
(
model
,
at
:
0
)
self
.
collectionView
.
reloadData
()
self
.
collectionView
.
reloadData
()
...
@@ -166,6 +168,29 @@ class YHEditInterestViewController: YHBaseViewController {
...
@@ -166,6 +168,29 @@ class YHEditInterestViewController: YHBaseViewController {
var
strSize
=
string
.
boundingRect
(
with
:
size
,
options
:
[
.
usesLineFragmentOrigin
],
attributes
:
dic
,
context
:
nil
)
.
size
var
strSize
=
string
.
boundingRect
(
with
:
size
,
options
:
[
.
usesLineFragmentOrigin
],
attributes
:
dic
,
context
:
nil
)
.
size
return
CGSizeMake
(
ceil
(
strSize
.
width
),
strSize
.
height
)
return
CGSizeMake
(
ceil
(
strSize
.
width
),
strSize
.
height
)
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditInterestViewController
{
extension
YHEditInterestViewController
{
...
@@ -251,6 +276,7 @@ extension YHEditInterestViewController: UICollectionViewDelegate, UICollectionVi
...
@@ -251,6 +276,7 @@ extension YHEditInterestViewController: UICollectionViewDelegate, UICollectionVi
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
self
.
likeItems
.
remove
(
at
:
indexPath
.
item
)
self
.
likeItems
.
remove
(
at
:
indexPath
.
item
)
self
.
collectionView
.
reloadData
()
self
.
collectionView
.
reloadData
()
self
.
viewModel
.
didChange
=
true
}
}
return
cell
return
cell
}
}
...
@@ -268,6 +294,7 @@ extension YHEditInterestViewController: UICollectionViewDelegate, UICollectionVi
...
@@ -268,6 +294,7 @@ extension YHEditInterestViewController: UICollectionViewDelegate, UICollectionVi
}
}
}
}
collectionView
.
reloadData
()
collectionView
.
reloadData
()
viewModel
.
didChange
=
true
}
}
func
collectionView
(
_
collectionView
:
UICollectionView
,
layout
collectionViewLayout
:
UICollectionViewLayout
,
referenceSizeForHeaderInSection
section
:
Int
)
->
CGSize
{
func
collectionView
(
_
collectionView
:
UICollectionView
,
layout
collectionViewLayout
:
UICollectionViewLayout
,
referenceSizeForHeaderInSection
section
:
Int
)
->
CGSize
{
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditPersonalProfileViewController.swift
View file @
c14fe571
...
@@ -125,6 +125,31 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
...
@@ -125,6 +125,31 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
}
}
}
}
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditPersonalProfileViewController
:
UITextViewDelegate
{
extension
YHEditPersonalProfileViewController
:
UITextViewDelegate
{
...
@@ -138,7 +163,7 @@ extension YHEditPersonalProfileViewController: UITextViewDelegate {
...
@@ -138,7 +163,7 @@ extension YHEditPersonalProfileViewController: UITextViewDelegate {
}
}
func
textView
(
_
textView
:
UITextView
,
shouldChangeTextIn
range
:
NSRange
,
replacementText
text
:
String
)
->
Bool
{
func
textView
(
_
textView
:
UITextView
,
shouldChangeTextIn
range
:
NSRange
,
replacementText
text
:
String
)
->
Bool
{
let
newLength
=
(
textView
.
text
as
NSString
)
.
length
+
text
.
count
-
range
.
length
let
newLength
=
(
textView
.
text
as
NSString
)
.
length
+
text
.
count
-
range
.
length
viewModel
.
didChange
=
true
return
newLength
<=
200
return
newLength
<=
200
}
}
}
}
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditSchoolViewController.swift
View file @
c14fe571
...
@@ -87,6 +87,29 @@ class YHEditSchoolViewController: YHBaseViewController {
...
@@ -87,6 +87,29 @@ class YHEditSchoolViewController: YHBaseViewController {
}
}
}
}
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditSchoolViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHEditSchoolViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/C/YHEditWorkViewController.swift
View file @
c14fe571
...
@@ -87,6 +87,29 @@ class YHEditWorkViewController: YHBaseViewController {
...
@@ -87,6 +87,29 @@ class YHEditWorkViewController: YHBaseViewController {
}
}
}
}
}
}
override
func
backItemClick
(
_
sender
:
Any
)
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
}
else
{
self
.
navigationController
?
.
popViewController
()
}
}
/// 是否可以返回,包括点击返回和手势返回,默认YES
override
func
navigationShouldPop
()
->
Bool
{
if
viewModel
.
didChange
{
YHCommonAlertView
.
show
(
""
,
"您尚未保存修改,确定关闭吗?"
,
"关闭"
,
"保存"
)
{
self
.
navigationController
?
.
popViewController
()
}
callBack
:
{
}
return
false
}
return
true
}
}
}
extension
YHEditWorkViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHEditWorkViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/MyCard(我的名片)/VM/YHEditViewModel.swift
View file @
c14fe571
...
@@ -10,6 +10,7 @@ import UIKit
...
@@ -10,6 +10,7 @@ import UIKit
class
YHEditViewModel
:
YHBaseViewModel
{
class
YHEditViewModel
:
YHBaseViewModel
{
var
model
:
YHUserNameCardInfo
=
YHUserNameCardInfo
()
var
model
:
YHUserNameCardInfo
=
YHUserNameCardInfo
()
var
didChange
:
Bool
=
false
override
init
()
{
override
init
()
{
super
.
init
()
super
.
init
()
}
}
...
@@ -77,6 +78,7 @@ class YHEditViewModel: YHBaseViewModel {
...
@@ -77,6 +78,7 @@ class YHEditViewModel: YHBaseViewModel {
case
.
id10
:
case
.
id10
:
model
.
companyName
=
item
.
message
??
""
model
.
companyName
=
item
.
message
??
""
}
}
didChange
=
true
}
}
func
getBaseSchoolDataSource
()
->
[
YHUserInformationModel
]
{
func
getBaseSchoolDataSource
()
->
[
YHUserInformationModel
]
{
...
...
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