From f640d6c5eff62bcbbd623171668b3e3b96ef0eeb Mon Sep 17 00:00:00 2001 From: allen Date: Fri, 29 Mar 2024 15:19:11 +0800 Subject: [PATCH] update ignore --- .gitignore | 3 +++ .../xcode/package.xcworkspace/contents.xcworkspacedata | 7 ------- Develop-Alert/dev-alert/Classes/AEAlertView.swift | 1 + Develop-Alert/dev-alert/Classes/AEBaseAlertView.swift | 3 ++- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/.gitignore b/.gitignore index 2e50c59..30cce2a 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,6 @@ AEAlertViewDemo/Pods/AEAlertView/AEAlertView.swift AEAlertViewDemo/Pods/AEAlertView/AEBaseAlertView.swift AEAlertViewDemo/Pods/AEAlertView/AEPathAnimation.swift AEAlertViewDemo/Pods/AEAlertView/AEUIAlertView.swift + + +.swiftpm diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Develop-Alert/dev-alert/Classes/AEAlertView.swift b/Develop-Alert/dev-alert/Classes/AEAlertView.swift index 672fa5f..93368df 100644 --- a/Develop-Alert/dev-alert/Classes/AEAlertView.swift +++ b/Develop-Alert/dev-alert/Classes/AEAlertView.swift @@ -274,6 +274,7 @@ open class AEAlertView: UIView { alertView = AEBaseAlertView(frame: defFrame, maximumWidth: maximumWidth) alertView.titleLabel.text = title alertView.messageTextView.text = message ?? "" + if style == .custom { alertView.alertStyle = .custom } else { diff --git a/Develop-Alert/dev-alert/Classes/AEBaseAlertView.swift b/Develop-Alert/dev-alert/Classes/AEBaseAlertView.swift index 509f999..01c882d 100644 --- a/Develop-Alert/dev-alert/Classes/AEBaseAlertView.swift +++ b/Develop-Alert/dev-alert/Classes/AEBaseAlertView.swift @@ -41,7 +41,7 @@ open class AEBaseAlertView: UIView { /// 最大宽度 请在init中赋值 为了适配iPad 默认值改为320 private(set) var maximumWidth: CGFloat = 320 - /// 新版本中text view 如果isScrollEnabled为true 则不能自动刷新高度，因此为了解决这个功能特意在计算高度是isScrollEnabled设置为false 当高度计算完成后在修改为true 除非你设置了false + /// 新版本中text view 如果isScrollEnabled为true 则不能自动刷新高度，因此为了解决这个功能特意在计算高度时isScrollEnabled设置为false 当高度计算完成后在修改为true 除非你设置了false public var textViewIsScrollEnabled = true public func dismiss() { @@ -217,6 +217,7 @@ extension AEBaseAlertView { backgroundView.addSubview(messageTextView) messageWidthConstraints = NSLayoutConstraint.constraints(withVisualFormat: "H:|-[messageTextView]-|", options: option, metrics: nil, views: ["messageTextView": messageTextView!]) backgroundView.addConstraints(messageWidthConstraints) + contentContainerView = UIView(frame: CGRect.zero) contentContainerView.translatesAutoresizingMaskIntoConstraints = false