Merge branch 'dev_main' of gitlab.huolea.com:ShuMing/phonemanager into dev_main

PhoneManager/Class/Page/Compress/Controller/CompressQualityController.swift

@@ -293,6 +293,9 @@ class CompressQualityController : BaseViewController{
                                 AdvManager.shared.finisedCallBack = {
                                     self.jumpToNextPage()
                                 }
+                                AdvManager.shared.failueFinishedCallBack = {
+                                    self.navigationController?.popViewController(animated: true)
+                                }
                             }
                         }
                     }

PhoneManager/Class/Page/Settings/ViewController/SettingViewController.swift

@@ -154,7 +154,7 @@ class SettingViewController : BaseViewController , UITableViewDelegate, UITableV
         
         switch detailModel.title {
         case settingLabels.Email.rawValue:
-            emailLoginSignOut()
+            emailLoginSignOut(indexPath)
             break
         case settingLabels.UsePIN.rawValue:
             
@@ -313,7 +313,7 @@ class SettingViewController : BaseViewController , UITableViewDelegate, UITableV
     }
     
     // MARK: - 邮件
-    private func emailLoginSignOut() -> Void {
+    private func emailLoginSignOut(_ indexPath:IndexPath) -> Void {
         if PMEmailManager.shareManager.loginUser != nil {
             self.view.showBlur()
             let alert = EmailContentDelAlert(state: .emailSignOut)
@@ -323,7 +323,7 @@ class SettingViewController : BaseViewController , UITableViewDelegate, UITableV
                     PMEmailManager.shareManager.signOut {[weak self] success in
                         if success {
                             EmailFilterManager.share.signOut()
-                            self?.tableView.reloadRows(at: [IndexPath(row: 0, section:1)], with: .none)
+                            self?.tableView.reloadRows(at: [indexPath], with: .none)
                         }
                     }
                 }
@@ -351,7 +351,10 @@ class SettingViewController : BaseViewController , UITableViewDelegate, UITableV
             let vc:EmailLoginController = EmailLoginController()
             vc.state = .home
             self.navigationController?.pushViewController(vc, animated: true)
-            self.tableView.reloadData()
+            vc.callblock = { [weak self] in
+                self?.tableView.reloadRows(at: [indexPath], with: .none)
+            }
+//            self.tableView.reloadData()
   
         }
     }

PhoneManager/Class/Session/Email/Controller/EmailLoginController.swift

@@ -54,14 +54,15 @@ class EmailLoginController: BaseViewController {
                     if self.state == .home {
                         let gourp = EmailCleanController()
                         var navigation = self.navigationController?.viewControllers
+                        if self.callblock != nil {
+                            self.callblock!()
+                        }
                         if navigation?.count ?? 0 > 1 {
                             navigation![navigation!.count-1] = gourp
                             self.navigationController?.setViewControllers(navigation ?? [], animated: true)
                         }
+                        
                     }else{
-                        if self.callblock != nil {
-                            self.callblock!()
-                        }
                         self.navigationController?.popViewController(animated: true)
                     }
                 }