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
959f39ea
Commit
959f39ea
authored
Sep 10, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
服务中心框架修改
parent
8c20fe22
Changes
14
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
297 additions
and
23 deletions
+297
-23
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+8
-0
AppDelegate.swift
galaxy/galaxy/AppDelegate.swift
+1
-1
YHStartPageViewController.swift
...lasses/Modules/Home(首页)/C/YHStartPageViewController.swift
+1
-1
YHOrderSearchViewController.swift
...elligentService(服务中心)/C/YHOrderSearchViewController.swift
+1
-1
YHServerCenterHoldViewController.swift
...entService(服务中心)/C/YHServerCenterHoldViewController.swift
+189
-0
YHServiceCenterMainViewController.swift
...ntService(服务中心)/C/YHServiceCenterMainViewController.swift
+0
-2
YHServiceCenterViewController.swift
...ligentService(服务中心)/C/YHServiceCenterViewController.swift
+0
-0
YHServiceOrderListViewController.swift
...entService(服务中心)/C/YHServiceOrderListViewController.swift
+53
-18
Contents.json
...viceCenter/主入口/service_center_more.imageset/Contents.json
+22
-0
service_center_more@2x.png
...口/service_center_more.imageset/service_center_more@2x.png
+0
-0
service_center_more@3x.png
...口/service_center_more.imageset/service_center_more@3x.png
+0
-0
Contents.json
...ter/主入口/service_center_select_step.imageset/Contents.json
+22
-0
service_center_select_step@2x.png
...er_select_step.imageset/service_center_select_step@2x.png
+0
-0
service_center_select_step@3x.png
...er_select_step.imageset/service_center_select_step@3x.png
+0
-0
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
959f39ea
...
@@ -179,6 +179,8 @@
...
@@ -179,6 +179,8 @@
044D0C1C2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1B2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift */
;
};
044D0C1C2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1B2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift */
;
};
044D0C1E2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
;
};
044D0C1E2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
;
};
044D0C202C22D37500C5CF5E
/* YHEditHonorViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
;
};
044D0C202C22D37500C5CF5E
/* YHEditHonorViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
;
};
044EE2232C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044EE2222C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift */
;
};
044EE2252C90138000A2FE3A
/* YHServerCenterHoldViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044EE2242C90138000A2FE3A
/* YHServerCenterHoldViewController.swift */
;
};
04506F552C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04506F542C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift */
;
};
04506F552C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04506F542C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift */
;
};
045A08C02C37ABF500BCBABA
/* YHSegmentView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
045A08BF2C37ABF500BCBABA
/* YHSegmentView.swift */
;
};
045A08C02C37ABF500BCBABA
/* YHSegmentView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
045A08BF2C37ABF500BCBABA
/* YHSegmentView.swift */
;
};
045A08C22C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
045A08C12C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift */
;
};
045A08C22C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
045A08C12C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift */
;
};
...
@@ -947,6 +949,8 @@
...
@@ -947,6 +949,8 @@
044D0C1B2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditSchoolViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1B2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditSchoolViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditWorkViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditWorkViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditHonorViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditHonorViewController.swift
;
sourceTree
=
"<group>"
;
};
044EE2222C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHServiceCenterViewController.swift
;
sourceTree
=
"<group>"
;
};
044EE2242C90138000A2FE3A
/* YHServerCenterHoldViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHServerCenterHoldViewController.swift
;
sourceTree
=
"<group>"
;
};
04506F542C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFamilyMemberInfoCell.swift
;
sourceTree
=
"<group>"
;
};
04506F542C6F57E600738EA1
/* YHFamilyMemberInfoCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHFamilyMemberInfoCell.swift
;
sourceTree
=
"<group>"
;
};
045A08BF2C37ABF500BCBABA
/* YHSegmentView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSegmentView.swift
;
sourceTree
=
"<group>"
;
};
045A08BF2C37ABF500BCBABA
/* YHSegmentView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSegmentView.swift
;
sourceTree
=
"<group>"
;
};
045A08C12C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHMyFileListNoneCell.swift
;
sourceTree
=
"<group>"
;
};
045A08C12C37EB8B00BCBABA
/* YHMyFileListNoneCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHMyFileListNoneCell.swift
;
sourceTree
=
"<group>"
;
};
...
@@ -3797,6 +3801,8 @@
...
@@ -3797,6 +3801,8 @@
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
A5ACE9192B4564F7002C94D2
/* YHServiceCenterMainViewController.swift */
,
A5ACE9192B4564F7002C94D2
/* YHServiceCenterMainViewController.swift */
,
044EE2222C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift */
,
044EE2242C90138000A2FE3A
/* YHServerCenterHoldViewController.swift */
,
04E41DE72BD240570077EAE3
/* YHOrderDetailViewController.swift */
,
04E41DE72BD240570077EAE3
/* YHOrderDetailViewController.swift */
,
048787D42BCE880B0036E221
/* YHServiceOrderListViewController.swift */
,
048787D42BCE880B0036E221
/* YHServiceOrderListViewController.swift */
,
A5FD63BC2B623C2C00D1D9DA
/* YHInformationPerfectListVC.swift */
,
A5FD63BC2B623C2C00D1D9DA
/* YHInformationPerfectListVC.swift */
,
...
@@ -4548,6 +4554,7 @@
...
@@ -4548,6 +4554,7 @@
A567E5B32BD7643D00D5D5A0
/* YHServiceOrderAlertView.swift in Sources */
,
A567E5B32BD7643D00D5D5A0
/* YHServiceOrderAlertView.swift in Sources */
,
A592FE932BA6CFFC0062FACA
/* YHCertificateEntryBottomView.swift in Sources */
,
A592FE932BA6CFFC0062FACA
/* YHCertificateEntryBottomView.swift in Sources */
,
A5ACE93B2B4564F7002C94D2
/* UIFont+Extension.swift in Sources */
,
A5ACE93B2B4564F7002C94D2
/* UIFont+Extension.swift in Sources */
,
044EE2232C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift in Sources */
,
A567E5A92BD7643D00D5D5A0
/* YHSearchInfoHistoryView.swift in Sources */
,
A567E5A92BD7643D00D5D5A0
/* YHSearchInfoHistoryView.swift in Sources */
,
045EEE802B9F171A0022A143
/* YHAcademicPreviewModel.swift in Sources */
,
045EEE802B9F171A0022A143
/* YHAcademicPreviewModel.swift in Sources */
,
04256E122C75BD2700A37BA4
/* YHPayMemberContentItem.swift in Sources */
,
04256E122C75BD2700A37BA4
/* YHPayMemberContentItem.swift in Sources */
,
...
@@ -4771,6 +4778,7 @@
...
@@ -4771,6 +4778,7 @@
045EEEAF2B9F171A0022A143
/* YHWorkExperienceTextItemView.swift in Sources */
,
045EEEAF2B9F171A0022A143
/* YHWorkExperienceTextItemView.swift in Sources */
,
A5ACE9492B4564F7002C94D2
/* YHHUDSuccessView.swift in Sources */
,
A5ACE9492B4564F7002C94D2
/* YHHUDSuccessView.swift in Sources */
,
04B360EF2C620975001EB053
/* YHPrincipleUploadStatusCell.swift in Sources */
,
04B360EF2C620975001EB053
/* YHPrincipleUploadStatusCell.swift in Sources */
,
044EE2252C90138000A2FE3A
/* YHServerCenterHoldViewController.swift in Sources */
,
045EEE9C2B9F171A0022A143
/* YHCompanyViewModel.swift in Sources */
,
045EEE9C2B9F171A0022A143
/* YHCompanyViewModel.swift in Sources */
,
A58556BA2B6BCF1A003746B2
/* YHPersonInfoFillStepModel.swift in Sources */
,
A58556BA2B6BCF1A003746B2
/* YHPersonInfoFillStepModel.swift in Sources */
,
045EEEC92B9F171A0022A143
/* YHOtherInfoSessionView.swift in Sources */
,
045EEEC92B9F171A0022A143
/* YHOtherInfoSessionView.swift in Sources */
,
...
...
galaxy/galaxy/AppDelegate.swift
View file @
959f39ea
...
@@ -194,7 +194,7 @@ extension AppDelegate {
...
@@ -194,7 +194,7 @@ extension AppDelegate {
let
homeVC
=
YHHomeHoldViewPageViewController
()
let
homeVC
=
YHHomeHoldViewPageViewController
()
tabBarController
.
delegate
=
homeVC
tabBarController
.
delegate
=
homeVC
let
v0
=
YHNavigationController
(
rootVC
:
homeVC
)
let
v0
=
YHNavigationController
(
rootVC
:
homeVC
)
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenter
Main
ViewController
())
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenterViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHCommunityViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHCommunityViewController
())
let
v3
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
let
v3
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift
View file @
959f39ea
...
@@ -183,7 +183,7 @@ private extension YHStartPageViewController {
...
@@ -183,7 +183,7 @@ private extension YHStartPageViewController {
let
homeVC
=
YHHomeHoldViewPageViewController
()
let
homeVC
=
YHHomeHoldViewPageViewController
()
tabBarController
.
delegate
=
homeVC
tabBarController
.
delegate
=
homeVC
let
v0
=
YHNavigationController
(
rootVC
:
homeVC
)
let
v0
=
YHNavigationController
(
rootVC
:
homeVC
)
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenter
Main
ViewController
())
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenterViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHCommunityViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHCommunityViewController
())
let
v3
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
let
v3
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderSearchViewController.swift
View file @
959f39ea
...
@@ -117,7 +117,7 @@ extension YHOrderSearchViewController: UITableViewDelegate, UITableViewDataSourc
...
@@ -117,7 +117,7 @@ extension YHOrderSearchViewController: UITableViewDelegate, UITableViewDataSourc
if
self
.
mobile
==
model
.
mobile
{
if
self
.
mobile
==
model
.
mobile
{
self
.
navigationController
?
.
popToRootViewController
(
animated
:
true
)
self
.
navigationController
?
.
popToRootViewController
(
animated
:
true
)
}
else
{
}
else
{
let
vc
=
YHServiceCenter
Main
ViewController
()
let
vc
=
YHServiceCenterViewController
()
vc
.
model
=
model
vc
.
model
=
model
self
.
navigationController
?
.
pushViewController
(
vc
)
self
.
navigationController
?
.
pushViewController
(
vc
)
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerCenterHoldViewController.swift
0 → 100644
View file @
959f39ea
//
// YHServerCenterHoldViewController.swift
// galaxy
//
// Created by EDY on 2024/9/10.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
import
JXSegmentedView
class
YHServerCenterHoldViewController
:
UIViewController
{
var
mobile
:
String
=
""
var
orderId
:
Int
=
0
{
didSet
{
for
i
in
0
..<
arrItemTitles
.
count
{
let
vc
=
arrItemVCs
[
i
]
as
YHServiceOrderListView
vc
.
type
=
i
if
i
==
1
{
vc
.
type
=
2
}
if
i
==
2
{
vc
.
type
=
1
}
vc
.
orderID
=
orderId
vc
.
mobile
=
mobile
vc
.
loadData
()
}
}
}
var
canScroll
:
Bool
=
false
{
didSet
{
for
vc
in
arrItemVCs
{
vc
.
vcCanScroll
=
canScroll
}
}
}
var
controllerOne
:
YHServiceOrderListView
=
YHServiceOrderListView
()
var
controllerTwo
:
YHServiceOrderListView
=
YHServiceOrderListView
()
var
controllerThree
:
YHServiceOrderListView
=
YHServiceOrderListView
()
var
controllerFour
:
YHServiceOrderListView
=
YHServiceOrderListView
()
var
arrItemTitles
=
[
"全部"
,
"进行中"
,
"待开始"
,
"已完成"
]
var
arrItemVCs
:
[
YHServiceOrderListView
]
=
[]
var
segmentedView
:
JXSegmentedView
=
JXSegmentedView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
48
))
lazy
var
segmentedDataSource
:
JXSegmentedDotDataSource
=
{
let
dataSource
=
JXSegmentedDotDataSource
()
dataSource
.
isTitleColorGradientEnabled
=
true
dataSource
.
titles
=
arrItemTitles
dataSource
.
titleNormalFont
=
UIFont
.
PFSC_M
(
ofSize
:
14
)
dataSource
.
titleNormalColor
=
.
labelTextColor2
dataSource
.
titleSelectedFont
=
UIFont
.
PFSC_M
(
ofSize
:
14
)
dataSource
.
titleSelectedColor
=
.
mainTextColor
dataSource
.
isItemSpacingAverageEnabled
=
false
dataSource
.
itemWidth
=
JXSegmentedViewAutomaticDimension
dataSource
.
itemSpacing
=
16
dataSource
.
dotStates
=
[
false
,
false
,
false
,
false
]
dataSource
.
dotSize
=
CGSize
(
width
:
6
,
height
:
6
)
return
dataSource
}()
//分类title 所对应的VC
lazy
var
listContainerView
:
JXSegmentedListContainerView
!
=
{
return
JXSegmentedListContainerView
(
dataSource
:
self
,
type
:
.
scrollView
)
}()
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
setupView
()
// Do any additional setup after loading the view.
}
override
func
viewDidLayoutSubviews
()
{
super
.
viewDidLayoutSubviews
()
segmentedView
.
snp
.
remakeConstraints
{
make
in
make
.
right
.
equalTo
(
-
4
)
make
.
left
.
equalTo
(
4
)
make
.
top
.
equalTo
(
0
)
make
.
height
.
equalTo
(
48
)
}
listContainerView
.
snp
.
remakeConstraints
{
make
in
make
.
right
.
left
.
equalToSuperview
()
make
.
top
.
equalTo
(
segmentedView
.
snp
.
bottom
)
make
.
bottom
.
equalToSuperview
()
}
}
func
setupView
()
{
view
.
backgroundColor
=
.
clear
controllerOne
.
type
=
0
controllerOne
.
orderID
=
orderId
controllerOne
.
block
=
{[
weak
self
]
type
,
count
,
flag
in
guard
let
self
=
self
else
{
return
}
arrItemTitles
[
0
]
=
"全部(
\(
count
)
)"
self
.
updata
(
flag
:
flag
,
type
:
0
)
}
controllerTwo
.
type
=
2
controllerTwo
.
orderID
=
orderId
controllerTwo
.
block
=
{[
weak
self
]
type
,
count
,
flag
in
guard
let
self
=
self
else
{
return
}
arrItemTitles
[
1
]
=
"进行中(
\(
count
)
)"
self
.
updata
(
flag
:
flag
,
type
:
2
)
}
controllerThree
.
type
=
1
controllerThree
.
orderID
=
orderId
controllerThree
.
block
=
{[
weak
self
]
type
,
count
,
flag
in
guard
let
self
=
self
else
{
return
}
arrItemTitles
[
2
]
=
"待开始(
\(
count
)
)"
self
.
updata
(
flag
:
flag
,
type
:
1
)
}
controllerFour
.
type
=
3
controllerFour
.
orderID
=
orderId
controllerFour
.
block
=
{[
weak
self
]
type
,
count
,
flag
in
guard
let
self
=
self
else
{
return
}
arrItemTitles
[
3
]
=
"已完成(
\(
count
)
)"
self
.
updata
(
flag
:
flag
,
type
:
3
)
}
arrItemVCs
.
append
(
controllerOne
)
arrItemVCs
.
append
(
controllerTwo
)
arrItemVCs
.
append
(
controllerThree
)
arrItemVCs
.
append
(
controllerFour
)
//segmentedViewDataSource一定要通过属性强持有!!!!!!!!!
segmentedView
.
collectionView
.
backgroundColor
=
.
clear
view
.
addSubview
(
segmentedView
)
segmentedView
.
listContainer
=
listContainerView
view
.
addSubview
(
listContainerView
)
//分类Title
segmentedView
.
dataSource
=
segmentedDataSource
segmentedView
.
delegate
=
self
//配置指示器
let
indicator
=
JXSegmentedIndicatorLineView
()
indicator
.
indicatorWidth
=
16
indicator
.
indicatorColor
=
UIColor
.
brandMainColor
indicator
.
indicatorCornerRadius
=
0
segmentedView
.
indicators
=
[
indicator
]
segmentedView
.
backgroundColor
=
UIColor
(
red
:
0.95
,
green
:
0.95
,
blue
:
0.95
,
alpha
:
1
)
segmentedView
.
defaultSelectedIndex
=
1
}
func
updata
(
flag
:
Bool
,
type
:
Int
){
DispatchQueue
.
main
.
async
{
self
.
segmentedDataSource
.
titles
=
self
.
arrItemTitles
if
type
==
3
{
self
.
segmentedDataSource
.
dotStates
=
[
false
,
false
,
false
,
flag
]
}
self
.
segmentedView
.
reloadData
()
}
}
}
extension
YHServerCenterHoldViewController
:
JXSegmentedViewDelegate
{
func
segmentedView
(
_
segmentedView
:
JXSegmentedView
,
didSelectedItemAt
index
:
Int
)
{
// NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
}
/// 正在滚动中的回调
///
/// - Parameters:
/// - segmentedView: JXSegmentedView
/// - leftIndex: 正在滚动中,相对位置处于左边的index
/// - rightIndex: 正在滚动中,相对位置处于右边的index
/// - percent: 从左往右计算的百分比
func
segmentedView
(
_
segmentedView
:
JXSegmentedView
,
scrollingFrom
leftIndex
:
Int
,
to
rightIndex
:
Int
,
percent
:
CGFloat
)
{
// NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
}
}
extension
YHServerCenterHoldViewController
:
JXSegmentedListContainerViewDataSource
{
func
numberOfLists
(
in
listContainerView
:
JXSegmentedListContainerView
)
->
Int
{
if
let
titleDataSource
=
segmentedView
.
dataSource
as?
JXSegmentedBaseDataSource
{
return
titleDataSource
.
dataSource
.
count
}
return
0
}
func
listContainerView
(
_
listContainerView
:
JXSegmentedListContainerView
,
initListAt
index
:
Int
)
->
JXSegmentedListContainerViewListDelegate
{
return
arrItemVCs
[
index
]
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @
959f39ea
...
@@ -22,7 +22,6 @@ class YHServiceCenterMainViewController: YHBaseViewController {
...
@@ -22,7 +22,6 @@ class YHServiceCenterMainViewController: YHBaseViewController {
var
mobile
:
String
=
""
var
mobile
:
String
=
""
var
model
:
YHContactItemModel
=
YHContactItemModel
()
var
model
:
YHContactItemModel
=
YHContactItemModel
()
var
oldModel
:
YHContactItemModel
=
YHContactItemModel
()
var
oldModel
:
YHContactItemModel
=
YHContactItemModel
()
var
doneCount
:
Int
=
0
private
lazy
var
topBkg
:
UIView
=
{
private
lazy
var
topBkg
:
UIView
=
{
let
imagV
=
UIImageView
()
let
imagV
=
UIImageView
()
imagV
.
image
=
UIImage
(
named
:
"service_center_head_bkg4"
)
imagV
.
image
=
UIImage
(
named
:
"service_center_head_bkg4"
)
...
@@ -446,7 +445,6 @@ extension YHServiceCenterMainViewController {
...
@@ -446,7 +445,6 @@ extension YHServiceCenterMainViewController {
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
arrItemTitles
[
3
]
=
"已完成(
\(
count
)
)"
arrItemTitles
[
3
]
=
"已完成(
\(
count
)
)"
self
.
updata
(
flag
:
flag
,
type
:
3
)
self
.
updata
(
flag
:
flag
,
type
:
3
)
doneCount
=
count
self
.
getStep
()
self
.
getStep
()
}
}
arrItemVCs
.
append
(
controllerOne
)
arrItemVCs
.
append
(
controllerOne
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
0 → 100644
View file @
959f39ea
This diff is collapsed.
Click to expand it.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @
959f39ea
...
@@ -13,6 +13,7 @@ class YHServiceOrderListView: YHBaseViewController {
...
@@ -13,6 +13,7 @@ class YHServiceOrderListView: YHBaseViewController {
private
let
viewModel
:
YHServiceCenterMainViewModel
=
YHServiceCenterMainViewModel
()
private
let
viewModel
:
YHServiceCenterMainViewModel
=
YHServiceCenterMainViewModel
()
let
principleViewModel
:
YHPrincleViewModel
=
YHPrincleViewModel
()
let
principleViewModel
:
YHPrincleViewModel
=
YHPrincleViewModel
()
let
appointViewModel
=
YHCerAppointViewModel
()
let
appointViewModel
=
YHCerAppointViewModel
()
public
var
vcCanScroll
:
Bool
=
true
typealias
Block
=
(
Int
,
Int
,
Bool
)
->
()
typealias
Block
=
(
Int
,
Int
,
Bool
)
->
()
var
block
:
Block
?
var
block
:
Block
?
...
@@ -33,6 +34,8 @@ class YHServiceOrderListView: YHBaseViewController {
...
@@ -33,6 +34,8 @@ class YHServiceOrderListView: YHBaseViewController {
super
.
viewDidLoad
()
super
.
viewDidLoad
()
setupUI
()
setupUI
()
loadData
()
loadData
()
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
beginDragging
)
,
name
:
Notification
.
Name
(
rawValue
:
"scrollViewWillBeginDragging0"
),
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
endDragging
)
,
name
:
Notification
.
Name
(
rawValue
:
"scrollViewDidEndDragging0"
),
object
:
nil
)
}
}
}
}
...
@@ -86,7 +89,7 @@ extension YHServiceOrderListView {
...
@@ -86,7 +89,7 @@ extension YHServiceOrderListView {
gk_navBarAlpha
=
0
gk_navBarAlpha
=
0
gk_navigationBar
.
isHidden
=
true
gk_navigationBar
.
isHidden
=
true
homeTableView
=
{
homeTableView
=
{
let
tableView
=
UI
TableView
(
frame
:
.
zero
,
style
:
.
grouped
)
let
tableView
=
YHGesture
TableView
(
frame
:
.
zero
,
style
:
.
grouped
)
tableView
.
backgroundColor
=
.
clear
tableView
.
backgroundColor
=
.
clear
tableView
.
separatorStyle
=
.
none
tableView
.
separatorStyle
=
.
none
tableView
.
showsHorizontalScrollIndicator
=
false
tableView
.
showsHorizontalScrollIndicator
=
false
...
@@ -196,12 +199,12 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -196,12 +199,12 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
if
model
.
type
==
1
{
if
model
.
type
==
1
{
let
vc
=
YHMineCertificateEntryViewController
()
let
vc
=
YHMineCertificateEntryViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
2
{
}
else
if
model
.
type
==
2
{
let
vc
=
YHInformationPerfectListVC
()
let
vc
=
YHInformationPerfectListVC
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
3
{
// 评分
}
else
if
model
.
type
==
3
{
// 评分
...
@@ -209,23 +212,23 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -209,23 +212,23 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
let
vc
=
YHScoreDetailViewController
()
let
vc
=
YHScoreDetailViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
// vc.model = serviceCenterMainReqVM.allInfoScoreModel
// vc.model = serviceCenterMainReqVM.allInfoScoreModel
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
4
{
// 方案
}
else
if
model
.
type
==
4
{
// 方案
handleRedPointFor
(
key
:
kMyPlanRedPointInfoKey
,
model
:
model
)
handleRedPointFor
(
key
:
kMyPlanRedPointInfoKey
,
model
:
model
)
let
vc
=
YHMineSchemeViewController
()
let
vc
=
YHMineSchemeViewController
()
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
5
{
}
else
if
model
.
type
==
5
{
let
vc
=
YHMySignatureListViewController
()
let
vc
=
YHMySignatureListViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
6
{
}
else
if
model
.
type
==
6
{
let
vc
=
YHMyDocumentsListViewController
()
let
vc
=
YHMyDocumentsListViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
vc
.
mobile
=
mobile
vc
.
mobile
=
mobile
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
11
||
model
.
type
==
12
||
model
.
type
==
14
{
}
else
if
model
.
type
==
11
||
model
.
type
==
12
||
model
.
type
==
14
{
...
@@ -236,37 +239,38 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -236,37 +239,38 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
let
vc
=
YHPrincipleWaitResultViewController
()
let
vc
=
YHPrincipleWaitResultViewController
()
vc
.
status
=
model
.
type
vc
.
status
=
model
.
type
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
13
{
//原则批已获批~
}
else
if
model
.
type
==
13
{
//原则批已获批~
let
vc
=
YHPrincipleApprovedResultVC
()
let
vc
=
YHPrincipleApprovedResultVC
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
15
{
}
else
if
model
.
type
==
15
{
//正式批已获批~
//正式批已获批~
let
vc
=
YHOfficialApprovalResultVC
()
let
vc
=
YHOfficialApprovalResultVC
()
self
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
21
{
}
else
if
model
.
type
==
21
{
//新增受养人
//新增受养人
let
vc
=
YHAddAdoptersViewController
()
let
vc
=
YHAddAdoptersViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
// navigationController?.pushViewController(vc)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
22
{
}
else
if
model
.
type
==
22
{
//家庭信息确认
//家庭信息确认
let
vc
=
YHFamilyInfoConfirmViewController
()
let
vc
=
YHFamilyInfoConfirmViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
self
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
23
{
}
else
if
model
.
type
==
23
{
//电子签字缴费
//电子签字缴费
let
vc
=
YHVisaPaymentVC
()
let
vc
=
YHVisaPaymentVC
()
vc
.
orderID
=
orderID
vc
.
orderID
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
24
{
}
else
if
model
.
type
==
24
{
//赴港时间预约
//赴港时间预约
let
vc
=
YHCertificateAppointViewController
()
let
vc
=
YHCertificateAppointViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
self
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
25
{
}
else
if
model
.
type
==
25
{
// 赴港行程指引
// 赴港行程指引
...
@@ -291,7 +295,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -291,7 +295,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
alert
.
confirmBlock
=
{
alert
.
confirmBlock
=
{
let
vc
=
YHCertificateAppointViewController
()
let
vc
=
YHCertificateAppointViewController
()
vc
.
orderId
=
self
.
orderID
vc
.
orderId
=
self
.
orderID
self
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
alert
.
show
()
alert
.
show
()
...
@@ -311,7 +315,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -311,7 +315,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
vc
.
isFullScreenFlag
=
false
vc
.
isFullScreenFlag
=
false
vc
.
navTitle
=
"赴港行程指引"
vc
.
navTitle
=
"赴港行程指引"
vc
.
isNeedRefreshDataFlag
=
true
vc
.
isNeedRefreshDataFlag
=
true
self
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
}
}
}
}
...
@@ -320,12 +324,12 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
...
@@ -320,12 +324,12 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
//旅行证件准备
//旅行证件准备
let
vc
=
YHTravelDocsPreparationListViewController
()
let
vc
=
YHTravelDocsPreparationListViewController
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
model
.
type
==
27
{
}
else
if
model
.
type
==
27
{
//上传过关证件
//上传过关证件
let
vc
=
YHUploadCertificateVC
()
let
vc
=
YHUploadCertificateVC
()
vc
.
orderId
=
orderID
vc
.
orderId
=
orderID
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
}
}
}
}
...
@@ -357,3 +361,34 @@ extension YHServiceOrderListView: JXSegmentedListContainerViewListDelegate {
...
@@ -357,3 +361,34 @@ extension YHServiceOrderListView: JXSegmentedListContainerViewListDelegate {
return
view
return
view
}
}
}
}
extension
YHServiceOrderListView
:
UIScrollViewDelegate
{
//控制滑动交互
func
scrollViewDidScroll
(
_
scrollView
:
UIScrollView
)
{
let
scrollViewSet
:
CGFloat
=
scrollView
.
contentOffset
.
y
if
vcCanScroll
==
false
{
//不能滚动时
scrollView
.
contentOffset
=
CGPoint
(
x
:
0
,
y
:
0
)
}
else
{
if
(
scrollViewSet
<=
0
)
{
scrollView
.
contentOffset
=
CGPoint
(
x
:
0
,
y
:
0
)
vcCanScroll
=
false
NotificationCenter
.
default
.
post
(
name
:
Notification
.
Name
(
rawValue
:
"leaveTop0"
),
object
:
nil
)
}
else
{
scrollView
.
contentOffset
=
CGPoint
(
x
:
0
,
y
:
scrollViewSet
)
}
}
}
}
extension
YHServiceOrderListView
{
@objc
func
beginDragging
()
{
homeTableView
.
isScrollEnabled
=
false
vcCanScroll
=
false
}
@objc
func
endDragging
()
{
homeTableView
.
isScrollEnabled
=
true
vcCanScroll
=
true
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_more.imageset/Contents.json
0 → 100644
View file @
959f39ea
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"service_center_more@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"service_center_more@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_more.imageset/service_center_more@2x.png
0 → 100644
View file @
959f39ea
297 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_more.imageset/service_center_more@3x.png
0 → 100644
View file @
959f39ea
411 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_select_step.imageset/Contents.json
0 → 100644
View file @
959f39ea
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"service_center_select_step@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"service_center_select_step@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_select_step.imageset/service_center_select_step@2x.png
0 → 100644
View file @
959f39ea
318 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_select_step.imageset/service_center_select_step@3x.png
0 → 100644
View file @
959f39ea
403 Bytes
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