Jelajahi Sumber

ui 多风格测试

jsonwang 3 tahun lalu
induk
melakukan
27b9e1294f

TEMPAT SAMPAH
BFFramework/Assets/Stuckpoint/editCoverimageSelect_pq@2x.png


TEMPAT SAMPAH
BFFramework/Assets/Stuckpoint/editCoverimageSelect_pq@3x.png


TEMPAT SAMPAH
BFFramework/Assets/Stuckpoint/editCoverimageSelected_pq@2x.png


TEMPAT SAMPAH
BFFramework/Assets/Stuckpoint/editCoverimageSelected_pq@3x.png


+ 3 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -322,7 +322,8 @@ class PQStuckPointPublicController: PQBaseViewController {
         let titleLabel = UILabel()
         titleLabel.numberOfLines = 2
         titleLabel.isUserInteractionEnabled = true
-        titleLabel.textColor = UIColor.hexColor(hexadecimal: "#ABABAB")
+
+        titleLabel.textColor = PQBFConfig.shared.styleTitleColor
         titleLabel.textAlignment = .left
         titleLabel.font = UIFont.systemFont(ofSize: 17)
         let ges = UITapGestureRecognizer(target: self, action: #selector(titleLabelClick))
@@ -345,7 +346,7 @@ class PQStuckPointPublicController: PQBaseViewController {
                 inputText = inputText.replacingOccurrences(of: " ", with: "")
 
                 if inputText.count > 0 {
-                    self?.setTitleText(text: title ?? "", textColor: .black)
+                    self?.setTitleText(text: title ?? "", textColor: PQBFConfig.shared.styleTitleColor)
                     // 更新数据
                     self?.videoData?.title = title
                     self?.updateCoverImagegOrTitle()

+ 11 - 8
BFFramework/Classes/Stuckpoint/View/PQEditPublicCoverImageView.swift

@@ -23,7 +23,7 @@ class PQEditPublicCoverImageView: UIView {
     lazy var backView: UIView = {
         let backView = UIView()
         backView.addCorner(corner: 1.5)
-        backView.backgroundColor = .white
+        backView.backgroundColor = PQBFConfig.shared.otherTintColor
         return backView
     }()
 
@@ -36,11 +36,13 @@ class PQEditPublicCoverImageView: UIView {
     // 确定按钮
     lazy var compliteBtn: UIButton = {
         let compliteBtn = UIButton(type: .custom)
-        compliteBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        compliteBtn.setImage(UIImage.moduleImage(named: "editCoverimageOk", moduleName: "BFFramework",isAssets: false), for: .normal)
-        compliteBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        compliteBtn.backgroundColor =  UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        compliteBtn.setTitle("确定", for: .normal)
+        compliteBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
+        compliteBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#FFFFFF"), for: .normal)
         compliteBtn.adjustsImageWhenHighlighted = false
         compliteBtn.tag = 2
+        compliteBtn.addCorner(corner: 11)
         compliteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         return compliteBtn
     }()
@@ -48,10 +50,10 @@ class PQEditPublicCoverImageView: UIView {
     // 从相册选择
     lazy var selectPhotoBtn: UIButton = {
         let selectPhotoBtn = UIButton(type: .custom)
-        selectPhotoBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        selectPhotoBtn.setImage(UIImage.moduleImage(named: "editCoverimageSelect", moduleName: "BFFramework",isAssets: false), for: .normal)
+       
+        selectPhotoBtn.setImage(UIImage.moduleImage(named:  PQBFConfig.shared.editCoverimageSelectImage, moduleName: "BFFramework",isAssets: false), for: .normal)
         selectPhotoBtn.adjustsImageWhenHighlighted = false
-        selectPhotoBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        selectPhotoBtn.addCorner(corner: 11)
         selectPhotoBtn.tag = 1
         selectPhotoBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         return selectPhotoBtn
@@ -89,7 +91,8 @@ class PQEditPublicCoverImageView: UIView {
             coverImageBtn.addTarget(self, action: #selector(coverImageBtnClick(sender:)), for: .touchUpInside)
             //选中后的角标
             let iconView = UIImageView.init(frame: CGRect(x: frame.size.width  - 22.0 - 6, y: 6, width: 22, height: 22))
-            iconView.image = UIImage.moduleImage(named: "editCoverimageSelected", moduleName: "BFFramework",isAssets: false)
+            iconView.image = UIImage.moduleImage(named:  PQBFConfig.shared.editCoverimageSelectedImage, moduleName: "BFFramework",isAssets: false)
+           
           
             iconView.tag = 1000
             if(i == 0){

+ 15 - 10
BFFramework/Classes/selectImage/PQUploadController.swift

@@ -135,10 +135,10 @@ class PQUploadController: PQBaseViewController {
         let backBtn = UIButton(type: .custom)
         backBtn.frame = CGRect(x: 0, y: cDevice_iPhoneStatusBarHei, width: cDefaultMargin * 4, height: cDefaultMargin * 4)
         backBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
-        backBtn.backgroundColor = .yellow
        
-        backBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false), for: .normal)
+        backBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         backBtn.addTarget(self, action: #selector(backBtnClick), for: .touchUpInside)
+        backBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
         return backBtn
     }()
 
@@ -206,7 +206,7 @@ class PQUploadController: PQBaseViewController {
         } else {
             automaticallyAdjustsScrollViewInsets = false
         }
-        categoryCollectionView.backgroundColor = .white
+        categoryCollectionView.backgroundColor = PQBFConfig.shared.editCoverimageSelectedbackgroundColor
         return categoryCollectionView
     }()
 
@@ -247,21 +247,23 @@ class PQUploadController: PQBaseViewController {
         let selecteBtn = UIButton(frame: CGRect(x: deleteBtn.frame.maxX + cDefaultMargin, y: 0, width: cScreenWidth - nextBtn.frame.width - deleteBtn.frame.maxX - cDefaultMargin * 5, height: cDevice_iPhoneTabBarHei))
         selecteBtn.titleLabel?.lineBreakMode = .byTruncatingTail
         selecteBtn.setTitle("全部", for: .normal)
-        
-        selecteBtn.setImage(UIImage.moduleImage(named: "icon_uploadVideo_more", moduleName: "BFFramework",isAssets: false), for: .normal)
-        selecteBtn.setTitleColor(UIColor.black, for: .normal)
+         
+        selecteBtn.setImage(UIImage.moduleImage(named: "icon_uploadVideo_more", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
+        selecteBtn.setTitleColor( PQBFConfig.shared.styleTitleColor, for: .normal)
         selecteBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
         selecteBtn.tag = 2
         selecteBtn.imagePosition(at: PQButtonImageEdgeInsetsStyle.right, space: cDefaultMargin / 2)
+        selecteBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
         selecteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         return selecteBtn
     }()
 
     lazy var deleteBtn: UIButton = {
         let deleteBtn = UIButton(frame: CGRect(x: cDefaultMargin, y: 0, width: cDefaultMargin * 4, height: cDevice_iPhoneTabBarHei))
-        deleteBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false), for: .normal)
+        deleteBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         deleteBtn.tag = 1
         deleteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
+        deleteBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
         return deleteBtn
     }()
 
@@ -290,11 +292,14 @@ class PQUploadController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = .white
-        navHeadImageView?.backgroundColor = .white
-        lineView?.backgroundColor = .white
+     
+        view.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
+        navHeadImageView?.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
+        lineView?.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
         addSubViews()
+        bottomView.backgroundColor = PQBFConfig.shared.editCoverimageSelectedbackgroundColor
         loadLocalData()
+ 
     }
 
     deinit {