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

heron-merge #2636

Merged
merged 153 commits into from Jul 2, 2019
Merged

heron-merge #2636

merged 153 commits into from Jul 2, 2019

Conversation

zshshr
Copy link
Contributor

@zshshr zshshr commented Jul 2, 2019

heron-merge

wqyfavor and others added 30 commits February 28, 2019 10:51
# Conflicts:
#	ios/sdk/WeexSDK.xcodeproj/project.pbxproj
# Conflicts:
#	ios/sdk/WeexSDK.xcodeproj/project.pbxproj
#	ios/sdk/WeexSDK/Sources/Utility/WXVersion.m
@weex-bot
Copy link

weex-bot commented Jul 2, 2019

Messages
📖 android build verification finished.

Generated by 🚫 dangerJS

}
});
}

Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't delete, use for preinit

@@ -1493,11 +1480,13 @@ public void run() {
}

WXModuleManager.createDomModule(instance);
instance.getApmForInstance().onStage(WXInstanceApm.KEY_PAGE_STAGES_LOAD_BUNDLE_START);
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't mv position

post(new Runnable() {
@Override
public void run() {
long start = System.currentTimeMillis();
instance.getApmForInstance().onStage(WXInstanceApm.KEY_PAGE_STAGES_LOAD_BUNDLE_START);
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't mv position,mv back

@@ -861,7 +869,6 @@ private void renderInternal(String pageName,
}
if (isPreInitMode()){
getApmForInstance().onStage(WXInstanceApm.KEY_PAGE_STAGES_LOAD_BUNDLE_START);
WXBridgeManager.getInstance().loadJsBundleInPreInitMode(getInstanceId(),template.getContent());
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't remove for preinit mode

@@ -1519,6 +1532,9 @@ public void onViewAppear(){


public void onCreateFinish() {
if(mHasCreateFinish){
Copy link
Contributor

Choose a reason for hiding this comment

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

This will cause onViewAppear never invoked

weex_core/Source/android/jsengine/CMakeLists.txt Outdated Show resolved Hide resolved
weex_core/Source/third_party/IPC/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Contributor

@YorkShen YorkShen left a comment

Choose a reason for hiding this comment

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

LGTM

@YorkShen YorkShen merged commit 67bad4f into apache:master Jul 2, 2019
katherine95s pushed a commit to katherine95s/incubator-weex that referenced this pull request Jul 4, 2019
katherine95s pushed a commit to katherine95s/incubator-weex that referenced this pull request Jul 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants