Skip to content

Commit e86180f

Browse files
MoLiceMoLice
committed
Merge commit 'a08470713d13e0c4fe39a8706d360af628f60788'
2 parents 4457937 + a084707 commit e86180f

8 files changed

Lines changed: 19 additions & 24 deletions

File tree

‎QMUI/QMUIKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "QMUIKit"
3-
s.version = "1.7.0"
3+
s.version = "1.7.1"
44
s.summary = "致力于提高项目 UI 开发效率的解决方案"
55
s.description = <<-DESC
66
QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。

‎QMUI/QMUIKit/UIComponents/AssetLibrary/QMUIAsset.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ - (void)requestImageData:(void (^)(NSData *imageData, BOOL isGif))completion {
284284
if (completion) {
285285
[self assetSize:^(long long size) {
286286
// 获取 NSData 数据
287-
uint8_t *buffer = malloc(size);
287+
uint8_t *buffer = malloc((size_t)size);
288288
NSError *error;
289-
NSUInteger bytes = [_alAssetRepresentation getBytes:buffer fromOffset:0 length:size error:&error];
289+
NSUInteger bytes = [_alAssetRepresentation getBytes:buffer fromOffset:0 length:(NSUInteger)size error:&error];
290290
NSData *imageData = [NSData dataWithBytes:buffer length:bytes];
291291
free(buffer);
292292
// 判断是否为 GIF 图

‎QMUI/QMUIKit/UIComponents/ImagePickerLibrary/QMUIImagePickerViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
361361
}];
362362

363363
if (imageAsset.assetType == QMUIAssetTypeVideo) {
364-
cell.videoDurationLabel.text = [NSString qmui_timeStringFromSeconds:imageAsset.duration];
364+
cell.videoDurationLabel.text = [NSString qmui_timeStringWithMinsAndSecsFromSecs:imageAsset.duration];
365365
}
366366

367367
[cell.checkboxButton addTarget:self action:@selector(handleCheckBoxButtonClick:) forControlEvents:UIControlEventTouchUpInside];

‎QMUI/QMUIKit/UIComponents/QMUIZoomImageView.m‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#import <MediaPlayer/MediaPlayer.h>
1818
#import "UIControl+QMUI.h"
1919
#import "UILabel+QMUI.h"
20+
#import "NSString+QMUI.h"
2021

2122
#define kIconsColor UIColorMakeWithRGBA(255, 255, 255, .75)
2223

@@ -475,9 +476,9 @@ - (void)syncVideoProgressSlider {
475476
}
476477

477478
- (void)configVideoProgressSlider {
478-
self.videoToolbar.sliderLeftLabel.text = [self timeStringFromSeconds:0];
479+
self.videoToolbar.sliderLeftLabel.text = [NSString qmui_timeStringWithMinsAndSecsFromSecs:0];
479480
double duration = CMTimeGetSeconds(self.videoPlayerItem.asset.duration);
480-
self.videoToolbar.sliderRightLabel.text = [self timeStringFromSeconds:duration];
481+
self.videoToolbar.sliderRightLabel.text = [NSString qmui_timeStringWithMinsAndSecsFromSecs:duration];
481482

482483
self.videoToolbar.slider.minimumValue = 0.0;
483484
self.videoToolbar.slider.maximumValue = duration;
@@ -510,14 +511,7 @@ - (void)removePlayerTimeObserver {
510511

511512
- (void)updateVideoSliderLeftLabel {
512513
double currentSeconds = CMTimeGetSeconds(self.videoPlayer.currentTime);
513-
self.videoToolbar.sliderLeftLabel.text = [self timeStringFromSeconds:currentSeconds];
514-
}
515-
516-
// convert "100" to "01:40"
517-
- (NSString *)timeStringFromSeconds:(NSUInteger)seconds {
518-
NSUInteger min = floor(seconds / 60);
519-
NSUInteger sec = floor(seconds - min * 60);
520-
return [NSString stringWithFormat:@"%02ld:%02ld", (long)min, (long)sec];
514+
self.videoToolbar.sliderLeftLabel.text = [NSString qmui_timeStringWithMinsAndSecsFromSecs:currentSeconds];
521515
}
522516

523517
- (void)pauseVideo {

‎QMUI/QMUIKit/UIKitExtensions/NSString+QMUI.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
+ (NSString *)qmui_hexStringWithInteger:(NSInteger)integer;
3131

3232
/**
33-
* 将秒数转换为数字时钟格式，例如"100"->"01:40"
33+
* 将秒数转换为同时包含分钟和秒数的格式的字符串，例如 100->"01:40"
3434
*/
35-
+ (NSString *)qmui_timeStringFromSeconds:(double)seconds;
35+
+ (NSString *)qmui_timeStringWithMinsAndSecsFromSecs:(double)seconds;
3636

3737
/**
3838
* 用正则表达式匹配的方式去除字符串里一些特殊字符，避免UI上的展示问题

‎QMUI/QMUIKit/UIKitExtensions/NSString+QMUI.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ - (NSString *)qmui_removeMagicalChar {
9191
return modifiedString;
9292
}
9393

94-
+ (NSString *)qmui_timeStringFromSeconds:(double)seconds {
94+
+ (NSString *)qmui_timeStringWithMinsAndSecsFromSecs:(double)seconds {
9595
NSUInteger min = floor(seconds / 60);
9696
NSUInteger sec = floor(seconds - min * 60);
9797
return [NSString stringWithFormat:@"%02ld:%02ld", (long)min, (long)sec];

‎QMUI/QMUIKit/UIKitExtensions/UIControl+QMUI.m‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ + (void)load {
9696
});
9797
}
9898

99+
BeginIgnoreDeprecatedWarning
99100
- (void)qmui_touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
100101
self.touchEndCount = 0;
101-
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView) {
102+
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView || self.qmui_needsTakeOverTouchEvent) {
102103
self.canSetHighlighted = YES;
103104
[self qmui_touchesBegan:touches withEvent:event];
104105
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -112,7 +113,7 @@ - (void)qmui_touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
112113
}
113114

114115
- (void)qmui_touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
115-
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView) {
116+
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView || self.qmui_needsTakeOverTouchEvent) {
116117
self.canSetHighlighted = NO;
117118
[self qmui_touchesMoved:touches withEvent:event];
118119
} else {
@@ -121,7 +122,7 @@ - (void)qmui_touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
121122
}
122123

123124
- (void)qmui_touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
124-
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView) {
125+
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView || self.qmui_needsTakeOverTouchEvent) {
125126
self.canSetHighlighted = NO;
126127
if (self.touchInside) {
127128
[self setHighlighted:YES];
@@ -143,7 +144,7 @@ - (void)qmui_touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
143144
}
144145

145146
- (void)qmui_touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
146-
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView) {
147+
if (self.qmui_automaticallyAdjustTouchHighlightedInScrollView || self.qmui_needsTakeOverTouchEvent) {
147148
self.canSetHighlighted = NO;
148149
[self qmui_touchesCancelled:touches withEvent:event];
149150
if (self.highlighted) {
@@ -153,6 +154,7 @@ - (void)qmui_touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
153154
[self qmui_touchesCancelled:touches withEvent:event];
154155
}
155156
}
157+
EndIgnoreDeprecatedWarning
156158

157159
- (BOOL)qmui_pointInside:(CGPoint)point withEvent:(UIEvent *)event {
158160
if (([event type] != UIEventTypeTouches)) {

‎QMUI/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
</p>
55

66
# QMUI iOS
7-
QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理，
8-
让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
7+
QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理，让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
98

109
官网：[http://qmuiteam.com/ios](http://qmuiteam.com/ios)
1110

@@ -37,7 +36,7 @@ QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设
3736

3837
提供高效的工具方法，包括设备信息、动态字体、键盘管理、状态栏管理等，可以解决各种常见场景并大幅度提升开发效率。
3938

40-
## 支持iOS版本
39+
## 支持 iOS 版本
4140
QMUI iOS 支持 iOS 7+。
4241

4342
## 使用方法

0 commit comments

Comments
 (0)