http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/RenderActionContext.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/RenderActionContext.java b/android/sdk/src/main/java/com/taobao/weex/dom/RenderActionContext.java new file mode 100644 index 0000000..8821ef6 --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/dom/RenderActionContext.java @@ -0,0 +1,218 @@ +/** + * + * 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.dom; + +import com.taobao.weex.WXSDKInstance; +import com.taobao.weex.ui.component.WXComponent; + +/** + * Created by sospartan on 23/02/2017. + */ + +public interface RenderActionContext { + WXSDKInstance getInstance(); + WXComponent getComponent(String ref); + WXComponent unregisterComponent(String ref); +}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/RenderTask.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/RenderTask.java b/android/sdk/src/main/java/com/taobao/weex/dom/RenderTask.java new file mode 100644 index 0000000..a841ede --- /dev/null +++ b/android/sdk/src/main/java/com/taobao/weex/dom/RenderTask.java @@ -0,0 +1,227 @@ +/** + * + * 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.dom; + +import com.taobao.weex.ui.IWXRenderTask; + +/** + * Created by sospartan on 23/02/2017. + */ + +class RenderTask implements IWXRenderTask { + private final RenderAction mRenderTask; + private final RenderActionContext mContext; + + public RenderTask(RenderAction action, RenderActionContext context){ + mRenderTask = action; + mContext = context; + } + + + @Override + public void execute() { + mRenderTask.executeRender(mContext); + } +} http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java index 2526a97..5c3a595 100755 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java @@ -210,6 +210,7 @@ import android.os.Message; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.taobao.weex.bridge.JSCallback; +import com.taobao.weex.dom.action.Actions; /** * Handler for dom operations. @@ -245,43 +246,14 @@ public class WXDomHandler implements Handler.Callback { mWXDomManager.sendEmptyMessageDelayed(WXDomHandler.MsgType.WX_DOM_BATCH, DELAY_TIME); } switch (what) { - case MsgType.WX_DOM_CREATE_BODY: - mWXDomManager.createBody(task.instanceId, (JSONObject) task.args.get(0)); - break; - case MsgType.WX_DOM_UPDATE_ATTRS: - mWXDomManager.updateAttrs(task.instanceId, (String) task.args.get(0), (JSONObject) task.args.get(1)); + case MsgType.WX_EXECUTE_ACTION: + mWXDomManager.executeAction(task.instanceId, (DOMAction) task.args.get(0), (boolean) task.args.get(1)); break; case MsgType.WX_DOM_UPDATE_STYLE: - mWXDomManager.updateStyle( - task.instanceId, - (String) task.args.get(0), + //keep this for direct native call + mWXDomManager.executeAction(task.instanceId, Actions.getUpdateStyle((String) task.args.get(0), (JSONObject) task.args.get(1), - task.args.size() > 2 && (boolean) task.args.get(2) - ); - break; - case MsgType.WX_DOM_ADD_DOM: - mWXDomManager.addDom(task.instanceId, (String) task.args.get(0), (JSONObject) task.args.get(1), (Integer) task.args.get(2)); - break; - case MsgType.WX_DOM_REMOVE_DOM: - mWXDomManager.removeDom(task.instanceId, (String) task.args.get(0)); - break; - case MsgType.WX_DOM_MOVE_DOM: - mWXDomManager.moveDom(task.instanceId, (String) task.args.get(0), (String) task.args.get(1), (Integer) task.args.get(2)); - break; - case MsgType.WX_DOM_ADD_EVENT: - mWXDomManager.addEvent(task.instanceId, (String) task.args.get(0), (String) task.args.get(1)); - break; - case MsgType.WX_DOM_REMOVE_EVENT: - mWXDomManager.removeEvent(task.instanceId, (String) task.args.get(0), (String) task.args.get(1)); - break; - case MsgType.WX_DOM_CREATE_FINISH: - mWXDomManager.createFinish(task.instanceId); - break; - case MsgType.WX_DOM_REFRESH_FINISH: - mWXDomManager.refreshFinish(task.instanceId); - break; - case MsgType.WX_DOM_UPDATE_FINISH: - mWXDomManager.updateFinish(task.instanceId); + task.args.size() > 2 && (boolean) task.args.get(2)),false); break; case MsgType.WX_ANIMATION: mWXDomManager.startAnimation(task.instanceId, @@ -294,22 +266,6 @@ public class WXDomHandler implements Handler.Callback { mWXDomManager.batch(); mHasBatch = false; break; - case MsgType.WX_DOM_SCROLLTO: - mWXDomManager.scrollToDom(task.instanceId, (String) task.args.get(0), (JSONObject) task.args.get(1)); - break; - case MsgType.WX_DOM_ADD_RULE: - mWXDomManager.addRule(task.instanceId,(String) task.args.get(0), (JSONObject) task.args.get(1)); - break; - case MsgType.WX_COMPONENT_SIZE: - mWXDomManager.getComponentSize(task.instanceId, (String) task.args.get(0), (JSCallback) task.args.get(1)); - break; - case MsgType.WX_DOM_INVOKE: - mWXDomManager.invokeMethod( - task.instanceId, - (String)task.args.get(0), - (String)task.args.get(1), - (JSONArray)task.args.get(2)); - break; default: break; } @@ -319,24 +275,41 @@ public class WXDomHandler implements Handler.Callback { public static class MsgType { + @Deprecated public static final int WX_DOM_CREATE_BODY = 0x0; + @Deprecated public static final int WX_DOM_UPDATE_ATTRS = 0x01; + @Deprecated public static final int WX_DOM_UPDATE_STYLE = 0x02; + @Deprecated public static final int WX_DOM_ADD_DOM = 0x03; + @Deprecated public static final int WX_DOM_REMOVE_DOM = 0x04; + @Deprecated public static final int WX_DOM_MOVE_DOM = 0x05; + @Deprecated public static final int WX_DOM_ADD_EVENT = 0x06; + @Deprecated public static final int WX_DOM_REMOVE_EVENT = 0x07; + @Deprecated public static final int WX_DOM_SCROLLTO = 0x08; + @Deprecated public static final int WX_DOM_CREATE_FINISH = 0x09; + @Deprecated public static final int WX_DOM_REFRESH_FINISH = 0x0a; + @Deprecated public static final int WX_DOM_UPDATE_FINISH = 0x0b; public static final int WX_ANIMATION=0xc; + @Deprecated public static final int WX_DOM_ADD_RULE=0xd; + @Deprecated public static final int WX_DOM_INVOKE=0xe; + public static final int WX_EXECUTE_ACTION = 0xfe; public static final int WX_DOM_BATCH = 0xff; + @Deprecated public static final int WX_COMPONENT_SIZE= 0xff1; + } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java index d7ebaa7..6bb5dbb 100755 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomManager.java @@ -208,31 +208,22 @@ import android.os.Handler; import android.os.Message; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.text.TextUtils; -import com.alibaba.fastjson.JSONArray; -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.JSCallback; -import com.taobao.weex.common.Constants; import com.taobao.weex.common.WXRuntimeException; import com.taobao.weex.common.WXThread; import com.taobao.weex.ui.WXRenderManager; -import com.taobao.weex.utils.FontDO; -import com.taobao.weex.utils.TypefaceUtil; import com.taobao.weex.utils.WXUtils; -import java.util.HashMap; +import java.util.ArrayList; import java.util.Iterator; -import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; /** * Class for managing dom operation. This class works as the client in the command pattern, it - * will call {@link WXDomStatement} for creating command object and invoking corresponding + * will call {@link DOMActionContextImpl} for creating command object and invoking corresponding * operation. * Methods in this class normally need to be invoked in dom thread, otherwise, {@link * WXRuntimeException} may be thrown. @@ -243,7 +234,7 @@ public final class WXDomManager { /** package **/ Handler mDomHandler; private WXRenderManager mWXRenderManager; - private ConcurrentHashMap<String, WXDomStatement> mDomRegistries; + private ConcurrentHashMap<String, DOMActionContextImpl> mDomRegistries; public WXDomManager(WXRenderManager renderManager) { mWXRenderManager = renderManager; @@ -281,7 +272,7 @@ public final class WXDomManager { if (!WXUtils.isUiThread()) { throw new WXRuntimeException("[WXDomManager] removeDomStatement"); } - final WXDomStatement statement = mDomRegistries.remove(instanceId); + final DOMActionContextImpl statement = mDomRegistries.remove(instanceId); if (statement != null) { post(new Runnable() { @@ -315,228 +306,27 @@ public final class WXDomManager { mDomThread = null; } - /** - * Invoke {@link WXDomStatement} for creating body according to the JSONObject. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param element the jsonObject according to which to create command object. - */ - void createBody(String instanceId, JSONObject element) { - throwIfNotDomThread(); - WXDomStatement statement = new WXDomStatement(instanceId, mWXRenderManager); - mDomRegistries.put(instanceId, statement); - statement.createBody(element); - } - private boolean isDomThread() { return !WXEnvironment.isApkDebugable() || Thread.currentThread().getId() == mDomThread.getId(); } /** - * Batch the execution of {@link WXDomStatement} + * Batch the execution of {@link DOMActionContextImpl} */ void batch() { throwIfNotDomThread(); - Iterator<Entry<String, WXDomStatement>> iterator = mDomRegistries.entrySet().iterator(); + Iterator<Entry<String, DOMActionContextImpl>> iterator = mDomRegistries.entrySet().iterator(); while (iterator.hasNext()) { iterator.next().getValue().batch(); } } - /** - * Invoke {@link WXDomStatement} for adding a dom node to its parent in a specific location. - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param element the dom object in the form of JSONObject - * @param parentRef parent to which the dom is added. - * @param index the location of which the dom is added. - */ - void addDom(String instanceId, String parentRef, JSONObject element, int index) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.addDom(element, parentRef, index); - } - - void invokeMethod(String instanceId, String ref, String method, JSONArray args){ - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.invokeMethod(ref,method,args); - } - private void throwIfNotDomThread(){ if (!isDomThread()) { throw new WXRuntimeException("dom operation must be done in dom thread"); } } - /** - * Invoke {@link WXDomStatement} for removing the specified {@link WXDomObject}. - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref of the dom. - */ - //removeElement(ref:String) - void removeDom(String instanceId, String ref) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.removeDom(ref); - } - - - /** - * Invoke {@link WXDomStatement} for moving the specific {@link WXDomObject} to a new parent. - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref of the dom to be moved. - * @param parentRef of the new parent DOM node - * @param index the index of the dom to be inserted in the new parent. - */ - void moveDom(String instanceId, String ref, String parentRef, int index) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.moveDom(ref, parentRef, index); - } - - /** - * Invoke {@link WXDomStatement} for updating the attributes according to the - * given attribute. - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref of the dom. - * @param attr the new attribute. This attribute is only a part of the full attribute, and will be - * merged into attributes - */ - void updateAttrs(String instanceId, String ref, JSONObject attr) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.updateAttrs(ref, attr); - } - - /** - * Invoke {@link WXDomStatement} for updating style - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref the given dom object - * @param style the given style. - */ - void updateStyle(String instanceId, String ref, JSONObject style, boolean byPesudo) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.updateStyle(ref, style, byPesudo); - } - - /** - * Invoke {@link WXDomStatement} for adding a default event listener to the corresponding {@link - * WXDomObject}. - * - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref of the dom. - * @param type the type of the event, this may be a plain event defined in - * {@link com.taobao.weex.common.Constants.Event} or a gesture defined in {@link com.taobao - * .weex.ui.view.gesture.WXGestureType} - */ - void addEvent(String instanceId, String ref, String type) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.addEvent(ref, type); - } - - /** - * Invoke the {@link WXDomStatement} for removing the event listener of the corresponding {@link - * WXDomObject}. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance - * @param ref of the dom. - * @param type the type of the event, this may be a plain event defined in - * {@link com.taobao.weex.common.Constants.Event} or a gesture defined in {@link com.taobao - * .weex.ui.view.gesture.WXGestureType} - */ - void removeEvent(String instanceId, String ref, String type) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.removeEvent(ref, type); - } - - /** - * Invoke the {@link WXDomStatement} for scrolling the given view to the specified position. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance to - * scroll. - * @param ref of the dom. - * @param options the specified position - */ - void scrollToDom(String instanceId, String ref, JSONObject options) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.scrollToDom(ref, options); - } - - /** - * Notify the creating of whole dom tree has finished. This message is sent by JS. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance to - * notify. - */ - void createFinish(String instanceId) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.createFinish(); - } - - /** - * Notify the refreshing has finished. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance to - * notify. - */ - void refreshFinish(String instanceId) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.refreshFinish(); - } - - /** - * Notify the update has finished. - * @param instanceId {@link com.taobao.weex.WXSDKInstance#mInstanceId} for the instance to - * notify. - */ - void updateFinish(String instanceId) { - throwIfNotDomThread(); - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - return; - } - statement.updateFinish(); - } - void startAnimation(@NonNull String instanceId, @NonNull String ref, @NonNull String animation, @@ -544,56 +334,46 @@ public final class WXDomManager { if (!isDomThread()) { throw new WXRuntimeException("RefreshFinish operation must be done in dom thread"); } - WXDomStatement statement = mDomRegistries.get(instanceId); + DOMActionContextImpl statement = mDomRegistries.get(instanceId); if (statement == null) { return; } statement.startAnimation(ref,animation,callBack); } - public void addRule(String instanceId,final String type,final JSONObject jsonObject) { - if (Constants.Name.FONT_FACE.equals(type)) { - FontDO fontDO = parseFontDO(jsonObject, mWXRenderManager.getWXSDKInstance(instanceId)); - if (fontDO != null && !TextUtils.isEmpty(fontDO.getFontFamilyName())) { - FontDO cacheFontDO = TypefaceUtil.getFontDO(fontDO.getFontFamilyName()); - if (cacheFontDO == null || !TextUtils.equals(cacheFontDO.getUrl(), fontDO.getUrl())) { - TypefaceUtil.putFontDO(fontDO); - TypefaceUtil.loadTypeface(fontDO); - } else { - TypefaceUtil.loadTypeface(cacheFontDO); - } + public void executeAction(String instanceId, DOMAction action, boolean createContext) { + DOMActionContext context = mDomRegistries.get(instanceId); + if(context == null){ + if(createContext){ + DOMActionContextImpl oldStatement = new DOMActionContextImpl(instanceId, mWXRenderManager); + mDomRegistries.put(instanceId, oldStatement); + context = oldStatement; + }else{ + //Instance not existed. + return; } } - } - - private FontDO parseFontDO(JSONObject jsonObject,WXSDKInstance instance) { - if(jsonObject == null) { - return null; - } - String src = jsonObject.getString(Constants.Name.SRC); - String name = jsonObject.getString(Constants.Name.FONT_FAMILY); + action.executeDom(context); - return new FontDO(name, src,instance); } + /** - * Gets the coordinate information of the control - * @param instanceId wxsdkinstance id - * @param ref ref - * @param callback callback + * @param action + * @param createContext only true when create body */ - public void getComponentSize(String instanceId, String ref, JSCallback callback) { - if (!isDomThread()) { - throw new WXRuntimeException("getComponentSize operation must be done in dom thread"); - } - WXDomStatement statement = mDomRegistries.get(instanceId); - if (statement == null) { - Map<String, Object> options = new HashMap<>(); - options.put("result", false); - options.put("errMsg", "Component does not exist"); - callback.invoke(options); + public void postAction(String instanceId,DOMAction action, boolean createContext){ + if(action == null){ return; } - statement.getComponentSize(ref, callback); + Message msg = Message.obtain(); + msg.what = WXDomHandler.MsgType.WX_EXECUTE_ACTION; + WXDomTask task = new WXDomTask(); + task.instanceId = instanceId; + task.args = new ArrayList<>(); + task.args.add(action); + task.args.add(createContext); + msg.obj = task; + sendMessage(msg); } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java index 046366c..fcf6b40 100755 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java @@ -205,23 +205,18 @@ package com.taobao.weex.dom; import android.os.Message; -import android.support.annotation.NonNull; -import android.text.TextUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.taobao.weex.WXSDKInstance; import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.SimpleJSCallback; import com.taobao.weex.bridge.WXBridgeManager; import com.taobao.weex.common.WXModule; +import com.taobao.weex.dom.action.Actions; import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** @@ -239,20 +234,20 @@ public final class WXDomModule extends WXModule { /** package **/ // method - static final String CREATE_BODY = "createBody"; - static final String UPDATE_ATTRS = "updateAttrs"; - static final String UPDATE_STYLE = "updateStyle"; - static final String REMOVE_ELEMENT = "removeElement"; - static final String ADD_ELEMENT = "addElement"; - static final String MOVE_ELEMENT = "moveElement"; - static final String ADD_EVENT = "addEvent"; - static final String REMOVE_EVENT = "removeEvent"; - static final String CREATE_FINISH = "createFinish"; - static final String REFRESH_FINISH = "refreshFinish"; - static final String UPDATE_FINISH = "updateFinish"; - static final String SCROLL_TO_ELEMENT = "scrollToElement"; - static final String ADD_RULE = "addRule"; - static final String GET_COMPONENT_RECT = "getComponentRect"; + public static final String CREATE_BODY = "createBody"; + public static final String UPDATE_ATTRS = "updateAttrs"; + public static final String UPDATE_STYLE = "updateStyle"; + public static final String REMOVE_ELEMENT = "removeElement"; + public static final String ADD_ELEMENT = "addElement"; + public static final String MOVE_ELEMENT = "moveElement"; + public static final String ADD_EVENT = "addEvent"; + public static final String REMOVE_EVENT = "removeEvent"; + public static final String CREATE_FINISH = "createFinish"; + public static final String REFRESH_FINISH = "refreshFinish"; + public static final String UPDATE_FINISH = "updateFinish"; + public static final String SCROLL_TO_ELEMENT = "scrollToElement"; + public static final String ADD_RULE = "addRule"; + public static final String GET_COMPONENT_RECT = "getComponentRect"; public static final String WXDOM = "dom"; @@ -284,95 +279,14 @@ public final class WXDomModule extends WXModule { if (method == null) { return null; } + //TODOï¼add pooling try { - switch (method) { - case CREATE_BODY: - if (args == null) { - return null; - } - createBody((JSONObject) args.get(0)); - break; - case UPDATE_ATTRS: - if (args == null) { - return null; - } - updateAttrs((String) args.get(0), (JSONObject) args.get(1)); - break; - case UPDATE_STYLE: - if (args == null) { - return null; - } - updateStyle((String) args.get(0), (JSONObject) args.get(1)); - break; - case REMOVE_ELEMENT: - if (args == null) { - return null; - } - removeElement((String) args.get(0)); - break; - case ADD_ELEMENT: - if (args == null) { - return null; - } - addElement((String) args.get(0), (JSONObject) args.get(1), (Integer) args.get(2)); - break; - case MOVE_ELEMENT: - if (args == null) { - return null; - } - moveElement((String) args.get(0), (String) args.get(1), (Integer) args.get(2)); - break; - case ADD_EVENT: - if (args == null) { - return null; - } - addEvent((String) args.get(0), (String) args.get(1)); - break; - case REMOVE_EVENT: - if (args == null) { - return null; - } - removeEvent((String) args.get(0), (String) args.get(1)); - break; - case CREATE_FINISH: - createFinish(); - break; - case REFRESH_FINISH: - refreshFinish(); - break; - case UPDATE_FINISH: - updateFinish(); - break; - case SCROLL_TO_ELEMENT: - if (args == null) { - return null; - } - JSONObject option =null; - if(args.size()>1) { - option = (JSONObject) args.get(1); - } - scrollToElement((String) args.get(0),option); - break; - case ADD_RULE: - if (args == null) { - return null; - } - addRule((String) args.get(0), (JSONObject) args.get(1)); - break; - case GET_COMPONENT_RECT: - if(args == null){ - return null; - } - getComponentRect((String) args.get(0),(String) args.get(1)); - break; - case INVOKE_METHOD: - if(args == null){ - return null; - } - invokeMethod((String) args.get(0),(String) args.get(1),(JSONArray) args.get(2)); - break; + DOMAction action = Actions.get(method,args); + if(action == null){ + WXLogUtils.e("Unknown dom action."); } + postAction(action,CREATE_BODY.equals(method)); } catch (IndexOutOfBoundsException e) { // no enougn args e.printStackTrace(); @@ -394,309 +308,14 @@ public final class WXDomModule extends WXModule { return; } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - List<Object> msgArgs = new ArrayList<>(); - msgArgs.add(ref); - msgArgs.add(method); - msgArgs.add(args); - - task.args = msgArgs; - msg.what = WXDomHandler.MsgType.WX_DOM_INVOKE; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Create a body for the current {@link com.taobao.weex.WXSDKInstance} according to given - * parameter. - * @param element info about how to create a body - */ - public void createBody(JSONObject element) { - if (element == null) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(element); - msg.what = WXDomHandler.MsgType.WX_DOM_CREATE_BODY; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Update attributes - * @param ref - * @param attr the expected attr - */ - public void updateAttrs(String ref, JSONObject attr) { - if (TextUtils.isEmpty(ref) || attr == null || attr.size() < 1) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(attr); - msg.what = WXDomHandler.MsgType.WX_DOM_UPDATE_ATTRS; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Update DOM style. - * @param ref DOM reference - * @param style the expected style - */ - public void updateStyle(String ref, JSONObject style) { - if (TextUtils.isEmpty(ref) || style == null || style.size() < 1) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(style); - msg.what = WXDomHandler.MsgType.WX_DOM_UPDATE_STYLE; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Remove a node for the node tree. - * @param ref reference of the node to be removed. - */ - public void removeElement(String ref) { - if (TextUtils.isEmpty(ref)) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - msg.what = WXDomHandler.MsgType.WX_DOM_REMOVE_DOM; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Add a {@link WXDomObject} to the specified parent as its given n-th child. - * @param parentRef reference of the parent. - * @param element the node to be added - * @param index the expected index that the new dom in its new parent - */ - public void addElement(String parentRef, JSONObject element, Integer index) { - if (element == null - || TextUtils.isEmpty(parentRef)) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(parentRef); - task.args.add(element); - task.args.add(index); - msg.what = WXDomHandler.MsgType.WX_DOM_ADD_DOM; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Move the DomElement to the specified parent as its given n-th child. - * @param ref reference of the node to be moved. - * @param parentRef reference of the parent. - * @param index the expected index that the dom in its new parent - */ - public void moveElement(String ref, String parentRef, Integer index) { - if (TextUtils.isEmpty(ref) - || TextUtils.isEmpty(parentRef)) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(parentRef); - task.args.add(index); - msg.what = WXDomHandler.MsgType.WX_DOM_MOVE_DOM; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Add eventListener for the specified {@link WXDomObject} - * @param ref reference of the node - * @param type the type of the event listener to be added. - */ - public void addEvent(String ref, String type) { - if (TextUtils.isEmpty(ref) || TextUtils.isEmpty(type)) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(type); - msg.what = WXDomHandler.MsgType.WX_DOM_ADD_EVENT; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Remove eventListener for the specified {@link WXDomObject} - * @param ref reference of the node - * @param type the type of the event listener to be removed. - */ - public void removeEvent(String ref, String type) { - if (TextUtils.isEmpty(ref) || TextUtils.isEmpty(type)) { - return; - } - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(type); - msg.what = WXDomHandler.MsgType.WX_DOM_REMOVE_EVENT; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Notify the {@link WXDomManager} that creation of dom tree is finished. - * This notify is given by JS. - */ - public void createFinish() { - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - msg.what = WXDomHandler.MsgType.WX_DOM_CREATE_FINISH; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - /** - * Notify the {@link WXDomManager} that refreshing of dom tree is finished. - * This notify is given by JS. - */ - public void refreshFinish() { - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - msg.what = WXDomHandler.MsgType.WX_DOM_REFRESH_FINISH; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - public void updateFinish() { - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - msg.what = WXDomHandler.MsgType.WX_DOM_UPDATE_FINISH; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - - /** - * Scroll the specified {@link WXDomObject} to given offset in given duration - * @param ref reference of specified dom object - * @param options scroll option, like {offset:0, duration:300} - */ - public void scrollToElement(String ref, JSONObject options) { - if (TextUtils.isEmpty(ref) ) { - return; - } - - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(options); - msg.what = WXDomHandler.MsgType.WX_DOM_SCROLLTO; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - - public void addRule(String type, JSONObject options) { - if (TextUtils.isEmpty(type) || options == null) { - return; - } - - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(type); - task.args.add(options); - msg.what = WXDomHandler.MsgType.WX_DOM_ADD_RULE; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); + postAction(Actions.getInvokeMethod(ref,method,args),false); } /** - * By ref the width and height of the component. - * - * @param ref the refer of component - * @param callback function id + * @param action + * @param createContext only true when create body */ - public void getComponentRect(String ref, String callback) { - if (mWXSDKInstance == null) { - return; - } - SimpleJSCallback jsCallback = new SimpleJSCallback(mWXSDKInstance.getInstanceId(), callback); - if (TextUtils.isEmpty(ref)) { - Map<String, Object> options = new HashMap<>(); - options.put("result", false); - options.put("errMsg", "Illegal parameter"); - jsCallback.invoke(options); - return; - } else if ("viewport".equalsIgnoreCase(ref)) { - if (mWXSDKInstance.getContainerView() != null) { - Map<String, Object> options = new HashMap<>(); - Map<String, Float> sizes = new HashMap<>(); - int[] location = new int[2]; - mWXSDKInstance.getContainerView().getLocationOnScreen(location); - sizes.put("left", 0f); - sizes.put("top", 0f); - sizes.put("right", getWebPxValue(mWXSDKInstance.getContainerView().getWidth())); - sizes.put("bottom", getWebPxValue(mWXSDKInstance.getContainerView().getHeight())); - sizes.put("width", getWebPxValue(mWXSDKInstance.getContainerView().getWidth())); - sizes.put("height", getWebPxValue(mWXSDKInstance.getContainerView().getHeight())); - options.put("size", sizes); - options.put("result", true); - jsCallback.invoke(options); - } else { - Map<String, Object> options = new HashMap<>(); - options.put("result", false); - options.put("errMsg", "Component does not exist"); - jsCallback.invoke(options); - } - } else { - Message msg = Message.obtain(); - WXDomTask task = new WXDomTask(); - task.instanceId = mWXSDKInstance.getInstanceId(); - task.args = new ArrayList<>(); - task.args.add(ref); - task.args.add(jsCallback); - msg.what = WXDomHandler.MsgType.WX_COMPONENT_SIZE; - msg.obj = task; - WXSDKManager.getInstance().getWXDomManager().sendMessage(msg); - } - } - - @NonNull - private float getWebPxValue(int value) { - return WXViewUtils.getWebPxByWidth(value,mWXSDKInstance.getInstanceViewPortWidth()); + public void postAction(DOMAction action, boolean createContext){ + WXSDKManager.getInstance().getWXDomManager().postAction(mWXSDKInstance.getInstanceId(),action,createContext); } } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f3390e3c/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java ---------------------------------------------------------------------- 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 b2fae6c..8963a37 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 @@ -272,7 +272,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject private boolean mYoung = false; - /** package **/ void traverseTree(Consumer...consumers){ + public void traverseTree(Consumer...consumers){ if (consumers == null) { return; } @@ -855,7 +855,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject return domObject; } - interface Consumer{ + public interface Consumer{ void accept(WXDomObject dom); } }
