Skip to content

Commit

Permalink
Animated Image Support
Browse files Browse the repository at this point in the history
  • Loading branch information
pcjbird committed Nov 27, 2018
1 parent 3d084f5 commit ca003cc
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Framework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.9</string>
<string>1.1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
40 changes: 20 additions & 20 deletions Framework/StencilLayout.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,32 +161,32 @@
892B846E1FDFCA4F00038DD0 /* source */ = {
isa = PBXGroup;
children = (
892B84741FDFCA4F00038DD0 /* Util */,
892B848A1FDFCA4F00038DD0 /* Categories */,
892B84861FDFCA4F00038DD0 /* StencilAdditionalHeaderCell.m */,
892B84811FDFCA4F00038DD0 /* StencilCollectionReusableView.h */,
892B848D1FDFCA4F00038DD0 /* StencilCollectionReusableView.m */,
892B84711FDFCA4F00038DD0 /* StencilColloectionViewDelegateFlowLayout.h */,
892B84831FDFCA4F00038DD0 /* StencilFlowLayout.h */,
892B846F1FDFCA4F00038DD0 /* StencilFlowLayout.m */,
892B84841FDFCA4F00038DD0 /* StencilLayoutDefine.h */,
892B847E1FDFCA4F00038DD0 /* StencilFlowLayoutAttributes.h */,
892B848E1FDFCA4F00038DD0 /* StencilFlowLayoutAttributes.m */,
892B84701FDFCA4F00038DD0 /* StencilInfo.m */,
892B84711FDFCA4F00038DD0 /* StencilColloectionViewDelegateFlowLayout.h */,
892B847A1FDFCA4F00038DD0 /* StencilItemCell.m */,
892B84721FDFCA4F00038DD0 /* StencilItemImageCell.m */,
892B84821FDFCA4F00038DD0 /* StencilItemWebCell.m */,
892B847D1FDFCA4F00038DD0 /* StencilLayout.m */,
892B84841FDFCA4F00038DD0 /* StencilLayoutDefine.h */,
892B84801FDFCA4F00038DD0 /* StencilLayoutViewController.m */,
892B84731FDFCA4F00038DD0 /* StencilLayoutViewController+SelectEvent.h */,
892B84871FDFCA4F00038DD0 /* StencilLayoutViewController+SelectEvent.m */,
892B84791FDFCA4F00038DD0 /* StencilSectionTitleCell.m */,
892B847A1FDFCA4F00038DD0 /* StencilItemCell.m */,
892B84891FDFCA4F00038DD0 /* StencilLayoutViewController+Web.h */,
892B847B1FDFCA4F00038DD0 /* StencilLayoutViewController+Web.m */,
892B84851FDFCA4F00038DD0 /* StencilModel.m */,
892B847F1FDFCA4F00038DD0 /* StencilSectionFooterCell.m */,
892B84881FDFCA4F00038DD0 /* StencilSectionManager.h */,
892B847C1FDFCA4F00038DD0 /* StencilSectionManager.m */,
892B847D1FDFCA4F00038DD0 /* StencilLayout.m */,
892B847E1FDFCA4F00038DD0 /* StencilFlowLayoutAttributes.h */,
892B848E1FDFCA4F00038DD0 /* StencilFlowLayoutAttributes.m */,
892B847F1FDFCA4F00038DD0 /* StencilSectionFooterCell.m */,
892B84801FDFCA4F00038DD0 /* StencilLayoutViewController.m */,
892B84821FDFCA4F00038DD0 /* StencilItemWebCell.m */,
892B84851FDFCA4F00038DD0 /* StencilModel.m */,
892B84861FDFCA4F00038DD0 /* StencilAdditionalHeaderCell.m */,
892B84811FDFCA4F00038DD0 /* StencilCollectionReusableView.h */,
892B848D1FDFCA4F00038DD0 /* StencilCollectionReusableView.m */,
892B84791FDFCA4F00038DD0 /* StencilSectionTitleCell.m */,
892B84741FDFCA4F00038DD0 /* Util */,
);
name = source;
sourceTree = "<group>";
Expand Down Expand Up @@ -214,17 +214,17 @@
892B848F1FDFCA4F00038DD0 /* public */ = {
isa = PBXGroup;
children = (
892B84951FDFCA4F00038DD0 /* StencilLayout.h */,
892B84931FDFCA4F00038DD0 /* StencilInfo.h */,
892B84911FDFCA4F00038DD0 /* SampleStencilSectionStyle.h */,
892B84901FDFCA4F00038DD0 /* StencilAdditionalHeaderCell.h */,
892B84921FDFCA4F00038DD0 /* StencilModel.h */,
892B84941FDFCA4F00038DD0 /* StencilItemImageCell.h */,
892B84931FDFCA4F00038DD0 /* StencilInfo.h */,
892B84961FDFCA4F00038DD0 /* StencilItemCell.h */,
892B84971FDFCA4F00038DD0 /* StencilSectionTitleCell.h */,
892B84941FDFCA4F00038DD0 /* StencilItemImageCell.h */,
892B84981FDFCA4F00038DD0 /* StencilItemWebCell.h */,
892B84951FDFCA4F00038DD0 /* StencilLayout.h */,
892B84991FDFCA4F00038DD0 /* StencilLayoutViewController.h */,
892B84921FDFCA4F00038DD0 /* StencilModel.h */,
892B849A1FDFCA4F00038DD0 /* StencilSectionFooterCell.h */,
892B84971FDFCA4F00038DD0 /* StencilSectionTitleCell.h */,
);
name = public;
path = public_headers;
Expand Down
2 changes: 1 addition & 1 deletion StencilLayout.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'StencilLayout'
s.summary = 'iOS一种基于模版的布局模式,旨在支持广告位灵活配置,高效运营,UI动态生成,提高开发效率。'
s.version = '1.0.9'
s.version = '1.1.0'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.authors = { 'pcjbird' => '[email protected]' }
s.social_media_url = 'http://www.lessney.com'
Expand Down
2 changes: 1 addition & 1 deletion StencilLayout/StencilItemImageCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@interface StencilItemImageCell()

@property (weak, nonatomic) IBOutlet UIImageView *imageView;
@property (weak, nonatomic) IBOutlet YYAnimatedImageView *imageView;
@end

@implementation StencilItemImageCell
Expand Down
10 changes: 3 additions & 7 deletions StencilLayout/StencilLayoutDefine.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,11 @@
//! 是否调试模式.
#define bDebugMode ([[[NSUserDefaults standardUserDefaults] objectForKey:StencilLayoutDebugKey] boolValue])

#define SDK_VERSION @"1.0.6"
#define SDK_VERSION @"1.1.0"

#define SDK_BUILD_VERSION @"201712290001"
#define SDK_BUILD_VERSION @"201811270001"

#ifdef DEBUG
# define SDKLog(fmt, ...) NSLog((@"[🐌StencilLayout] %s (line %d) " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
#else
# define SDKLog(fmt, ...) (bDebugMode ? NSLog((@"[🐌StencilLayout] %s (line %d) " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__) : nil)
#endif
#define SDKLog(fmt, ...) (bDebugMode ? NSLog((@"[🐌StencilLayout] %s (line %d) " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__) : nil)

#define SDK_RAISE_EXCEPTION(msg) ([NSException raise:@"[🐌StencilLayout]" format:@"%@ 【class name:%@, line:%@】",(msg),@(__PRETTY_FUNCTION__),@(__LINE__)])

Expand Down
3 changes: 3 additions & 0 deletions StencilLayout/public_headers/StencilLayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
// 框架名称:iOS模版布局框架SDK
// 框架功能:基于模版的布局模式,旨在支持广告位灵活配置,高效运营,UI动态生成,提高开发效率。
// 修改记录:
// pcjbird 2018-11-27 Version:1.1.0 Build:201811270001
// 1.Animated Image Support
//
// pcjbird 2018-09-18 Version:1.0.9 Build:201809180001
// 1.XCode 10 支持
//
Expand Down
4 changes: 2 additions & 2 deletions StencilLayout/public_headers/StencilLayoutViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@
/**
*@brief delegate
*/
@property(nullable, nonatomic, assign) id<StencilLayoutViewControllerDelegate> delegate;
@property(nullable, nonatomic, weak) id<StencilLayoutViewControllerDelegate> delegate;

/**
*@brief additional header datasource
*/
@property(nullable, nonatomic, assign) id<StencilLayoutViewControllerAdditionalHeaderDataSource> headerDataSource;
@property(nullable, nonatomic, weak) id<StencilLayoutViewControllerAdditionalHeaderDataSource> headerDataSource;

/**
*@brief 设置附加头部数据源
Expand Down
4 changes: 2 additions & 2 deletions StencilLayout/resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.6</string>
<string>1.1.0</string>
<key>CFBundleVersion</key>
<string>201712290001</string>
<string>201811270001</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016年 Zero Status. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
6 changes: 3 additions & 3 deletions StencilLayout/resource/StencilItemImageCell.xib
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -18,7 +18,7 @@
<rect key="frame" x="0.0" y="0.0" width="249" height="155"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wfY-rf-1MT">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wfY-rf-1MT" customClass="YYAnimatedImageView">
<rect key="frame" x="0.0" y="0.0" width="249" height="155"/>
</imageView>
</subviews>
Expand Down

0 comments on commit ca003cc

Please sign in to comment.