瀏覽代碼

修改了一部分 bug

100Years 4 天之前
父節點
當前提交
082314d25b

+ 9 - 3
AIEmoji/Business/TSAILIstVC/TSAIAgeImageHintVC/TSAIListHintBaseVC.swift

@@ -206,8 +206,10 @@ class TSAIListHintBaseVC: TSBaseVC {
     }
     
     var config:Config = Config.defaultConfig
-    init(config: Config, clickUpImageHandle: ((UIImage?) -> Void)? = nil) {
+    var isOnlyShow:Bool
+    init(config: Config,isOnlyShow:Bool = false, clickUpImageHandle: ((UIImage?) -> Void)? = nil) {
         self.config = config
+        self.isOnlyShow = isOnlyShow
         self.clickUpImageHandle = clickUpImageHandle
         super.init()
     }
@@ -230,9 +232,13 @@ class TSAIListHintBaseVC: TSBaseVC {
     }()
     
     lazy var submitBtn: UIButton = {
-        let submitBtn = kCreateNormalSubmitBtn(title: "Upload Photo".localized) { [weak self]  in
+        let submitBtn = kCreateNormalSubmitBtn(title: self.isOnlyShow ? "Got it".localized : "Upload Photo".localized) { [weak self]  in
             guard let self = self else { return }
-            pickSinglePhoto()
+            if self.isOnlyShow {
+                dismissPageVC()
+            }else{
+                pickSinglePhoto()
+            }
         }
         submitBtn.cornerRadius = 24.0
         return submitBtn

+ 8 - 2
AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVideoTimesVC/TSPurchaseVideoTimesVC.swift

@@ -150,7 +150,10 @@ extension TSPurchaseVideoTimesVC {
                     TSToastShared.showLoading(text: "Purchasing now".localized,containerView: self.view)
                 case .paySuccess:
                     TSToastShared.hideLoading()
-                    let loadingText = "购买成功".localized
+                    var loadingText = "Congratulations on your purchase! You have %d video effect uses. Try now!".localized
+                    if let purchaseNum = self.viewModel.selectedType.purchaseNum {
+                        loadingText = String(format: "Congratulations on your purchase! You have %d video effect uses. Try now!".localized, purchaseNum)
+                    }
                     debugPrint(loadingText)
                     TSToastShared.showToast(text:loadingText)
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
@@ -167,7 +170,10 @@ extension TSPurchaseVideoTimesVC {
                     TSToastShared.showLoading(text: "Restoring now".localized,containerView: self.view)
                 case .restoreSuccess:
                     TSToastShared.hideLoading()
-                    let loadingText = "Video Effects Pack Activated!".localized
+                    var loadingText = "Congratulations on your purchase! You have %d video effect uses. Try now!".localized
+                    if let purchaseNum = self.viewModel.selectedType.purchaseNum {
+                        loadingText = String(format: "Congratulations on your purchase! You have %d video effect uses. Try now!".localized, purchaseNum)
+                    }
                     debugPrint(loadingText)
                     TSToastShared.showToast(text:loadingText)
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {

+ 14 - 5
AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVideoTimesVC/View/TSPurchaseVideoTimesAlertView.swift

@@ -20,12 +20,15 @@ struct TSPurchaseVideoTimesAlertView :View {
                 VStack {
                     Spacer().frame(height: 24)
                     Text("Limit Reached".localized)
+                        .multilineTextAlignment(.center)
                         .font(.font(size: 22,weight: .medium))
                         .foregroundColor(.white)
                         .padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
                     
                     Spacer().frame(height: 16)
                     Text(limit)
+                        .font(.font(size: 14,weight: .regular))
+                        .multilineTextAlignment(.center)
                         .foregroundColor(.white.opacity(0.7))
                         .padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
                     
@@ -41,7 +44,7 @@ struct TSPurchaseVideoTimesAlertView :View {
                                     viewModel.selectedType = .purchase(.videoNum2)
                                 }
                             TSPurchaseVideoTimesRecView()
-                                .offset(x:-30,y:-14)
+                                .offset(x:-12,y:-14)
                         }
                         TSPurchaseVideoTimesCellView(type: .purchase(.videoNum3), selectedType: $viewModel.selectedType)
                             .onTapGesture {
@@ -49,7 +52,7 @@ struct TSPurchaseVideoTimesAlertView :View {
                             }
                     }).multilineTextAlignment(.center).font(.font(size: 16,weight:.regular)).foregroundColor(.white)
                     
-                    Spacer().frame(height: 44)
+                    Spacer().frame(height: 28)
                     
                     
                     Button {
@@ -90,6 +93,7 @@ struct TSPurchaseVideoTimesAlertView :View {
                             TSPurchaseVideoTextLineView(image: .purchaseVideoTimesCheck, text: "Uses never expire and can be purchased repeatedly".localized)
                             TSPurchaseVideoTextLineView(image: .purchaseVideoTimesCheck, text: "All unused uses will be lost if the app is uninstalled".localized)
                         })
+                        .foregroundColor(Color.hex("#FCE5FF").opacity(0.8))
                         .padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
                         
                         Spacer().frame(height: 24 + k_Height_safeAreaInsetsBottom())
@@ -100,9 +104,14 @@ struct TSPurchaseVideoTimesAlertView :View {
                 }
                 .padding(.horizontal,16)
                 .background(
-//                    Image(.purchaseVideoTimesAlertBj)
-//                        .resizable() // 允许调整大小
-//                        .scaledToFill()
+//                    GeometryReader { geometry in
+//                          Image(.purchaseVideoTimesAlertBj)
+//                              .resizable()
+//                              .scaledToFill()
+//                              .frame(width: geometry.size.width)
+//                              // 关键:限制高度不超过内容高度
+//                              .frame(height: geometry.size.height)
+//                      }
                     Color.hex("#261840").cornerRadius([.topLeading,.topTrailing], 20)
                 )
                 

+ 1 - 1
AIEmoji/Business/TSSetingVC/SetingVC/TSSetingViewModel.swift

@@ -97,7 +97,7 @@ class TSSetingViewModel: ObservableObject {
     }
     
     func purchaseVideoTimesVC(parent: UIViewController) {
-        kPresentModalVC(target: parent, modelVC: TSPurchaseVideoTimesVC(isShowAlertModel: false))
+        kPresentModalVC(target: parent, modelVC: TSPurchaseVideoTimesVC(isShowAlertModel: true))
     }
 }
 

+ 3 - 1
AIEmoji/Business/TSSetingVC/TSChangeLanguageVC/TSChangeLanguageVC.swift

@@ -12,6 +12,8 @@ class TSChangeLanguageVC: TSBaseVC {
         simpleTableView.register(TSChangeLanguageCell.self, forCellReuseIdentifier: "TSChangeLanguageCell")
         simpleTableView.delegate = self
         simpleTableView.dataSource = self
+        simpleTableView.cornerRadius = 16
+        simpleTableView.backgroundColor = .white.withAlphaComponent(0.05)
         return simpleTableView
     }()
     
@@ -159,7 +161,7 @@ class TSChangeLanguageCell: UITableViewCell {
         rightImageView.snp.makeConstraints { make in
             make.trailing.equalTo(-16)
             make.centerY.equalToSuperview()
-            make.width.height.equalTo(16)
+            make.width.height.equalTo(20)
         }
         
     }

+ 1 - 1
AIEmoji/Business2/DisCover/TSDiscoverVC/Cell/TSDiscoverBannerCell.swift

@@ -54,7 +54,7 @@ class TSDiscoverBannerCell: TSDiscoverBaseCell {
         pagerView.register(TSDiscoverBannerViewImageCell.classForCoder(), forCellWithReuseIdentifier: "TSDiscoverBannerViewImageCell")
         pagerView.addSubview(pageControl)
         pageControl.snp.makeConstraints { make in
-            make.bottom.equalTo(-52)
+            make.bottom.equalTo(-45)
             make.leading.trailing.equalTo(0)
             make.height.equalTo(6)
         }

+ 6 - 0
AIEmoji/Business2/DisCover/TSDiscoverVC/TSDiscoverVC.swift

@@ -352,6 +352,12 @@ extension TSDiscoverVC{
     static var hintBaseVC:TSAIListHintBaseVC?
     static var photoPickerManager:TSPhotoPickerManager?
     
+    static func showHintBaseVC(target:UIViewController,style:TSFuncStyle,hintType:Int = 0){
+        let hintBaseVC = TSAIListHintBaseVC(config: style.getConfig(hintType: hintType))
+        kPresentModalVC(target: target, modelVC: hintBaseVC,transitionStyle: .crossDissolve)
+    }
+    
+    
     static func enterSelectPhotos(
         target:UIViewController,
         style:TSFuncStyle,

+ 9 - 10
AIEmoji/Business2/DisCover/TSGenerateHistoryVC/TSGenerateHistoryVC.swift

@@ -34,6 +34,14 @@ class TSGenerateHistoryVC: TSBaseVC {
 //       return purchaseCountdownView
 //   }()
     
+    
+    lazy var deleteBtn: UIButton = {
+        let deleteBtn = UIButton.createButton(image: .delete) { [weak self]  in
+            guard let self = self else { return }
+            clickNavRight()
+        }
+        return deleteBtn
+    }()
     lazy var navBarView: TSBaseNavContentBarView = {
         let navBarView = TSBaseNavContentBarView()
 
@@ -45,14 +53,7 @@ class TSGenerateHistoryVC: TSBaseVC {
             make.leading.equalTo(17.0)
         }
         
-        let deleteBtn = UIButton.createButton(image: .delete) { [weak self]  in
-            guard let self = self else { return }
-            clickNavRight()
-        }
-        
         let clearView = UIView()
-        
-
         let stackView:UIStackView = UIStackView()
         stackView.spacing = 8
         navBarView.barView.addSubview(stackView)
@@ -117,8 +118,6 @@ class TSGenerateHistoryVC: TSBaseVC {
         
     }
     
-    var navRightBtn = UIButton()
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         ClickEvent.logEvent(type: .creationsTab)
@@ -196,7 +195,7 @@ class TSGenerateHistoryVC: TSBaseVC {
     func updateView() {
         collectionView.reloadData()
         
-        navRightBtn.isHidden = listModelArray.count <= 0
+        deleteBtn.isHidden = listModelArray.count <= 0
         pageNullView.isHidden = listModelArray.count > 0
     }
     

+ 3 - 3
AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC.swift

@@ -30,7 +30,7 @@ class TSPTPUploadImageVC: TSBaseVC {
     override func createView() {
         addNormalNavBarView()
         setPageTitle(viewModel.selectedPTPStyleModel.imageText.localized)
-
+        setNavTitle(title: viewModel.selectedPTPStyleModel.imageText.localized)
         contentView.addSubview(uploadView)
         uploadView.snp.makeConstraints { make in
             make.leading.trailing.equalToSuperview()
@@ -114,12 +114,12 @@ extension TSPTPUploadImageVC {
 
 extension TSPTPUploadImageVC {
     func setNavTitle(title:String){
-        let btn = setTitleText(title,image:.ptpHint,space: 8,imageRight: true)
+        let btn = setTitleText(title,image:.ptpHint,spacing: 8,imageRight: true)
         btn.addTarget(self, action: #selector(clickNavTitleBtn), for: .touchUpInside)
     }
     
     @objc func clickNavTitleBtn(){
-        dePrint("1111")
+        TSDiscoverVC.showHintBaseVC(target: self, style: viewModel.style, hintType: viewModel.selectedPTPStyleModel.hintType)
     }
 
 }