Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c602869
Using FMDB 2.0 instead of head version to adopt new Cocoapod spec req…
stcui Mar 20, 2013
2306351
fix BeeLog defination
stcui Mar 20, 2013
cdbb6a7
Merge remote-tracking branch 'upstream/master'
stcui Apr 13, 2013
8ba79bd
supress warnings
stcui Apr 13, 2013
052bd4e
Merge remote-tracking branch 'upstream/master'
stcui May 8, 2013
3a4302f
Add more geometry helper methods to UIView Extension
stcui May 18, 2013
5b367a2
simple singleton macro
stcui May 23, 2013
fbdb3ab
fix UITableBoard layout problem
stcui Jul 12, 2013
0cf52a9
add podspec to repos
stcui Jul 27, 2013
1c1957d
fix project file, remove deleted files
stcui Jul 29, 2013
f47cb78
replace with latest podspec
stcui Jul 29, 2013
e9044f5
clean project file
stcui Jul 29, 2013
388cfa9
Merge remote-tracking branch 'upstream/master'
stcui Jul 29, 2013
ea60eff
Merge remote-tracking branch 'upstream/master'
stcui Jul 29, 2013
405d968
fix
stcui Jul 29, 2013
b7a0232
update podspec
stcui Jul 29, 2013
c9d7db1
add ASI patch
stcui Jul 29, 2013
cec4ef3
fix podspec, add ASI_Bee to target lib
stcui Jul 30, 2013
7ccd039
supress warning
stcui Jul 30, 2013
f104348
Merge remote-tracking branch 'upstream/master'
stcui Aug 2, 2013
632877c
Merge remote-tracking branch 'upstream/master'
stcui Jan 13, 2014
3fe94c2
fix
stcui Jan 13, 2014
4b32569
replace JSONKit, fix podspec
stcui Jan 15, 2014
b007ed5
avoid duplicated symbol
stcui Jan 16, 2014
545577c
remove libalixpay.a
stcui Jan 16, 2014
6db1cf6
remove alipay library
stcui Jan 16, 2014
169decd
Merge remote-tracking branch 'upstream/master'
stcui Mar 6, 2014
3e72559
suppress warnings
stcui Mar 6, 2014
8c52fe9
update podspec
stcui Mar 6, 2014
578a078
Merge remote-tracking branch 'upstream/master'
stcui Dec 8, 2014
ebabc18
fix compile
stcui Dec 8, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions BeeFramework.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Pod::Spec.new do |s|
s.name = "BeeFramework"
s.version = "0.6.0"
s.summary = "Bee Framework is a rapid developemnt framework for iOS."
s.description = <<-DESC
Bee Framework is a MVC Framework to develop iOS application.
It has pretty clear hieracy and signal based mechanism, also with cache and asynchonized networking methods in it.
DESC
s.homepage = "http://bee-framework.com"
s.license = 'MIT'
s.platform = :ios, '6.0'
s.author = { "gavinkwoe" => "gavinkwoe@gmail.com"}
s.source = { :git => "https://github.com/stcui/BeeFramework.git", :tag => "0.6.0"}
s.frameworks = 'CoreMedia', 'CoreVideo', 'AVFoundation', 'Security', 'SystemConfiguration', 'QuartzCore', 'MobileCoreServices', 'CFNetwork'
s.vendored_libraries = 'services/**/*.a'
s.library = 'z', 'xml2', 'sqlite3'

s.subspec 'JSONKit' do |sp|
sp.source_files = 'framework/vendor/JSONKit/JSONKit.{h,m}'
sp.requires_arc = false
end

s.subspec 'Core' do |sp|
sp.resource = 'services/**/*.{xml, bundle}'
sp.source_files = 'framework/**/*.{h,m,mm}', 'services/**/*.{h,m,mm}', 'framework/vendor/*.{h,m}'
sp.exclude_files = 'framework/vendor/{ASI,ZipArchive,FMDB,JSONKit,OpenUDID,Reachability,TouchXML}/**/*'
sp.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libz, $(SDKROOT)/usr/include/libxml2', 'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++0x', 'CLANG_CXX_LIBRARY' => 'libstdc++', 'CLANG_WARN_DIRECT_OBJC_ISA_USAGE' => 'YES'}
sp.requires_arc = false
sp.dependency 'ASIHTTPRequest'
sp.dependency 'Reachability'
sp.dependency 'OpenUDID'
sp.dependency 'ZipArchive'
sp.dependency 'FMDB'
sp.dependency 'TouchXML'
sp.dependency 'BeeFramework/JSONKit'
end

end
7 changes: 5 additions & 2 deletions deprecated/Bee_UITableBoard.m
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,12 @@ - (void)setCellLayout:(NSObject *)layout
- (void)setFrame:(CGRect)rc
{
[super setFrame:CGRectZeroNan(rc)];
}

[_gridCell setFrame:self.bounds];
// [_gridCell layoutSubcells];
- (void)layoutSubviews
{
[super layoutSubviews];
[_gridCell setFrame:self.contentView.bounds];
}

- (void)setCenter:(CGPoint)pt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

#import "UIView+BeeUISignal.h"
#import "UIViewController+BeeUISignal.h"
#import "BeeUIBoard+Popover.h"

#pragma mark -

Expand Down
2 changes: 1 addition & 1 deletion framework/mvc/view/dom-element-ext/Bee_UITipsView.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ AS_SIGNAL( DID_DISAPPEAR ); // 已经隐藏
@property (nonatomic, retain) UIImage * successIcon;
@property (nonatomic, retain) UIImage * failureIcon;

AS_SINGLETON( BeeUITipsCenter )
AS_SINGLETON( BeeUITipsCenter );

+ (void)setDefaultContainerView:(UIView *)view;
+ (void)setDefaultMessageIcon:(UIImage *)image;
Expand Down
2 changes: 1 addition & 1 deletion framework/mvc/view/dom-element/Bee_UIAccelerometer.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
AS_NOTIFICATION( ANGLE_CHANGED ); // 设备角度改变
AS_NOTIFICATION( DIRECTION_CHANGED ); // 设备方向改变

AS_SINGLETON( BeeUIAccelerometer );
AS_SINGLETON( BeeUIAccelerometer )

@property (nonatomic, assign) UIInterfaceOrientation orientation;
@property (nonatomic, assign) BOOL showIndicator;
Expand Down
2 changes: 1 addition & 1 deletion framework/mvc/view/dom-element/Bee_UIImageCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#import "Bee_Precompile.h"
#import "Bee_Foundation.h"
#import "Bee_Cache.h"

#import "Bee_UIImageView.h"
#pragma mark -

//@interface BeeImageCache : NSObject<BeeCacheProtocol>
Expand Down
3 changes: 2 additions & 1 deletion framework/mvc/view/dom-element/Bee_UIImageView.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#import "Bee_UIImageView.h"
#import "Bee_UIConfig.h"
#import "Bee_UISignalBus.h"
#import "Bee_UIMetrics.h"

#import "Bee_Cache.h"
#import "Bee_Network.h"
Expand Down Expand Up @@ -66,7 +67,7 @@ @interface BeeImageCache()

@implementation BeeImageCache

DEF_SINGLETON( BeeImageCache );
DEF_SINGLETON( BeeImageCache )

@synthesize memoryCache = _memoryCache;
@synthesize fileCache = _fileCache;
Expand Down
2 changes: 1 addition & 1 deletion framework/mvc/view/dom-element/Bee_UIKeyboard.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ @interface BeeUIKeyboard()

@implementation BeeUIKeyboard

DEF_SINGLETON( BeeUIKeyboard )
DEF_SINGLETON( BeeUIKeyboard );

DEF_NOTIFICATION( SHOWN );
DEF_NOTIFICATION( HIDDEN );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ - (CGSize)estimateUISizeByBound:(CGSize)bound
return [super estimateUISizeByBound:bound];
}

CGSize titleSize = [self.currentTitle sizeWithFont:self.font constrainedToSize:bound lineBreakMode:self.lineBreakMode];
CGSize titleSize = [self.currentTitle sizeWithFont: self.titleLabel.font constrainedToSize:bound lineBreakMode: self.titleLabel.lineBreakMode];
CGSize imageSize = self.currentImage.size;
CGSize backgroundSize = self.currentBackgroundImage.size;

Expand All @@ -64,7 +64,7 @@ - (CGSize)estimateUISizeByWidth:(CGFloat)width
return [super estimateUISizeByWidth:width];
}

CGSize titleSize = [self.currentTitle sizeWithFont:self.font constrainedToSize:CGSizeMake(width, 99999) lineBreakMode:self.lineBreakMode];
CGSize titleSize = [self.currentTitle sizeWithFont: self.titleLabel.font constrainedToSize:CGSizeMake(width, 99999) lineBreakMode: self.titleLabel.lineBreakMode];
CGSize imageSize = self.currentImage.size;
CGSize backgroundSize = self.currentBackgroundImage.size;

Expand All @@ -87,7 +87,7 @@ - (CGSize)estimateUISizeByHeight:(CGFloat)height
return [super estimateUISizeByHeight:height];
}

CGSize titleSize = [self.currentTitle sizeWithFont:self.font constrainedToSize:CGSizeMake(99999, height) lineBreakMode:self.lineBreakMode];
CGSize titleSize = [self.currentTitle sizeWithFont: self.titleLabel.font constrainedToSize:CGSizeMake(99999, height) lineBreakMode: self.titleLabel.lineBreakMode];
CGSize imageSize = self.currentImage.size;
CGSize backgroundSize = self.currentBackgroundImage.size;

Expand Down
1 change: 1 addition & 0 deletions framework/mvc/view/dom-query/extension/BeeUIQuery+Offset.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#import "BeeUIQuery+Offset.h"
#import "UIView+Metrics.h"
#import "UIView+BeeUILayout.h"

#pragma mark -

Expand Down
1 change: 1 addition & 0 deletions framework/system/cache/Bee_Cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#import "Bee_CacheProtocol.h"
#import "Bee_FileCache.h"
#import "Bee_UIImageCache.h"
#import "Bee_Keychain.h"
#import "Bee_MemoryCache.h"
#import "Bee_UserDefaults.h"
Expand Down
2 changes: 1 addition & 1 deletion framework/system/foundation/Bee_Performance.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ AS_PACKAGE( BeePackage_System, BeePerformance, performance );

@interface BeePerformance : NSObject

AS_SINGLETON( BeePerformance );
AS_SINGLETON(BeePerformance)

@property (nonatomic, readonly) NSArray * records;
@property (nonatomic, assign) NSTimeInterval valve;
Expand Down
2 changes: 1 addition & 1 deletion framework/system/foundation/Bee_Performance.mm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ @interface BeePerformance()

@implementation BeePerformance

DEF_SINGLETON( BeePerformance );
DEF_SINGLETON( BeePerformance )

@synthesize records = _records;
@synthesize valve = _valve;
Expand Down
6 changes: 6 additions & 0 deletions framework/system/foundation/Bee_UnitTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
+ (BOOL)runTests;
@end

@interface BeeTestCase (GeneratedMethodStub)
+ (NSString *)name;
+ (const char *)file;
+ (unsigned int)line;
@end

#pragma mark -

@interface BeeUnitTest : NSObject
Expand Down
2 changes: 1 addition & 1 deletion framework/system/network/http/client/Bee_HTTPRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ - (id)initWithURL:(NSURL *)newURL
[_callstack addObjectsFromArray:[BeeRuntime callstack:16]];
#endif // #if __BEE_DEVELOPMENT__

self.userAgent = [BeeHTTPClientConfig sharedInstance].userAgent;
self.userAgentString = [BeeHTTPClientConfig sharedInstance].userAgent;
}

return self;
Expand Down
2 changes: 1 addition & 1 deletion framework/system/network/http/server/Bee_HTTPUtility2.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#pragma mark -

BEE_EXTERN void echo( NSString * text, ... );
BEE_EXTERN void http_echo( NSString * text, ... );
BEE_EXTERN void line( NSString * text, ... );
BEE_EXTERN void file( NSString * filePath );
BEE_EXTERN void header( NSString * key, NSString * value );
2 changes: 1 addition & 1 deletion framework/system/network/http/server/Bee_HTTPUtility2.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#pragma mark -

BEE_EXTERN void echo( NSString * text, ... )
BEE_EXTERN void http_echo( NSString * text, ... )
{
BeeHTTPWorkflow2 * workflow = [BeeHTTPWorkflow2 processingWorkflow];
if ( workflow )
Expand Down
39 changes: 39 additions & 0 deletions framework/vendor/ASIHTTPRequest+Bee.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
//
// ______ ______ ______
// /\ __ \ /\ ___\ /\ ___\
// \ \ __< \ \ __\_ \ \ __\_
// \ \_____\ \ \_____\ \ \_____\
// \/_____/ \/_____/ \/_____/
//
// Copyright (c) 2013 BEE creators
// http://www.whatsbug.com
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//
//

// add ForceThrottleBandwidth method to latest ASIHTTPRequest

#import "ASIHTTPRequest.h"

@interface ASIHTTPRequest (Bee)
// Set to YES to force turn on throttling
+ (void)setForceThrottleBandwidth:(BOOL)throttle;

@end
70 changes: 70 additions & 0 deletions framework/vendor/ASIHTTPRequest+Bee.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
//
// ______ ______ ______
// /\ __ \ /\ ___\ /\ ___\
// \ \ __< \ \ __\_ \ \ __\_
// \ \_____\ \ \_____\ \ \_____\
// \/_____/ \/_____/ \/_____/
//
// Copyright (c) 2013 BEE creators
// http://www.whatsbug.com
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//

#import "ASIHTTPRequest+Bee.h"
#import <objc/runtime.h>

static BOOL forceThrottleBandwith = NO;
static IMP originalIsBandwidthThrottled;

@implementation ASIHTTPRequest (BeeExt)
+ (void)load
{
Class clazz = objc_getMetaClass(class_getName([self class]));
SEL selector = @selector(setForceThrottleBandwidth:);
if ( ! [clazz resolveClassMethod:selector]) {
IMP imp = class_getMethodImplementation(clazz, @selector(_setForceThrottleBandwidth:));
class_addMethod(clazz, selector, imp, "v:C");

SEL bandwidthSelector = @selector(isBandwidthThrottled);
originalIsBandwidthThrottled = class_getMethodImplementation(clazz, bandwidthSelector);
Method method = class_getClassMethod(clazz, bandwidthSelector);
IMP myImp = class_getMethodImplementation(clazz, @selector(_isBandwidthThrottled));
method_setImplementation( method, myImp );
}
class_getClassMethod(clazz, @selector(setForceThrottleBandwidth:));
}

// Set to YES to force turn on throttling
+ (void)_setForceThrottleBandwidth:(BOOL)throttle
{
forceThrottleBandwith = throttle;
}

+ (BOOL)_isBandwidthThrottled
{
if ( forceThrottleBandwith )
return YES;
if (originalIsBandwidthThrottled) {
return (BOOL)originalIsBandwidthThrottled(self, _cmd);
}
return NO;
}

@end
2 changes: 1 addition & 1 deletion framework/vendor/Bee_Vendor.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#import "ASIInputStream.h"
#import "ASINetworkQueue.h"
#import "ASIProgressDelegate.h"

#import "ASIHTTPRequest+Bee.h"
// JSON
#import "JSONKit.h"

Expand Down
Loading