Browse Source

1.修改UI

wenweiwei 3 years ago
parent
commit
51b2bdb2cf

BIN
BFFramework/Assets/Stuckpoint/icon_selected_down@2x.png


BIN
BFFramework/Assets/Stuckpoint/icon_selected_up@2x.png


BIN
BFFramework/Assets/base/deleteAudio@2x.png


BIN
BFFramework/Assets/base/deleteAudio@3x.png


+ 2 - 1
BFFramework/Classes/Base/View/PQChoseMaterialCell.swift

@@ -79,7 +79,8 @@ class PQChoseMaterialCell: UICollectionViewCell {
     /// 删除按钮
     lazy var deleteBtn: UIButton = {
         let deleteBtn = UIButton(type: .custom)
-        deleteBtn.setImage(UIImage.init().BF_Image(named:  "icon_search_delete"), for: .normal)
+        deleteBtn.tintColor = PQBFConfig.shared.styleBackGroundColor
+        deleteBtn.setImage(PQBFConfig.shared.materialDeleteImage, for: .normal)
         deleteBtn.tag = 2
         deleteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         deleteBtn.isHidden = !isAdded

+ 5 - 5
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -58,7 +58,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         choseLocalAllBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
         choseLocalAllBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
         choseLocalAllBtn.setTitle("全部", for: .normal)
-        choseLocalAllBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17)
+        choseLocalAllBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17,weight: .medium)
         choseLocalAllBtn.addCorner(corner: 6)
         choseLocalAllBtn.tag = 10
         choseLocalAllBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -70,7 +70,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         choseLocalVideoBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
         choseLocalVideoBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
         choseLocalVideoBtn.setTitle("视频", for: .normal)
-        choseLocalVideoBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17)
+        choseLocalVideoBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17,weight: .medium)
         choseLocalVideoBtn.addCorner(corner: 6)
         choseLocalVideoBtn.tag = 11
         choseLocalVideoBtn.isSelected = true
@@ -83,7 +83,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         choseLocalImageBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
         choseLocalImageBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
         choseLocalImageBtn.setTitle("照片", for: .normal)
-        choseLocalImageBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17)
+        choseLocalImageBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17,weight: .medium)
         choseLocalImageBtn.addCorner(corner: 6)
         choseLocalImageBtn.tag = 12
         choseLocalImageBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -91,8 +91,8 @@ public class PQStuckPointMaterialController: PQBaseViewController {
     }()
 
     lazy var choseLineView: UIView = {
-        let choseLineView = UIView(frame: CGRect(x: 0, y: 0, width: 25, height: 2))
-        choseLineView.frame.origin.y = (navHeadImageView?.frame.maxY ?? 0) - 5
+        let choseLineView = UIView(frame: CGRect(x: 0, y: 0, width: 25, height: 3))
+        choseLineView.frame.origin.y = (navHeadImageView?.frame.maxY ?? 0) - 6
         choseLineView.center.x = choseLocalVideoBtn.center.x
         choseLineView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return choseLineView

+ 7 - 1
BFFramework/Classes/Utils/PQBFConfig.swift

@@ -17,6 +17,8 @@ public class PQBFConfig: NSObject {
      styleTitleColor: UIColor = UIColor.white
      cutViewStyleColor: UIColor = UIColor.white
      cutViewTintColor: UIColor = UIColor.black
+     materialDeleteImage = UIImage.init().BF_Image(named:"icon_search_delete")
+     cutDurationColor = UIColor.init(red: 238.0 / 255.0, green: 0 / 255.0, blue: 81.0 / 255.0, alpha: 0.1)
      //主题适配方案二
      styleColor = green
      statusBarStyle = .dark
@@ -24,6 +26,8 @@ public class PQBFConfig: NSObject {
      styleTitleColor: UIColor = UIColor.black
      cutViewStyleColor: UIColor = UIColor.hexColor(hexadecimal: "#3DC1C1")
      cutViewTintColor: UIColor = UIColor.white
+     materialDeleteImage = UIImage.init().BF_Image(named:"deleteAudio")
+     cutDurationColor = UIColor.init(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
      */
     // 主题色
     public var styleColor: styleColor = .green
@@ -35,8 +39,10 @@ public class PQBFConfig: NSObject {
     public var styleTitleColor: UIColor = UIColor.black
     // 裁剪主题色
     public var cutViewStyleColor: UIColor = UIColor.hexColor(hexadecimal: "#3DC1C1")
+    // 素材删除图
+    public var materialDeleteImage: UIImage? = UIImage().BF_Image(named: "deleteAudio")
     // 裁剪主题色61, 193, 193
-    public var cutDurationColor: UIColor = UIColor.init(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
+    public var cutDurationColor: UIColor = UIColor(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
     // 裁剪主题色
     public var cutViewTintColor: UIColor = UIColor.white
     public var otherTintColor: UIColor = UIColor.hexColor(hexadecimal: "#F2F2F2")

+ 4 - 4
Example/BFFramework.xcodeproj/project.pbxproj

@@ -144,8 +144,8 @@
 				607FACCC1AFB9204008FA782 /* Sources */,
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
-				61F57263BAF9416EBA8ABA4E /* [CP] Embed Pods Frameworks */,
-				3B08C72EF954B603EE0ED282 /* [CP] Copy Pods Resources */,
+				4891C51BEE84B7DFFA829FAD /* [CP] Embed Pods Frameworks */,
+				21CEA0AE7A716A91F00E718F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -226,7 +226,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3B08C72EF954B603EE0ED282 /* [CP] Copy Pods Resources */ = {
+		21CEA0AE7A716A91F00E718F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -244,7 +244,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BFFramework_Example/Pods-BFFramework_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		61F57263BAF9416EBA8ABA4E /* [CP] Embed Pods Frameworks */ = {
+		4891C51BEE84B7DFFA829FAD /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

+ 0 - 2
Example/Podfile

@@ -4,6 +4,4 @@ platform :ios, '10.0'
 
 target 'BFFramework_Example' do
   pod 'BFFramework', :path => '../'
-
-
 end

+ 1 - 1
Example/Podfile.lock

@@ -93,6 +93,6 @@ SPEC CHECKSUMS:
   TXLiteAVSDK_Player: 3542b8d539779d57b3c870eac00321f8ab0f05f8
   WechatOpenSDK-Swift: 18a8f7b12e745c30acc013f72a9f8a25aad6e216
 
-PODFILE CHECKSUM: fbceb8d678f3260ea2e79f17e99b626365bfef4d
+PODFILE CHECKSUM: c4df0050584ce2cb487016f3899dfb474d4fbccc
 
 COCOAPODS: 1.10.1

+ 1 - 1
Example/Pods/Manifest.lock

@@ -93,6 +93,6 @@ SPEC CHECKSUMS:
   TXLiteAVSDK_Player: 3542b8d539779d57b3c870eac00321f8ab0f05f8
   WechatOpenSDK-Swift: 18a8f7b12e745c30acc013f72a9f8a25aad6e216
 
-PODFILE CHECKSUM: fbceb8d678f3260ea2e79f17e99b626365bfef4d
+PODFILE CHECKSUM: c4df0050584ce2cb487016f3899dfb474d4fbccc
 
 COCOAPODS: 1.10.1

File diff suppressed because it is too large
+ 1369 - 1366
Example/Pods/Pods.xcodeproj/project.pbxproj


Some files were not shown because too many files changed in this diff