This is an automated email from the ASF dual-hosted git repository.
jianhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new e6739fe fix eagle card render interaction time delay cause by the
main thread queue blocked
new aa52002 Merge pull request #3023 from
pengtaopt/feature/ios_eagle_inteactive_time_fix
e6739fe is described below
commit e6739fe6dd78f9857f9b4112fb02c9a1c74396c4
Author: pengtao.pt <[email protected]>
AuthorDate: Tue Nov 19 11:21:26 2019 +0800
fix eagle card render interaction time delay cause by the main thread queue
blocked
---
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm | 3 +++
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
index 9f9c3de..3daa53e 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -907,6 +907,9 @@ static NSThread *WXComponentThread;
[self _addUITask:^{
UIView *rootView = instance.rootView;
[instance.performance onInstanceRenderSuccess:instance];
+ if (instance.wlasmRender) {
+ [instance.apmInstance forceSetInteractionTime:[WXUtility
getUnixFixTimeMillis]];
+ }
if (instance.renderFinish) {
instance.renderFinish(rootView);
}
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 2ed9999..39487ee 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -798,7 +798,7 @@ typedef enum : NSUInteger {
}
- (BOOL)wlasmRender {
- if ([_options[@"WLASM_RENDER"] boolValue]) {
+ if ([_options[@"WLASM_RENDER"] boolValue] || [_scriptURL.pathExtension
isEqualToString:@"wlasm"] || [_scriptURL.pathExtension isEqualToString:@"wlm"])
{
return YES;
}
return NO;