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
1e8d38f2
Commit
1e8d38f2
authored
Jul 03, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'youhua-dev'
* youhua-dev: 屏蔽小程序分享入口 修改版本号 0.9.1.0 // UI 框架刷新消失不见的问题修改
parents
c84326a0
21fc445f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
9 deletions
+21
-9
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+6
-6
YHCommunityViewController.swift
...s/Modules/Community(社区)/C/YHCommunityViewController.swift
+1
-1
YHMatchUserViewController.swift
...s/Modules/Community(社区)/C/YHMatchUserViewController.swift
+12
-0
YHDocumentToActionTableViewCell.swift
...MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift
+1
-1
YHMyFileMethodTableViewCell.swift
...中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift
+1
-1
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
1e8d38f2
...
...
@@ -3740,7 +3740,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyTestEnv.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
1
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -3765,7 +3765,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
0
;
MARKETING_VERSION
=
0.9.
1
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
@@ -3944,7 +3944,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyDebug.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
1
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -3969,7 +3969,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
0
;
MARKETING_VERSION
=
0.9.
1
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
@@ -3990,7 +3990,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxy.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
1
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -4015,7 +4015,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
0
;
MARKETING_VERSION
=
0.9.
1
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHCommunityViewController.swift
View file @
1e8d38f2
...
...
@@ -250,7 +250,7 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
segmentedView
.
indicators
=
[
indicator
]
}
segmentedView
.
dataSource
=
segmentedDataSource
se
gmentedView
.
reloadData
()
se
lf
.
segmentedView
.
reloadDataWithoutListContainer
()
}
}
...
...
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchUserViewController.swift
View file @
1e8d38f2
...
...
@@ -16,6 +16,11 @@ class YHMatchUserViewController: YHBaseViewController {
var
needToMatch
:
Bool
=
false
var
isStartMatch
:
Bool
=
false
lazy
var
bgImgV
:
UIImageView
=
{
let
bg
=
UIImageView
(
image
:
UIImage
(
named
:
"people_match_bg"
))
return
bg
}()
lazy
var
topLabel
:
UILabel
=
{
let
label
=
UILabel
()
label
.
textAlignment
=
.
center
...
...
@@ -142,6 +147,7 @@ class YHMatchUserViewController: YHBaseViewController {
func
createUI
()
{
self
.
view
.
addSubview
(
self
.
bgImgV
)
self
.
view
.
addSubview
(
self
.
wingLeftImgV
)
self
.
view
.
addSubview
(
self
.
wingRightImgV
)
...
...
@@ -155,6 +161,12 @@ class YHMatchUserViewController: YHBaseViewController {
self
.
view
.
addSubview
(
headLottieView
)
self
.
view
.
addSubview
(
matchTipsLabel
)
self
.
headLottieView
.
play
()
bgImgV
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
equalToSuperview
()
make
.
top
.
equalTo
(
-
k_Height_statusBar
()
-
48.0
)
make
.
bottom
.
equalToSuperview
()
}
launchLottieView
.
snp
.
makeConstraints
{
make
in
make
.
width
.
height
.
equalTo
(
KScreenWidth
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift
View file @
1e8d38f2
...
...
@@ -252,7 +252,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
fileImageView
.
image
=
UIImage
(
named
:
iconImgName
)
fileNameLabel
.
text
=
dataSource
.
writing_document
.
doc_sign
.
doc_type_name
if
dataSource
.
writing_document
.
doc_sign
.
doc_type
==
7
||
dataSource
.
writing_document
.
doc_sign
.
doc_type
==
8
{
shareButton
.
isHidden
=
false
//
shareButton.isHidden = false
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift
View file @
1e8d38f2
...
...
@@ -264,7 +264,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
fileImageView
.
image
=
UIImage
(
named
:
iconImgName
)
fileNameLabel
.
text
=
dataSource
.
doc_type_name
if
dataSource
.
doc_type
==
7
||
dataSource
.
doc_type
==
8
{
shareButton
.
isHidden
=
false
//
shareButton.isHidden = false
}
}
...
...
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