Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C3672004F5 for ; Fri, 1 Sep 2017 09:23:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1AB6B16C996; Fri, 1 Sep 2017 07:23:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6146B16C990 for ; Fri, 1 Sep 2017 09:23:51 +0200 (CEST) Received: (qmail 2159 invoked by uid 500); 1 Sep 2017 07:23:50 -0000 Mailing-List: contact commits-help@weex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@weex.incubator.apache.org Delivered-To: mailing list commits@weex.incubator.apache.org Received: (qmail 2145 invoked by uid 99); 1 Sep 2017 07:23:50 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2017 07:23:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 1B7781A5976 for ; Fri, 1 Sep 2017 07:23:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id PL0R9Ua0Gjz8 for ; Fri, 1 Sep 2017 07:23:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 2C6E85F5B8 for ; Fri, 1 Sep 2017 07:23:47 +0000 (UTC) Received: (qmail 1904 invoked by uid 99); 1 Sep 2017 07:23:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Sep 2017 07:23:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1726F55EB; Fri, 1 Sep 2017 07:23:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acton393@apache.org To: commits@weex.incubator.apache.org Date: Fri, 01 Sep 2017 07:23:47 -0000 Message-Id: <4a6ebf1eb8734e668ba8cb9c272727f0@git.apache.org> In-Reply-To: <1bb6177b801d437ba0ae2456270527e3@git.apache.org> References: <1bb6177b801d437ba0ae2456270527e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/25] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-dev archived-at: Fri, 01 Sep 2017 07:23:52 -0000 Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ef94d710 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ef94d710 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ef94d710 Branch: refs/heads/0.16-dev Commit: ef94d710ec52b97995d1f27a8d8e4c512ca5d6d6 Parents: 887f61a 42285f3 Author: acton393 Authored: Fri Aug 11 17:27:20 2017 +0800 Committer: acton393 Committed: Fri Aug 11 17:27:20 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes examples/vue/modules/websocket.vue | 22 ++- html5/runtime/normalize.js | 13 +- .../WeexDemo.xcodeproj/project.pbxproj | 6 + ios/playground/WeexDemo/AppDelegate.m | 2 +- .../WeexDemo/WXExtendCallNativeTest.h | 25 +++ .../WeexDemo/WXExtendCallNativeTest.m | 47 ++++++ ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 32 ++++ .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 ++-- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 ++- .../Sources/Component/WXScrollerComponent.m | 3 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 5 +- ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 4 + ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 10 ++ ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 10 ++ ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 6 + .../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +- .../WeexSDK/Sources/Manager/WXBridgeManager.m | 4 + .../Sources/Manager/WXComponentFactory.h | 1 + .../Sources/Manager/WXComponentFactory.m | 23 +++ .../Sources/Manager/WXComponentManager.m | 18 +- .../Sources/Manager/WXExtendCallNativeManager.h | 26 +++ .../Sources/Manager/WXExtendCallNativeManager.m | 80 +++++++++ .../WeexSDK/Sources/Manager/WXModuleFactory.h | 6 + .../WeexSDK/Sources/Manager/WXModuleFactory.m | 24 +++ .../WeexSDK/Sources/Manager/WXTracingManager.h | 33 +++- .../WeexSDK/Sources/Manager/WXTracingManager.m | 169 ++++++++++++++++--- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 1 - ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 ++ .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 + .../Sources/Protocol/WXAppMonitorProtocol.h | 2 + .../Protocol/WXExtendCallNativeProtocol.h | 47 ++++++ .../Sources/Protocol/WXTracingProtocol.h | 29 ++++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 +++ .../Sources/View/WXComponent+ViewManagement.m | 1 - .../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + package.json | 3 +- pre-build/native-bundle-main.js | 10 +- 44 files changed, 720 insertions(+), 86 deletions(-) ----------------------------------------------------------------------