diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index 7c0ba9b268..bb66b0a2db 100755 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -294,6 +294,11 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View. private boolean isCommit=false; private WXGlobalEventReceiver mGlobalEventReceiver=null; private boolean trackComponent; + private boolean needValidate = false; + + public boolean isNeedValidate() { + return needValidate; + } /* * store custom ViewPort Width */ @@ -559,6 +564,9 @@ private void renderByUrlInternal(String pageName, ensureRenderArchor(); pageName = wrapPageName(pageName, url); mBundleUrl = url; + if(WXSDKManager.getInstance().getValidateProcessor()!=null) { + needValidate = WXSDKManager.getInstance().getValidateProcessor().needValidate(mBundleUrl); + } Map renderOptions = options; if (renderOptions == null) { @@ -1258,6 +1266,9 @@ public View getContainerView() { public void setBundleUrl(String url){ mBundleUrl = url; + if(WXSDKManager.getInstance().getValidateProcessor()!=null) { + needValidate = WXSDKManager.getInstance().getValidateProcessor().needValidate(mBundleUrl); + } } public void onRootCreated(WXComponent root) { diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java index b5c9c4e0b8..bee15e6ae6 100755 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java @@ -148,6 +148,7 @@ import com.taobao.weex.appfram.websocket.IWebSocketAdapterFactory; import com.taobao.weex.bridge.WXBridgeManager; import com.taobao.weex.bridge.WXModuleManager; +import com.taobao.weex.bridge.WXValidateProcessor; import com.taobao.weex.common.WXRefreshData; import com.taobao.weex.common.WXRuntimeException; import com.taobao.weex.common.WXThread; @@ -187,6 +188,8 @@ public class WXSDKManager { private URIAdapter mURIAdapter; private IWebSocketAdapterFactory mIWebSocketAdapterFactory; + private WXValidateProcessor mWXValidateProcessor; + private WXSDKManager() { mWXRenderManager = new WXRenderManager(); mWXDomManager = new WXDomManager(mWXRenderManager); @@ -412,4 +415,12 @@ IWebSocketAdapter getIWXWebSocketAdapter() { return null; } + public void registerValidateProcessor(WXValidateProcessor processor){ + this.mWXValidateProcessor = processor; + } + + public WXValidateProcessor getValidateProcessor(){ + return mWXValidateProcessor; + } + } diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index 51eb1da1c9..cfa043db5e 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -405,7 +405,20 @@ public void stopRemoteDebug() { } public Object callModuleMethod(String instanceId, String moduleStr, String methodStr, JSONArray args) { - return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args); + WXSDKInstance wxsdkInstance = WXSDKManager.getInstance() + .getSDKInstance(instanceId); + if (wxsdkInstance.isNeedValidate() + && WXSDKManager.getInstance().getValidateProcessor() != null) { + boolean result = WXSDKManager.getInstance().getValidateProcessor() + .onModuleValidate(wxsdkInstance, moduleStr, methodStr, args); + if (result) { + return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, + args); + } else { + return null; + } + } + return WXModuleManager.callModuleMethod(instanceId, moduleStr, methodStr, args); } /** @@ -499,7 +512,7 @@ public Object callNativeModule(String instanceId, String module, String method, WXDomModule dom = getDomModule(instanceId); return dom.callDomMethod(method,arguments); }else { - return WXModuleManager.callModuleMethod(instanceId, module, + return callModuleMethod(instanceId, module, method, arguments); } } catch (Exception e) { @@ -577,7 +590,7 @@ public int callNative(String instanceId, String tasks, String callback) { WXDomModule dom = getDomModule(instanceId); dom.callDomMethod(task); }else { - WXModuleManager.callModuleMethod(instanceId, (String) target, + callModuleMethod(instanceId, (String) target, (String) task.get(METHOD), (JSONArray) task.get(ARGS)); } }else if(task.get(COMPONENT) != null){ diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java new file mode 100644 index 0000000000..59b2908ceb --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java @@ -0,0 +1,230 @@ +/** + * + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "[]" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2016 Alibaba Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.taobao.weex.bridge; + +import com.alibaba.fastjson.JSONArray; +import com.taobao.weex.WXSDKInstance; + +/** + * Created by fengjunjie + */ +public interface WXValidateProcessor { + + boolean onModuleValidate(WXSDKInstance wxsdkInstance, String moduleStr, + String methodStr, JSONArray params); + + WXComponentValidateResult onComponentValidate(WXSDKInstance wxsdkInstance, + String componentName); + + boolean needValidate(String bundleUrl); + + class WXComponentValidateResult { + + public boolean isSuccess; + + public String replacedComponent; + + } +} diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java index 6fb4a02d44..803051de41 100755 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java @@ -212,6 +212,8 @@ import com.alibaba.fastjson.JSONObject; import com.taobao.weex.WXEnvironment; import com.taobao.weex.WXSDKInstance; +import com.taobao.weex.WXSDKManager; +import com.taobao.weex.bridge.WXValidateProcessor; import com.taobao.weex.common.Constants; import com.taobao.weex.dom.flex.CSSLayoutContext; import com.taobao.weex.dom.flex.CSSNode; @@ -812,6 +814,21 @@ public String dumpDomTree() { } String type = (String) json.get(TYPE); + + if (wxsdkInstance.isNeedValidate()) { + WXValidateProcessor processor = WXSDKManager.getInstance() + .getValidateProcessor(); + if (processor != null) { + WXValidateProcessor.WXComponentValidateResult result = processor + .onComponentValidate(wxsdkInstance, type); + if (result != null && !result.isSuccess) { + type = TextUtils.isEmpty(result.replacedComponent) ? WXBasicComponentType.DIV + : result.replacedComponent; + json.put(TYPE, type); + } + } + } + WXDomObject domObject = WXDomObjectFactory.newInstance(type); domObject.setViewPortWidth(wxsdkInstance.getViewPortWidth()); diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj index add0dddb8e..b01860d70e 100644 --- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj +++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 042013AD1E66CD6A001FC79C /* WXValidateProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 042013AC1E66CD6A001FC79C /* WXValidateProcessor.h */; }; 1C1A2BED1D91172800539AA1 /* WXConvertTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1A2BEC1D91172800539AA1 /* WXConvertTests.m */; }; 1D3000F11D40B9AC004F3B4F /* WXClipboardModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D3000EF1D40B9AB004F3B4F /* WXClipboardModule.h */; }; 1D3000F21D40B9AC004F3B4F /* WXClipboardModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3000F01D40B9AB004F3B4F /* WXClipboardModule.m */; }; @@ -294,6 +295,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 042013AC1E66CD6A001FC79C /* WXValidateProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXValidateProcessor.h; sourceTree = ""; }; 1C1A2BEC1D91172800539AA1 /* WXConvertTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXConvertTests.m; sourceTree = ""; }; 1D3000EF1D40B9AB004F3B4F /* WXClipboardModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXClipboardModule.h; sourceTree = ""; }; 1D3000F01D40B9AB004F3B4F /* WXClipboardModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXClipboardModule.m; sourceTree = ""; }; @@ -935,6 +937,7 @@ 74A4BA841CAD453400195969 /* WXNetworkProtocol.h */, 59A582D31CF481110081FD3E /* WXAppMonitorProtocol.h */, 74EF31A91DE58AE600667A07 /* WXURLRewriteProtocol.h */, + 042013AC1E66CD6A001FC79C /* WXValidateProcessor.h */, ); path = Protocol; sourceTree = ""; @@ -1161,6 +1164,7 @@ C4F012861E150307003378D0 /* WXWebSocketLoader.h in Headers */, 77D161381C02DE940010B15B /* WXBridgeManager.h in Headers */, C4D872251E5DDF7500E39BC1 /* WXBoxShadow.h in Headers */, + 042013AD1E66CD6A001FC79C /* WXValidateProcessor.h in Headers */, C4D872221E5DDEDA00E39BC1 /* WXInnerLayer.h in Headers */, 2A919DA61E321F1F006EB6B5 /* WXBridgeMethod.h in Headers */, 77D161281C02DE1A0010B15B /* WXSDKManager.h in Headers */, diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m b/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m index 351c5c37a4..e2b67f385f 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m @@ -13,6 +13,7 @@ #import "WXAssert.h" #import "WXUtility.h" #import "WXSDKInstance_private.h" +#import "WXSDKManager.h" @implementation WXModuleMethod @@ -30,6 +31,18 @@ - (instancetype)initWithModuleName:(NSString *)moduleName - (NSInvocation *)invoke { + + if (self.instance.needValidate) { + if ([WXSDKManager validateProcessor]) { + BOOL result = [[WXSDKManager validateProcessor] validateWithWXSDKInstance:self.instance module:self.moduleName method:self.methodName args:self.arguments]; + if (!result) { + NSString *errorMessage = [NSString stringWithFormat:@"Invalid module：%@ method: %@ , please check the authority", self.moduleName,self.methodName]; + WX_MONITOR_FAIL(WXMTJSBridge, WX_ERR_INVOKE_NATIVE, errorMessage); + return nil; + } + } + } + Class moduleClass = [WXModuleFactory classWithModuleName:_moduleName]; if (!moduleClass) { NSString *errorMessage = [NSString stringWithFormat:@"Module：%@ doesn't exist, maybe it has not been registered", _moduleName]; diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m index f9e8fcc939..4bde7940b2 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m @@ -319,6 +319,15 @@ - (WXComponent *)_buildComponentForData:(NSDictionary *)data NSDictionary *attributes = data[@"attr"]; NSArray *events = data[@"event"]; + if (self.weexInstance.needValidate) { + if ([WXSDKManager validateProcessor]) { + WXComponentValidateResult* validateResult = [[WXSDKManager validateProcessor] validateWithWXSDKInstance:self.weexInstance component:type]; + if (validateResult && !validateResult.isSuccess) { + type = validateResult.replacedComponent? validateResult.replacedComponent : @"div"; + } + } + } + Class clazz = [WXComponentFactory classWithComponentName:type]; WXComponent *component = [[clazz alloc] initWithRef:ref type:type styles:styles attributes:attributes events:events weexInstance:self.weexInstance]; WXAssert(component, @"Component build failed for data:%@", data); diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h index 0f904208a2..204b21c29b 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h +++ b/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h @@ -9,6 +9,7 @@ #import #import "WXSDKInstance.h" #import "WXBridgeManager.h" +#import "WXValidateProcessor.h" @class WXModuleManager; @@ -19,11 +20,19 @@ **/ + (WXBridgeManager *)bridgeMgr; +/** + * @abstract Returns validate processor + **/ ++ (id)validateProcessor; + /** * @abstract Returns weex instance for specific identifier **/ + (WXSDKInstance *)instanceForID:(NSString *)identifier; + ++ (void)registerValidateProcessor:(id)validateProcessor; + /** * @abstract Returns weex instance for specific identifier **/ diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m index 071bc2bbf5..2383d9f1b7 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m @@ -13,6 +13,8 @@ @interface WXSDKManager () @property (nonatomic, strong) WXBridgeManager *bridgeMgr; +@property (nonatomic, strong) id validateProcessor; + @property (nonatomic, strong) WXThreadSafeMutableDictionary *instanceDict; @end @@ -43,6 +45,15 @@ + (WXBridgeManager *)bridgeMgr return bridgeMgr; } ++ (id )validateProcessor{ + return [self sharedInstance].validateProcessor; +} + ++ (void)registerValidateProcessor:(id)validateProcessor{ + [self sharedInstance].validateProcessor = validateProcessor; +} + + + (id)instanceForID:(NSString *)identifier { return [[self sharedInstance].instanceDict objectForKey:identifier]; diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h index 2fd0b74848..c2a33f4d66 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h @@ -52,6 +52,11 @@ extern NSString *const bundleUrlOptionKey; **/ @property (nonatomic, strong) NSString *instanceId; +/** + * Which indicates current instance needs to be validated or not to load,default value is false. + **/ +@property (nonatomic, assign) BOOL needValidate; + /** * The state of current instance. **/ diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 35e9c0f704..15fbdb13f6 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -126,6 +126,8 @@ - (void)renderWithURL:(NSURL *)url options:(NSDictionary *)options data:(id)data return; } + self.needValidate = [[WXSDKManager validateProcessor] needValidate:url]; + WXResourceRequest *request = [WXResourceRequest requestWithURL:url resourceType:WXResourceTypeMainBundle referrer:@"" cachePolicy:NSURLRequestUseProtocolCachePolicy]; [self _renderWithRequest:request options:options data:data]; } diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProcessor.h b/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProcessor.h new file mode 100644 index 0000000000..023e8516e4 --- /dev/null +++ b/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProcessor.h @@ -0,0 +1,28 @@ +/** + * Created by Weex. + * Copyright (c) 2016, Alibaba, Inc. All rights reserved. + * + * This source code is licensed under the Apache Licence 2.0. + * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree. + */ + +#import +#import "WXSDKInstance.h" + +@interface WXComponentValidateResult : NSObject + +@property(nonatomic,assign)BOOL isSuccess; +@property(nonatomic,copy)NSString* replacedComponent; + +@end + + +@protocol WXValidateProcessor + +-(BOOL)needValidate:(NSURL*) bundleUrl; + +-(BOOL)validateWithWXSDKInstance:(WXSDKInstance *)wxsdkInstance module:(NSString*) moduel method:(NSString *)method args:(NSArray *)args; + +-(WXComponentValidateResult *)validateWithWXSDKInstance:(WXSDKInstance *)wxsdkInstance component:(NSString *)componentName; + +@end