优化设置页面

Koala/Koala/Modular/Deal/V/Deal/Views/Order/KKOrderModificationAlert.swift

@@ -132,6 +132,7 @@ class KKOrderModificationAlert: UIView, KKAlertProtol {
         btn.setTitleColor(.white, for: .normal)
         btn.titleLabel?.font =  UIFont.systemFont(ofSize: 16, weight: .semibold)
         btn.backgroundColor = .black
+        btn.layer.cornerRadius = 5
         return btn
     }()
     
@@ -141,6 +142,7 @@ class KKOrderModificationAlert: UIView, KKAlertProtol {
         btn.setTitleColor(UIColor.pg_color(withHexString: "B6B6B6"), for: .normal)
         btn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
         btn.backgroundColor = UIColor.pg_color(withHexString: "F6F6F6")
+        btn.layer.cornerRadius = 5
         return btn
     }()
     
@@ -276,7 +278,7 @@ class KKOrderModificationAlert: UIView, KKAlertProtol {
             make.left.equalToSuperview().offset(16)
             make.top.equalTo(spEditItem.snp.bottom).offset(30)
             make.height.equalTo(50)
-            make.right.equalTo(confirmBtn.snp.left).offset(-7)
+            make.right.equalTo(confirmBtn.snp.left).offset(-10)
         }
         
         confirmBtn.snp.makeConstraints { make in

Koala/Koala/Modular/Deal/V/Deal/Views/Order/KKOrderModificationEditView.swift

@@ -40,6 +40,7 @@ class KKOrderModificationEditView: UIView {
         textField.textAlignment = .center
         textField.keyboardType = .decimalPad
         textField.backgroundColor = UIColor.pg_color(withHexString: "#F6F6F6")
+        textField.tintColor = MainBackGroundColor
         
         let holder =  NSMutableAttributedString(string: switchLanguage("请输入金额"))
         holder.addAttributes([.font: UIFont.systemFont(ofSize: 14), .foregroundColor: UIColor.pg_color(withHexString: "B6B6B6")!], range: NSMakeRange(0,  holder.string.count))
@@ -173,7 +174,6 @@ class KKOrderModificationEditView: UIView {
 }
 
 extension KKOrderModificationEditView: UITextFieldDelegate {
-    
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let text = (textField.text! as NSString).replacingCharacters(in: range, with: string)
         if text.isEmpty {

Koala/Koala/Modular/JDMine/VC/JDMineSettingViewController.swift

@@ -11,6 +11,8 @@ import Kingfisher
 import UIKit
 
 class JDMineSettingViewController: BaseViewController {
+    var cacheStr: String = ""
+    
     lazy var tableView: UITableView = {
         let v = UITableView(frame: .zero, style: .plain)
         v.delegate = self
@@ -88,6 +90,7 @@ class JDMineSettingViewController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         view.backgroundColor = color(248, 250, 254, 1)
         
         myNavigationBar.title_Label.text = switchLanguage("设置")
@@ -103,6 +106,8 @@ class JDMineSettingViewController: BaseViewController {
         } else {
             logoutBtn.setTitle(switchLanguage("登录"), for: .normal)
         }
+        
+        updateData()
     }
 }
 
@@ -113,8 +118,8 @@ extension JDMineSettingViewController: UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: JDMineSettingCell.description()) as! JDMineSettingCell
-        
         cell.titleLb.text = titleAry[indexPath.row]
+        cell.subTitleLb.text = cell.titleLb.text == switchLanguage("清除缓存") ? cacheStr : nil
         return cell
     }
 }
@@ -125,7 +130,7 @@ extension JDMineSettingViewController: UITableViewDelegate {
         v.backgroundColor = .white
         return v
     }
-
+    
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         return 5
     }
@@ -153,8 +158,7 @@ extension JDMineSettingViewController: UITableViewDelegate {
         } else if indexPath.row == 2 {
             UIAlertController.showAlert(in: self, title: switchLanguage("是否清除缓存?"), cancelTitle: switchLanguage("取消"), otherTitles: [switchLanguage("确认")]) { _, _, index in
                 if index == .sure {
-                    KingfisherManager.shared.cache.clearMemoryCache()
-                    KingfisherManager.shared.cache.clearDiskCache()
+                    self.clearDiskMemory()
                     
                     ProgressHUD.showSuccess(status: switchLanguage("缓存已清除"))
                 }
@@ -166,3 +170,51 @@ extension JDMineSettingViewController: UITableViewDelegate {
         }
     }
 }
+
+extension JDMineSettingViewController {
+    func updateData() {
+        Task {
+            let cacheSize = await getCachSize()
+            await updateCacheData(withCacheSize: cacheSize)
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+            }
+        }
+    }
+    
+    func getCachSize() async -> CGFloat {
+        do {
+            let cache = try await ImageCache.default.diskStorageSize
+            return CGFloat(cache) / 1024.0 / 1024.0
+        } catch {
+            return 0.0
+        }
+    }
+    
+    func clearDiskMemory() {
+        ImageCache.default.clearMemoryCache()
+        ImageCache.default.clearDiskCache {
+            self.updateData()
+        }
+    }
+    
+    func updateCacheData(withCacheSize cache: CGFloat) async {
+        var cacheStr: String
+        
+        if abs(cache) <= 0.01 {
+            cacheStr = "0M"
+        } else {
+            if cache > 1024 {
+                cacheStr = String(format: "%.1fG", cache / 1024.0)
+            } else {
+                cacheStr = String(format: "%.1fM", cache)
+            }
+            
+            if cacheStr.contains(".0") {
+                cacheStr = cacheStr.replacingOccurrences(of: ".0", with: "")
+            }
+        }
+        
+        self.cacheStr = cacheStr
+    }
+}