ui 调整

PhoneManager/Class/Page/Compress/View/CompressCustomHeaderView.swift

@@ -41,7 +41,7 @@ class CompressCustomHeaderView: UICollectionReusableView{
     lazy var filterButton :  UIButton =  {
         let button = UIButton(type: .custom)
         button.setImage(UIImage(named: "Frame 1"), for: .normal)
-        button.setTitle("The largest", for: .normal)
+        button.setTitle("largest", for: .normal)
         button.layer.cornerRadius = 14
         button.clipsToBounds = true
         button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)

PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift

@@ -126,7 +126,7 @@ class HomePhotosDetailViewController : BaseViewController {
     
     lazy var trashSubView : TrashSubView = {
         let view = TrashSubView()
-        view.backgroundColor = .white
+        view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
         view.isHidden = true
         return view
     }()

PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift

@@ -101,7 +101,7 @@ class HomeVideoDetailController :BaseViewController {
     
     lazy var trashSubView : TrashSubView = {
         let view = TrashSubView()
-        view.backgroundColor = .white
+        view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
         view.tipLabel.text = "The video in the trash can"
         view.isHidden = true
         return view

PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift

@@ -78,7 +78,7 @@ class PhotoRemoveViewController: BaseViewController {
     
     lazy var trashSubView : TrashSubView = {
         let view = TrashSubView()
-        view.backgroundColor = .white
+        view.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
         view.isHidden = true
         return view
     }()
@@ -163,7 +163,7 @@ class PhotoRemoveViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.view.backgroundColor = UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
+        self.view.backgroundColor = .white//UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
         
         formatter.dateStyle = .medium
         formatter.timeStyle = .none

PhoneManager/Class/Page/Home/View/HomeInfoView.swift

@@ -62,7 +62,7 @@ class HomeInfoView :UIView {
     
     lazy var deleteView:HomeInfoDeleteView = {
         
-        let cH:CGFloat = 48 + 2 * marginLR + safeHeight
+        let cH:CGFloat = 45 + 2 * marginLR + safeHeight
         
         let sview:HomeInfoDeleteView = HomeInfoDeleteView(frame: CGRect(x: 0, y: height - cH, width: width, height: cH))
         
@@ -438,7 +438,7 @@ extension HomeInfoView:UITableViewDataSource,UITableViewDelegate {
         
         let models = ids?[indexPath.row]
         
-        return ((models?.count ?? 0) > 2 ? 190 : 214) + 8
+        return ((models?.count ?? 0) > 2 ? 205 : 229) + 8
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
@@ -519,7 +519,7 @@ class HomeInfoTitleView:UIView {
         
         let sview:UILabel = UILabel()
         
-        sview.font = .systemFont(ofSize: 20, weight: .bold)
+        sview.font = .systemFont(ofSize: 22, weight: .bold)
         sview.textColor = UIColor.colorWithHex(hexStr: black3Color)
         sview.x = 15
         sview.y = 14
@@ -545,7 +545,7 @@ class HomeInfoTitleView:UIView {
     lazy var filterButton :  UIButton =  {
         let button = UIButton(type: .custom)
         button.setImage(UIImage(named: "Frame 1"), for: .normal)
-        button.setTitle("The largest", for: .normal)
+        button.setTitle("largest", for: .normal)
         button.layer.cornerRadius = 14
         button.clipsToBounds = true
         button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)
@@ -601,7 +601,7 @@ class HomeInfoTitleView:UIView {
         
         
         let attributedString2 = NSMutableAttributedString(string: fullText, attributes: [
-            .font: UIFont.systemFont(ofSize: 14),
+            .font: UIFont.systemFont(ofSize: 14,weight: .semibold),
             .foregroundColor: UIColor.colorWithHex(hexStr: "#666666")
         ])
         
@@ -649,15 +649,16 @@ class HomeInfoDeleteView:UIView {
         
         let sview:UIButton = UIButton()
         
-        sview.titleLabel?.font = .systemFont(ofSize: 16, weight: .bold)
+        sview.titleLabel?.font = .systemFont(ofSize: 16, weight: .semibold)
         sview.addTarget(self, action: #selector(deleteBtnClick), for: .touchUpInside)
         sview.backgroundColor = UIColor.colorWithHex(hexStr: mColor)
-        
-        sview.width = width - 2 * marginLR
-        sview.height = 48
+        sview.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
+        sview.width = width - 2 * 39
+        sview.height = 45
+        sview.titleEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 0)
         sview.centerX = width / 2
         sview.y = marginLR
-        sview.layer.cornerRadius = sview.height / 2
+        sview.layer.cornerRadius = 12
         sview.layer.masksToBounds = true
         
         return sview
@@ -665,7 +666,7 @@ class HomeInfoDeleteView:UIView {
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        
+        self.backgroundColor = .clear
         setupUI()
     }
     
@@ -675,9 +676,9 @@ class HomeInfoDeleteView:UIView {
     
     func setupUI() {
         
-        self.setShadow()
+//        self.setShadow()
         
-        backgroundColor = .white
+        backgroundColor = .clear
         addSubview(deleteBtn)
         
     }

PhoneManager/Class/Page/Home/View/HomePhotosDetailCustomHeaderView.swift

@@ -26,7 +26,7 @@ class HomePhotosDetailCustomHeaderView : UICollectionReusableView {
     lazy var filterButton :  UIButton =  {
         let button = UIButton(type: .custom)
         button.setImage(UIImage(named: "Frame 1"), for: .normal)
-        button.setTitle("The largest", for: .normal)
+        button.setTitle("largest", for: .normal)
         button.layer.cornerRadius = 14
         button.clipsToBounds = true
         button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)

PhoneManager/Class/Page/Home/View/HomeVideoDetailCustomHeaderView.swift

@@ -24,7 +24,7 @@ class HomeVideoDetailCustomHeaderView : UICollectionReusableView {
     lazy var filterButton :  UIButton =  {
         let button = UIButton(type: .custom)
         button.setImage(UIImage(named: "Frame 1"), for: .normal)
-        button.setTitle("The largest", for: .normal)
+        button.setTitle("largest", for: .normal)
         button.layer.cornerRadius = 14
         button.clipsToBounds = true
         button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 0.1000)

PhoneManager/Class/Page/Home/View/ResourceFilterBoxView.swift

@@ -10,10 +10,10 @@ import Foundation
 import SnapKit
 
 enum ResouceSortType : String{
-    case largest = "The largest"
-    case smallest = "The smallest"
-    case latest = "The latest"
-    case oldest = "The oldest"
+    case largest = "largest"
+    case smallest = "smallest"
+    case latest = "latest"
+    case oldest = "oldest"
 }
 
 struct ResourceFilterBoxModel {
@@ -36,7 +36,7 @@ class ResourceFilterBoxView : UIView {
     var endDate : Date?
     
     var currentSortType: ResouceSortType = .largest
-    let tableData: [String] = ["The largest", "The smallest", "The latest", "The oldest"]
+    let tableData: [String] = ["largest", "smallest", "latest", "oldest"]
     var callBack : callBack<Any> = {sortType in}
     
     var datePicker : YearMonthPickerView?

PhoneManager/Class/Page/Home/View/TrashSubView.swift

@@ -32,21 +32,27 @@ class TrashSubView: UIView {
     
     lazy var emptyButton: UIButton = {
         let button = UIButton(type: .custom)
-        button.setImage(UIImage(named: "ic_delete_duplicates"), for: .normal)
+        button.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
         button.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 1)
         button.setTitle("Empty Trash", for: .normal)
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = UIFont.systemFont(ofSize: 12, weight: .semibold)
         button.layer.cornerRadius = 19
+        button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
         button.clipsToBounds = true
         button.addTarget(self, action: #selector(emptyButtonAction), for: .touchUpInside)
         return button
     }()
 
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        self.setShadow(cornerRadius: 0, sColor: UIColor.colorWithHex(hexStr: "#1475B9"), offset: CGSizeMake(3, -1),opacity: 0.15)
+    }
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         
-        self.addTopShadow()
+//        self.addTopShadow()
         // 给当前视图添加手势
         addTapGestureToSelf()
         
@@ -71,7 +77,8 @@ class TrashSubView: UIView {
             make.top.equalToSuperview().offset(17)
             make.bottom.equalToSuperview().offset(-17 - safeHeight)
             make.left.equalTo(self.resourceCountlabel.snp.right).offset(11)
-            make.width.equalTo(100)
+//            make.width.equalTo(200)
+            make.right.equalTo(emptyButton.snp.left).offset(-5)
         }
         self.emptyButton.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-9)

PhoneManager/Class/Page/Home/View/cell/HomeInfoTableViewCell.swift

@@ -52,11 +52,11 @@ class HomeInfoTableViewCell:UITableViewCell {
         backView?.isUserInteractionEnabled = true
         
         numberLabel = UILabel()
-        numberLabel?.textColor = UIColor.colorWithHex(hexStr: black3Color)
-        numberLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold)
+        numberLabel?.textColor = UIColor.colorWithHex(hexStr: "#111111")
+        numberLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
         
         seletedAllBtn = UIButton()
-        seletedAllBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .bold)
+        seletedAllBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .semibold)
         seletedAllBtn?.setTitle("Select All", for: .normal)
         seletedAllBtn?.setTitle("Unselect all", for: .selected)
         
@@ -66,7 +66,7 @@ class HomeInfoTableViewCell:UITableViewCell {
         
         let flowlayout:UICollectionViewFlowLayout =  UICollectionViewFlowLayout()
         flowlayout.scrollDirection = .horizontal
-        flowlayout.minimumLineSpacing = 10
+        flowlayout.minimumLineSpacing = 6
         
         collectionView = UICollectionView.init(frame: CGRectMake(0, 0 , ScreenW , ScreenH), collectionViewLayout: flowlayout)
         collectionView?.backgroundColor = .clear
@@ -95,26 +95,26 @@ class HomeInfoTableViewCell:UITableViewCell {
             
             guard let model else {return}
             
-            let cH = ((model.smodels?.count ?? 0) > 2 ? 190 : 214) + 8
+            let cH = ((model.smodels?.count ?? 0) > 2 ? 205 : 229) + 8
             
             backView?.height = CGFloat(cH - 8)
-            backView?.width  = ScreenW - 16 * 2
+            backView?.width  = ScreenW - 8 * 2
             backView?.centerY = CGFloat(cH / 2)
             backView?.centerX = ScreenW / 2
             
             numberLabel?.text = "\(model.smodels?.count ?? 0) \(String(model.titleText!))"
             numberLabel?.sizeToFit()
-            numberLabel?.x = (backView?.x ?? 0) + marginLR
-            numberLabel?.y = (backView?.y ?? 0) + marginLR
+            numberLabel?.x = (backView?.x ?? 0) + 8
+            numberLabel?.y = (backView?.y ?? 0) + 8
             
             seletedAllBtn?.centerY = numberLabel?.centerY ?? 0
             seletedAllBtn?.x = (backView?.x ?? 0) + (backView?.width ?? 0) - 12 - (seletedAllBtn?.width ?? 0)
             checkSeletedAll()
             
-            collectionView?.height = CGFloat(cH - 64)
-            collectionView?.width = (backView?.width ?? 0) - marginLR
-            collectionView?.x = (backView?.x ?? 0) + marginLR
-            collectionView?.y = (backView?.y ?? 0) + (backView?.height ?? 0) - (collectionView?.height ?? 0) - 16
+            collectionView?.height = CGFloat(cH - Int(CGRectGetMaxY(numberLabel?.frame ?? CGRect())) - 16)
+            collectionView?.width = (backView?.width ?? 0) - 16
+            collectionView?.x = (backView?.x ?? 0) + 8
+            collectionView?.y = (backView?.y ?? 0) + (backView?.height ?? 0) - (collectionView?.height ?? 0) - 8
             
             self.collectionView?.reloadData()
             

PhoneManager/Class/Page/Home/View/cell/HomePhotosDetailCollectionCell.swift

@@ -140,7 +140,7 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
         
         self.selectImageView.snp.makeConstraints { make in
             make.bottom.right.equalToSuperview().offset(-6)
-            make.height.width.equalTo(18)
+            make.height.width.equalTo(18.38)
         }
         
         self.saveSizeView.snp.makeConstraints { make in

PhoneManager/Class/Page/Home/View/cell/HomeVideoDetailCell.swift

@@ -196,7 +196,7 @@ class HomeVideoDetailCell : UICollectionViewCell {
         }
         self.playImageView.snp.makeConstraints { make in
             make.center.equalToSuperview()
-            make.width.height.equalTo(18.38)
+            make.width.height.equalTo(26.RW())
         }
         self.saveSizeView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(6)

PhoneManager/Class/Page/Home/View/cell/ImageSeletedCollectionCell.swift

@@ -213,7 +213,7 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
         
         seletedBtn?.snp.makeConstraints({ make in
             
-            make.width.height.equalTo(12)
+            make.width.height.equalTo(18.38.RW())
             make.bottom.equalToSuperview().offset(-6)
             make.right.equalToSuperview().offset(-6)
         })

PhoneManager/Class/Page/Secret/PMShowImgVideoController.swift

@@ -63,7 +63,7 @@ class PMShowImgVideoController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
+        self.view.backgroundColor = .white//UIColor(red: 0.95, green: 0.96, blue: 0.99, alpha: 1)
         
         self.view.addSubview(self.navView)
         self.navView.showType = .dateAndSizeNav
@@ -102,6 +102,7 @@ class PMShowImgVideoController: BaseViewController {
         self.MaxCollection.scrollToItem(at: IndexPath(row: currentIdx, section: 0), at: .centeredHorizontally, animated: false)
         
         changeNavInfo()
+        backView.setShadow(cornerRadius: 0, sColor: UIColor.colorWithHex(hexStr: "#1475B9"), offset: CGSizeMake(3, -1),opacity: 0.15)
     }
     
     private func changeNavInfo(){
@@ -161,7 +162,7 @@ class PMShowImgVideoController: BaseViewController {
         let col = UICollectionView(frame: CGRect(), collectionViewLayout: flowlayout)
         col.delegate = self;
         col.dataSource = self;
-        
+        col.backgroundColor = .clear
         col.register(PMShowItemCell.self, forCellWithReuseIdentifier: PMShowItemCellID)
         col.register(UICollectionViewCell.self, forCellWithReuseIdentifier: "UICollectionViewCell")
         col.showsHorizontalScrollIndicator = false
@@ -230,7 +231,7 @@ class PMShowImgVideoController: BaseViewController {
     
     private lazy var backView: UIView = {
         let v = UIView()
-        v.backgroundColor = .white
+        v.backgroundColor = UIColor.colorWithHex(hexStr: "#F2F6FC")
         view.addSubview(v)
         return v
     }()

PhoneManager/Class/Page/Secret/View/SecretBottomView.swift

@@ -36,11 +36,12 @@ class SecretBottomView: UIView {
         layer.shadowOffset = CGSize(width: 0, height: -2)
         layer.shadowOpacity = 1
         layer.shadowRadius = 10
+        self.backgroundColor = .clear
     }
     
     private lazy var clayer: CALayer = {
         let l = CALayer()
-        l.backgroundColor = UIColor.white.cgColor
+        l.backgroundColor = UIColor.clear.cgColor
         return l
     }()
     

PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift

@@ -20,7 +20,9 @@ class TrashViewController: BaseViewController {
         button.setTitle("Delete", for: .normal)
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .semibold)
+        button.setImage(UIImage(named: "pm-home-Frame-del"), for: .normal)
         button.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
+        button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
         button.layer.cornerRadius = 20
         button.addTarget(self, action: #selector(delBtnAction), for: .touchUpInside)
         return button
@@ -124,18 +126,36 @@ class TrashViewController: BaseViewController {
     lazy var videoView:TrashContenView = {
         let videoView = TrashContenView()
         videoView.trashType = .video
+        videoView.callback = { idx in
+            UIView.animate(withDuration: 0.2) {
+                self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
+                self.currentPage = idx + 1
+            }
+        }
         return videoView
     }()
     
     lazy var otherView:TrashContenView = {
         let otherView = TrashContenView()
         otherView.trashType = .other
+        otherView.callback = { idx in
+            UIView.animate(withDuration: 0.2) {
+                self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
+                self.currentPage = idx + 1
+            }
+        }
         return otherView
     }()
     
     lazy var shotView:TrashContenView = {
         let shotView = TrashContenView()
         shotView.trashType = .shot
+        shotView.callback = { idx in
+            UIView.animate(withDuration: 0.2) {
+                self.contentScrollView.contentOffset = CGPoint(x: Int(self.view.width) * idx, y: 0)
+                self.currentPage = idx + 1
+            }
+        }
         return shotView
     }()
     
@@ -198,6 +218,7 @@ extension TrashViewController:UIScrollViewDelegate{
            if self.delBtn == nil{
                return
            }
+           self.delBtn.isHidden = data.count <= 0
            if data.count <= 0{
                self.delBtn.setTitle("Delete", for: .normal)
                self.delBtn.backgroundColor = UIColor(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)

PhoneManager/Class/Page/Trash/View/TrashContenAssetCell.xib

@@ -22,9 +22,9 @@
                         <color key="backgroundColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </imageView>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u7L-fz-1My">
-                        <rect key="frame" x="110" y="0.0" width="28" height="34"/>
+                        <rect key="frame" x="104" y="0.0" width="34" height="34"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="28" id="8iF-C1-mzq"/>
+                            <constraint firstAttribute="width" constant="34" id="8iF-C1-mzq"/>
                             <constraint firstAttribute="height" constant="34" id="Yde-4P-yCb"/>
                         </constraints>
                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -52,6 +52,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_trash_remove" width="16" height="16"/>
+        <image name="icon_trash_remove" width="20" height="20"/>
     </resources>
 </document>

PhoneManager/Class/Page/Trash/View/TrashDefaultView.swift

@@ -43,7 +43,7 @@ class TrashDefaultView: UIView {
     
     lazy var startButton : UIButton = {
         let view = UIButton()
-        view.setTitle("Start cleaning", for: UIControl.State.normal)
+        view.setTitle("Clean Now", for: UIControl.State.normal)
         view.setTitleColor(UIColor(red: 1, green: 1, blue: 1, alpha: 1), for: .normal)
         view.titleLabel?.font = UIFont.systemFont(ofSize: 12, weight: .semibold)
         view.clipsToBounds = true

PhoneManager/Class/Tool/Class/showImage/PMScaleImageView.swift

@@ -49,13 +49,13 @@ class PMScaleImageView: UIView , UIScrollViewDelegate {
                 }
                 self.showImg.snp.remakeConstraints({ make in
                     make.left.equalToSuperview().offset((self.width - size.width)/2.0 )
-                    if size.height < self.height / 2.0 {
-                        make.top.equalToSuperview().offset((self.height - size.height)/2.0 - 20 )
-                    }else if self.height - size.height > 20 {
-                        make.top.equalToSuperview().offset(10)
-                    }else{
+//                    if size.height < self.height / 2.0 {
+//                        make.top.equalToSuperview().offset((self.height - size.height)/2.0 - 20 )
+//                    }else if self.height - size.height > 20 {
+//                        make.top.equalToSuperview().offset(10)
+//                    }else{
                         make.top.equalToSuperview().offset((self.height - size.height)/2.0 )
-                    }
+//                    }
                     make.size.equalTo(size)
                 })
             })