Merge branch 'develop'

Author: LinXunFeng

Example/LXFProtocolTool/ViewController.swift

@@ -57,6 +57,17 @@ extension ViewController {
         tableView.dataSource = self
         tableView.delegate = self
         self.view.addSubview(tableView)
+        
+        // 适配iOS15导航栏
+        if #available(iOS 15.0, *) {
+            let navBarAppearance = UINavigationBarAppearance()
+            navBarAppearance.backgroundColor = .white // 背景色
+            navBarAppearance.titleTextAttributes = [
+                .foregroundColor: UIColor.black // 字体颜色
+            ]
+            self.navigationController?.navigationBar.standardAppearance = navBarAppearance
+            self.navigationController?.navigationBar.scrollEdgeAppearance = navBarAppearance
+        }
     }
 }
 

LXFProtocolTool.podspec

@@ -34,8 +34,8 @@ LXFProtocolTool是使用Swift中的协议来实现多种方便、实用的工具
   s.subspec 'Refreshable' do |t|
       t.source_files = 'LXFProtocolTool/Classes/Refreshable/**/*.{swift}'
       t.dependency 'MJRefresh', '>= 3.5.0'
-      t.dependency 'RxSwift', '~> 5'
-      t.dependency 'RxRelay', '~> 5'
+      t.dependency 'RxSwift', '>= 6'
+      t.dependency 'RxRelay', '>= 6'
       t.dependency "LXFProtocolTool/AssociatedObjectStore"
       t.dependency "LXFProtocolTool/Base"
   end
@@ -50,7 +50,7 @@ LXFProtocolTool是使用Swift中的协议来实现多种方便、实用的工具
 
   s.subspec 'RxEmptyDataSetable' do |t|
       t.source_files = 'LXFProtocolTool/Classes/RxEmptyDataSetable/**/*.{swift}'
-      t.dependency 'RxCocoa', '~> 5'
+      t.dependency 'RxCocoa', '>= 6'
       t.dependency "LXFProtocolTool/EmptyDataSetable"
   end