Commit 27a994b8 authored by DavidHuang's avatar DavidHuang

修改 七鱼 crm信息不完整的bug

parent b5f58e4c
......@@ -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(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 {
......@@ -113,17 +113,16 @@ class YHButlerServiceManager: NSObject {
return
}
gotoSessionVC(groupTmpId) //for test hjl
// getUserInfoViewModel.getUserInfomation(userId) { [weak self] dataString, avatar, groupTmpId, error in
// // 改变头像
// self?.customUIConfig?.customerHeadImageUrl = avatar
// self?.customUIConfig?.showServiceNickName = true
// self?.updateUserInfo(userId: userId, userData: dataString ?? "", completion: { success in
// DispatchQueue.main.async {
// gotoSessionVC(groupTmpId)
// }
// })
// }
getUserInfoViewModel.getUserInfomation(userId) { [weak self] dataString, avatar, groupTmpId, error in
// 改变头像
self?.customUIConfig?.customerHeadImageUrl = avatar
self?.customUIConfig?.showServiceNickName = true
self?.updateUserInfo(userId: userId, userData: dataString ?? "", completion: { success in
DispatchQueue.main.async {
gotoSessionVC(groupTmpId)
}
})
}
}
}
......@@ -298,8 +297,6 @@ extension YHButlerServiceManager {
}
}
//for test hjl
private func setupInfomationForQiYu(completion: @escaping (Bool) -> Void) {
guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
completion(false)
......@@ -324,12 +321,13 @@ extension YHButlerServiceManager {
return
}
// 如果新旧账号相同,直接设置用户账号信息
guard QYSDK.shared().currentUserID() != userId else {
guard let currentUserID = QYSDK.shared().currentUserID(), currentUserID.count > 0, currentUserID != userId else {
setupInfomationForQiYu(completion: { done in
completion(done)
})
return
}
// 如果新旧账号不相同,先登出SDK,再用新账号信息写入,
logoutCurrentUser { [weak self] success in
if success {
......
......@@ -57,17 +57,10 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
make.right.equalToSuperview()
make.left.equalTo(nameLable.snp.right).offset(10)
make.height.greaterThanOrEqualTo(20)
// make.bottom.equalToSuperview()
make.bottom.lessThanOrEqualToSuperview()
}
nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
subtitleLable.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
// nameLable.backgroundColor = .red //for test hjl
// subtitleLable.backgroundColor = .yellow //for test hjl
}
}
......
......@@ -73,8 +73,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
make.right.equalToSuperview().offset(-kMargin)
make.left.equalToSuperview().offset(kMargin)
make.bottom.equalToSuperview().offset(-21)
// cellView.backgroundColor = UIColor.purple//for test hjl
} else {
make.top.equalTo(tmp!.snp.bottom)
make.right.equalToSuperview().offset(-kMargin)
......@@ -89,9 +87,6 @@ extension YHPreviewInfoNameAndSubNameItemsView {
make.top.equalToSuperview()
make.right.equalToSuperview().offset(-kMargin)
make.left.equalToSuperview().offset(kMargin)
// cellView.backgroundColor = UIColor.purple//for test hjl
} else {
make.top.equalTo(tmp!.snp.bottom)
make.right.equalToSuperview().offset(-kMargin)
......
......@@ -56,7 +56,6 @@ private extension YHIMTestViewController {
make.width.equalTo(300)
make.height.equalTo(44)
}
addBtn.backgroundColor = UIColor.red//for test hjl
addBtn.addTarget(self, action: #selector(userLoginOp), for: .touchUpInside)
tagView = addBtn
}
......
......@@ -443,9 +443,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
vc.isSupportWebviewInterBackFlag = true
UIViewController.current?.navigationController?.pushViewController(vc)
}
// case .liveEntryTest:
// let vc = YHSimpleAudienceVC()
// self.navigationController?.pushViewController(vc) //for test hjl
case .mycart:
// 我的订单
if let token = YHLoginManager.shared.userModel?.token,token.count > 5 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment