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
a1d06ae9
Commit
a1d06ae9
authored
Jul 30, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
连接替换 UIbug
parent
fbd18ea6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
48 deletions
+12
-48
YHStatusAdvantageVC.swift
...laxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift
+1
-1
YHInvatationShareViewController.swift
...onWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift
+3
-3
YHInvitationWithGiftsViewController.swift
...thGifts(邀请有礼)/C/YHInvitationWithGiftsViewController.swift
+4
-42
YHInvitationWithGiftsSecondTableViewCell.swift
...ts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift
+2
-0
YHEvaluationView.swift
.../galaxy/Classes/Modules/Home(首页)/V/YHEvaluationView.swift
+1
-1
YHServiceCenterMainViewController.swift
...ntService(服务中心)/C/YHServiceCenterMainViewController.swift
+1
-1
No files found.
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift
View file @
a1d06ae9
...
...
@@ -152,7 +152,7 @@ private extension YHStatusAdvantageVC {
if
tag
==
0
{
//跳转测评页
let
vc
=
YHH5WebViewVC
()
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=APP-zrll"
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=APP-zrll"
vc
.
isShowRightShareItemFlag
=
true
self
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
tag
==
1
{
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift
View file @
a1d06ae9
...
...
@@ -131,7 +131,7 @@ extension YHInvatationShareViewController {
}
func
loadData
()
{
if
let
qrCode
=
generateQRCode
(
from
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
)
{
if
let
qrCode
=
generateQRCode
(
from
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
)
{
// 可以将qrCode设置为UIImageView的image属性来显示二维码
imageView
.
image
=
qrCode
}
...
...
@@ -157,14 +157,14 @@ extension YHInvatationShareViewController {
@objc
func
wxClick
()
{
// guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return }
YHShareManager
.
shared
.
sendLinkContent
(
"香港身份规划专属礼包,限时领取!"
,
"1000元折扣福利券,资深银河规划专家1V1评估方案"
,
UIImage
(
named
:
"invitation_with_gifts_share_other"
)
??
UIImage
(),
link
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
)
YHShareManager
.
shared
.
sendLinkContent
(
"香港身份规划专属礼包,限时领取!"
,
"1000元折扣福利券,资深银河规划专家1V1评估方案"
,
UIImage
(
named
:
"invitation_with_gifts_share_other"
)
??
UIImage
(),
link
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
)
// YHShareManager.shared.sendImageContent(combinedImage)
}
@objc
func
peopleClick
()
{
// guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return }
// YHShareManager.shared.sendImageContent(combinedImage, WXSceneTimeline)
YHShareManager
.
shared
.
sendLinkContent
(
"香港身份规划专属礼包,限时领取!"
,
"1000元折扣福利券,资深银河规划专家1V1评估方案"
,
UIImage
(
named
:
"invitation_with_gifts_share_other"
)
??
UIImage
(),
link
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
,
WXSceneTimeline
)
YHShareManager
.
shared
.
sendLinkContent
(
"香港身份规划专属礼包,限时领取!"
,
"1000元折扣福利券,资深银河规划专家1V1评估方案"
,
UIImage
(
named
:
"invitation_with_gifts_share_other"
)
??
UIImage
(),
link
:
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=lkhtj-app&customer_id=
\(
YHLoginManager
.
shared
.
userModel
?
.
id
??
""
)
&scene_id=30"
,
WXSceneTimeline
)
}
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvitationWithGiftsViewController.swift
View file @
a1d06ae9
...
...
@@ -13,38 +13,7 @@ class YHInvitationWithGiftsViewController: YHBaseViewController {
var
tableView
:
UITableView
!
var
bottomViewForShare
:
YHInvitationWithGiftsShareBottomView
!
var
viewModel
:
YHInvitationWithGiftsViewModel
=
YHInvitationWithGiftsViewModel
()
lazy
var
navBar
:
YHCustomNavigationBar
=
{
let
bar
=
YHCustomNavigationBar
.
navBar
()
bar
.
backgroundColor
=
.
clear
bar
.
backButton
.
setImage
(
UIImage
(
named
:
"back_icon"
),
for
:
.
normal
)
bar
.
backBlock
=
{
[
weak
self
]
in
guard
let
self
=
self
else
{
return
}
let
view
=
YHInvitationWithGiftsShareView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
KScreenHeight
))
view
.
block
=
{[
weak
self
]
tag
in
if
tag
==
0
{
self
?
.
navigationController
?
.
popViewController
()
}
else
{
let
vc
=
YHInvatationShareViewController
()
self
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
let
window
=
UIApplication
.
shared
.
yhKeyWindow
()
window
?
.
addSubview
(
view
)
}
return
bar
}()
lazy
var
navView
:
UIView
=
{
let
view
=
UIView
()
view
.
backgroundColor
=
.
clear
view
.
addSubview
(
self
.
navBar
)
self
.
navBar
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
bottom
.
equalToSuperview
()
make
.
height
.
equalTo
(
k_Height_NavContentBar
)
}
return
view
}()
lazy
var
headView
:
YHInvitationWithGiftsHeadView
=
{
let
headView
=
YHInvitationWithGiftsHeadView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
666
))
return
headView
...
...
@@ -151,7 +120,6 @@ extension YHInvitationWithGiftsViewController {
}
func
setView
()
{
gk_navigationBar
.
isHidden
=
true
view
.
backgroundColor
=
.
contentBkgColor
let
rightButtonItem
=
UIBarButtonItem
(
title
:
"规则"
,
style
:
.
plain
,
target
:
self
,
action
:
#selector(
lookDeatil
)
)
rightButtonItem
.
setTitleTextAttributes
([
.
foregroundColor
:
UIColor
.
mainTextColor
],
for
:
.
normal
)
...
...
@@ -192,11 +160,6 @@ extension YHInvitationWithGiftsViewController {
make
.
bottom
.
left
.
right
.
equalToSuperview
()
make
.
height
.
equalTo
(
98
)
}
view
.
addSubview
(
self
.
navView
)
self
.
navView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
top
.
equalToSuperview
()
make
.
height
.
equalTo
(
k_Height_NavigationtBarAndStatuBar
)
}
}
@objc
func
lookDeatil
()
{
...
...
@@ -232,14 +195,13 @@ extension YHInvitationWithGiftsViewController: UIScrollViewDelegate {
}
else
if
percent
>
1.0
{
percent
=
1.0
}
navView
.
backgroundColor
=
UIColor
(
hex
:
0xFFFFFF
,
alpha
:
percent
)
gk_navBackgroundColor
=
UIColor
(
hex
:
0xFFFFFF
,
alpha
:
percent
)
gk_navBarAlpha
=
1
if
percent
>=
0.5
{
navBar
.
backButton
.
setImage
(
UIImage
(
named
:
"back_icon"
),
for
:
.
normal
)
navBar
.
title
=
"关于银河湾"
gk_navTitle
=
"关于银河湾"
}
else
{
navBar
.
backButton
.
setImage
(
UIImage
(
named
:
"back_icon"
),
for
:
.
normal
)
navBar
.
title
=
""
gk_navTitle
=
""
}
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift
View file @
a1d06ae9
...
...
@@ -52,6 +52,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
label
.
textColor
=
UIColor
.
yhGreyColor
label
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
12
)
label
.
textAlignment
=
.
center
label
.
layer
.
borderWidth
=
1
label
.
layer
.
borderColor
=
UIColor
(
hex
:
0xebf4fe
)
.
cgColor
self
.
tableView
.
tableFooterView
=
label
}
else
{
self
.
tableView
.
tableFooterView
=
UIView
()
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHEvaluationView.swift
View file @
a1d06ae9
...
...
@@ -67,7 +67,7 @@ extension YHEvaluationView {
@objc
func
tapButton
(
gestureRecognizer
:
UITapGestureRecognizer
)
{
//跳转测评页
let
vc
=
YHH5WebViewVC
()
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=APP-zrll"
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=APP-zrll"
vc
.
isShowRightShareItemFlag
=
true
parentViewController
?
.
navigationController
?
.
pushViewController
(
vc
)
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @
a1d06ae9
...
...
@@ -92,7 +92,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
//跳转测评页
let
vc
=
YHH5WebViewVC
()
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge/evaluation?channel=APP-zrll"
vc
.
url
=
YHBaseUrlManager
.
shared
.
curH5URL
()
+
"superAppBridge
.html#
/evaluation?channel=APP-zrll"
vc
.
isShowRightShareItemFlag
=
true
self
?
.
navigationController
?
.
pushViewController
(
vc
)
}
...
...
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