4.3.0

ddviper · Aug 30, 2021 · 1a0a6a5 · 1a0a6a5
1 parent 0f4a3eb
commit 1a0a6a5
Show file tree

Hide file tree

Showing 100 changed files with 2,188 additions and 1,010 deletions.
diff --git a/QMUIConfigurationTemplate/QMUIConfigurationTemplate.m b/QMUIConfigurationTemplate/QMUIConfigurationTemplate.m
@@ -83,16 +83,15 @@ - (void)applyConfigurationTemplate {
     #pragma mark - UISwitch
     QMUICMI.switchOnTintColor = nil;                                            // SwitchOnTintColor : UISwitch 打开时的背景色（除了圆点外的其他颜色）
     QMUICMI.switchOffTintColor = nil;                                           // SwitchOffTintColor : UISwitch 关闭时的背景色（除了圆点外的其他颜色）
-    QMUICMI.switchTintColor = nil;                                              // SwitchTintColor : UISwitch 关闭时的周围边框颜色
     QMUICMI.switchThumbTintColor = nil;                                         // SwitchThumbTintColor : UISwitch 中间的操控圆点的颜色
 
     #pragma mark - NavigationBar
 
     QMUICMI.navBarContainerClasses = nil;                                       // NavBarContainerClasses : NavigationBar 系列开关被用于 UIAppearance 时的生效范围（默认情况下除了用于 UIAppearance 外，还用于实现了 QMUINavigationControllerAppearanceDelegate 的 UIViewController），默认为 nil。当赋值为 nil 或者空数组时等效于 @[UINavigationController.class]，也即对所有 UINavigationBar 生效，包括系统的通讯录（ContactsUI.framework)、打印等。当值不为空时，获取 UINavigationBar 的 appearance 请使用 UINavigationBar.qmui_appearanceConfigured 方法代替系统的 UINavigationBar.appearance。请保证这个配置项先于其他任意 NavBar 配置项执行。
     QMUICMI.navBarHighlightedAlpha = 0.2f;                                      // NavBarHighlightedAlpha : QMUINavigationButton 在 highlighted 时的 alpha
     QMUICMI.navBarDisabledAlpha = 0.2f;                                         // NavBarDisabledAlpha : QMUINavigationButton 在 disabled 时的 alpha
-    QMUICMI.navBarButtonFont = nil;                                             // NavBarButtonFont : QMUINavigationButtonTypeNormal 和 UINavigationBar 上的 UIBarButtonItem 的字体
-    QMUICMI.navBarButtonFontBold = nil;                                         // NavBarButtonFontBold : QMUINavigationButtonTypeBold 的字体
+    QMUICMI.navBarButtonFont = nil;                                             // NavBarButtonFont : UINavigationBar 里 UIBarButtonItem 以及 QMUINavigationButtonTypeNormal 的字体
+    QMUICMI.navBarButtonFontBold = nil;                                         // NavBarButtonFontBold : UINavigationBar 里 Done 类型的 UIBarButtonItem 以及 QMUINavigationButtonTypeBold 的字体
     QMUICMI.navBarBackgroundImage = nil;                                        // NavBarBackgroundImage : UINavigationBar 的背景图
     QMUICMI.navBarShadowImage = nil;                                            // NavBarShadowImage : UINavigationBar.shadowImage，也即导航栏底部那条分隔线，配合 NavBarShadowImageColor 使用。
     QMUICMI.navBarShadowImageColor = nil;                                       // NavBarShadowImageColor : UINavigationBar.shadowImage 的颜色，如果为 nil，则使用 NavBarShadowImage 的值，如果 NavBarShadowImage 也为 nil，则使用系统默认的分隔线。如果不为 nil，而 NavBarShadowImage 为 nil，则自动创建一张 1px 高的图并将其设置为 NavBarShadowImageColor 的颜色然后设置上去，如果 NavBarShadowImage 不为 nil 且 renderingMode 不为 UIImageRenderingModeAlwaysOriginal，则将 NavBarShadowImage 设置为 NavBarShadowImageColor 的颜色然后设置上去。

diff --git a/QMUIKit.podspec b/QMUIKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QMUIKit"
-  s.version          = "4.2.3"
+  s.version          = "4.3.0"
   s.summary          = "致力于提高项目 UI 开发效率的解决方案"
   s.description      = <<-DESC
                        QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
@@ -89,11 +89,6 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
     end
 
-    ss.subspec 'QMUILinkButton' do |sss|
-      sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUILinkButton.{h,m}'
-      sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
-    end
-
     ss.subspec 'QMUINavigationButton' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUINavigationButton.{h,m}'
       sss.dependency 'QMUIKit/QMUIMainFrame'
@@ -125,6 +120,7 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUIKeyboardManager' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIKeyboardManager.{h,m}'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
+      sss.dependency 'QMUIKit/QMUIComponents/QMUIMultipleDelegates'
     end
 
     # 从这里开始就是非必须的组件
@@ -140,6 +136,7 @@ Pod::Spec.new do |s|
 			sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUILabel'
     end
 
     ss.subspec 'QMUIAppearance' do |sss|
@@ -314,7 +311,6 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIFillButton'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIGhostButton'
-      sss.dependency 'QMUIKit/QMUIComponents/QMUILinkButton'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIConsole'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIEmotionView'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
@@ -326,7 +322,6 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUISlider'
       sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
       sss.dependency 'QMUIKit/QMUIComponents/QMUITextView'
-      sss.dependency 'QMUIKit/QMUIComponents/QMUIVisualEffectView'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIToastView'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIBadge'
@@ -338,11 +333,6 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUIToastView'
     end
 
-    ss.subspec 'QMUIVisualEffectView' do |sss|
-      sss.source_files = 'QMUIKit/QMUIComponents/QMUIVisualEffectView.{h,m}'
-      sss.dependency 'QMUIKit/QMUIComponents/QMUICALayerExtension'
-    end
-
     ss.subspec 'QMUIWindowSizeMonitor' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIWindowSizeMonitor.{h,m}'
     end
@@ -406,7 +396,6 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUIToastView' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/ToastView/*.{h,m}'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
-      sss.dependency 'QMUIKit/QMUIComponents/QMUIVisualEffectView'
     end
 
     ss.subspec 'QMUIStaticTableView' do |sss|

diff --git a/QMUIKit/QMUIComponents/CALayer+QMUIViewAnimation.m b/QMUIKit/QMUIComponents/CALayer+QMUIViewAnimation.m
@@ -81,7 +81,7 @@ + (void)load {
 
 static char kAssociatedObjectKey_qmuiviewAnimationEnabled;
 - (void)setQmui_viewAnimationEnabled:(BOOL)qmui_viewAnimationEnabled {
-    NSAssert(!self.qmui_isRootLayerOfView, @"UIView 本身的 Layer 无须开启该属性");
+    QMUIAssert(!self.qmui_isRootLayerOfView, @"CALayer (QMUIViewAnimation)", @"UIView 本身的 Layer 无须开启 %s", __func__);
     objc_setAssociatedObject(self, &kAssociatedObjectKey_qmuiviewAnimationEnabled, @(qmui_viewAnimationEnabled), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     if (qmui_viewAnimationEnabled) {
         self.qmui_multipleDelegatesEnabled = YES;

diff --git a/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m b/QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m
@@ -227,7 +227,7 @@ - (void)pickAlbumsGroup:(QMUIAssetsGroup *)assetsGroup animated:(BOOL)animated {
     if (!self.imagePickerViewController) {
         self.imagePickerViewController = [self.albumViewControllerDelegate imagePickerViewControllerForAlbumViewController:self];
     }
-    NSAssert(self.imagePickerViewController, @"self.%@ 必须实现 %@ 并返回一个 %@ 对象", NSStringFromSelector(@selector(albumViewControllerDelegate)), NSStringFromSelector(@selector(imagePickerViewControllerForAlbumViewController:)), NSStringFromClass([QMUIImagePickerViewController class]));
+    QMUIAssert(!!self.imagePickerViewController, NSStringFromClass(self.class), NSStringFromClass(self.class), @"self.%@ 必须实现 %@ 并返回一个 %@ 对象", NSStringFromSelector(@selector(albumViewControllerDelegate)), NSStringFromSelector(@selector(imagePickerViewControllerForAlbumViewController:)), NSStringFromClass([QMUIImagePickerViewController class]));
 
     [self.imagePickerViewController refreshWithAssetsGroup:assetsGroup];
     self.imagePickerViewController.title = [assetsGroup name];