对齐壳子文件

Author: 徐善栋

app/AppDelegate.swift

@@ -31,14 +31,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         let option = NIMSDKOption()
         option.appKey = AppKey.appKey
         option.apnsCername = AppKey.pushCerName
-        CoreKitEngine.instance.setupCoreKit(option)
+        IMKitEngine.instance.setupCoreKitIM(option)
 
 
         IQKeyboardManager.shared.enable = true
         IQKeyboardManager.shared.shouldResignOnTouchOutside = true
 
         //login action
-        startLogin(account: <#imaccid#>, token: <#imToken#>)
+        startLogin(account:"279476370047232", token:"22b4fb5a-9696-4ce6-95b5-39be56bf5980")
     }
 
     @objc func refreshRoot(){
@@ -80,13 +80,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     func startLogin(account:String,token:String){
         weak var weakSelf = self
-        CoreKitEngine.instance.login(account, token) { error in
+        IMKitLoginManager.instance.loginIM(account, token) { error in
             if let err = error {
                 print("NEKitCore login error : ", err)
             }else {
                 ChatRouter.setupInit()
                 let param = QChatLoginParam(account,token)
-                CoreKitIMEngine.instance.loginQchat(param) { error, response in
+                IMKitLoginManager.instance.loginQchat(param) { error, response in
                     if let err = error {
                         print("qchatLogin failed, error : ", err)
                     }else {

app/Mine/MeViewController.swift

@@ -127,7 +127,7 @@ class MeViewController: UIViewController {
     }
 
     func updateUserInfo(){
-        let user = userProvider.getUserInfo(userId: CoreKitIMEngine.instance.imAccid)
+        let user = userProvider.getUserInfo(userId: IMKitLoginManager.instance.imAccid)
         idLabel.text = "账号:\(user?.userId ?? "")"
         nameLabel.text = user?.userInfo?.nickName
         header.configHeadData(headUrl: user?.userInfo?.avatarUrl, name: user?.showName() ?? "")

app/Mine/MineSettingViewModel.swift

@@ -57,10 +57,11 @@ public class MineSettingViewModel {
         receiverModel.cellName = "听筒模式"
         receiverModel.type = SettingCellType.SettingSwitchCell.rawValue
         receiverModel.cornerType = .topLeft.union(.topRight)
-        receiverModel.switchOpen = CoreKitEngine.instance.repo.getHandSetMode()
-        
+//        receiverModel.switchOpen = CoreKitEngine.instance.repo.getHandSetMode()
+        receiverModel.switchOpen = IMKitEngine.instance.repo.getHandSetMode()
+
         receiverModel.swichChange = { isOpen in
-            CoreKitEngine.instance.repo.setHandSetMode(isOpen)
+            IMKitEngine.instance.repo.setHandSetMode(isOpen)
         }
 //        //过滤通知
 //        let filterNotify = SettingCellModel()
@@ -76,10 +77,10 @@ public class MineSettingViewModel {
         let deleteFriend = SettingCellModel()
         deleteFriend.cellName = "删除好友是否同步删除备注"
         deleteFriend.type = SettingCellType.SettingSwitchCell.rawValue
-        deleteFriend.switchOpen = CoreKitEngine.instance.repo.getDeleteFriendAlias()
+        deleteFriend.switchOpen = IMKitEngine.instance.repo.getDeleteFriendAlias()
 
         deleteFriend.swichChange = { isOpen in
-            CoreKitEngine.instance.repo.setDeleteFriendAlias(isOpen)
+            IMKitEngine.instance.repo.setDeleteFriendAlias(isOpen)
         }
 
         //消息已读未读功能
@@ -88,9 +89,9 @@ public class MineSettingViewModel {
         hasRead.type = SettingCellType.SettingSwitchCell.rawValue
         hasRead.cornerType = .bottomLeft.union(.bottomRight)
 //        hasRead.switchOpen = true
-        hasRead.switchOpen = CoreKitEngine.instance.repo.getMessageRead()
+        hasRead.switchOpen = IMKitEngine.instance.repo.getMessageRead()
         hasRead.swichChange = { isOpen in
-            CoreKitEngine.instance.repo.setMessageRead(isOpen)
+            IMKitEngine.instance.repo.setMessageRead(isOpen)
         }
         model.cellModels.append(contentsOf: [receiverModel ,deleteFriend,hasRead])
         return model

app/Mine/PersonInfoViewController.swift

@@ -128,7 +128,7 @@ class PersonInfoViewController: NEBaseViewController {
 extension PersonInfoViewController:NIMUserManagerDelegate {
 
     func onUserInfoChanged(_ user: NIMUser) {
-        if user.userId == CoreKitIMEngine.instance.imAccid {
+        if user.userId == IMKitLoginManager.instance.imAccid {
             viewModel.getData()
             tableView.reloadData()
         }
@@ -150,7 +150,7 @@ extension PersonInfoViewController:UINavigationControllerDelegate {
         self.view.makeToastActivity(.center)
         weak var weakSelf = self
         if let imageData = image.jpegData(compressionQuality: 0.6) as NSData? {
-             let filePath = NSHomeDirectory().appending("/Documents/").appending(CoreKitIMEngine.instance.imAccid)
+             let filePath = NSHomeDirectory().appending("/Documents/").appending(IMKitLoginManager.instance.imAccid)
              let succcess =  imageData.write(toFile: filePath, atomically: true)
             if succcess {
                 NIMSDK.shared().resourceManager.upload(filePath, scene: NIMNOSSceneTypeAvatar, progress: nil) { urlString, error in

app/Mine/PersonInfoViewModel.swift

@@ -26,7 +26,7 @@ public class  PersonInfoViewModel{
 
     func getData(){
         sectionData.removeAll()
-        userInfo = friendProvider.getUserInfo(userId: CoreKitIMEngine.instance.imAccid)
+        userInfo = friendProvider.getUserInfo(userId: IMKitLoginManager.instance.imAccid)
         sectionData.append(getFirstSection())
         sectionData.append(getSecondSection())
     }

app/NETabBarController.swift

@@ -61,7 +61,7 @@ class NETabBarController: UITabBarController {
     }
 
     func setUpSessionBadgeValue(){
-        sessionUnreadCount = ConversationRepo().allUnreadCount(notify: true)
+        sessionUnreadCount = ConversationRepo().getMsgUnreadCount(notify: true)
         if sessionUnreadCount > 0  {
             self.tabBar.showBadgOn(index: 0)
         }else {