性能测试scheme控制fix

ahua-chen · Sep 25, 2020 · 0a9009a · 0a9009a
1 parent ea78982
commit 0a9009a
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 11 deletions.
diff --git a/src/app/src/main/java/com/alipay/hulu/scheme/PerformanceSchemeResolver.java b/src/app/src/main/java/com/alipay/hulu/scheme/PerformanceSchemeResolver.java
@@ -31,14 +31,19 @@
 import com.alipay.hulu.common.utils.PermissionUtil;
 import com.alipay.hulu.common.utils.StringUtil;
 import com.alipay.hulu.screenRecord.Notifications;
+import com.alipay.hulu.shared.display.DisplayItemInfo;
 import com.alipay.hulu.shared.display.DisplayProvider;
 import com.alipay.hulu.shared.display.items.base.RecordPattern;
 import com.alipay.hulu.util.RecordUtil;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by qiaoruikai on 2019/12/4 4:47 PM.
@@ -81,8 +86,8 @@ private boolean processNormalRecord(final Context context, Map<String, String> p
         String action = params.get(ACTION);
         if (StringUtil.equals(action, "start")) {
             String itemList = params.get(NORMAL_ITEMS);
-            final String[] items = StringUtil.split(itemList, ",");
-            if (items == null) {
+            final String[] itemArray = StringUtil.split(itemList, ",");
+            if (itemArray == null) {
                 return false;
             }
 
@@ -105,12 +110,23 @@ private boolean processNormalRecord(final Context context, Map<String, String> p
                 MyApplication.getInstance().updateAppAndNameTemp(targetApp, appLabel);
             }
 
-            PermissionUtil.requestPermissions(Arrays.asList("adb", "float", "toast:" + context.getString(R.string.toast__open_gfx_info), Settings.ACTION_ACCESSIBILITY_SETTINGS), (Activity) context, new PermissionUtil.OnPermissionCallback() {
+            final List<String> items = Arrays.asList(itemArray);
+            final DisplayProvider displayProvider = LauncherApplication.service(DisplayProvider.class);
+            // 逐项开启
+            List<DisplayItemInfo> displayItems = displayProvider.getAllDisplayItems();
+            Set<String> allPermissions = new HashSet<>();
+            for (DisplayItemInfo info: displayItems) {
+                if (items.contains(info.getKey())) {
+                    allPermissions.addAll(info.getPermissions());
+                }
+            }
+
+            PermissionUtil.requestPermissions(new ArrayList<>(allPermissions), (Activity) context, new PermissionUtil.OnPermissionCallback() {
                 @Override
                 public void onPermissionResult(boolean result, String reason) {
                     if (result) {
                         isRecording = true;
-                        DisplayProvider displayProvider = LauncherApplication.service(DisplayProvider.class);
+
                         // 逐项开启
                         displayProvider.stopAllDisplay();
                         for (String name : items) {

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/DisplayItemInfo.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/DisplayItemInfo.java
@@ -34,6 +34,11 @@ public class DisplayItemInfo {
      */
     private final String name;
 
+    /**
+     * key
+     */
+    private final String key;
+
     /**
      * 依赖权限
      */
@@ -67,6 +72,7 @@ public class DisplayItemInfo {
     public DisplayItemInfo(DisplayItem displayItem, Class<? extends Displayable> targetClass) {
         this.targetClass = targetClass;
         FinalR nameRes = displayItem.nameRes();
+        this.key = displayItem.key();
         if (nameRes != FinalR.NULL) {
             this.name = StringUtil.getString(nameRes.getRealVal());
         } else {
@@ -87,6 +93,10 @@ public String getName() {
         return name;
     }
 
+    public String getKey() {
+        return key;
+    }
+
     public List<String> getPermissions() {
         return permissions;
     }

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/BatteryInfo.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/BatteryInfo.java
@@ -48,7 +48,7 @@
 import java.util.List;
 import java.util.Map;
 
-@DisplayItem(nameRes = FinalR.BATTERY, trigger = "清零")
+@DisplayItem(nameRes = FinalR.BATTERY, key = "Battery", trigger = "清零")
 public class BatteryInfo implements Displayable{
 
 	private static String batteryPath = null;

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/CPUTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/CPUTools.java
@@ -50,7 +50,7 @@
 import java.util.List;
 import java.util.Map;
 
-@DisplayItem(name = "CPU")
+@DisplayItem(name = "CPU", key = "CPU")
 public class CPUTools implements Displayable{
 
 	private static final String TAG = "CPUTools";

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/FpsTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/FpsTools.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-@DisplayItem(nameRes = FinalR.FPS, permissions = "toast:${com.alipay.hulu.shared.R$string.toast_message__turn_on_gfx_info}")
+@DisplayItem(nameRes = FinalR.FPS, key = "FPS", permissions = "toast:${com.alipay.hulu.shared.R$string.toast_message__turn_on_gfx_info}")
 public class FpsTools implements Displayable {
 	private static String TAG = "FpsTools";
 	private static Long startTime = 0L;

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/MemoryTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/MemoryTools.java
@@ -43,7 +43,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-@DisplayItem(nameRes = FinalR.MEMORY)
+@DisplayItem(nameRes = FinalR.MEMORY, key = "Memory")
 public class MemoryTools implements Displayable{
 
 	private static String TAG = "MemoryTools";

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/NetworkTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/NetworkTools.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Map;
 
-@DisplayItem(nameRes = FinalR.NETWORK, trigger = "清零")
+@DisplayItem(nameRes = FinalR.NETWORK, key = "Network", trigger = "清零")
 public class NetworkTools implements Displayable{
 
 	private static final float KB_MILLION_SECOND = 1000 / 1024f;

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/ResponseTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/ResponseTools.java
@@ -45,7 +45,7 @@
  * Created by cathor on 17/7/25.
  */
 
-@DisplayItem(nameRes = FinalR.RESPONSE_TIME, permissions = {Settings.ACTION_ACCESSIBILITY_SETTINGS})
+@DisplayItem(nameRes = FinalR.RESPONSE_TIME, key = "Response", permissions = {Settings.ACTION_ACCESSIBILITY_SETTINGS})
 public class ResponseTools implements Displayable {
     public static final int RES = 1;
     private static final String TAG = "ResponseTools";

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/StatusTools.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/StatusTools.java
@@ -36,7 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-@DisplayItem(nameRes = FinalR.PROCESS_STATUS)
+@DisplayItem(nameRes = FinalR.PROCESS_STATUS, key = "Status")
 public class StatusTools implements Displayable {
     private static final String TAG = StatusTools.class.getSimpleName();
 

diff --git a/src/shared/src/main/java/com/alipay/hulu/shared/display/items/base/DisplayItem.java b/src/shared/src/main/java/com/alipay/hulu/shared/display/items/base/DisplayItem.java
@@ -37,6 +37,12 @@
      */
     String name() default "";
 
+    /**
+     * 显示名称
+     * @return
+     */
+    String key();
+
 //    @StringRes
     FinalR nameRes() default FinalR.NULL;