feat: 增加短时间内日志输出次数检测防止输出大量日志导致启动器卡死

Author: ShirosakiMio

FCL/src/main/java/com/tungsten/fcl/control/GameMenu.java

@@ -463,13 +463,13 @@ private void initRightMenu() {
             return true;
         }));
 
-        logWindow.visibilityProperty().setValue(menuSetting.isShowLog() || (!isSimulated() && menuSetting.isAutoShowLog()));
+        logWindow.setVisibility(menuSetting.isShowLog() || (!isSimulated() && menuSetting.isAutoShowLog()));
         menuSetting.getShowLogProperty().addListener(observable -> {
-            logWindow.visibilityProperty().setValue(menuSetting.isShowLog());
+            logWindow.setVisibility(menuSetting.isShowLog());
         });
         menuSetting.getAutoShowLogProperty().addListener(observable -> {
             if (baseLayout.getBackground() != null) {
-                logWindow.visibilityProperty().setValue(menuSetting.isAutoShowLog());
+                logWindow.setVisibility(menuSetting.isAutoShowLog());
             }
         });
 
@@ -717,7 +717,7 @@ public void onGraphicOutput() {
         baseLayout.setBackground(null);
         baseLayout.removeView(launchProgress);
         if (!menuSetting.isShowLog() && menuSetting.isAutoShowLog()) {
-            logWindow.visibilityProperty().setValue(false);
+            logWindow.setVisibility(false);
         }
         refreshWindowsSize(menuSetting.getWindowScale());
     }

FCL/src/main/java/com/tungsten/fcl/control/JarExecutorMenu.java

@@ -73,7 +73,7 @@ public void setup(FCLActivity activity, FCLBridge fclBridge) {
         cursorView = findViewById(R.id.cursor);
         touchCharInput = findViewById(R.id.input_scanner);
         touchPad.setOnTouchListener(this);
-        logWindow.setVisibilityValue(true);
+        logWindow.setVisibility(true);
         touchCharInput.setCharacterSender(null, new AwtCharSender(awtInput));
 
         forceExit = findViewById(R.id.force_exit);
@@ -202,7 +202,7 @@ public void onClick(View view) {
             builder.create().show();
         }
         if (view == showLog) {
-            logWindow.setVisibilityValue(!logWindow.getVisibilityValue());
+            logWindow.setVisibility(!(logWindow.getVisibility() == View.VISIBLE));
         }
         if (view == mouseMode) {
             clickMode = !clickMode;

FCL/src/main/java/com/tungsten/fcl/control/view/LogWindow.java

@@ -14,13 +14,15 @@
 import com.tungsten.fclcore.task.Schedulers;
 import com.tungsten.fcllibrary.component.view.FCLTextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LogWindow extends ScrollView {
 
-    private boolean autoTint;
-    private BooleanProperty visibilityProperty;
+    private final boolean autoTint;
     private FCLTextView textView;
     private int lineCount;
-
+    private final List<Long> timeList = new ArrayList<>();
     public LogWindow(Context context) {
         super(context);
         autoTint = false;
@@ -29,25 +31,17 @@ public LogWindow(Context context) {
 
     public LogWindow(Context context, AttributeSet attrs) {
         super(context, attrs);
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LogWindow);
-        autoTint = typedArray.getBoolean(R.styleable.LogWindow_auto_log_tint, false);
-        typedArray.recycle();
+        try(TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LogWindow)) {
+            autoTint = typedArray.getBoolean(R.styleable.LogWindow_auto_log_tint, false);
+        }
         init(context);
     }
 
     public LogWindow(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LogWindow);
-        autoTint = typedArray.getBoolean(R.styleable.LogWindow_auto_log_tint, false);
-        typedArray.recycle();
-        init(context);
-    }
-
-    public LogWindow(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LogWindow);
-        autoTint = typedArray.getBoolean(R.styleable.LogWindow_auto_log_tint, false);
-        typedArray.recycle();
+        try(TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.LogWindow)) {
+            autoTint = typedArray.getBoolean(R.styleable.LogWindow_auto_log_tint, false);
+        }
         init(context);
     }
 
@@ -62,46 +56,14 @@ private void init(Context context) {
         textView.setEllipsize(null);
     }
 
-    public final void setVisibilityValue(boolean visibility) {
-        visibilityProperty().set(visibility);
-    }
-
-    public final boolean getVisibilityValue() {
-        return visibilityProperty == null || visibilityProperty.get();
-    }
-
-    public final BooleanProperty visibilityProperty() {
-        if (visibilityProperty == null) {
-            visibilityProperty = new BooleanPropertyBase() {
-
-                @Override
-                public void invalidated() {
-                    Schedulers.androidUIThread().execute(() -> {
-                        boolean visible = get();
-                        setVisibility(visible ? VISIBLE : GONE);
-                        if (!visible) {
-                            cleanLog();
-                        }
-                    });
-                }
-
-                @Override
-                public Object getBean() {
-                    return this;
-                }
-
-                @Override
-                public String getName() {
-                    return "visibility";
-                }
-            };
-        }
-
-        return visibilityProperty;
+    public final void setVisibility(boolean visibility) {
+        setVisibility(visibility ? VISIBLE : GONE);
+        if (!visibility)
+            cleanLog();
     }
 
     public void appendLog(String str) {
-        if (!getVisibilityValue()) {
+        if (getVisibility() != VISIBLE) {
             return;
         }
         lineCount++;
@@ -115,6 +77,12 @@ public void appendLog(String str) {
                 fullScroll(View.FOCUS_DOWN);
             }
         });
+        long now = System.currentTimeMillis();
+        timeList.removeIf(time -> now - time > 200);
+        timeList.add(now);
+        if (timeList.size() > 200) {
+            setVisibility(false);
+        }
     }
 
     public void cleanLog() {