From 2bef3bb4146f99631578752fee00dbba4e51fafe Mon Sep 17 00:00:00 2001 From: chen Date: Wed, 18 Sep 2019 13:22:42 +0800 Subject: [PATCH] [Android] close alarm_signal for release test [Android] rm useless msg --- .../java/com/taobao/weex/bridge/WXBridgeManager.java | 9 ++++++--- .../java/com/taobao/weex/ui/component/WXComponent.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java index bb383152f1..94ac0cda26 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java @@ -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); @@ -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()); @@ -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") diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 3a933c724f..17630e1401 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -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()) ); }