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

Commit 3c6eb35

Browse files
lucky-chenYorkShen
authored andcommitted
[Android] close alarm_signal for release test (#2916)
[Android] rm useless msg
1 parent 5499154 commit 3c6eb35

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,12 +2281,13 @@ private WXParams assembleDefaultOptions() {
22812281
customOptions.put("__enable_native_promise__","true");
22822282
}
22832283

2284-
String enableAlarmSignal = "true";
2284+
String enableAlarmSignal = "false";
22852285
IWXConfigAdapter adapter = WXSDKManager.getInstance().getWxConfigAdapter();
22862286
if (null != adapter){
22872287
try {
22882288
if (adapter.checkMode("white_screen_fix_open")){
22892289
WXEnvironment.isWsFixMode = true;
2290+
enableAlarmSignal = "true";
22902291
}else {
22912292
enableAlarmSignal = adapter.getConfigWhenInit("wxapm","enableAlarmSignal",enableAlarmSignal);
22922293
WXEnvironment.isWsFixMode = "true".equalsIgnoreCase(enableAlarmSignal);
@@ -2295,7 +2296,10 @@ private WXParams assembleDefaultOptions() {
22952296
e.printStackTrace();
22962297
}
22972298
}
2298-
customOptions.put("enableAlarmSignal",enableAlarmSignal);
2299+
if (null != enableAlarmSignal){
2300+
customOptions.put("enableAlarmSignal",enableAlarmSignal);
2301+
}
2302+
WXLogUtils.e("weex","enableAlarmSignal:"+enableAlarmSignal);
22992303

23002304
wxParams.setOptions(customOptions);
23012305
wxParams.setNeedInitV8(WXSDKManager.getInstance().needInitV8());
@@ -2552,7 +2556,6 @@ public void reportJSException(String instanceId, String function,
25522556
} else {
25532557
String errorMsg = new StringBuilder()
25542558
.append(WXErrorCode.WX_DEGRAD_ERR_INSTANCE_CREATE_FAILED.getErrorMsg())
2555-
.append(", reportJSException >>>> instanceId:").append(instanceId)
25562559
.append(", exception function:").append(function)
25572560
.append(", exception:").append(exception)
25582561
.append(", extInitTime:").append(System.currentTimeMillis()-WXBridgeManager.sInitFrameWorkTimeOrigin).append("ms")

android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ public void setLayout(WXComponent component) {
992992
mInstance.getWXPerformance().cellExceedNum++;
993993
if (WXAnalyzerDataTransfer.isOpenPerformance){
994994
WXAnalyzerDataTransfer.transferPerformance(getInstanceId(),"details",WXInstanceApm.KEY_PAGE_STATS_CELL_EXCEED_NUM,
995-
String.format(Locale.ROOT, "cell:[w:%d,h:%d],attrs:%s,styles:%s",realWidth,realHeight,getAttrs(),getStyles())
995+
String.format(Locale.ROOT, "cell:ref:%s,[w:%d,h:%d],attrs:%s,styles:%s",getRef(),realWidth,realHeight,getAttrs(),getStyles())
996996
);
997997
}
998998

0 commit comments

Comments
 (0)