You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/03 08:34:44 UTC
[1/2] incubator-weex git commit: + [ios] fix compile bug about
wxeditcomponent
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 5c1ded048 -> 59dee77d3
+ [ios] fix compile bug about wxeditcomponent
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d4f016f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d4f016f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d4f016f6
Branch: refs/heads/0.11-dev
Commit: d4f016f6ba235a4c0cbef4102f41f0f61ba2f88f
Parents: 5c1ded0
Author: kfeagle <su...@163.com>
Authored: Fri Mar 3 15:40:53 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Fri Mar 3 15:40:53 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 ++++++++
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 1 +
5 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4f016f6/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 3b97234..2a0f761 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -219,6 +219,8 @@
C401945E1E344E8300D19C31 /* WXFloatCompareTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */; };
C41E1A971DC1FD15009C7F90 /* WXDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */; };
C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */; };
+ C4B3D6D41E6954300013F38D /* WXEditComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = C4B3D6D21E6954300013F38D /* WXEditComponent.h */; };
+ C4B3D6D51E6954300013F38D /* WXEditComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B3D6D31E6954300013F38D /* WXEditComponent.m */; };
C4B834271DE69B09007AD27E /* WXPickerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B834251DE69B09007AD27E /* WXPickerModule.m */; };
C4B834281DE69B09007AD27E /* WXPickerModule.h in Headers */ = {isa = PBXBuildFile; fileRef = C4B834261DE69B09007AD27E /* WXPickerModule.h */; };
C4C30DE81E1B833D00786B6C /* WXComponent+PseudoClassManagement.m in Sources */ = {isa = PBXBuildFile; fileRef = C4C30DE61E1B833D00786B6C /* WXComponent+PseudoClassManagement.m */; };
@@ -514,6 +516,8 @@
C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXFloatCompareTests.m; sourceTree = "<group>"; };
C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDatePickerManager.h; sourceTree = "<group>"; };
C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXDatePickerManager.m; sourceTree = "<group>"; };
+ C4B3D6D21E6954300013F38D /* WXEditComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXEditComponent.h; sourceTree = "<group>"; };
+ C4B3D6D31E6954300013F38D /* WXEditComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXEditComponent.m; sourceTree = "<group>"; };
C4B834251DE69B09007AD27E /* WXPickerModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPickerModule.m; sourceTree = "<group>"; };
C4B834261DE69B09007AD27E /* WXPickerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPickerModule.h; sourceTree = "<group>"; };
C4C30DE61E1B833D00786B6C /* WXComponent+PseudoClassManagement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WXComponent+PseudoClassManagement.m"; sourceTree = "<group>"; };
@@ -1030,6 +1034,8 @@
77E65A0A1C155E6E008B8775 /* Component */ = {
isa = PBXGroup;
children = (
+ C4B3D6D21E6954300013F38D /* WXEditComponent.h */,
+ C4B3D6D31E6954300013F38D /* WXEditComponent.m */,
2A837AAC1CD9DE9200AEDF03 /* WXLoadingComponent.h */,
2A837AAD1CD9DE9200AEDF03 /* WXLoadingComponent.m */,
2A837AAE1CD9DE9200AEDF03 /* WXLoadingIndicator.h */,
@@ -1222,6 +1228,7 @@
DCF087611DCAE161005CD6EB /* WXInvocationConfig.h in Headers */,
742AD7301DF98C45007DC46C /* WXResourceRequestHandler.h in Headers */,
77E65A151C155EB5008B8775 /* WXTextComponent.h in Headers */,
+ C4B3D6D41E6954300013F38D /* WXEditComponent.h in Headers */,
74CC7A1C1C2BC5F800829368 /* WXCellComponent.h in Headers */,
74896F301D1AC79400D1D593 /* NSObject+WXSwizzle.h in Headers */,
DCF343671E49CAEE00A2FB34 /* WXJSExceptionInfo.h in Headers */,
@@ -1502,6 +1509,7 @@
DCAB35FF1D658EB700C0EA70 /* WXRuleManager.m in Sources */,
77D161251C02DDD10010B15B /* WXSDKInstance.m in Sources */,
74EF31AE1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m in Sources */,
+ C4B3D6D51E6954300013F38D /* WXEditComponent.m in Sources */,
C4C30DE81E1B833D00786B6C /* WXComponent+PseudoClassManagement.m in Sources */,
74915F481C8EB02B00BEBCC0 /* WXAssert.m in Sources */,
59A596251CB6311F0012CD52 /* WXStorageModule.m in Sources */,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4f016f6/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
index dcc74e6..8665178 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
@@ -11,7 +11,7 @@
#import "WXTextComponentProtocol.h"
#import "WXDatePickerManager.h"
-@interface WXEditComponent : WXComponent<WXTextComponentProtocol,WXDatePickerManagerDelegate,UITextViewDelegate,UITextFieldDelegate>
+@interface WXEditComponent : WXComponent<WXDatePickerManagerDelegate,UITextViewDelegate,UITextFieldDelegate>
//attribute
@property (nonatomic, strong) UIColor *placeholderColor;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4f016f6/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h
index 0fff5d1..f0fcfac 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.h
@@ -9,5 +9,5 @@
#import <Foundation/Foundation.h>
#import "WXEditComponent.h"
-@interface WXTextInputComponent : WXEditComponent<WXTextComponentProtocol>
+@interface WXTextInputComponent : WXEditComponent
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4f016f6/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
index d9312bc..f181700 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h
@@ -11,8 +11,8 @@
#import "WXLog.h"
#import "WXLayoutDefine.h"
#import "WXType.h"
-#import "WXBoxShadow.h"
+@class WXBoxShadow;
@interface WXConvert : NSObject
+ (BOOL)BOOL:(id)value;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4f016f6/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
index b0de541..d3ee3b2 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
@@ -8,6 +8,7 @@
#import "WXConvert.h"
#import "WXUtility.h"
+#import "WXBoxShadow.h"
@implementation WXConvert
[2/2] incubator-weex git commit: + [ios] add debug to delete waring
Posted by cx...@apache.org.
+ [ios] add debug to delete waring
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/59dee77d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59dee77d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59dee77d
Branch: refs/heads/0.11-dev
Commit: 59dee77d38eca9f39ce74ba3c56771212b8977e5
Parents: d4f016f
Author: kfeagle <su...@163.com>
Authored: Fri Mar 3 15:48:52 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Fri Mar 3 15:48:52 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/59dee77d/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m
index c9ca9fa..c872412 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m
@@ -37,7 +37,9 @@
//https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/ObjCRuntimeGuide/Articles/ocrtTypeEncodings.html
-(id)parseArgument:(id)obj parameterType:(const char *)parameterType order:(int)order
{
+#ifdef DEBUG
BOOL check = YES;
+#endif
if (strcmp(parameterType,@encode(float))==0 || strcmp(parameterType,@encode(double))==0)
{
#ifdef DEBUG