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

Feature/close alarm signal for release test #2916

Merged
merged 1 commit into from
Sep 18, 2019
Merged

Feature/close alarm signal for release test #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,12 +2281,13 @@ private WXParams assembleDefaultOptions() {
customOptions.put("__enable_native_promise__","true");
}

String enableAlarmSignal = "true";
String enableAlarmSignal = "false";
IWXConfigAdapter adapter = WXSDKManager.getInstance().getWxConfigAdapter();
if (null != adapter){
try {
if (adapter.checkMode("white_screen_fix_open")){
WXEnvironment.isWsFixMode = true;
enableAlarmSignal = "true";
}else {
enableAlarmSignal = adapter.getConfigWhenInit("wxapm","enableAlarmSignal",enableAlarmSignal);
WXEnvironment.isWsFixMode = "true".equalsIgnoreCase(enableAlarmSignal);
Expand All @@ -2295,7 +2296,10 @@ private WXParams assembleDefaultOptions() {
e.printStackTrace();
}
}
customOptions.put("enableAlarmSignal",enableAlarmSignal);
if (null != enableAlarmSignal){
customOptions.put("enableAlarmSignal",enableAlarmSignal);
}
WXLogUtils.e("weex","enableAlarmSignal:"+enableAlarmSignal);

wxParams.setOptions(customOptions);
wxParams.setNeedInitV8(WXSDKManager.getInstance().needInitV8());
Expand Down Expand Up @@ -2552,7 +2556,6 @@ public void reportJSException(String instanceId, String function,
} else {
String errorMsg = new StringBuilder()
.append(WXErrorCode.WX_DEGRAD_ERR_INSTANCE_CREATE_FAILED.getErrorMsg())
.append(", reportJSException >>>> instanceId:").append(instanceId)
.append(", exception function:").append(function)
.append(", exception:").append(exception)
.append(", extInitTime:").append(System.currentTimeMillis()-WXBridgeManager.sInitFrameWorkTimeOrigin).append("ms")
Expand Down
2 changes: 1 addition & 1 deletion android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ public void setLayout(WXComponent component) {
mInstance.getWXPerformance().cellExceedNum++;
if (WXAnalyzerDataTransfer.isOpenPerformance){
WXAnalyzerDataTransfer.transferPerformance(getInstanceId(),"details",WXInstanceApm.KEY_PAGE_STATS_CELL_EXCEED_NUM,
String.format(Locale.ROOT, "cell:[w:%d,h:%d],attrs:%s,styles:%s",realWidth,realHeight,getAttrs(),getStyles())
String.format(Locale.ROOT, "cell:ref:%s,[w:%d,h:%d],attrs:%s,styles:%s",getRef(),realWidth,realHeight,getAttrs(),getStyles())
);
}

Expand Down