Merge branch 'feature/dev' into dev

Author: txfelixzhou

README.md

@@ -1,6 +1,6 @@
 ![Matrix-icon](assets/img/readme/header.png)
 
-[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.5.2-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.5.4-red.svg)](https://github.com/Tencent/matrix/wiki)
 
 (中文版本请参看[这里](#matrix_cn))  
 
@@ -172,7 +172,7 @@ At this point, Matrix has been integrated into the app and is beginning to colle
 
 1. Configure `MATRIX_VERSION` in gradle.properties.
 ``` gradle
-  MATRIX_VERSION=0.5.2
+  MATRIX_VERSION=0.5.4
 ```
 
 2. Add `matrix-gradle-plugin` in your build.gradle:
@@ -289,11 +289,11 @@ You can get more about Matrix output at the wiki [The output of Matrix](https://
 
 #### APK Checker Usage
 
-APK Checker can run independently in Jar ([matrix-apk-canary-0.5.2.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.5.2/matrix-apk-canary-0.5.2.jar)）  mode, usage:
+APK Checker can run independently in Jar ([matrix-apk-canary-0.5.4.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.5.4/matrix-apk-canary-0.5.4.jar)）  mode, usage:
 
 
 ```shell
-java -jar matrix-apk-canary-0.5.2.jar
+java -jar matrix-apk-canary-0.5.4.jar
 Usages: 
     --config CONFIG-FILE-PATH
 or
@@ -352,14 +352,14 @@ Matrix is under the BSD license. See the [LICENSE](https://github.com/Tencent/Ma
 
 # <a name="matrix_cn">Matrix</a>
 ![Matrix-icon](assets/img/readme/header.png)
-[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.5.2-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.5.4-red.svg)](https://github.com/Tencent/matrix/wiki)
 
-**Matrix** 是一款微信团队研发并日常使用的应用性能接入框架，支持iOS, macOS和Android。
+**Matrix** 是一款微信研发并日常使用的应用性能接入框架，支持iOS, macOS和Android。
 Matrix 通过接入各种性能监控方案，对性能监控项的异常数据进行采集和分析，输出相应的问题分析、定位与优化建议，从而帮助开发者开发出更高质量的应用。
 
 # <a name='matrix_ios_cn'>Matrix for iOS/macOS </a>
 
-Matrix-iOS 当前工具监控范围包括：崩溃、卡顿和爆内存，包含以下两款插件：
+当前工具监控范围包括：崩溃、卡顿和爆内存，包含以下两款插件：
 
 * **WCCrashBlockMonitorPlugin：** 基于 [KSCrash](https://github.com/kstenerud/KSCrash) 框架开发，具有业界领先的卡顿堆栈捕获能力，同时兼备崩溃捕获能力。
 
@@ -510,7 +510,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 
 1. 在你项目根目录下的 gradle.properties 中配置要依赖的 Matrix 版本号，如：
 ``` gradle
-  MATRIX_VERSION=0.5.2
+  MATRIX_VERSION=0.5.4
 ```
 
 2. 在你项目根目录下的 build.gradle 文件添加 Matrix 依赖，如：
@@ -624,10 +624,10 @@ Matrix 分析后的输出字段的含义请查看 [Matrix 输出内容的含义
 
 #### APK Checker
 
-APK Check 以独立的 jar 包提供 ([matrix-apk-canary-0.5.2.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.5.2/matrix-apk-canary-0.5.2.jar)），你可以运行：
+APK Check 以独立的 jar 包提供 ([matrix-apk-canary-0.5.4.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.5.4/matrix-apk-canary-0.5.4.jar)），你可以运行：
 
 ```cmd
-java -jar matrix-apk-canary-0.5.2.jar
+java -jar matrix-apk-canary-0.5.4.jar
 ```
 
 查看 Usages 来使用它。

matrix/matrix-android/gradle.properties

@@ -10,9 +10,10 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# http://www.gradle.org/docs/current/userguide/multifa_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Tue Jun 20 10:24:33 CST 2017
 
-VERSION_NAME_PREFIX=0.5.2
+
+VERSION_NAME_PREFIX=0.5.4
 VERSION_NAME_SUFFIX=

matrix/matrix-android/matrix-android-lib/build.gradle

@@ -23,24 +23,12 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
-
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     api 'com.android.support:support-annotations:27.0.2'
 }
 
 version = rootProject.ext.VERSION_NAME
 group = rootProject.ext.GROUP
 
 apply from: rootProject.file('gradle/android-publish.gradle')
-
-
-
-//apply plugin: 'matrix-trace-plugin'
-//matrixTrace {
-//    packageName = "com.tencent.matrix"
-//    baseMethodMap = "${rootProject.buildDir}/outputs/matrix-trace/Release.methodmap"
-//    methodMapDir = "${rootProject.buildDir}/outputs/matrix-trace"
-//    mappingPath = "${project.buildDir}/outputs/mapping/release/mapping.txt"
-//    jarDir = "${project.buildDir}/intermediates/transforms/proguard/release/jars/3/1f/main.jar"
-//    blackListDir = "${rootProject.rootDir}/matrixTrace/blackMethodList.txt"
-//}
-

matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/AppActiveMatrixDelegate.java

@@ -0,0 +1,216 @@
+package com.tencent.matrix;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ComponentCallbacks2;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+
+import com.tencent.matrix.listeners.IAppForeground;
+import com.tencent.matrix.util.MatrixLog;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+
+public enum AppActiveMatrixDelegate {
+
+    INSTANCE;
+
+    private static final String TAG = "Matrix.AppActiveMatrixDelegate";
+    private Set<IAppForeground> listeners = Collections.synchronizedSet(new HashSet<IAppForeground>());
+    private boolean isAppForeground = false;
+    private String visibleScene = "default";
+    private Controller controller = new Controller();
+    private boolean isInited = false;
+    private String currentFragmentName;
+
+    public void init(Application application) {
+        if (isInited) {
+            MatrixLog.e(TAG, "has inited!");
+            return;
+        }
+        this.isInited = true;
+        application.registerComponentCallbacks(controller);
+        application.registerActivityLifecycleCallbacks(controller);
+    }
+
+    public String getCurrentFragmentName() {
+        return currentFragmentName;
+    }
+
+    /**
+     * must set after {@link Activity#onStart()}
+     *
+     * @param fragmentName
+     */
+    public void setCurrentFragmentName(String fragmentName) {
+        MatrixLog.i(TAG, "[setCurrentFragmentName] fragmentName:%s", fragmentName);
+        this.currentFragmentName = fragmentName;
+        updateScene(fragmentName);
+    }
+
+    public String getVisibleScene() {
+        return visibleScene;
+    }
+
+    private void onDispatchForeground(String visibleScene) {
+        if (isAppForeground || !isInited) {
+            return;
+        }
+
+        MatrixLog.i(TAG, "onForeground... visibleScene[%s]", visibleScene);
+        try {
+            for (IAppForeground listener : listeners) {
+                listener.onForeground(true);
+            }
+        } finally {
+            isAppForeground = true;
+        }
+    }
+
+    private void onDispatchBackground(String visibleScene) {
+        if (!isAppForeground || !isInited) {
+            return;
+        }
+        MatrixLog.i(TAG, "onBackground... visibleScene[%s]", visibleScene);
+        try {
+            for (IAppForeground listener : listeners) {
+                listener.onForeground(false);
+            }
+        } finally {
+            isAppForeground = false;
+        }
+    }
+
+    public boolean isAppForeground() {
+        return isAppForeground;
+    }
+
+    public void addListener(IAppForeground listener) {
+        listeners.add(listener);
+    }
+
+    public void removeListener(IAppForeground listener) {
+        listeners.remove(listener);
+    }
+
+
+    private final class Controller implements Application.ActivityLifecycleCallbacks, ComponentCallbacks2 {
+
+        @Override
+        public void onActivityStarted(Activity activity) {
+            updateScene(activity);
+            if (!isAppForeground) {
+                onDispatchForeground(getVisibleScene());
+            }
+        }
+
+
+        @Override
+        public void onActivityStopped(Activity activity) {
+            if (getTopActivityName() == null) {
+                onDispatchBackground(getVisibleScene());
+            }
+        }
+
+
+        @Override
+        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityResumed(Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityPaused(Activity activity) {
+
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+        }
+
+        @Override
+        public void onConfigurationChanged(Configuration newConfig) {
+
+        }
+
+        @Override
+        public void onLowMemory() {
+
+        }
+
+        @Override
+        public void onTrimMemory(int level) {
+            MatrixLog.i(TAG, "[onTrimMemory] level:%s", level);
+            if (level == TRIM_MEMORY_UI_HIDDEN && isAppForeground) { // fallback
+                onDispatchBackground(visibleScene);
+            }
+        }
+    }
+
+    private void updateScene(Activity activity) {
+        visibleScene = activity.getClass().getName();
+    }
+
+    private void updateScene(String currentFragmentName) {
+        StringBuilder ss = new StringBuilder();
+        ss.append(TextUtils.isEmpty(currentFragmentName) ? "?" : currentFragmentName);
+        visibleScene = ss.toString();
+    }
+
+    public static String getTopActivityName() {
+        long start = System.currentTimeMillis();
+        try {
+            Class activityThreadClass = Class.forName("android.app.ActivityThread");
+            Object activityThread = activityThreadClass.getMethod("currentActivityThread").invoke(null);
+            Field activitiesField = activityThreadClass.getDeclaredField("mActivities");
+            activitiesField.setAccessible(true);
+
+            Map<Object, Object> activities;
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+                activities = (HashMap<Object, Object>) activitiesField.get(activityThread);
+            } else {
+                activities = (ArrayMap<Object, Object>) activitiesField.get(activityThread);
+            }
+            if (activities.size() < 1) {
+                return null;
+            }
+            for (Object activityRecord : activities.values()) {
+                Class activityRecordClass = activityRecord.getClass();
+                Field pausedField = activityRecordClass.getDeclaredField("paused");
+                pausedField.setAccessible(true);
+                if (!pausedField.getBoolean(activityRecord)) {
+                    Field activityField = activityRecordClass.getDeclaredField("activity");
+                    activityField.setAccessible(true);
+                    Activity activity = (Activity) activityField.get(activityRecord);
+                    return activity.getClass().getName();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            long cost = System.currentTimeMillis() - start;
+            MatrixLog.d(TAG, "[getTopActivityName] Cost:%s", cost);
+        }
+        return null;
+    }
+
+}

matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/Matrix.java

@@ -36,13 +36,14 @@ public class Matrix {
     private static volatile Matrix sInstance;
 
     private final HashSet<Plugin> plugins;
-    private final Application     application;
-    private final PluginListener  pluginListener;
+    private final Application application;
+    private final PluginListener pluginListener;
 
     private Matrix(Application app, PluginListener listener, HashSet<Plugin> plugins) {
         this.application = app;
         this.pluginListener = listener;
         this.plugins = plugins;
+        AppActiveMatrixDelegate.INSTANCE.init(application);
         for (Plugin plugin : plugins) {
             plugin.init(application, pluginListener);
             pluginListener.onInit(plugin);
@@ -125,8 +126,8 @@ public <T extends Plugin> T getPluginByClass(Class<T> pluginClass) {
     }
 
     public static class Builder {
-        private final Application    application;
-        private       PluginListener pluginListener;
+        private final Application application;
+        private PluginListener pluginListener;
 
         private HashSet<Plugin> plugins = new HashSet<>();
 

matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/listeners/IAppForeground.java

@@ -0,0 +1,6 @@
+package com.tencent.matrix.listeners;
+
+public interface IAppForeground {
+
+    void onForeground(boolean isForeground);
+}