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
27a994b8
Commit
27a994b8
authored
Dec 12, 2024
by
DavidHuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 七鱼 crm信息不完整的bug
parent
b5f58e4c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
31 deletions
+13
-31
YHButlerServiceManager.swift
...s/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
+13
-15
YHPreviewInfoNameAndSubNameItemView.swift
...oList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift
+0
-7
YHPreviewInfoNameAndSubNameItemsView.swift
...List(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemsView.swift
+0
-5
YHIMTestViewController.swift
...vestreamSales(直播销售)/IM(环信)/C/YHIMTestViewController.swift
+0
-1
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+0
-3
No files found.
galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
View file @
27a994b8
...
@@ -43,7 +43,7 @@ class YHButlerServiceManager: NSObject {
...
@@ -43,7 +43,7 @@ class YHButlerServiceManager: NSObject {
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
loginSuccess
)
,
name
:
YhConstant
.
YhNotification
.
didLoginSuccessNotifiction
,
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
loginSuccess
)
,
name
:
YhConstant
.
YhNotification
.
didLoginSuccessNotifiction
,
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
logoutSuccess
)
,
name
:
YhConstant
.
YhNotification
.
didLogoutSuccessNotifiction
,
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
logoutSuccess
)
,
name
:
YhConstant
.
YhNotification
.
didLogoutSuccessNotifiction
,
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
didRevUatParam
)
,
name
:
YhConstant
.
YhNotification
.
didRevUatParam
,
object
:
nil
)
//
NotificationCenter.default.addObserver(self, selector: #selector(didRevUatParam), name: YhConstant.YhNotification.didRevUatParam, object: nil)
}
}
deinit
{
deinit
{
...
@@ -113,17 +113,16 @@ class YHButlerServiceManager: NSObject {
...
@@ -113,17 +113,16 @@ class YHButlerServiceManager: NSObject {
return
return
}
}
gotoSessionVC
(
groupTmpId
)
//for test hjl
getUserInfoViewModel
.
getUserInfomation
(
userId
)
{
[
weak
self
]
dataString
,
avatar
,
groupTmpId
,
error
in
// getUserInfoViewModel.getUserInfomation(userId) { [weak self] dataString, avatar, groupTmpId, error in
// 改变头像
// // 改变头像
self
?
.
customUIConfig
?
.
customerHeadImageUrl
=
avatar
// self?.customUIConfig?.customerHeadImageUrl = avatar
self
?
.
customUIConfig
?
.
showServiceNickName
=
true
// self?.customUIConfig?.showServiceNickName = true
self
?
.
updateUserInfo
(
userId
:
userId
,
userData
:
dataString
??
""
,
completion
:
{
success
in
// self?.updateUserInfo(userId: userId, userData: dataString ?? "", completion: { success in
DispatchQueue
.
main
.
async
{
// DispatchQueue.main.async {
gotoSessionVC
(
groupTmpId
)
// gotoSessionVC(groupTmpId)
}
// }
})
// })
}
// }
}
}
}
}
...
@@ -298,8 +297,6 @@ extension YHButlerServiceManager {
...
@@ -298,8 +297,6 @@ extension YHButlerServiceManager {
}
}
}
}
//for test hjl
private
func
setupInfomationForQiYu
(
completion
:
@escaping
(
Bool
)
->
Void
)
{
private
func
setupInfomationForQiYu
(
completion
:
@escaping
(
Bool
)
->
Void
)
{
guard
let
userId
=
YHLoginManager
.
shared
.
userModel
?
.
id
,
userId
.
count
>
0
else
{
guard
let
userId
=
YHLoginManager
.
shared
.
userModel
?
.
id
,
userId
.
count
>
0
else
{
completion
(
false
)
completion
(
false
)
...
@@ -324,12 +321,13 @@ extension YHButlerServiceManager {
...
@@ -324,12 +321,13 @@ extension YHButlerServiceManager {
return
return
}
}
// 如果新旧账号相同,直接设置用户账号信息
// 如果新旧账号相同,直接设置用户账号信息
guard
QYSDK
.
shared
()
.
currentUserID
()
!=
userId
else
{
guard
let
currentUserID
=
QYSDK
.
shared
()
.
currentUserID
(),
currentUserID
.
count
>
0
,
currentUserID
!=
userId
else
{
setupInfomationForQiYu
(
completion
:
{
done
in
setupInfomationForQiYu
(
completion
:
{
done
in
completion
(
done
)
completion
(
done
)
})
})
return
return
}
}
// 如果新旧账号不相同,先登出SDK,再用新账号信息写入,
// 如果新旧账号不相同,先登出SDK,再用新账号信息写入,
logoutCurrentUser
{
[
weak
self
]
success
in
logoutCurrentUser
{
[
weak
self
]
success
in
if
success
{
if
success
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift
View file @
27a994b8
...
@@ -57,17 +57,10 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
...
@@ -57,17 +57,10 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
make
.
right
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
make
.
left
.
equalTo
(
nameLable
.
snp
.
right
)
.
offset
(
10
)
make
.
left
.
equalTo
(
nameLable
.
snp
.
right
)
.
offset
(
10
)
make
.
height
.
greaterThanOrEqualTo
(
20
)
make
.
height
.
greaterThanOrEqualTo
(
20
)
// make.bottom.equalToSuperview()
make
.
bottom
.
lessThanOrEqualToSuperview
()
make
.
bottom
.
lessThanOrEqualToSuperview
()
}
}
nameLable
.
setContentCompressionResistancePriority
(
.
required
,
for
:
.
horizontal
)
nameLable
.
setContentCompressionResistancePriority
(
.
required
,
for
:
.
horizontal
)
subtitleLable
.
setContentCompressionResistancePriority
(
.
defaultLow
,
for
:
.
horizontal
)
subtitleLable
.
setContentCompressionResistancePriority
(
.
defaultLow
,
for
:
.
horizontal
)
// nameLable.backgroundColor = .red //for test hjl
// subtitleLable.backgroundColor = .yellow //for test hjl
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemsView.swift
View file @
27a994b8
...
@@ -73,8 +73,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
...
@@ -73,8 +73,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
left
.
equalToSuperview
()
.
offset
(
kMargin
)
make
.
left
.
equalToSuperview
()
.
offset
(
kMargin
)
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
21
)
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
21
)
// cellView.backgroundColor = UIColor.purple//for test hjl
}
else
{
}
else
{
make
.
top
.
equalTo
(
tmp
!.
snp
.
bottom
)
make
.
top
.
equalTo
(
tmp
!.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
...
@@ -89,9 +87,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
...
@@ -89,9 +87,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
make
.
top
.
equalToSuperview
()
make
.
top
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
left
.
equalToSuperview
()
.
offset
(
kMargin
)
make
.
left
.
equalToSuperview
()
.
offset
(
kMargin
)
// cellView.backgroundColor = UIColor.purple//for test hjl
}
else
{
}
else
{
make
.
top
.
equalTo
(
tmp
!.
snp
.
bottom
)
make
.
top
.
equalTo
(
tmp
!.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
...
...
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/IM(环信)/C/YHIMTestViewController.swift
View file @
27a994b8
...
@@ -56,7 +56,6 @@ private extension YHIMTestViewController {
...
@@ -56,7 +56,6 @@ private extension YHIMTestViewController {
make
.
width
.
equalTo
(
300
)
make
.
width
.
equalTo
(
300
)
make
.
height
.
equalTo
(
44
)
make
.
height
.
equalTo
(
44
)
}
}
addBtn
.
backgroundColor
=
UIColor
.
red
//for test hjl
addBtn
.
addTarget
(
self
,
action
:
#selector(
userLoginOp
)
,
for
:
.
touchUpInside
)
addBtn
.
addTarget
(
self
,
action
:
#selector(
userLoginOp
)
,
for
:
.
touchUpInside
)
tagView
=
addBtn
tagView
=
addBtn
}
}
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
27a994b8
...
@@ -443,9 +443,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
...
@@ -443,9 +443,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
vc
.
isSupportWebviewInterBackFlag
=
true
vc
.
isSupportWebviewInterBackFlag
=
true
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
}
// case .liveEntryTest:
// let vc = YHSimpleAudienceVC()
// self.navigationController?.pushViewController(vc) //for test hjl
case
.
mycart
:
case
.
mycart
:
// 我的订单
// 我的订单
if
let
token
=
YHLoginManager
.
shared
.
userModel
?
.
token
,
token
.
count
>
5
{
if
let
token
=
YHLoginManager
.
shared
.
userModel
?
.
token
,
token
.
count
>
5
{
...
...
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