Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Jht committed Sep 17, 2019
1 parent 86019f3 commit 65cdd8e
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 46 deletions.
2 changes: 1 addition & 1 deletion JhtMarquee.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = 'JhtMarquee'
s.version = '1.0.5'
s.version = '1.0.6'
s.summary = '跑马灯/滚动文字条'
s.homepage = 'https://github.com/jinht/Marquee'
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand Down
7 changes: 4 additions & 3 deletions JhtMarquee.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
TargetAttributes = {
A58F83DB1E1120BE00E30D68 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 8C4D9692Z4;
DevelopmentTeam = Q67TW3T8PL;
ProvisioningStyle = Automatic;
};
A58F83F41E1120BE00E30D68 = {
Expand All @@ -219,6 +219,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -416,7 +417,7 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 8C4D9692Z4;
DEVELOPMENT_TEAM = Q67TW3T8PL;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand All @@ -440,7 +441,7 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 8C4D9692Z4;
DEVELOPMENT_TEAM = Q67TW3T8PL;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down
17 changes: 1 addition & 16 deletions JhtMarquee/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ - (void)viewDidLoad {
}



#pragma mark - UI
/** createUI */
- (void)createUI {
Expand All @@ -82,7 +81,6 @@ - (void)createUI {
[self addVerticalMarquee];
}


#pragma mark 横向 跑马灯
/** 添加 横向 跑马灯 */
- (void)addHorizontalMarquee {
Expand All @@ -92,7 +90,6 @@ - (void)addHorizontalMarquee {
// NSLog(@"self.horizontalMarquee.singleScrollDuration => %lf", self.horizontalMarquee.singleScrollDuration);
}


#pragma mark 纵向 跑马灯
/** 添加纵向 跑马灯 */
- (void)addVerticalMarquee {
Expand Down Expand Up @@ -129,9 +126,7 @@ - (void)addVerticalMarquee {
}



#pragma mark - Get
/** 横向 跑马灯 */
#pragma mark - Getter
- (JhtHorizontalMarquee *)horizontalMarquee {
if (!_horizontalMarquee) {
_horizontalMarquee = [[JhtHorizontalMarquee alloc] initWithFrame:CGRectMake(0, 66, FrameW, 40) singleScrollDuration:0.0];
Expand All @@ -145,7 +140,6 @@ - (JhtHorizontalMarquee *)horizontalMarquee {
return _horizontalMarquee;
}

/** 纵向 跑马灯 */
- (JhtVerticalMarquee *)verticalMarquee {
if (!_verticalMarquee) {
_verticalMarquee = [[JhtVerticalMarquee alloc] initWithFrame:CGRectMake(10, CGRectGetMaxY(self.horizontalMarquee.frame) + 40, FrameW - 20, 60)];
Expand All @@ -164,7 +158,6 @@ - (JhtVerticalMarquee *)verticalMarquee {
return _verticalMarquee;
}


#pragma mark Get Method
/** 点击 滚动跑马灯 触发方法 */
- (void)marqueeTapGes:(UITapGestureRecognizer *)ges {
Expand All @@ -182,12 +175,4 @@ - (void)marqueeTapGes:(UITapGestureRecognizer *)ges {
}




- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}


@end
19 changes: 0 additions & 19 deletions JhtMarquee/testVC/testVC.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,4 @@ - (void)viewDidLoad {
}






- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/

@end
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@
@property (nonatomic, assign, readonly) CGFloat singleScrollDuration;



#pragma mark - Public Method
/** 初始化
* duration: 单次滚动时间
* 注: duration = 0.0,使用内部自适应计算功能
*/
- (instancetype)initWithFrame:(CGRect)frame singleScrollDuration:(NSTimeInterval)duration;

#pragma mark 设置跑马灯状态
/** 设置跑马灯状态
* marqueeState: 跑马灯状态(MarqueeState_H)
* 注: 《开启跑马灯》放在viewDidAppear中,《关闭跑马灯》放在viewWillDisappear中
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


/** 跑马灯状态_枚举
* tip: 调用 MarqueeShutDown_H 后,需要调用 MarqueeStart_H 才能开启滚动
* tips: 调用 MarqueeShutDown_H 后,需要调用 MarqueeStart_H 才能开启滚动
*/
typedef NS_ENUM(NSUInteger, MarqueeState_H) {
// 开启
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/** 跑马灯文字 数据源数组(支持attributedText && text混合) */
@property (nonatomic, strong) NSArray *sourceArray;


#pragma mark optional
/** 当前展示内容 索引 */
@property (nonatomic, assign, readonly) NSInteger currentIndex;
Expand All @@ -30,7 +29,7 @@
* 顺时针: 底部 ===> 顶部
* 逆时针: 顶部 ===> 底部
*/
@property (nonatomic, assign) BOOL isCounterclockwise;
@property (nonatomic, assign, getter=isCounterclockwise) BOOL counterclockwise;

/** 单次滚动 时间
* default: 0.5f
Expand Down Expand Up @@ -59,7 +58,6 @@
@property (nonatomic, assign) NSInteger numberOfLines;



#pragma mark - Public Method
/** 设置跑马灯状态
* marqueeState: 目标状态(MarqueeState_V)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


/** 跑马灯状态_枚举
* tip: 调用 MarqueeShutDown_V 后,需要调用 MarqueeStart_V 才能开启滚动
* tips: 调用 MarqueeShutDown_V 后,需要调用 MarqueeStart_V 才能开启滚动
*/
typedef NS_ENUM(NSUInteger, MarqueeState_V) {
// 开启
Expand Down
Binary file modified JhtMarquee_SDK/JhtMarquee.framework/Info.plist
Binary file not shown.
Binary file modified JhtMarquee_SDK/JhtMarquee.framework/JhtMarquee
Binary file not shown.

0 comments on commit 65cdd8e

Please sign in to comment.