[incubator-weex] branch master updated: [Android] add eagle version track info (#1762)

[kyork]

This is an automated email from the ASF dual-hosted git repository.

kyork 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 953c3fa  [Android] add eagle version track info (#1762)
953c3fa is described below

commit 953c3fac38ed18a58d5ef7da258c83d0638f29f4
Author: yxping <yxp...@users.noreply.github.com>
AuthorDate: Fri Nov 16 16:18:21 2018 +0800

    [Android] add eagle version track info (#1762)
---
 android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java        | 1 +
 android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java        | 4 +++-
 .../src/main/java/com/taobao/weex/performance/WXInstanceApm.java    | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java 
b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index cf4c7b2..1bdb8d1 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -63,6 +63,7 @@ public class WXEnvironment {
     }
   }
   public static final String SYS_MODEL = android.os.Build.MODEL;
+  public static final String EAGLE = "eagle";
   public static final String ENVIRONMENT = "environment";
   public static final String WEEX_CURRENT_KEY = "wx_current_url";
   /*********************
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java 
b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 0962db5..6b91c07 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -661,6 +661,8 @@ public class WXSDKInstance implements 
IWXActivityStateListener,View.OnLayoutChan
       return;
     }
 
+    mRenderStrategy = flag;
+
     //some case ,from render(template),but not render (url)
     if (!mApmForInstance.hasInit()){
       mApmForInstance.doInit();
@@ -702,7 +704,6 @@ public class WXSDKInstance implements 
IWXActivityStateListener,View.OnLayoutChan
     
mApmForInstance.addStats(WXInstanceApm.KEY_PAGE_STATS_BUNDLE_SIZE,mWXPerformance.JSTemplateSize);
 
     mRenderStartTime = System.currentTimeMillis();
-    mRenderStrategy = flag;
 
     
WXSDKManager.getInstance().setCrashInfo(WXEnvironment.WEEX_CURRENT_KEY,pageName);
 
@@ -749,6 +750,7 @@ public class WXSDKInstance implements 
IWXActivityStateListener,View.OnLayoutChan
     ensureRenderArchor();
     pageName = wrapPageName(pageName, url);
     mBundleUrl = url;
+    mRenderStrategy = flag;
     if(WXSDKManager.getInstance().getValidateProcessor()!=null) {
       mNeedValidate = 
WXSDKManager.getInstance().getValidateProcessor().needValidate(mBundleUrl);
     }
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java 
b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
index bbb5ba3..88dfbd8 100644
--- a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
+++ b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
@@ -29,6 +29,7 @@ import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.WXSDKManager;
 import com.taobao.weex.common.WXErrorCode;
 import com.taobao.weex.common.WXPerformance;
+import com.taobao.weex.common.WXRenderStrategy;
 import com.taobao.weex.ui.component.WXComponent;
 import com.taobao.weex.utils.WXExceptionUtils;
 import com.taobao.weex.utils.WXUtils;
@@ -52,6 +53,7 @@ public class WXInstanceApm {
     public static final String KEY_PAGE_PROPERTIES_INSTANCE_TYPE = 
"wxInstanceType";
     public static final String KEY_PAGE_PROPERTIES_PARENT_PAGE = 
"wxParentPage";
     public static final String KEY_PAGE_PROPERTIES_BUNDLE_TYPE = 
"wxBundleType";
+    public static final String KEY_PAGE_PROPERTIES_RENDER_TYPE = 
"wxRenderType";
 
     /************** stages *****************/
     public static final String KEY_PAGE_STAGES_DOWN_BUNDLE_START = 
"wxStartDownLoadBundle";
@@ -203,6 +205,10 @@ public class WXInstanceApm {
         addProperty(KEY_PROPERTIES_ERROR_CODE, VALUE_ERROR_CODE_DEFAULT);
         addProperty(KEY_PAGE_PROPERTIES_JSLIB_VERSION, 
WXEnvironment.JS_LIB_SDK_VERSION);
         addProperty(KEY_PAGE_PROPERTIES_WEEX_VERSION, 
WXEnvironment.WXSDK_VERSION);
+        if (instance != null && (instance.getRenderStrategy() == 
WXRenderStrategy.DATA_RENDER
+                || instance.getRenderStrategy() == 
WXRenderStrategy.DATA_RENDER_BINARY)) {
+            addProperty(KEY_PAGE_PROPERTIES_RENDER_TYPE, WXEnvironment.EAGLE);
+        }
         if (null != instance) {
             for (Map.Entry<String, String> entry : 
instance.getContainerInfo().entrySet()) {
                 addProperty(entry.getKey(), entry.getValue());