Merge branch 'developer' of https://github.com/BlackStarLang/BSFramework

Author: langzhanqiang

BSFrameworks.podspec

@@ -34,6 +34,8 @@ Pod::Spec.new do |s|
     
   4、轮播图：'2D/3D'（完成）
   
+  5、分段控件：segment
+  
   
   DESC
 
@@ -89,6 +91,11 @@ Pod::Spec.new do |s|
     videoloader.source_files = 'BSFrameworks/Classes/BSVideoPreLoader/**/*{.h,.m}'
 
   end
+  
+  s.subspec 'BSSegmentView' do |segmentView|
+    segmentView.source_files = 'BSFrameworks/Classes/BSSegment/**/*{.h,.m}'
+  end
+  
   # 上拉下拉刷新控件
 #  s.subspec 'BSRefresh' do |ss|
 #    ss.source_files = 'BSFrameworks/Classes/BSRefresh/**/*{.h,.m}'

BSFrameworks/Classes/BSCategory/UIView+BSView.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #define SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width
 #define SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height
+#define SCALE_W(x) (SCREEN_WIDTH/375.0 * x)
 
 //是否全面屏包括X XS XSMax XR
 #define iPhoneX (SCREEN_HEIGHT==812||SCREEN_HEIGHT==896)

BSFrameworks/Classes/BSLooperView/BSLooper3DFlowLayout.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef enum : NSUInteger {
     BSLOOP_STYLE_NORMAL = 0,// 默认 3D轮播
-    BSLOOP_STYLE_CARD, // 卡片样式
+    BSLOOP_STYLE_CARD, // 卡片样式(类似于卡包样式的叠加覆盖效果)
 } BSLOOP_STYLE;
 
 

BSFrameworks/Classes/BSLooperView/BSLooperView.h

@@ -56,11 +56,11 @@ typedef NS_OPTIONS(NSInteger, BSLooperPosition){
 
     //只针对scrollDirection = ScrollDirectionHorizontal的
     BSLooperPositionLeft    =   0,      /// 向左
-    BSLooperPositionRight   =   1<<0,   /// 向右
+    BSLooperPositionRight   =   1,      /// 向右
 
     //只针对scrollDirection = ScrollDirectionVertical的
-    BSLooperPositionUp      =   2<<1,   /// 向上
-    BSLooperPositionDown    =   3<<2    /// 向下
+    BSLooperPositionUp      =   2,      /// 向上
+    BSLooperPositionDown    =   3       /// 向下
 };
 
 
@@ -99,7 +99,9 @@ typedef NS_OPTIONS(NSInteger, BSLooperPosition){
 
 
 /// ====================================
-///  是否自动轮播(只有无限轮播，才可自动轮播)
+///  if isInfinite = NO , autoLoop unavailable
+///  如果没有开启无线轮播，此属性将无效
+///  是否自动轮播
 /// ====================================
 @property (nonatomic ,assign) BOOL autoLoop;
 

BSFrameworks/Classes/BSLooperView/BSLooperView.m

@@ -98,14 +98,6 @@ -(void)initSubViews{
 
 #pragma mark - set method or public
 
--(void)setAutoLoop:(BOOL)autoLoop{
-    _autoLoop = autoLoop;
-    
-    if (autoLoop) {
-        self.isInfinite = YES;
-    }
-}
-
 -(void)setCellName:(NSString *)cellName{
     _cellName = cellName;
     /// 注册cell
@@ -138,18 +130,22 @@ -(void)setDataArr:(NSArray *)dataArr{
         self.flowLayout.maxIndexRow = self.newDataArr.count - 1;
         [self.collectionView reloadData];
 
-        self.currentPageIndex = dataArr.count;
+        if (self.isInfinite) {
+            self.currentPageIndex = dataArr.count;
+        }else{
+            self.currentPageIndex = 0;
+        }
 
         if (self.loopStyle == BSLOOP_STYLE_CARD) {
             [self.collectionView setContentOffset:CGPointMake(self.currentPageIndex*self.collectionView.width, 0) animated:NO];
         }else{
             /// 默认滚动到 第二个数据源的第一个数组
             [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:self.currentPageIndex inSection:0] atScrollPosition:UICollectionViewScrollPositionNone animated:NO];
         }
-    }
-    
-    if (self.autoLoop) {
-        [self creatTimer];
+        
+        if (self.autoLoop) {
+            [self creatTimer];
+        }
     }
 }
 
@@ -474,6 +470,9 @@ -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPat
 
 
 #pragma mark - scrollView delegate
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    
+}
 
 /// 减速时，重置 UICollectionView 位置（手动滚动）
 -(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{
@@ -514,6 +513,12 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView{
 
 
 #pragma mark - init 属性初始化
+- (BOOL)autoLoop {
+    if (self.isInfinite){
+        return _autoLoop;
+    }
+    return NO;
+}
 
 -(UICollectionView *)collectionView{
     if (!_collectionView) {

BSFrameworks/Classes/BSSegment/BSSegmentView.h

@@ -0,0 +1,74 @@
+//
+//  BSSegmentView.h
+//  BSFrameworks
+//
+//  Created by zongheng on 2023/3/21.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSUInteger, barTitleAligmentType) {
+    barTitleAligmentType_Bottom = 0,  ///底部对齐 默认
+    barTitleAligmentType_CenterY,     ///纵向居中
+    barTitleAligmentType_Top,         ///顶部对齐
+};
+
+typedef NS_ENUM(NSUInteger, barTitleScrollAligment) {
+    barTitleScrollAligment_Normal = 0,  ///不处理
+    barTitleScrollAligment_CenterX,     ///默认横向居中
+};
+
+
+@interface BSSegmentView : UIView
+
+///联动的scrollView，通过监听scrollView的contentoffset变化来处理联动效果
+@property (nonatomic, weak) UIScrollView *linkScrollView;
+///滚动指示器(底部横条)的宽度比 label 长多少：默认 3
+@property (nonatomic, assign) CGFloat indicatorGreatLabelWidth;
+///每个标题之间的间距
+@property (nonatomic, assign) CGFloat lineSpace;
+///默认 1.5
+@property (nonatomic, assign) CGFloat headIndent;
+///默认 15
+@property (nonatomic, assign) CGFloat tailIndent;
+
+///设置内容居中展示，适用于个数固定居中展示的样式，如：男生 女生 样式
+///此种样式 headIndent/tailIndent 无效，contentView的centerX固定为中间，
+///且scrollView不会设置contentSize，即不会滚动
+@property (nonatomic, assign) BOOL contentViewLayoutCenter;
+
+
+///普通字体和选中后的字体
+@property (nonatomic, strong) UIFont *normalFont;
+@property (nonatomic, strong) UIFont *selectFont;
+
+///普通字体颜色和选中后的字体颜色
+@property (nonatomic, strong) UIColor *normalColor;
+@property (nonatomic, strong) UIColor *selectColor;
+
+///标题对齐类型
+@property (nonatomic, assign) barTitleAligmentType aligmentType;
+//纵向偏移，负数为上偏倚，正数下偏移
+@property (nonatomic, assign) CGFloat verticalOffsetY;
+
+///选中标题后，标题是否自动滚动到中间
+@property (nonatomic, assign) barTitleScrollAligment autoScrollType;
+///被选中的item自动滚动后，需要的横向偏移量，负数为向左，正数为向右
+///只有在 barTitleScrollAligment_CenterX 状态下有用
+@property (nonatomic, assign) CGFloat horizontalAutoOffsetX;
+
+///默认选中index
+@property (nonatomic, assign) NSUInteger defaultSelectIndex;
+
+///设置标题数据
+- (void)setDataArr:(NSArray<NSString *> *)dataArr;
+
+///设置选中的标签,只能在 setDataArr 方法之后
+- (void)setSelectIndex:(NSInteger)selectIndex animate:(BOOL)animate;
+
+///设置底部横线的颜色或图片，如果都设置，以图片优先
+- (void)setIndicatorLineColor:(UIColor *)lineColor orImage:(UIImage *)image;
+
+@end
+
+