Skip to content

G
galaxy-iOS
Commit 2778ddd2 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

进入群聊以及点击头像都不让进入用户详情页、IM增加灰度控制

parent e4576af6
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 18 deletions
TUIKit/TUIChat/UI_Classic/Chat/TUIBaseChatViewController.h
View file @ 2778ddd2
......@@ -49,7 +49,7 @@
// 是否隐藏更多按钮
@property(nonatomic, assign) BOOL needHideNaviMore;
// 是否选中cell头像
@property(nonatomic, assign) BOOL needHideCellAvatar;
@property(nonatomic, assign) BOOL needHideShowUserInfoPage;
// 文件预览代理
@property(nonatomic, weak) id<TUICustomOpenFileDelegate> filePreviewDelegate;
......
TUIKit/TUIChat/UI_Classic/Chat/TUIBaseChatViewController.m
View file @ 2778ddd2
......@@ -950,7 +950,7 @@ static CGRect gCustomTopViewRect;
}
- (void)messageController:(TUIBaseMessageController *)controller onSelectMessageAvatar:(TUIMessageCell *)cell {
if (self.needHideCellAvatar) {
if (self.needHideShowUserInfoPage) {
return;
}
NSString *userID = nil;
......@@ -1464,6 +1464,9 @@ static CGRect gCustomTopViewRect;
#pragma mark - TUIJoinGroupMessageCellDelegate
- (void)didTapOnRestNameLabel:(TUIJoinGroupMessageCell *)cell withIndex:(NSInteger)index {
if (self.needHideShowUserInfoPage) {
return;
}
NSString *userId = cell.joinData.userIDList[index];
[self getUserOrFriendProfileVCWithUserID:userId
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 2778ddd2
......@@ -8510,7 +8510,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8537,7 +8537,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8658,7 +8658,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8685,7 +8685,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8868,7 +8868,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8895,7 +8895,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -8918,7 +8918,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8945,7 +8945,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.2.4;
MARKETING_VERSION = 2.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHTencentDeskManager.swift
View file @ 2778ddd2
......@@ -83,7 +83,7 @@ extension YHTencentDeskManager {
/// 灰度打开
func isUatAllowed() -> Bool {
let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: .QiYu_Service) == 1
let allowed = YHUatHelper.shared.getUatModuleStatusBy(module: .Tx_IM) == 1
return allowed
}
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
View file @ 2778ddd2
......@@ -28,6 +28,8 @@ class YHMessageListVC: YHBaseViewController {
var isNotifyEnabled = false
private var oldImUat: Bool = false
private lazy var previewFileTool: YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: self)
return tool
......@@ -108,7 +110,10 @@ class YHMessageListVC: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
setupMessageList()
oldImUat = YHTencentDeskManager.shared.isUatAllowed()
if oldImUat {
setupMessageList()
}
}
override func viewWillAppear(_ animated: Bool) {
......@@ -155,6 +160,7 @@ class YHMessageListVC: YHBaseViewController {
NotificationCenter.default.addObserver(self, selector: #selector(checkNotificationPermisson), name: YhConstant.YhNotification.didReqeustNotifyPermissionNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(didRefreshYinHeManagerUnreadMsg), name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(imLoginSuccess), name: YhConstant.YhNotification.didTxIMLoginSuccessNotifiction, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(didRevUatParam), name: YhConstant.YhNotification.didRevUatParam, object: nil)
}
private func setupMessageList() {
......@@ -245,7 +251,11 @@ class YHMessageListVC: YHBaseViewController {
}
// 银河资讯
msgArr.append(self.viewModel.msgList.article)
if msgArr.count > 0 {
msgArr.insert(self.viewModel.msgList.article, at: 1)
} else {
msgArr.insert(self.viewModel.msgList.article, at: 0)
}
if success {
var hasUnreadMsg = false
......@@ -316,6 +326,13 @@ class YHMessageListVC: YHBaseViewController {
}
}
@objc private func didRevUatParam() {
guard oldImUat != YHTencentDeskManager.shared.isUatAllowed(), YHTencentDeskManager.shared.isUatAllowed() else {
return
}
setupMessageList()
}
func requestOrderStatus(callback: ((_ status: Int) -> Void)?) {
// 先获取订单列表
self.serviceCenterMainViewModel.getContactList {
......@@ -499,7 +516,7 @@ extension YHMessageListVC {
vc.navigationItem.rightBarButtonItems = nil
vc.needHideNaviMore = true
vc.filePreviewDelegate = self
vc.needHideCellAvatar = true
vc.needHideShowUserInfoPage = true
}
}
......@@ -584,7 +601,7 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
vc.navigationItem.rightBarButtonItems = nil
vc.needHideNaviMore = true
vc.filePreviewDelegate = self
vc.needHideCellAvatar = true
vc.needHideShowUserInfoPage = true
}
return
}
......@@ -697,7 +714,9 @@ extension YHMessageListVC: YHMessageListDelegate {
}
msgArr.removeAll(where: { $0.type == YHMessageType.txIM.rawValue })
convertedItems.sort { $0.lastMessageTime > $1.lastMessageTime }
if msgArr.count > 0 {
if msgArr.count > 1 {
msgArr.insert(contentsOf: convertedItems, at: 2)
} else if msgArr.count > 0 {
msgArr.insert(contentsOf: convertedItems, at: 1)
} else {
msgArr.insert(contentsOf: convertedItems, at: 0)
......
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift
View file @ 2778ddd2
......@@ -71,7 +71,6 @@ class YHMessageSessionCell: UITableViewCell {
self.iconContentView.backgroundColor = UIColor(hex: 0xF0F5FF)
} else if model.type == YHMessageType.txIM.rawValue {
// self.iconImgView.kf.setImage(with: URL(string: model.avatar), placeholder: model.avatarImage ?? UIImage(named: "people_head_default"))
updatePortrait(convData: model)
}
......
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift
View file @ 2778ddd2
......@@ -41,6 +41,7 @@ enum YHUatModules: Int {
case Update_Suggest = 9 // 更新-建议更新弹窗
case QiYu_Service = 10 // 七鱼智能客服入口
case Tx_IM = 11 // 腾讯IM
// 1-可见 2-不可见 3-新界面
var defaultValue: Int {
......@@ -66,6 +67,8 @@ enum YHUatModules: Int {
return 2
case .QiYu_Service:
return 1
case .Tx_IM:
return 1
default:
return 2
}
......
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift
View file @ 2778ddd2
......@@ -60,7 +60,7 @@ extension YHUatHelperViewModel {
return
}
// let params: [String] = ["1", "2","3", "4","5","6","9","10"]
let params: [String] = ["1", "2", "3", "4", "5", "6", "9"]
let params: [String] = ["1", "2", "3", "4", "5", "6", "9", "11"]
var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
for (index, item) in params.enumerated() {
if index == 0 {
......
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