1.1.6.25.04.24.19 ,,提审

“张旭”
1 parent 85e6297c
Showing 4 changed files with 42 additions and 140 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Other/AD/CNLiveLaunchAdController.swift
metaCode/Classes/Other/AD/CNOSAdImgDownloadManager.swift
metaCode/Classes/Other/AD/LaunchAdManager.swift
@@ -201,7 +201,6 @@
 		196A55F92D963AE700B06DB7 /* CNLiveVodLandscapeGaoqingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A55F82D963AE600B06DB7 /* CNLiveVodLandscapeGaoqingView.swift */; };
 		196A55FB2D9BE7DC00B06DB7 /* CNLiveVodPayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A55FA2D9BE7DC00B06DB7 /* CNLiveVodPayView.swift */; };
 		196A55FD2DA66AEE00B06DB7 /* CNLiveVodXuanjiKandianCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A55FC2DA66AED00B06DB7 /* CNLiveVodXuanjiKandianCell.swift */; };
-		196A55FF2DB766BC00B06DB7 /* LaunchAdManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A55FE2DB766BC00B06DB7 /* LaunchAdManager.swift */; };
 		196A56012DB7717B00B06DB7 /* CNOSAdImgDownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A56002DB7717B00B06DB7 /* CNOSAdImgDownloadManager.swift */; };
 		196A56032DB7720A00B06DB7 /* CNLiveLaunchAdController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A56022DB7720A00B06DB7 /* CNLiveLaunchAdController.swift */; };
 		196A56062DB7752900B06DB7 /* CNLiveAdViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196A56052DB7752900B06DB7 /* CNLiveAdViewModel.swift */; };
@@ -609,7 +608,6 @@
 		196A55F82D963AE600B06DB7 /* CNLiveVodLandscapeGaoqingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodLandscapeGaoqingView.swift; sourceTree = "<group>"; };
 		196A55FA2D9BE7DC00B06DB7 /* CNLiveVodPayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodPayView.swift; sourceTree = "<group>"; };
 		196A55FC2DA66AED00B06DB7 /* CNLiveVodXuanjiKandianCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodXuanjiKandianCell.swift; sourceTree = "<group>"; };
-		196A55FE2DB766BC00B06DB7 /* LaunchAdManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchAdManager.swift; sourceTree = "<group>"; };
 		196A56002DB7717B00B06DB7 /* CNOSAdImgDownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNOSAdImgDownloadManager.swift; sourceTree = "<group>"; };
 		196A56022DB7720A00B06DB7 /* CNLiveLaunchAdController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLaunchAdController.swift; sourceTree = "<group>"; };
 		196A56052DB7752900B06DB7 /* CNLiveAdViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAdViewModel.swift; sourceTree = "<group>"; };
@@ -1511,7 +1509,6 @@
 		196A56042DB7720F00B06DB7 /* AD */ = {
 			isa = PBXGroup;
 			children = (
-				196A55FE2DB766BC00B06DB7 /* LaunchAdManager.swift */,
 				196A56002DB7717B00B06DB7 /* CNOSAdImgDownloadManager.swift */,
 				196A56022DB7720A00B06DB7 /* CNLiveLaunchAdController.swift */,
 				196A56052DB7752900B06DB7 /* CNLiveAdViewModel.swift */,
@@ -2453,7 +2450,6 @@
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				191733042B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift in Sources */,
 				192ED48A2C5771930057244C /* CNLiveVitaeAddWorkSecCell.swift in Sources */,
-				196A55FF2DB766BC00B06DB7 /* LaunchAdManager.swift in Sources */,
 				79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
@@ -2960,7 +2956,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.16;
+				CURRENT_PROJECT_VERSION = 1.1.6.25.04.24.19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3033,7 +3029,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3216,7 +3212,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.16;
+				CURRENT_PROJECT_VERSION = 1.1.6.25.04.24.19;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3288,7 +3284,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -55,7 +55,7 @@ class CNLiveLaunchAdController:UIViewController,URLSessionTaskDelegate{
         // 2. 存在有效URL时执行清理
         if !oldUrl.isEmpty {
             // 3. 检查图片缓存是否存在
-            if let cachedImage = CNOSAdImgDownloadManager.getOSImage(with: oldUrl) {
+            if let cachedImageData = CNOSAdImgDownloadManager.getOSImage(with: oldUrl),let image = UIImage(data: cachedImageData) {
                 // 4. 异步执行资源清理（避免阻塞主线程）
                 DispatchQueue.global(qos: .utility).async {
                     CNOSAdImgDownloadManager.clearOSImage(with: oldUrl)
@@ -93,7 +93,11 @@ class CNLiveLaunchAdController:UIViewController,URLSessionTaskDelegate{
                         let modifyStatus = adv["modifyStatus"] as? Int
                         let oldModifyStatus = UserDefaults.standard.integer(forKey: "wjjAdv_modifyStatus")
                         let imageUrl = UserDefaults.standard.string(forKey: "wjjAdv_imageUrl")
-                        let localImage = CNOSAdImgDownloadManager.getOSImage(with: imageUrl)
+//                        let localImage = CNOSAdImgDownloadManager.getOSImage(with: imageUrl)
+                        var localImage:UIImage?
+                        if let cachedImageData = CNOSAdImgDownloadManager.getOSImage(with: imageUrl),let localImg = UIImage(data: cachedImageData){
+                            localImage = localImg
+                        }
  
                         if (modifyStatus==oldModifyStatus && (modifyStatus != 0) && ((imageUrl?.count ?? 0 == 0) || (localImage != nil))) {
                             print("无变化")
@@ -112,7 +116,7 @@ class CNLiveLaunchAdController:UIViewController,URLSessionTaskDelegate{
                             advImgUrl = advImgUrl?.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
  
                             if advImgUrl?.count ?? 0 > 0{
-                                if let newImage = CNOSAdImgDownloadManager.getOSImage(with: advImgUrl!) {
+                                if let newImage =  CNOSAdImgDownloadManager.getOSImage(with: advImgUrl!) {
                                     UserDefaults.standard.set(adv["duration"] as? Int ?? 0, forKey: "wjjAdv_duration")//时长
                                     UserDefaults.standard.set(adv["wjjAdv"] as? Bool ?? false, forKey: "wjjAdv_isOpenExternal")//是否外部
                                     let linkUrl = adv["url"] as? String ?? ""
@@ -152,14 +156,26 @@ class CNLiveLaunchAdController:UIViewController,URLSessionTaskDelegate{
         }
  
         // 判断本地是否存在广告图片
-        if let newImage = CNOSAdImgDownloadManager.getOSImage(with: UserDefaults.standard.string(forKey: "wjjAdv_imageUrl")){
+        if  let data = CNOSAdImgDownloadManager.getOSImage(with: UserDefaults.standard.string(forKey: "wjjAdv_imageUrl")), let newImage = YYImage(data: data){
+            let g = YYAnimatedImageView(image: newImage)
+            print("YYImage:\(g.image)")
+            let f = YYImage.animatedImage(withAnimatedGIFData: data)
+            let b = YYImage.gif(data: data)
+            let c = UIImage.sd_image(withGIFData: data)
+            let a = UIImage(data: data)
+            let d = YYFrameImage(data: data)
+            let e = YYImage(smallGIFData: data, scale: 1)
+//            let newImage = CNOSAdImgDownloadManager.getOSImage(with: UserDefaults.standard.string(forKey: "wjjAdv_imageUrl")){
             // 显示广告
 //            let yyImage = newImage as? YYImage
-            
+            print("YYImage:\(newImage),UIImage:\(c)")
             bgView.isUserInteractionEnabled = true
             bgView.addSubview(advImg)
             bgView.addSubview(skipBtn)
-            bgView.image = newImage//yyImage
+//            let gif = YYImage(named: "123.gif")
+            bgView.image = newImage//g.image//e//c//gif//newImage//yyImage
+            bgView.autoPlayAnimatedImage = true
+            bgView.startAnimating()
             let duration = UserDefaults.standard.integer(forKey: "wjjAdv_duration")
             if duration > 0 {
                 var second = duration > 1000 ? duration / 1000 : duration
@@ -34,27 +34,36 @@ final class CNOSAdImgDownloadManager {
  
             let ocUrl: NSString = NSString(string: url ?? "")
             if let md5Key = ocUrl.md5(){
-                shared.cache.store(image, forKey: md5Key, completion: {
-                    success?()
-                })
+                guard let data = image.imageData else { return }//image.sd_imageData()
+                shared.cache.storeImageData(toDisk: data, forKey: md5Key)
+//                shared.cache.store(image, forKey: md5Key, completion: {
+//                    success?()
+//                })
             }
         }
     }
  
     /// 获取缓存图片
-    static func getOSImage(with url: String?) -> UIImage? {
+    static func getOSImage(with url: String?) -> Data? {
         let ocUrl: NSString = NSString(string: url ?? "")
         if let md5Key = ocUrl.md5(){
-            return shared.cache.imageFromCache(forKey: md5Key)// as? YYImage
+            let isCached = shared.cache.diskImageDataExists(withKey: md5Key)
+
+            if isCached{
+                return shared.cache.diskImageData(forKey: md5Key)
+            }
+            
+//            return shared.cache.imageFromCache(forKey: md5Key)// as? YYImage
         }
-        return shared.cache.imageFromCache(forKey: "")// as? YYImage
+        return nil//shared.cache.imageFromCache(forKey: "")// as? YYImage
     }
  
     /// 清除指定图片缓存
     static func clearOSImage(with url: String?) {
         let ocUrl: NSString = NSString(string: url ?? "")
         if let md5Key = ocUrl.md5(){
-            shared.cache.removeImage(forKey: md5Key, withCompletion: nil)
+            shared.cache.removeImageFromDisk(forKey: md5Key)
+//            shared.cache.removeImage(forKey: md5Key, withCompletion: nil)
         }
     }
 }
-//
-//  LaunchAdManager.swift
-//  metaCode
-//
-//  Created by zx on 2025/4/22.
-//
-
-import Foundation
-import UIKit
-
-final class LaunchAdManager {
-    static let shared = LaunchAdManager()
-    private var adViewController: LaunchAdViewController?
-    private var adDataTask: URLSessionDataTask?
-    
-    /// 预加载广告资源 :ml-citation{ref="1,3" data="citationList"}
-    func loadAd() {
-        let adURL = URL(string: "https://wjj.ys2.cnliveimg.com/769/img/2/2025/01/22/173751152842250414939.jpg")!
-        
-        adDataTask?.cancel()
-        adDataTask = URLSession.shared.dataTask(with: adURL) { [weak self] data, _, _ in
-            guard let data = data else { return }
-            DispatchQueue.main.async {
-                self?.cacheAdImage(UIImage(data: data))
-            }
-        }
-        adDataTask?.resume()
-    }
-    
-    /// 显示广告页（在AppDelegate中调用）
-    func showAdIfNeeded(in window: UIWindow?) {
-//        guard !UserSessionManager.shared.isLoggedIn() else {
-//            window?.switchToMainUI()
-//            return
-//        }
-        
-        adViewController = LaunchAdViewController()
-        window?.rootViewController = adViewController
-        window?.makeKeyAndVisible()
-    }
-    
-    private func cacheAdImage(_ image: UIImage?) {
-        // 实现广告图片缓存逻辑（可扩展为文件存储）
-        UserDefaults.standard.set(image?.pngData(), forKey: "cachedAdImage")
-    }
-}
-
-// MARK: - 广告页控制器实现
-private class LaunchAdViewController: UIViewController {
-    private let countdownSeconds = 5
-    private var remainingSeconds = 5
-    private var timer: Timer?
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupUI()
-        startCountdown()
-        loadCachedAd()
-    }
-    
-    private func setupUI() {
-        view.backgroundColor = .white
-        let skipButton = UIButton(type: .system)
-        skipButton.setTitle("跳过 \(countdownSeconds)s", for: .normal)
-        skipButton.addTarget(self, action: #selector(skipAd), for: .touchUpInside)
-        // 布局代码略...
-    }
-    
-    @objc private func skipAd() {
-        timer?.invalidate()
-        switchToMainUI()
-    }
-    
-    private func startCountdown() {
-        timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
-            guard let self = self else { return }
-            self.remainingSeconds -= 1
-            if self.remainingSeconds <= 0 {
-                self.switchToMainUI()
-            }
-        }
-    }
-    
-    private func loadCachedAd() {
-        if let data = UserDefaults.standard.data(forKey: "cachedAdImage") {
-            let imageView = UIImageView(image: UIImage(data: data))
-            imageView.contentMode = .scaleAspectFill
-            view.addSubview(imageView)
-            // 布局代码略...
-        }
-    }
-    
-    fileprivate func switchToMainUI() {
-        UIView.transition(with: view.window!,
-                          duration: 0.3,
-                          options: .transitionCrossDissolve,
-                          animations: {
-                            self.view.window?.switchToMainUI()
-                          })
-    }
-}
-
-// MARK: - 登录状态管理（UserDefaults方案）
-final class UserSessionManager {
-    static let shared = UserSessionManager()
-    private init() {}
-    
-    func isLoggedIn() -> Bool {
-        return UserDefaults.standard.bool(forKey: "isLoggedIn")
-    }
-}
-
-// MARK: - 窗口切换扩展
-extension UIWindow {
-    func switchToMainUI() {
-        rootViewController = CNLiveBaseTabBarViewController.init()
-        makeKeyAndVisible()
-    }
-}