Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

* [Android] Use JSON to find bundleType #1927

Merged
merged 1 commit into from
Dec 19, 2018
Merged

* [Android] Use JSON to find bundleType #1927

merged 1 commit into from
Dec 19, 2018

Conversation

YorkShen
Copy link
Contributor

Use JSON instead of simple string compare to find bundleType

Regular Expression is really slow, there is no reason we should use it.

@YorkShen
* [Android] Use JSON instead of simple string compare to find bundleT…
1d4c114 
…ype.

Regular is really slow, no reason to use it.
@YorkShen YorkShen requested a review from gubaojian as a code owner December 18, 2018 09:53
@weex-bot
Copy link

weex-bot commented Dec 18, 2018 •
edited
Loading

Fails
🚫 Failed to run assembleDebug task for android.
Messages
📖 android build verification finished.

Generated by 🚫 dangerJS

miomin
miomin approved these changes Dec 18, 2018
View reviewed changes
Copy link
Contributor

@miomin miomin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

gubaojian
gubaojian approved these changes Dec 18, 2018
View reviewed changes
Copy link
Member

@gubaojian gubaojian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good approve

@YorkShen YorkShen merged commit 2770fee into apache:master Dec 19, 2018
gubaojian pushed a commit to gubaojian/incubator-weex that referenced this pull request Dec 27, 2018
@hpop1994
[data-render] qking-engine in data-render rax mode
d3a68a6 
Squashed commit of the following:

commit bc0ee1492bdbe9789170ff100b8059b44773aa76
Author: xujc <[email protected]>
Date:   Thu Dec 20 11:53:13 2018 +0800

    [data-render] update qking so

commit 9c3f34cc355a79abadec266b4da575aab5ad0824
Author: pingyi.xjc <[email protected]>
Date:   Wed Dec 19 23:09:46 2018 +0800

    [data-render] fix append string to vnode

commit 701032819bc9142cf066d1fef63db151be89477a
Author: pingyi.xjc <[email protected]>
Date:   Wed Dec 19 22:17:03 2018 +0800

    [data-render] fix qking event err

commit f2aa3cb738a8fe4a3bc5c9ca8d1303eba9de2c90
Merge: 3979ef911 6715a09ee
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 19:12:07 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into develop-data-render-script

    * 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex:
      [data-render] android qking using release so

commit 3979ef911904bdfb09e449158121f46239580e7f
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 19:11:48 2018 +0800

    [core] add Qking.framework for building

commit 6715a09eed71d954ce5f0792d75b2a948141cd2d
Author: pingyi.xjc <[email protected]>
Date:   Wed Dec 19 18:10:43 2018 +0800

    [data-render] android qking using release so

commit e6b1612cd5648c718e104e989afebd6df726ea89
Merge: a41a9b212 3fef88487
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 18:10:32 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into develop-data-render-script

    * 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex:
      [data-render] android qking support
      [data-render] android qking support

commit a41a9b21217982d551664db80b33e3e1a6bce8d3
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 18:10:26 2018 +0800

    [core] remove podfile

commit 3fef88487a5afed2487915ba07144444ec066c0f
Author: pingyi.xjc <[email protected]>
Date:   Wed Dec 19 16:56:40 2018 +0800

    [data-render] android qking support

commit 9939c20dd034d0cd1abe0d5cf85fe30f008fe657
Author: pingyi.xjc <[email protected]>
Date:   Wed Dec 19 16:45:18 2018 +0800

    [data-render] android qking support

commit 31ff5e97e455b2f3af341f1b68c7a0788865a1b2
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 16:22:30 2018 +0800

    add Qking For playground

commit bb391fd263895d5a0553977da858542966e4f758
Merge: 710aa7ecb 8dc1efb
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 15:26:49 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into develop-data-render-script

    * 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex:
      * [Android] Add customPreprocess for APM
      [iOS] add CUSTOM_PREPROCESS record time
      * [Android] Use JSON instead of simple string compare to find bundleType. (apache#1927)
      * [Android] Update so
      [core] fix onAppear event can not exec
      [iOS] Fix bug with borderRadius's calculation. (apache#1929)
      [WEEX][Android] Bugfix java.lang.NullPointerException: println needs a message  at android.util.Log.println(Log.java:357)at com.taobao.weex.utils.WXLogUtils.log(WXLogUtils.java:80) (apache#1925)
      * [Android] record dataLength received from network. if time out exception, could help us fix issue quickly. (apache#1926)

commit 710aa7ecb3c2b77e63c40b5a2bb30fa6f3657b1e
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 15:26:41 2018 +0800

    add WeexSDK Building OK

commit 8dc1efb
Author: YorkShen <[email protected]>
Date:   Wed Dec 19 15:03:18 2018 +0800

    * [Android] Add customPreprocess for APM

commit 47c8be3
Merge: 49a80bd 863c018
Author: jianhan-he <[email protected]>
Date:   Wed Dec 19 12:15:27 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data_render_script_dev

commit 49a80bd
Author: jianhan-he <[email protected]>
Date:   Wed Dec 19 12:14:17 2018 +0800

    [iOS] add CUSTOM_PREPROCESS record time

commit 863c018
Merge: 0429019 2770fee
Author: YorkShen <[email protected]>
Date:   Wed Dec 19 11:56:20 2018 +0800

    Merge branch 'master' into develop-data-render-script

    # Conflicts:
    #	android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java

commit 0429019
Author: YorkShen <[email protected]>
Date:   Wed Dec 19 11:11:36 2018 +0800

    * [Android] Update so

commit f102f4b
Author: jianhan-he <[email protected]>
Date:   Wed Dec 19 10:06:21 2018 +0800

    [core] fix onAppear event can not exec

commit 8ff2c4159be23c950238c6839e37f8e0eaa0ca67
Merge: a14597b35 72f9b09
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 06:49:44 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into develop-data-render-script

    * 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex:
      [core] fix parent component bug

commit a14597b3535a4365a1c792bf6f1c5d9e5462ff20
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 06:49:37 2018 +0800

    qking OK

commit 8c4b45828efa8c0e7f155e6e326a05c82c2ee3b4
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 06:12:42 2018 +0800

    modify andriod interface

commit 13ebab64c30f91fd1242fe5597dbfc31f3fa7dee
Author: pengtao.pt <[email protected]>
Date:   Wed Dec 19 06:07:09 2018 +0800

    modify qking interface

commit 72f9b09
Author: jianhan-he <[email protected]>
Date:   Wed Dec 19 02:25:16 2018 +0800

    [core] fix parent component bug

commit d739f302d65a2596052ca3ad6a2b88cc4d2a0a0f
Author: pengtao.pt <[email protected]>
Date:   Tue Dec 18 20:27:47 2018 +0800

    remove encoder && decoder

commit 45db48b
Author: YorkShen <[email protected]>
Date:   Tue Dec 18 19:52:35 2018 +0800

    * [Android] Update libweexcore.so

commit dffc0ad
Merge: 8b33bc6 c0313b0
Author: fangxi.fx <[email protected]>
Date:   Tue Dec 18 14:13:46 2018 +0800

    Merge branch 'master' of https://github.com/apache/incubator-weex into develop-data-render-script

    * 'master' of https://github.com/apache/incubator-weex:
      [iOS] Fix `scrollStart` and `scrollEnd` can not be triggered when setting scroller's contentOffset
      * [Doc] Add mailing list (apache#1921)
      [iOS] Add WebSocket' implementation in playground's project. (apache#1922)
      [iOS] Add WebSocket' implementation in playground's project. (apache#1920)
      * [Android] Read weex version from command (apache#1919)
      [iOS] [BugFix] Fix remove active pseudo class doesn't work.
      [iOS] BugFix, slide.index is reset to zero when the view is out of window. It should be kept to the last show index.

commit 8b33bc6
Author: jianhan-he <[email protected]>
Date:   Mon Dec 17 21:53:25 2018 +0800

    [core] fix incorrect data this get from js

commit b92b1e7
Merge: ed441b8 cb44e2f
Author: 玉冈 <[email protected]>
Date:   Mon Dec 17 11:14:08 2018 +0800

    Merge branch 'master' into 'develop-data-render-script'

    Merge master into develop-data-render-script

    See merge request !198263

commit ed441b8
Author: YorkShen <[email protected]>
Date:   Fri Dec 14 12:31:38 2018 +0800

    * [Android] Update jsfm.js

commit 625ed22
Author: jianhan-he <[email protected]>
Date:   Fri Dec 14 11:45:54 2018 +0800

    [jsframework] updata jsframework to support get data

commit 2683f93
Author: YorkShen <[email protected]>
Date:   Thu Dec 13 20:44:32 2018 +0800

    * [Android] Add libweexcore.so due to the malfunction of integration machine

commit 9e8ae8c
Merge: 66f3378 8e1499a
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 17:58:52 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data_render_script_dev

commit 66f3378
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 17:48:47 2018 +0800

    [core] fix crash when root_node is null

commit 2046041
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 16:13:05 2018 +0800

    [iOS] support bundleUrl on eagle

commit 8e1499a
Merge: 411ffeb 491cc95
Author: YorkShen <[email protected]>
Date:   Thu Dec 13 15:29:32 2018 +0800

    Merge branch 'master' into develop-data-render-script

    # Conflicts:
    #	WeexSDK.podspec
    #	android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
    #	weex_core/Source/core/data_render/vnode/vnode_exec_env.cc

commit 411ffeb
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 14:08:41 2018 +0800

    [iOS] fix data null error

commit 2be6d17
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 11:30:03 2018 +0800

    [core] support js file cache

commit b105cf4
Merge: 91a917f 49d4235
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 11:24:23 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data_render_script_dev

commit 91a917f
Author: jianhan-he <[email protected]>
Date:   Thu Dec 13 11:21:54 2018 +0800

    [core] fix bool type equre operator error

commit 49d4235
Author: YorkShen <[email protected]>
Date:   Wed Dec 12 21:15:13 2018 +0800

    * [Android] Update libweexjss for updateComponentData.

commit b7ca0d8
Author: jianhan-he <[email protected]>
Date:   Wed Dec 12 16:11:55 2018 +0800

    [core] fix crash when data array are null on eagle

commit 778165a
Author: jianhan-he <[email protected]>
Date:   Wed Dec 12 14:26:40 2018 +0800

    [core] fix crash when data is null on eagle

commit 09de7ad
Author: jianhan-he <[email protected]>
Date:   Tue Dec 11 19:38:01 2018 +0800

    [core] fix click event error on eagle

commit 5e5d731
Merge: 3d7b4af 33dec8d
Author: jianhan-he <[email protected]>
Date:   Tue Dec 11 12:28:16 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data_render_script_dev

commit 3d7b4af
Author: jianhan-he <[email protected]>
Date:   Tue Dec 11 12:20:04 2018 +0800

    [iOS] update js framework

commit 33dec8d
Merge: d8c4ad9 d4d1aa2
Author: 玉冈 <[email protected]>
Date:   Mon Dec 10 16:06:22 2018 +0800

    Merge branch 'master' into 'develop-data-render-script'

    Merge Master to develop-data-render-script

    See merge request !190634

commit d8c4ad9
Merge: cc4f8f6 dcc34f2
Author: jianhan-he <[email protected]>
Date:   Mon Dec 10 15:40:31 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data_render_script_dev

commit cc4f8f6
Author: jianhan-he <[email protected]>
Date:   Mon Dec 10 15:37:55 2018 +0800

    [core] support javascript binding on iOS

commit dcc34f2
Author: YorkShen <[email protected]>
Date:   Mon Dec 10 15:30:26 2018 +0800

    * [Android] Update URL render rule

    1. __data_render==true for WXRenderStrategy.DATA_RENDER
    2. __eagle==true for WXRenderStrategy.DATA_RENDER_BINARY
    3. others for WXRenderStrategy.APPEND_ASYNC

commit f542d76
Merge: 0f21755 374dc3b
Author: yxping <[email protected]>
Date:   Thu Nov 29 21:37:55 2018 +0800

    Merge remote-tracking branch 'github/master' into develop-data-render-script

commit 0f21755
Merge: 5cf90a9 a49f83a
Author: yxping <[email protected]>
Date:   Thu Nov 29 17:44:36 2018 +0800

    Merge remote-tracking branch 'github/master' into develop-data-render-script

commit 5cf90a9
Author: yxping <[email protected]>
Date:   Thu Nov 29 15:00:05 2018 +0800

    [Android] fix boxshadow not change size when view size changed

commit 8012cbf
Author: yxping <[email protected]>
Date:   Thu Nov 29 14:18:11 2018 +0800

    [Android] do not set the same text repeatedly

commit 941b9ab
Author: yxping <[email protected]>
Date:   Thu Nov 29 14:15:26 2018 +0800

    [Android] fix update styles bug when only border change

commit dda2359
Author: yxping <[email protected]>
Date:   Thu Nov 29 12:30:04 2018 +0800

    [eagle] fix bugs

commit 66998fe
Author: yxping <[email protected]>
Date:   Thu Nov 29 12:27:43 2018 +0800

    [eagle] support binding style and computed

commit ff165ef
Author: yxping <[email protected]>
Date:   Mon Nov 19 21:46:43 2018 +0800

    [core][eagle] support httpmodule in android

commit 34a9fec
Author: yxping <[email protected]>
Date:   Mon Nov 19 20:41:13 2018 +0800

    [Android] make WXHttpListener be in common use

commit b9c847b
Author: jianhan-he <[email protected]>
Date:   Tue Nov 13 11:46:03 2018 +0800

    [iOS] fix weexsdk compile error

commit 724bcf5
Author: jianhan-he <[email protected]>
Date:   Tue Nov 13 11:34:10 2018 +0800

    [iOS] fix weexsdk compile error

commit 9a40175
Merge: 9b3acb4 7cda3b1
Author: jianhan-he <[email protected]>
Date:   Tue Nov 13 09:51:47 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data-render-script

commit 9b3acb4
Author: jianhan-he <[email protected]>
Date:   Tue Nov 13 09:50:29 2018 +0800

    [iOS] add requestHandle to download js

commit 7cda3b1
Author: yxping <[email protected]>
Date:   Sun Nov 11 23:10:57 2018 +0800

    [eagle] fix repeat bug

commit 13a0bbb
Author: yxping <[email protected]>
Date:   Sun Nov 11 19:12:56 2018 +0800

    [core][eagle] fix event params

commit d306455
Author: jianhan-he <[email protected]>
Date:   Sun Nov 11 20:08:07 2018 +0800

    [core] add http_module

commit 0c685a3
Merge: 407945a 2408aaa
Author: jianhan-he <[email protected]>
Date:   Sun Nov 11 16:23:12 2018 +0800

    Merge branch 'develop-data-render-script' of gitlab.alibaba-inc.com:weex/weex into data-render-script

commit 407945a
Author: jianhan-he <[email protected]>
Date:   Sun Nov 11 16:21:49 2018 +0800

    [iOS] add createinstance to execute js

commit 2408aaa
Author: yxping <[email protected]>
Date:   Sat Nov 10 15:50:16 2018 +0800

    [core][eagle] fix codegen prefix invalid problem

commit eb0220b
Author: jianhan-he <[email protected]>
Date:   Sat Nov 10 22:37:03 2018 +0800

    [iOS] add js binding on iOS

commit 38b88ee
Author: yxping <[email protected]>
Date:   Fri Nov 9 19:39:11 2018 +0800

    [core][data_render] support event

commit ad24674
Author: yxping <[email protected]>
Date:   Thu Nov 8 19:18:46 2018 +0800

    [core][data_render] support vcomponent lifecycle and update from js

commit 1ca818e
Author: yxping <[email protected]>
Date:   Thu Nov 8 18:19:13 2018 +0800

    [core][data_render] support value array of attr parser

commit 4da4a58
Author: yxping <[email protected]>
Date:   Tue Nov 6 23:51:34 2018 +0800

    [core][data_render] add event support

commit 75db0d1
Author: yxping <[email protected]>
Date:   Mon Nov 5 17:29:32 2018 +0800

    [core][data_render] support class binding

commit 257cdcd
Author: yxping <[email protected]>
Date:   Fri Nov 2 18:10:48 2018 +0800

    [core] support component ref finder

commit e7e2abd
Author: yxping <[email protected]>
Date:   Fri Nov 2 18:02:39 2018 +0800

    [core] add vcomponent diff
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gubaojian gubaojian gubaojian approved these changes

@miomin miomin miomin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@YorkShen @weex-bot @gubaojian @miomin