فهرست منبع

修复1.7(1)bug

100Years 3 هفته پیش
والد
کامیت
97e2d3a396

+ 2 - 2
AIRingtone.xcodeproj/project.pbxproj

@@ -1323,7 +1323,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1365,7 +1365,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;

BIN
AIRingtone/Assets.xcassets/Tabbar/tabbar_unSelect_discover.imageset/tabbar_unSelect_discover@2x.png


BIN
AIRingtone/Assets.xcassets/Tabbar/tabbar_unSelect_discover.imageset/tabbar_unSelect_discover@3x.png


+ 2 - 0
AIRingtone/Business/TSAIRintoneVC/TSAIRintoneVC/TSAIRintoneVC.swift

@@ -183,7 +183,9 @@ extension TSAIRintoneVC: UICollectionViewDataSource ,UICollectionViewDelegate,UI
             cell.setRingBtn.addTarget(self, action: #selector(clickSetRingBtn(_ :)), for: .touchUpInside)
             if let model = itemModel as? TSActionInfoModel {
                 cell.model = model
+                cell.ringModel = nil
             }else if let ringModel = itemModel as? TSRingModel {
+                cell.model = nil
                 cell.ringModel = ringModel
             }
         }

+ 2 - 0
AIRingtone/Business/TSDiscoverVC/TSDiscoverListVC/TSDiscoverListVC.swift

@@ -140,7 +140,9 @@ extension TSDiscoverListVC: UICollectionViewDataSource ,UICollectionViewDelegate
             cell.setRingBtn.addTarget(self, action: #selector(clickSetRingBtn(_ :)), for: .touchUpInside)
             if let model = itemModel as? TSActionInfoModel {
                 cell.model = model
+                cell.ringModel = nil
             }else if let ringModel = itemModel as? TSRingModel {
+                cell.model = nil
                 cell.ringModel = ringModel
             }
         }

+ 2 - 0
AIRingtone/Business/TSDiscoverVC/TSRingDownVC/TSRingDownVC.swift

@@ -129,7 +129,9 @@ extension TSRingDownVC: UICollectionViewDataSource ,UICollectionViewDelegate,UIC
             cell.setRingBtn.addTarget(self, action: #selector(clickSetRingBtn(_ :)), for: .touchUpInside)
             if let model = itemModel as? TSActionInfoModel {
                 cell.model = model
+                cell.ringModel = nil
             }else if let ringModel = itemModel as? TSRingModel {
+                cell.model = nil
                 cell.ringModel = ringModel
             }
 

+ 1 - 1
AIRingtone/Business/VIewTool/TSRingLoadingView.swift

@@ -27,7 +27,7 @@ class TSRingLoadingView: TSBaseView {
     }()
     
     lazy var textLabel: UILabel = {
-        let textLabel = UILabel.createLabel(text:"loading...".localized, font: .font(size: 12),textColor: .fromHex("#FFFFFF").withAlphaComponent(0.8) ,textAlignment: .center)
+        let textLabel = UILabel.createLabel(text:"Loading...".localized, font: .font(size: 12),textColor: .fromHex("#FFFFFF").withAlphaComponent(0.8) ,textAlignment: .center)
         return textLabel
     }()
     

+ 2 - 1
AIRingtone/Common/Tool/TSBandRingTool/TSBandRingTool.swift

@@ -77,7 +77,8 @@ class TSBandRingTool:NSObject {
 //                TSLoadingAnimation.hideLoading()
                 ringLoadingView.removeFromSuperview()
                 if let path = path,let url = URL(string: path) {
-                    self.createBand(with: url, fileName: fileName) { bandURL in
+                    self.createBand(with: url, fileName: fileName) { [weak self]  bandURL in
+                        guard let self = self else { return }
                         if let url = bandURL {
                             completion?(true)
                             self.shareRing(fileUrl: url)