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
3f406535
Commit
3f406535
authored
Jul 02, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、修改一处可能的bug
2、处理一处
parent
543bdf54
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
45 deletions
+38
-45
Applegate(JPush).swift
galaxy/galaxy/Applegate(JPush).swift
+2
-3
YHActivityListViewController.swift
...ity(社区)/Activity(活动)/C/YHActivityListViewController.swift
+4
-2
YHHomePageViewController.swift
...Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
+28
-36
YHOrderTipsItemView.swift
...laxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift
+3
-2
YHOrderTipsView.swift
...y/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
+1
-0
YHHomePageViewModel.swift
...axy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
+0
-2
No files found.
galaxy/galaxy/Applegate(JPush).swift
View file @
3f406535
...
...
@@ -107,9 +107,8 @@ extension AppDelegate: JPUSHRegisterDelegate {
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didRequestUnreadMsgTotalCountNotification
,
object
:
nil
)
// 请求消息列表通知
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didRequestUnreadMsgListNotification
,
object
:
nil
)
//for test hjl
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didRevMsgNotifiction
,
object
:
nil
)
//for test hjl
//更新首页消息
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didRevMsgNotifiction
,
object
:
nil
)
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift
View file @
3f406535
...
...
@@ -193,13 +193,15 @@ extension YHActivityListViewController {
self
.
tableView
.
reloadData
()
self
.
emptyDataTipsView
.
isHidden
=
self
.
viewModel
.
arrActivityListData
.
count
>
0
?
true
:
false
DispatchQueue
.
main
.
asyncAfter
(
wallDeadline
:
.
now
()
+
0.35
,
execute
:
{
//
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
self
.
tableView
.
es
.
stopLoadingMore
()
if
self
.
viewModel
.
hasMoreForActivityList
==
false
{
self
.
tableView
.
es
.
noticeNoMoreData
()
self
.
tableView
.
footer
?
.
alpha
=
1
}
})
// })
self
.
tableView
.
reloadData
()
}
}
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @
3f406535
...
...
@@ -112,42 +112,33 @@ class YHHomePageViewController: YHBaseViewController {
if
YHLoginManager
.
shared
.
isLogin
()
==
false
{
return
}
// DispatchQueue.global().async {
self
.
serviceCenterMainReqVM
.
getContactList
{
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
let
isShow
=
self
.
serviceCenterMainReqVM
.
arrContactList
.
count
>
0
if
isShow
{
self
.
serviceCenterMainReqVM
.
getContactList
{
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
let
isShow
=
self
.
serviceCenterMainReqVM
.
arrContactList
.
count
>
0
if
isShow
{
self
.
viewModel
.
getBasicInfoForSigner
{
success
,
error
in
if
success
{
self
.
homeHeaderView
.
orderTipsView
.
dataModelForBasicInfo
=
self
.
viewModel
.
signerModel
}
else
{
}
self
.
viewModel
.
get
BasicInfo
ForSigner
{
success
,
error
in
self
.
viewModel
.
get
LastTwoMessages
ForSigner
{
success
,
error
in
if
success
{
self
.
homeHeaderView
.
orderTipsView
.
dataModelForBasicInfo
=
self
.
viewModel
.
signerModel
self
.
homeHeaderView
.
orderTipsView
.
arrLastTwoMessage
=
self
.
viewModel
.
arrLastTwoMessages
self
.
homeHeaderView
.
updateSubViewsConstraints
()
}
else
{
}
self
.
viewModel
.
getLastTwoMessagesForSigner
{
success
,
error
in
if
success
{
self
.
homeHeaderView
.
orderTipsView
.
arrLastTwoMessage
=
self
.
viewModel
.
arrLastTwoMessages
self
.
homeHeaderView
.
updateSubViewsConstraints
()
}
else
{
}
// DispatchQueue.main.async {
self
.
showOrderTipsView
(
isShow
)
// }
}
}
}
else
{
// DispatchQueue.main.async {
self
.
showOrderTipsView
(
isShow
)
//
}
}
}
}
else
{
self
.
showOrderTipsView
(
isShow
)
}
//
}
}
}
// 是否展示订单提示视图
...
...
@@ -164,7 +155,7 @@ class YHHomePageViewController: YHBaseViewController {
self
.
getData
()
}
var
r
=
CGRectZero
//for test hjl
var
r
=
CGRectZero
r
.
origin
.
y
=
-
homeHeaderViewHeight
-
81
r
.
origin
.
x
=
0
r
.
size
.
width
=
KScreenWidth
...
...
@@ -175,6 +166,14 @@ class YHHomePageViewController: YHBaseViewController {
homeCollectView
.
es
.
addInfiniteScrolling
{
self
.
loadMoreData
()
}
self
.
homeCollectView
.
es
.
stopPullToRefresh
()
self
.
homeCollectView
.
es
.
stopLoadingMore
()
if
self
.
viewModel
.
hasMoreForHomeNews
==
false
{
self
.
homeCollectView
.
es
.
noticeNoMoreData
()
self
.
homeCollectView
.
footer
?
.
alpha
=
1
}
self
.
homeCollectView
.
reloadData
()
}
}
...
...
@@ -293,7 +292,6 @@ private extension YHHomePageViewController {
UserDefaults
.
standard
.
synchronize
()
}
// DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
self
.
homeCollectView
.
es
.
stopPullToRefresh
()
...
...
@@ -302,17 +300,11 @@ private extension YHHomePageViewController {
self
.
homeCollectView
.
footer
?
.
alpha
=
1
}
// CATransaction.setDisableActions(true)
self
.
homeCollectView
.
reloadData
()
// CATransaction.commit()
DispatchQueue
.
main
.
asyncAfter
(
wallDeadline
:
.
now
()
+
0.25
,
execute
:
{
self
.
requestOrder
()
})
// })
}
}
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift
View file @
3f406535
...
...
@@ -46,6 +46,8 @@ class YHOrderTipsItemView: UIView {
func
updateData
()
{
guard
let
message
=
message
else
{
return
}
let
typeString
=
self
.
getTypeString
()
lableMyOrder
.
text
=
typeString
lableName
.
text
=
message
.
content
...
...
@@ -175,10 +177,9 @@ extension YHOrderTipsItemView {
make
.
centerY
.
equalToSuperview
()
make
.
left
.
equalTo
(
12
)
make
.
height
.
equalTo
(
18
)
make
.
width
.
lessThanOrEqualTo
(
6
0
)
make
.
width
.
greaterThanOrEqualTo
(
5
0
)
}
addSubview
(
segmentationView
)
segmentationView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalTo
(
lableMyOrder
.
snp
.
right
)
.
offset
(
8
)
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
View file @
3f406535
...
...
@@ -232,6 +232,7 @@ private extension YHOrderTipsView {
firstItem
.
isHidden
=
true
secondItem
.
isHidden
=
true
}
if
let
first
=
arrLastTwoMessage
?
.
first
,
let
last
=
arrLastTwoMessage
?
.
last
{
firstItem
.
message
=
first
secondItem
.
message
=
last
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @
3f406535
...
...
@@ -33,8 +33,6 @@ class YHHomePageViewModel : YHBaseViewModel {
//首页 签约用户信息
var
signerModel
:
YHSignerInfoModel
?
// var testNumber : Int = 5 //for test hjl
}
//接口
...
...
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