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

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bugs

PhoneManager/Class/Page/Advertisement/Manager/AdvManager.swift

@@ -276,7 +276,7 @@ class AdvManager : NSObject, FullScreenContentDelegate {
                 if needAlert{
                     showErrMessage(vc: vc)
                 }else{
-                    finisedCallBack()
+                    failueFinishedCallBack()
                 }
                 return
             }

PhoneManager/Class/Page/Home/Controller/HomeViewController.swift

@@ -19,10 +19,14 @@ class HomeViewController:BaseViewController {
     
     var homeView:HomeView?
     
+    var isAdCallBack = false
+    
     let adManager = AdvManager.shared
     
     fileprivate func junmToModule(_ cIndex: String, _ self: HomeViewController) {
+       
         switch cIndex {
+
         case HomeTabbarItemState.Charging.rawValue:
             
             DispatchQueue.main.async {[weak self] in
@@ -37,7 +41,6 @@ class HomeViewController:BaseViewController {
         case HomeTabbarItemState.SecretSpace.rawValue:
             DispatchQueue.main.async { [weak self] in
                 guard let self else {return}
-                
                 // 这里需要看下是否需要PIN验证
                 let pass =  SettingConfiguration.share.config.secret ?? ""//UserDefaults.standard.object(forKey: SecretViewController.psKey) as? String ?? ""
                 if pass.count > 2{
@@ -177,24 +180,35 @@ class HomeViewController:BaseViewController {
         homeView?.indexCallBack = {[weak self] index in
             
             guard let self else {return}
-            
+                
             if let cIndex = index as? String {
+                //self.junmToModule(cIndex, self)
                 // 先走广告策略
                 if IAPManager.share.isSubscribed == false {
-                    self.adManager.showInterstitialAd(vc: self,from: cIndex,isHome: true)
-                }
-               // junmToModule(cIndex, self)
-                self.adManager.finisedCallBack = {
-                    if self.adManager.isFromHome{
-                        self.junmToModule(cIndex, self)
+                    self.adManager.finisedCallBack = {
+                        Print("执行成功",cIndex)
+                        if self.adManager.adFromVC == cIndex{
+                            self.isAdCallBack = true
+                            self.junmToModule(cIndex, self)
+                        }
                     }
-                }
-                self.adManager.failueFinishedCallBack = {
-                    // 首页特殊要求广告没准备好也需要跳转
-                    if self.adManager.isFromHome{
-                        self.junmToModule(cIndex, self)
+                    self.adManager.failueFinishedCallBack = {
+                        // 首页特殊要求广告没准备好也需要跳转
+                        Print("执行失败",cIndex)
+                        if self.adManager.adFromVC == cIndex{
+                            self.junmToModule(cIndex, self)
+                        }
                     }
+                    self.adManager.showInterstitialAd(vc: self,from: cIndex,isHome: true)
+                   // self.junmToModule(cIndex, self)
+
+          
+                }else{
+                    self.isAdCallBack = true
+                    self.junmToModule(cIndex, self)
                 }
+               
+             
             }
         }
         view.addSubview(homeView!)

PhoneManager/Class/Page/Home/ViewModel/HomeViewModel.swift

@@ -159,7 +159,7 @@ class HomeViewModel {
         } completionHandler: {[weak self]  totalGroup in
             guard let weakSelf = self else { return }
             print("获取相似图片完成",totalGroup.count)
-            weakSelf.photoManager.similarModels = totalGroup
+            weakSelf.photoManager.similarModels = weakSelf.sortGroupsByTime(totalGroup)
             weakSelf.filterResource()
             weakSelf.homeDataChanged?(0,type.index,true)
             

PhoneManager/Class/Page/Secret/SecretViewController.swift

@@ -288,18 +288,26 @@ class SecretViewController: BaseViewController {
 //                    self.AddAction.callback = { idx in
 //                        popAdvThenDo(idx: idx)
 //                    }
-                    AdvManager.shared.finisedCallBack = {
-                        if AdvManager.shared.adFromVC == "Secret"{
-                            self.AddAction = SecretActionView()
-                            self.AddAction.show();
-                            self.view.showBlur()
-                            self.AddAction.callback = { idx in
-                                popAdvThenDo(idx: idx)
-                            }
-                        }
-  
+//                    
+//                    AdvManager.shared.finisedCallBack = {
+//                        if AdvManager.shared.adFromVC == "Secret"{
+//                            self.AddAction = SecretActionView()
+//                            self.AddAction.show();
+//                            self.view.showBlur()
+//                            self.AddAction.callback = { idx in
+//                                popAdvThenDo(idx: idx)
+//                            }
+//                        }
+//                    }
+
+                  //  popAdverTisement()
+                    
+                    self.AddAction = SecretActionView()
+                    self.AddAction.show();
+                    self.view.showBlur()
+                    self.AddAction.callback = { idx in
+                        popAdvThenDo(idx: idx)
                     }
-                    popAdverTisement()
            
                     
                 }else {