Merge branch 'develop_0409' into homeUpdate

* develop_0409:
  选择按钮 和 硬盘使用情况

PhoneManager/Class/Session/Home/View/VideoDetaiNavView.swift

@@ -15,7 +15,7 @@ class VideoDetaiNavView : UIView {
     
     lazy var seletedAllBtn:UIButton = {
         
-        let btn:UIButton = UIButton(frame: CGRect(x: 0, y: 0, width: 131, height: 32))
+        let btn:UIButton = UIButton(frame: CGRect(x: 0, y: 0, width: 115, height: 32))
         btn.isSelected = false
         btn.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
         btn.setImage(UIImage.init(named: "ic_check_similar"), for: .normal)
@@ -27,7 +27,7 @@ class VideoDetaiNavView : UIView {
         btn.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .bold)
         btn.changBtnWithStytl(btnStyle: .defalut, margin: 8)
         btn.addTarget(self, action: #selector(seletedAllBtnClick), for: .touchUpInside)
-        
+        btn.layer.cornerRadius = btn.height / 2
         return btn
     }()
     
@@ -52,11 +52,14 @@ class VideoDetaiNavView : UIView {
         self.addSubview(backButton)
         
         self.addSubview(self.seletedAllBtn)
-        
-        self.seletedAllBtn.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-23)
-            make.centerY.equalTo(self.backButton.snp.centerY)
-        }
+
+        seletedAllBtn.x = self.width - marginLR - seletedAllBtn.width
+        seletedAllBtn.centerY = navCenterY
+
+//        self.seletedAllBtn.snp.makeConstraints { make in
+//            make.right.equalToSuperview().offset(-23)
+//            make.centerY.equalTo(self.backButton.snp.centerY)
+//        }
         
         backButton.snp.makeConstraints { make in
             
@@ -75,7 +78,10 @@ class VideoDetaiNavView : UIView {
         
         DispatchQueue.main.async {[weak self] in
             guard let self  else {return}
+//            seletedAllBtn.isSelected = !seletedAllBtn.isSelected
             seletedAllBtn.isSelected = !seletedAllBtn.isSelected
+            self.seletedAllBtn.width = seletedAllBtn.isSelected ? 131 : 115
+            seletedAllBtn.x = self.width - marginLR - seletedAllBtn.width
             self.selectAllCallBack(seletedAllBtn.isSelected)
         }
         

PhoneManager/Class/Session/Landing/PermissionVC.swift

@@ -71,7 +71,12 @@ class PermissionVC:UIViewController {
         tipLabel.textAlignment = .center // 设置对齐方式（可选）
         
         // 创建 NSAttributedString
-        let text = "? of 64 GB used"
+        
+        let disk = WidgetPublicModel.getDiskSpace()
+        let all = String(format: "%.1f" ,CGFloat(disk.0)/(1000.0 * 1000.0 * 1000.0))
+        let use = String(format: "%.1f" ,CGFloat(disk.0 - disk.1)/(1024.0 * 1024.0 * 1024.0))
+        
+        let text = "\(use) of \(all) GB used"
         let attributedString = NSMutableAttributedString(string: text)
         
         // 设置整体颜色为 #333333

PhoneManager/Class/Session/Widget/Model/WidgetPublicModel.swift

@@ -27,7 +27,7 @@ class WidgetPublicModel: NSObject {
         return useP
     }
     
-    private class func getDiskSpace() -> (Int64,Int64) {
+    public class func getDiskSpace() -> (Int64,Int64) {
         let total = TotalDiskSize()
         let available = AvailableDiskSize()
         return (total,available)