Merge pull request #377 from zsw666/master

v961
netease-kit · Jul 11, 2023 · b5b377c · b5b377c
2 parents 49c0a15 + 216e46e
commit b5b377c
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 42 deletions.
diff --git a/NEChatUIKit/NEChatUIKit.podspec b/NEChatUIKit/NEChatUIKit.podspec
@@ -1,4 +1,4 @@
-#
+Az #
 #  Be sure to run `pod spec lint NEChatUIKit.podspec' to ensure this is a
 #  valid spec and to remove all comments including this before submitting the s.
 #
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '9.6.0'
+  s.version      = '9.6.1'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.

diff --git a/NEChatUIKit/NEChatUIKit/Classes/Base/BaseViewController/ChatBaseViewController.swift b/NEChatUIKit/NEChatUIKit/Classes/Base/BaseViewController/ChatBaseViewController.swift
@@ -36,6 +36,7 @@ open class ChatBaseViewController: UIViewController, UIGestureRecognizerDelegate
     if let useSystemNav = NEConfigManager.instance.getParameter(key: useSystemNav) as? Bool, useSystemNav {
       navigationController?.isNavigationBarHidden = false
       setupBackUI()
+      topConstant = NEConstant.navigationAndStatusHeight
     } else {
       navigationController?.isNavigationBarHidden = true
       topConstant = NEConstant.navigationAndStatusHeight

diff --git a/NEChatUIKit/NEChatUIKit/Classes/FunUI/Controller/FunReadViewController.swift b/NEChatUIKit/NEChatUIKit/Classes/FunUI/Controller/FunReadViewController.swift
@@ -19,7 +19,7 @@ open class FunReadViewController: NEBaseReadViewController {
 
     readTableView.register(
       FunUserTableViewCell.self,
-      forCellReuseIdentifier: "\(FunUserTableViewCell.self)"
+      forCellReuseIdentifier: "\(UserBaseTableViewCell.self)"
     )
     readTableView.rowHeight = 64
 

diff --git a/NEChatUIKit/NEChatUIKit/Classes/NormalUI/Controller/ReadViewController.swift b/NEChatUIKit/NEChatUIKit/Classes/NormalUI/Controller/ReadViewController.swift
@@ -28,7 +28,7 @@ open class ReadViewController: NEBaseReadViewController {
 
     readTableView.register(
       UserTableViewCell.self,
-      forCellReuseIdentifier: "\(UserTableViewCell.self)"
+      forCellReuseIdentifier: "\(UserBaseTableViewCell.self)"
     )
     readTableView.rowHeight = 62
   }

diff --git a/NEContactUIKit/NEContactUIKit.podspec b/NEContactUIKit/NEContactUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEContactUIKit'
-  s.version          = '9.6.0'
+  s.version          = '9.6.1'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/.../NEContactUIKit/Classes/Validation/Controller/NEBaseValidationMessageViewController.swift b/.../NEContactUIKit/Classes/Validation/Controller/NEBaseValidationMessageViewController.swift
@@ -73,7 +73,7 @@ open class NEBaseValidationMessageViewController: NEBaseContactViewController {
     tableView.separatorStyle = .none
 
     NSLayoutConstraint.activate([
-      tableView.topAnchor.constraint(equalTo: view.topAnchor, constant: NEConstant.navigationAndStatusHeight),
+      tableView.topAnchor.constraint(equalTo: view.topAnchor, constant: topConstant),
       tableView.leftAnchor.constraint(equalTo: view.leftAnchor),
       tableView.rightAnchor.constraint(equalTo: view.rightAnchor),
       tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor),

diff --git a/NEContactUIKit/NEContactUIKit/Classes/Views/NEBaseContactViewController.swift b/NEContactUIKit/NEContactUIKit/Classes/Views/NEBaseContactViewController.swift
@@ -33,6 +33,7 @@ open class NEBaseContactViewController: UIViewController, UIGestureRecognizerDel
     if let useSystemNav = NEConfigManager.instance.getParameter(key: useSystemNav) as? Bool, useSystemNav {
       navigationController?.isNavigationBarHidden = false
       setupBackUI()
+      topConstant = 0
     } else {
       navigationController?.isNavigationBarHidden = true
       topConstant = NEConstant.navigationAndStatusHeight

diff --git a/NEContactUIKit/NEContactUIKit/Classes/Views/NEBaseContactsViewController.swift b/NEContactUIKit/NEContactUIKit/Classes/Views/NEBaseContactsViewController.swift
@@ -105,6 +105,12 @@ open class NEBaseContactsViewController: UIViewController, UITableViewDelegate,
   }
 
   override open func viewWillAppear(_ animated: Bool) {
+    if let useSystemNav = NEConfigManager.instance.getParameter(key: useSystemNav) as? Bool, useSystemNav {
+      navigationController?.isNavigationBarHidden = false
+    } else {
+      navigationController?.isNavigationBarHidden = true
+    }
+
     // 刷新数据
     viewModel.reLoadData { [weak self] error, userSectionCount in
       self?.emptyView.isHidden = userSectionCount > 0

diff --git a/NEConversationUIKit/NEConversationUIKit.podspec b/NEConversationUIKit/NEConversationUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NEConversationUIKit'
-  s.version          = '9.6.0'
+  s.version          = '9.6.1'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/...onversationUIKit/Classes/Conversation/Controller/NEBaseConversationSearchController.swift b/...onversationUIKit/Classes/Conversation/Controller/NEBaseConversationSearchController.swift
@@ -146,19 +146,21 @@ open class NEBaseConversationSearchController: NEBaseConversationNavigationContr
 
   open func tableView(_ tableView: UITableView,
                       cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-    let cell = tableView.dequeueReusableCell(
+    if let cell = tableView.dequeueReusableCell(
       withIdentifier: "\(NSStringFromClass(NEBaseConversationSearchCell.self))",
       for: indexPath
-    ) as! NEBaseConversationSearchCell
-    if indexPath.section == 0 {
-      cell.searchModel = viewModel.searchResult?.friend[indexPath.row]
-    } else if indexPath.section == 1 {
-      cell.searchModel = viewModel.searchResult?.contactGroup[indexPath.row]
-    } else {
-      cell.searchModel = viewModel.searchResult?.seniorGroup[indexPath.row]
+    ) as? NEBaseConversationSearchCell {
+      if indexPath.section == 0 {
+        cell.searchModel = viewModel.searchResult?.friend[indexPath.row]
+      } else if indexPath.section == 1 {
+        cell.searchModel = viewModel.searchResult?.contactGroup[indexPath.row]
+      } else {
+        cell.searchModel = viewModel.searchResult?.seniorGroup[indexPath.row]
+      }
+      cell.searchText = searchStr
+      return cell
     }
-    cell.searchText = searchStr
-    return cell
+    return NEBaseConversationListCell()
   }
 
   open func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

diff --git a/...nUIKit/NEConversationUIKit/Classes/FunUI/Controller/FunConversationSearchController.swift b/...nUIKit/NEConversationUIKit/Classes/FunUI/Controller/FunConversationSearchController.swift
@@ -63,11 +63,11 @@ open class FunConversationSearchController: NEBaseConversationSearchController {
     ])
     tableView.register(
       FunConversationSearchCell.self,
-      forCellReuseIdentifier: "\(NSStringFromClass(FunConversationSearchCell.self))"
+      forCellReuseIdentifier: "\(NSStringFromClass(NEBaseConversationSearchCell.self))"
     )
     tableView.register(
       FunSearchSessionHeaderView.self,
-      forHeaderFooterViewReuseIdentifier: "\(NSStringFromClass(FunSearchSessionHeaderView.self))"
+      forHeaderFooterViewReuseIdentifier: "\(NSStringFromClass(SearchSessionBaseView.self))"
     )
     tableView.backgroundColor = .funConversationBackgroundColor
     if #available(iOS 15.0, *) {
@@ -78,28 +78,11 @@ open class FunConversationSearchController: NEBaseConversationSearchController {
 
   // MARK: UITableViewDelegate, UITableViewDataSource
 
-//  override open func tableView(_ tableView: UITableView,
-//                               cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//    let cell = tableView.dequeueReusableCell(
-//      withIdentifier: "\(NSStringFromClass(FunConversationSearchCell.self))",
-//      for: indexPath
-//    ) as! FunConversationSearchCell
-//    if indexPath.section == 0 {
-//      cell.searchModel = viewModel.searchResult?.friend[indexPath.row]
-//    } else if indexPath.section == 1 {
-//      cell.searchModel = viewModel.searchResult?.contactGroup[indexPath.row]
-//    } else {
-//      cell.searchModel = viewModel.searchResult?.seniorGroup[indexPath.row]
-//    }
-//    cell.searchText = searchStr
-//    return cell
-//  }
-
   override open func tableView(_ tableView: UITableView,
                                viewForHeaderInSection section: Int) -> UIView? {
     let sectionView = tableView
       .dequeueReusableHeaderFooterView(
-        withIdentifier: "\(NSStringFromClass(FunSearchSessionHeaderView.self))"
+        withIdentifier: "\(NSStringFromClass(SearchSessionBaseView.self))"
       ) as! FunSearchSessionHeaderView
     sectionView.title.textColor = .funConversationSearchHeaderViewTitleColor
     sectionView.bottomLine.backgroundColor = .funConversationLineBorderColor

diff --git a/...nUIKit/NEConversationUIKit/Classes/NormalUI/Controller/ConversationSearchController.swift b/...nUIKit/NEConversationUIKit/Classes/NormalUI/Controller/ConversationSearchController.swift
@@ -59,11 +59,11 @@ open class ConversationSearchController: NEBaseConversationSearchController {
     ])
     tableView.register(
       ConversationSearchCell.self,
-      forCellReuseIdentifier: "\(NSStringFromClass(ConversationSearchCell.self))"
+      forCellReuseIdentifier: "\(NSStringFromClass(NEBaseConversationSearchCell.self))"
     )
     tableView.register(
       SearchSessionHeaderView.self,
-      forHeaderFooterViewReuseIdentifier: "\(NSStringFromClass(SearchSessionHeaderView.self))"
+      forHeaderFooterViewReuseIdentifier: "\(NSStringFromClass(SearchSessionBaseView.self))"
     )
   }
 }
diff --git a/NETeamUIKit/NETeamUIKit.podspec b/NETeamUIKit/NETeamUIKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NETeamUIKit'
-  s.version          = '9.6.0'
+  s.version          = '9.6.1'
   s.summary          = 'Netease XKit'
 
 # This description is used to generate tags and improve search results.

diff --git a/NETeamUIKit/NETeamUIKit/Classes/FunUI/Controller/FunTeamMembersController.swift b/NETeamUIKit/NETeamUIKit/Classes/FunUI/Controller/FunTeamMembersController.swift
@@ -20,7 +20,7 @@ open class FunTeamMembersController: NEBaseTeamMembersController {
     NSLayoutConstraint.activate([
       searchGrayBackView.leftAnchor.constraint(equalTo: view.leftAnchor),
       searchGrayBackView.rightAnchor.constraint(equalTo: view.rightAnchor),
-      searchGrayBackView.topAnchor.constraint(equalTo: customNavigationView.bottomAnchor),
+      searchGrayBackView.topAnchor.constraint(equalTo: view.topAnchor, constant: topConstant),
       searchGrayBackView.bottomAnchor.constraint(equalTo: contentTable.topAnchor),
     ])
     back.backgroundColor = UIColor.white

diff --git a/NETeamUIKit/NETeamUIKit/Classes/Setting/NEBaseTeamMembersController.swift b/NETeamUIKit/NETeamUIKit/Classes/Setting/NEBaseTeamMembersController.swift
@@ -103,7 +103,7 @@ open class NEBaseTeamMembersController: NEBaseViewController, UITableViewDelegat
 
     view.addSubview(back)
     NSLayoutConstraint.activate([
-      back.topAnchor.constraint(equalTo: view.topAnchor, constant: 4.0 + NEConstant.navigationAndStatusHeight),
+      back.topAnchor.constraint(equalTo: view.topAnchor, constant: 8.0 + topConstant),
       back.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 20),
       back.rightAnchor.constraint(equalTo: view.rightAnchor, constant: -20),
       back.heightAnchor.constraint(equalToConstant: 32),