feat:增加图片示例,完善细节代码

TSLiveWallpaper/AppDelegate.swift

@@ -111,6 +111,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 extension AppDelegate {
     func initPlatform() {
+        dePrint("TSRMShared.aiListDB.listModels.count=\(TSRMShared.aiListDB.listModels.count)")
         TSColorConfigShared.naviMianTextColor = .white
     }
 }

TSLiveWallpaper/Assets.xcassets/AIList/example/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_new_0.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_new_0@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_new_0@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_new_1.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_new_1@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_new_1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_new_2.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_new_2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_new_2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_old_0.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_old_0@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_old_0@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_old_1.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_old_1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_old_1png.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_old_1@2xpng.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Assets.xcassets/AIList/example/ailist_example_image_old_2.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ailist_example_image_old_2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ailist_example_image_old_2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TSLiveWallpaper/Business/BusinessView/TSGeneratorloadingView/TSGeneratorErrorView.swift

@@ -44,7 +44,7 @@ class TSGeneratorErrorView: TSBaseView {
     lazy var submitBtn: UIButton = {
         let btn = UIButton.createButton(title: "Generate in the background".localized,backgroundImage: kSubmitBtnNormalbg,font: .font(size: 16),titleColor: "#111111".uiColor,corner: 24)
         btn.titleLabel?.adjustsFontSizeToFitWidth = true
-        btn.layer.borderColor = "#E4A858".uiCGColor
+        btn.layer.borderColor = (UIColor.themeColor).cgColor
         btn.layer.borderWidth = 1.0
         return btn
     }()

TSLiveWallpaper/Business/BusinessView/TSGeneratorloadingView/TSGeneratoringAnimationView.swift

@@ -61,7 +61,7 @@ class TSGeneratoringAnimationView : TSBaseView {
     
     lazy var backgroundGenerateBtn: UIButton = {
         let btn = UIButton.createButton(title: "Generate in the background".localized,font: .font(size: 16),titleColor: .themeColor,corner: 24)
-        btn.layer.borderColor = "#E4A858".uiCGColor
+        btn.layer.borderColor = (UIColor.themeColor).cgColor
         btn.layer.borderWidth = 1.0
         btn.titleLabel?.adjustsFontSizeToFitWidth = true
         btn.isHidden = true

TSLiveWallpaper/Business/TSAIListVC/TSAIListHistoryVC/TSAIListHistoryCell.swift

@@ -22,6 +22,7 @@ class TSAIListHistoryCell: TSBaseCollectionCell {
 //                        self.showImageView.image = UIImage(contentsOfFile: dataModel.videoThumbnailURL.path)
 //                    }else {
                         showImageView.setAsyncImage(urlString: dataModel.response!.resultUrl,contentMode: .scaleAspectFill,backgroundColor: .white.withAlphaComponent(0.1))
+                    hiddenImageView.setAsyncImage(urlString: dataModel.request!.imageUrl,contentMode: .scaleAspectFill)
 //                    }
                 }
             }
@@ -55,6 +56,13 @@ class TSAIListHistoryCell: TSBaseCollectionCell {
         return showImageView
     }()
     
+    lazy var hiddenImageView: UIImageView = {
+        let hiddenImageView = UIImageView.createImageView(imageName:"",contentMode: .scaleAspectFill)
+        hiddenImageView.backgroundColor = .gray
+        hiddenImageView.isHidden = true
+        return hiddenImageView
+    }()
+    
     lazy var videoIconImageView: UIImageView = {
         let videoIconImageView = UIImageView.createImageView(imageName:"video_icon",contentMode: .scaleToFill)
         videoIconImageView.isHidden = true
@@ -67,6 +75,13 @@ class TSAIListHistoryCell: TSBaseCollectionCell {
         contentView.layer.borderWidth = 3
         contentView.layer.borderColor = "#DFD7C0".uiCGColor
         
+        contentView.addSubview(hiddenImageView)
+        hiddenImageView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.leading.equalTo(0)
+            make.trailing.bottom.equalTo(0)
+        }
+        
         contentView.addSubview(showImageView)
         showImageView.snp.makeConstraints { make in
             make.top.equalTo(0)

TSLiveWallpaper/Business/TSAIListVC/TSAIListHistoryVC/TSAIListHistoryVC.swift

@@ -116,13 +116,23 @@ extension TSAIListHistoryVC: UICollectionViewDataSource ,UICollectionViewDelegat
         if let dbModel = listModelArray[safe: indexPath.row]{
             let vc = TSAIPhotoDetailsVC()
             vc.imageModel = dbModel.getModel()
-            kPushVC(target: self, modelVC: vc)
+            vc.deleteBlock = { [weak self]  in
+                guard let self = self else { return }
+                removeDelete(index: indexPath.row)
+            }
+            kPresentModalVC(target: self, modelVC: vc)
         }
     }
 }
 
 
 extension TSAIListHistoryVC{
+    
+    func removeDelete(index:Int){
+        dbHistory.deleteListModel(index: index)
+        updateView()
+    }
+    
     func removeAllHistoryList(){
         dbHistory.delete()
         updateView()

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/TSAIListVC.swift

@@ -68,6 +68,7 @@ class TSAIListVC: TSBaseVC {
     lazy var recordBtn: UIButton = {
        let recordBtn = UIButton.createButton(image: UIImage(named: "record")) { [weak self]  in
            guard let self = self else { return }
+           PlayerManager.shared.miniBar.isHidden = true
            kPushVC(target: self, modelVC: TSAIListHistoryVC())
        }
        return recordBtn
@@ -143,6 +144,14 @@ class TSAIListVC: TSBaseVC {
 //        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
 //        updateVipView()
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        PlayerManager.shared.miniBar.isHidden = false
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        
+    }
 }
 
 
@@ -222,6 +231,7 @@ extension TSAIListVC{
         hintBaseVC = TSAIListHintBaseVC(config: config) { [weak self] image in
             guard let self = self else { return }
             if let image = image {
+                PlayerManager.shared.miniBar.isHidden = true
                 complete(image)
             }else{
                 dePrint("图片异常")
@@ -240,6 +250,7 @@ extension TSAIListVC{
             if let errorString = errorString {
                 TSToastShared.showToast(text: errorString)
             }else if let image = image {
+                PlayerManager.shared.miniBar.isHidden = true
                 complete(image)
             }else{
                 dePrint("图片异常")

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoDetailsVC/TSAIPhotoDetailsVC.swift

@@ -6,7 +6,7 @@
 //
 
 class TSAIPhotoDetailsVC: TSBaseVC {
-    
+    var deleteBlock:(()->Void)?
     var imageModel:TSActionInfoModel?{
         didSet{
             updateImageView()
@@ -14,14 +14,6 @@ class TSAIPhotoDetailsVC: TSBaseVC {
     }
 
     lazy var bottomViewH = 60+k_Height_safeAreaInsetsBottom()
-//    lazy var netWorkImageView: UIImageView = {
-//        let netWorkImageView = UIImageView(frame: CGRectMake(0, 0, k_ScreenWidth, k_ScreenHeight-bottomViewH))
-//        netWorkImageView.backgroundColor = "#111111".uiColor
-//        netWorkImageView.contentMode = .scaleAspectFit
-//        netWorkImageView.isUserInteractionEnabled = true
-//        return netWorkImageView
-//    }()
-    
     lazy var panComparisonView : TSImageIPanComparisonView = {
         let panComparisonView = TSImageIPanComparisonView()
         return panComparisonView
@@ -67,6 +59,7 @@ class TSAIPhotoDetailsVC: TSBaseVC {
         return saveBtn
     }()
     
+    var navRightBtn:UIButton = UIButton()
     override func createView() {
         
         let imageView = UIImageView.createImageView(image: .navShadow,contentMode: .scaleToFill)
@@ -77,6 +70,7 @@ class TSAIPhotoDetailsVC: TSBaseVC {
 
         addNormalNavBarView()
         setPageTitle("Result".localized)
+        navRightBtn = setNavigationItem("", imageName: "ai_delete", direction: .right, action: #selector(clickNavRight))
         contentView.snp.updateConstraints { make in
             make.top.equalTo(0)
         }
@@ -168,6 +162,16 @@ class TSAIPhotoDetailsVC: TSBaseVC {
 //        }
     }
     
+    override func navBarClickLeftAction() {
+        dismiss(animated: true)
+    }
+    
+    @objc func clickNavRight() {
+        showCustomAlert(message: "Are you sure to delete?".localized, rightActionString: "Delete".localized ,deleteHandler:  {
+            self.deleteBlock?()
+            self.navBarClickLeftAction()
+        })
+    }
 }
 
 
@@ -176,38 +180,43 @@ extension TSAIPhotoDetailsVC {
     
     func updateImageView(){
         
-        uploadPanComparisonView()
+        kMainAsync {
+            self.uploadPanComparisonView()
+        }
+        
         
 //        self.netWorkImageView.setAsyncImage(urlString:imageModel.response.resultUrl,placeholder:kPlaceholderImage)
     }
     
     func uploadPanComparisonView(){
         guard let imageModel = imageModel else { return }
-        var oldImage:UIImage?
-        var newImage:UIImage?
-        let grounp = DispatchGroup()
-        grounp.enter()
-        UIImageView.downloadImageWithProgress(urlString: imageModel.request.imageUrl) { image in
-            grounp.leave()
-            oldImage = image
+        DispatchQueue.global(qos: .userInitiated).async {
+            var oldImage:UIImage?
+            var newImage:UIImage?
+            let grounp = DispatchGroup()
+            grounp.enter()
+            UIImageView.downloadImageWithProgress(urlString: imageModel.request.imageUrl) { image in
+                grounp.leave()
+                oldImage = image
+                
+            }
             
-        }
-        
-        grounp.enter()
-        UIImageView.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
-            grounp.leave()
-            newImage = image
-        }
-        
-        grounp.notify(queue: .main) {
-            if let oldImage = oldImage,let newImage = newImage {
-                let size = oldImage.size.height > newImage.size.height ? oldImage.size : newImage.size
-                self.panComparisonView.snp.updateConstraints { make in
-                    make.height.equalTo(kGetUIWdith(designSize: size, currentW: k_ScreenWidth))
-                }
+            grounp.enter()
+            UIImageView.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
+                grounp.leave()
+                newImage = image
             }
             
-            self.panComparisonView.configure(oldImage: oldImage, newImage: newImage)
+            grounp.notify(queue: .main) {
+                if let oldImage = oldImage,let newImage = newImage {
+                    let size = oldImage.size.height > newImage.size.height ? oldImage.size : newImage.size
+                    self.panComparisonView.snp.updateConstraints { make in
+                        make.height.equalTo(kGetUIWdith(designSize: size, currentW: k_ScreenWidth))
+                    }
+                }
+                
+                self.panComparisonView.configure(oldImage: oldImage, newImage: newImage)
+            }
         }
     }
     @objc func switchOriginalPictureTouchDown() {

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIListPhotoGeneratorVC.swift

@@ -84,7 +84,7 @@ class TSAIListPhotoGeneratorVC: TSAIPhotoDetailsVC {
     override func createView() {
         
         super.createView()
-        
+        navRightBtn.isHidden = true
         view.addSubview(generateInView)
         generateInView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -164,9 +164,6 @@ class TSAIListPhotoGeneratorVC: TSAIPhotoDetailsVC {
         }.store(in: &cancellable)
     }
     
-    override func navBarClickLeftAction() {
-        navigationController?.popToRootViewController(animated: true)
-    }
 }
 
 extension TSAIListPhotoGeneratorVC {

TSLiveWallpaper/Business/TSTabBarController/TSTabBarController.swift

@@ -122,10 +122,6 @@ class TSTabBarController: UITabBarController {
         }
 
         addMusicAndMiniBar()
-        kMainAfter(1.0) {
-            self.miniBar.isHidden = true
-        }
-
     }
 
     func updateMarkViewFrame() {

TSLiveWallpaper/Data/TSDBManager/TSDBManager.swift

@@ -75,6 +75,13 @@ class TSDBHistory: Object {
         }
     }
     
+    func deleteListModel(index:Int) {
+        TSRMShared.writeThread {
+            listModels.remove(at: index)
+            debugPrint("listModels.remove(at: \(index))")
+        }
+    }
+    
     static func deleteAll() {
         do {
             let realm = try Realm()
@@ -138,7 +145,7 @@ extension TSRealmManager {
         }
     }
     
-    func createExampleModel(id:Int,imageName:String)->TSActionInfoModel{
+    func createExampleModel(id:Int,oldImageName:String,newImageName:String)->TSActionInfoModel{
         let model = TSActionInfoModel()
         model.id = id
         model.modelType = .example
@@ -146,7 +153,8 @@ extension TSRealmManager {
         model.request.inputText = "Example"
         model.request.width = 330
         model.request.height = 440
-        model.response.resultUrl = imageName
+        model.request.imageUrl = oldImageName
+        model.response.resultUrl = newImageName
         model.status = "success"
         return model
     }
@@ -157,8 +165,9 @@ extension TSRealmManager {
         if history.listModels.count == 0,UserDefaults.standard.string(forKey: "insertAIListExampleData") == nil {
             let id = Date.timestampInt
             history.updateDatas([
-                createExampleModel(id:id, imageName: "ttp_example_image0"),
-                createExampleModel(id:id+1, imageName: "ttp_example_image1")
+                createExampleModel(id:id, oldImageName: "ailist_example_image_old_2", newImageName: "ailist_example_image_new_2"),
+                createExampleModel(id:id+1, oldImageName: "ailist_example_image_old_1", newImageName: "ailist_example_image_new_1"),
+                createExampleModel(id:id+2, oldImageName: "ailist_example_image_old_0", newImageName: "ailist_example_image_new_0")
             ])
             UserDefaults.standard.set("1", forKey: "insertAIListExampleData")
             UserDefaults.standard.synchronize()

TSLiveWallpaper/DataManger/Config/TSConfig.swift

@@ -10,7 +10,7 @@ extension UIColor {
     static let mainBg = "#121212".uiColor
     
     /// 主色调
-    static let themeColor = UIColor.clear
+    static let themeColor = "#E4A858".uiColor
     
     static let naviMianBgColor = UIColor.clear
     static let naviMianTextColor = UIColor.white.withAlphaComponent(0.8)