Skip to content

Commit bd5eefb

Browse files
GeekZooStudioGeekZooStudio
committed
Merge pull request GeekZooStudio#1 from libertyBoy/master
3.1.1兼容arm64
2 parents c811bb3 + e051863 commit bd5eefb

File tree

76 files changed

+4686
-4583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4686
-4583
lines changed

‎iOS/framework/mvc/model/Bee_Model.mm

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ + (id)model
106106
+ (id)modelWithObserver:(id)observer
107107
{
108108
BeeModel * model = nil;
109-
109+
110110
if ( [self respondsToSelector:@selector(sharedInstance)] )
111111
{
112112
model = (BeeModel *)[[self class] sharedInstance];
113113
}
114-
114+
115115
if ( nil == model || NO == [model isKindOfClass:[BeeModel class]] )
116116
{
117117
model = [[[[self class] alloc] init] autorelease];
@@ -121,7 +121,7 @@ + (id)modelWithObserver:(id)observer
121121
{
122122
[model addObserver:observer];
123123
}
124-
124+
125125
return model;
126126
}
127127

@@ -134,7 +134,7 @@ + (NSMutableArray *)modelsByClass:(Class)clazz
134134
{
135135
if ( 0 == __models.count )
136136
return nil;
137-
137+
138138
NSMutableArray * array = [NSMutableArray array];
139139

140140
for ( BeeModel * model in __models )

‎iOS/framework/mvc/view/css/extension/UIImageView+BeeUIStyle.m

+41-11
Original file line numberDiff line numberDiff line change
@@ -205,37 +205,51 @@ - (void)applyImageContent:(NSMutableDictionary *)properties
205205

206206
if ( [self respondsToSelector:@selector(setStrech:)] )
207207
{
208-
objc_msgSend( self, @selector(setStrech:), stretched );
208+
// TODO: CY
209+
[self performMsgSendWithTarget:self sel:@selector(setStrech:) signal:(void *)&stretched];
210+
// objc_msgSend( self, @selector(setStrech:), stretched );
209211
}
210-
212+
211213
if ( [self respondsToSelector:@selector(setRound:)] )
212214
{
213-
objc_msgSend( self, @selector(setRound:), rounded );
215+
// TODO: CY
216+
[self performMsgSendWithTarget:self sel:@selector(setRound:) signal:(void *)&rounded];
217+
// objc_msgSend( self, @selector(setRound:), rounded );
214218
}
215219

216220
if ( [self respondsToSelector:@selector(setGray:)] )
217221
{
218-
objc_msgSend( self, @selector(setGray:), grayed );
222+
// TODO: CY
223+
[self performMsgSendWithTarget:self sel:@selector(setGray:) signal:(void *)&grayed];
224+
// objc_msgSend( self, @selector(setGray:), grayed );
219225
}
220226

221227
if ( [self respondsToSelector:@selector(setPattern:)] )
222228
{
223-
objc_msgSend( self, @selector(setPattern:), pattern );
229+
// TODO: CY
230+
[self performMsgSendWithTarget:self sel:@selector(setPattern:) signal:(void *)&pattern];
231+
// objc_msgSend( self, @selector(setPattern:), pattern );
224232
}
225233

226234
if ( [self respondsToSelector:@selector(setStrechInsets:)] )
227235
{
228-
objc_msgSend( self, @selector(setStrechInsets:), contentInsets );
236+
// TODO: CY
237+
[self performMsgSendWithTarget:self sel:@selector(setStrechInsets:) signal:(void *)&contentInsets];
238+
// objc_msgSend( self, @selector(setStrechInsets:), contentInsets );
229239
}
230240

231241
if ( [self respondsToSelector:@selector(setCrop:)] )
232242
{
233-
objc_msgSend( self, @selector(setCrop:), croped );
243+
// TODO: CY
244+
[self performMsgSendWithTarget:self sel:@selector(setCrop:) signal:(void *)&croped];
245+
// objc_msgSend( self, @selector(setCrop:), croped );
234246
}
235247

236248
if ( [self respondsToSelector:@selector(setCropSize:)] )
237249
{
238-
objc_msgSend( self, @selector(setCropSize:), cropSize );
250+
// TODO: CY
251+
[self performMsgSendWithTarget:self sel:@selector(setCropSize:) signal:(void *)&cropSize];
252+
// objc_msgSend( self, @selector(setCropSize:), cropSize );
239253
}
240254

241255
self.contentMode = contentMode;
@@ -301,30 +315,46 @@ - (void)applyImageContent:(NSMutableDictionary *)properties
301315
- (void)applyImageIndicator:(NSMutableDictionary *)properties
302316
{
303317
NSString * imageLoading = [properties parseStringWithKeys:@[@"loading", @"image-loading"]];
318+
304319
if ( imageLoading )
305320
{
306321
if ( NSOrderedSame == [imageLoading compare:@"white" options:NSCaseInsensitiveSearch] )
307322
{
308323
if ( [self respondsToSelector:@selector(setIndicatorStyle:)] )
309324
{
310-
objc_msgSend( self, @selector(setIndicatorStyle:), UIActivityIndicatorViewStyleWhite );
325+
// TODO: CY
326+
327+
UIActivityIndicatorViewStyle indicatorStyle = UIActivityIndicatorViewStyleWhite;
328+
329+
[self performMsgSendWithTarget:self sel:@selector(setIndicatorStyle:) signal:(void *)&indicatorStyle];
330+
331+
// objc_msgSend( self, @selector(setIndicatorStyle:), UIActivityIndicatorViewStyleWhite );
311332
}
312333
}
313334
else if ( NSOrderedSame == [imageLoading compare:@"gray" options:NSCaseInsensitiveSearch] )
314335
{
315336
if ( [self respondsToSelector:@selector(setIndicatorStyle:)] )
316337
{
317-
objc_msgSend( self, @selector(setIndicatorStyle:), UIActivityIndicatorViewStyleGray );
338+
// TODO: CY
339+
340+
UIActivityIndicatorViewStyle indicatorStyle = UIActivityIndicatorViewStyleGray;
341+
342+
[self performMsgSendWithTarget:self sel:@selector(setIndicatorStyle:) signal:(void *)&indicatorStyle];
343+
344+
// objc_msgSend( self, @selector(setIndicatorStyle:), UIActivityIndicatorViewStyleGray );
318345
}
319346
}
320347
else
321348
{
322349
if ( [self respondsToSelector:@selector(setIndicatorColor:)] )
323350
{
324351
UIColor * color = [UIColor colorWithString:imageLoading];
352+
325353
if ( color )
326354
{
327-
objc_msgSend( self, @selector(setIndicatorColor:), color );
355+
// TODO: CY
356+
[self performMsgSendWithTarget:self sel:@selector(setIndicatorStyle:) signal:(void *)&color];
357+
// objc_msgSend( self, @selector(setIndicatorColor:), color );
328358
}
329359
}
330360
}

‎iOS/framework/mvc/view/css/extension/UIPageControl+BeeUIStyle.m

+3-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ - (void)applySizes:(NSMutableDictionary *)properties
126126

127127
if ( NO == CGSizeEqualToSize( dotSize, CGSizeZero ) )
128128
{
129-
objc_msgSend( self, @selector(setDotSize:), dotSize );
129+
// TODO: CY
130+
[self performMsgSendWithTarget:self sel:@selector(setDotSize:) signal:(void *)&dotSize];
131+
// objc_msgSend( self, @selector(setDotSize:), dotSize );
130132
}
131133
}
132134
}

‎iOS/framework/mvc/view/css/extension/UIScrollView+BeeUIStyle.m

+22-6
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,31 @@ - (void)applyScrollDirection:(NSMutableDictionary *)properties
5656
{
5757
if ( [self respondsToSelector:@selector(setHorizontal:)] )
5858
{
59-
objc_msgSend( self, @selector(setHorizontal:), YES );
59+
// TODO: CY
60+
BOOL i = YES;
61+
[self performMsgSendWithTarget:self sel:@selector(setHorizontal:) signal:(void *)&i];
62+
// objc_msgSend( self, @selector(setHorizontal:), YES );
6063
}
6164
}
6265
else
6366
{
6467
if ( [self respondsToSelector:@selector(setVertical:)] )
6568
{
66-
objc_msgSend( self, @selector(setVertical:), YES );
69+
// TODO: CY
70+
BOOL i = YES;
71+
[self performMsgSendWithTarget:self sel:@selector(setVertical:) signal:(void *)&i];
72+
// objc_msgSend( self, @selector(setVertical:), YES );
6773
}
6874
}
6975
}
7076
else
7177
{
7278
if ( [self respondsToSelector:@selector(setVertical:)] )
7379
{
74-
objc_msgSend( self, @selector(setVertical:), YES );
80+
// TODO: CY
81+
BOOL i = YES;
82+
[self performMsgSendWithTarget:self sel:@selector(setVertical:) signal:(void *)&i];
83+
// objc_msgSend( self, @selector(setVertical:), YES );
7584
}
7685
}
7786
}
@@ -88,12 +97,17 @@ - (void)applyScrollInsets:(NSMutableDictionary *)properties
8897
if ( [scrollInsets matchAnyOf:@[@"auto"]] )
8998
{
9099
UIEdgeInsets insets = [BeeUIConfig sharedInstance].baseInsets;
91-
objc_msgSend( self, @selector(setExtInsets:), insets );
100+
101+
// TODO: CY
102+
[self performMsgSendWithTarget:self sel:@selector(setExtInsets:) signal:(void *)&insets];
103+
// objc_msgSend( self, @selector(setExtInsets:), insets );
92104
}
93105
else
94106
{
95107
UIEdgeInsets insets = UIEdgeInsetsFromStringEx( scrollInsets );
96-
objc_msgSend( self, @selector(setExtInsets:), insets);
108+
// TODO: CY
109+
[self performMsgSendWithTarget:self sel:@selector(setExtInsets:) signal:(void *)&insets];
110+
// objc_msgSend( self, @selector(setExtInsets:), insets);
97111
}
98112
}
99113
}
@@ -114,7 +128,9 @@ - (void)applyScrollLines:(NSMutableDictionary *)properties
114128
lineCount = 1;
115129
}
116130

117-
objc_msgSend( self, @selector(setLineCount:), lineCount);
131+
// TODO: CY
132+
[self performMsgSendWithTarget:self sel:@selector(setLineCount:) signal:(void *)&lineCount];
133+
// objc_msgSend( self, @selector(setLineCount:), lineCount);
118134
}
119135
}
120136
}

‎iOS/framework/mvc/view/css/extension/UITextField+BeeUIStyle.m

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ - (void)applyInputValue:(NSMutableDictionary *)properties
7373

7474
if ( [self respondsToSelector:@selector(setMaxLength:)] )
7575
{
76-
objc_msgSend( self, @selector(setMaxLength:), maxLength );
76+
// TODO: CY
77+
[self performMsgSendWithTarget:self sel:@selector(setMaxLength:) signal:(void *)&maxLength];
78+
// objc_msgSend( self, @selector(setMaxLength:), maxLength );
7779
}
7880
}
7981

‎iOS/framework/mvc/view/css/extension/UITextView+BeeUIStyle.m

+6-2
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,17 @@ - (void)applyInputValue:(NSMutableDictionary *)properties
6565
{
6666
NSString * defaultPlaceholder = [self performSelector:@selector(placeholder)];
6767
NSString * placeholder = [properties parseTextWithKeys:@[@"placeholder", @"input-placeholder"] defaultValue:defaultPlaceholder];
68-
objc_msgSend( self, @selector(setPlaceholder:), placeholder );
68+
// TODO: CY
69+
[self performMsgSendWithTarget:self sel:@selector(setPlaceholder:) signal:(void *)&placeholder];
70+
// objc_msgSend( self, @selector(setPlaceholder:), placeholder );
6971
}
7072

7173
NSInteger maxLength = [properties parseIntegerWithKeys:@[@"maxlength", @"input-max-length"] defaultValue:0];
7274
if ( [self respondsToSelector:@selector(setMaxLength:)] )
7375
{
74-
objc_msgSend( self, @selector(setMaxLength:), maxLength );
76+
// TODO: CY
77+
[self performMsgSendWithTarget:self sel:@selector(setMaxLength:) signal:(void *)&maxLength];
78+
// objc_msgSend( self, @selector(setMaxLength:), maxLength );
7579
}
7680
}
7781

‎iOS/framework/mvc/view/css/parser/cssom/CSSStyleSelector.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ - (BOOL)checkOneSelector:(CSSSelector *)selector element:(id<CSSElementProtocol>
7474
return element.classes && [element.classes containsObject:selector.value];
7575

7676
if ( selector.match == MatchId )
77-
return element.hash && [element.hash isEqualToString:selector.value];
77+
return [element hash] && [[element hash] isEqualToString:selector.value];
7878

7979
// TODO: attribute check
8080
}
@@ -299,9 +299,9 @@ - (void)clearMatchedRules
299299
- (void)matchRules:(CSSRuleSet *)ruleSet
300300
{
301301
// #id
302-
if ( self.element.hash )
302+
if ( [self.element hash] )
303303
{
304-
[self matchRulesForList:[ruleSet getIDRules:self.element.hash]];
304+
[self matchRulesForList:[ruleSet getIDRules:[self.element hash]]];
305305
}
306306
// .class
307307
for ( NSString * className in self.element.classes )

‎iOS/framework/mvc/view/dom-element/Bee_UIImageView.m

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#import "Bee_UIImageView.h"
3535
#import "Bee_UIConfig.h"
3636
#import "Bee_UISignalBus.h"
37-
#import "Bee_UIMetrics.h"
3837

3938
#import "Bee_Cache.h"
4039
#import "Bee_Network.h"

‎iOS/framework/mvc/view/dom-event/Bee_UISignalBus.m

+26-1
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,42 @@ - (BOOL)perform:(BeeUISignal *)signal target:(id)target selector:(SEL)sel class:
296296

297297
if ( [BeeUIConfig sharedInstance].ASR )
298298
{
299+
// NSInvocation 调用 TODO: CY
300+
301+
ImpFuncType prevImp = NULL;
302+
299303
Method method = class_getInstanceMethod( clazz, sel );
304+
300305
if ( method )
301306
{
302-
IMP imp = method_getImplementation( method );
307+
ImpFuncType imp = (ImpFuncType)method_getImplementation( method );
308+
303309
if ( imp )
304310
{
311+
// if ( imp == prevImp )
312+
// {
313+
// continue;
314+
// }
315+
305316
imp( target, sel, signal );
306317

318+
prevImp = imp;
319+
307320
performed = YES;
308321
}
309322
}
323+
324+
// Method method = class_getInstanceMethod( clazz, sel );
325+
// if ( method )
326+
// {
327+
// IMP imp = method_getImplementation( method );
328+
// if ( imp )
329+
// {
330+
// imp( target, sel, signal );
331+
//
332+
// performed = YES;
333+
// }
334+
// }
310335
}
311336
else
312337
{

0 commit comments

Comments
 (0)