feat: java 工具 ui

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/AnimTool.java

@@ -39,7 +39,11 @@ public class AnimTool {
     private volatile int finishThreadCount = 0;
     private long time;
     private GetAlphaFrame getAlphaFrame = new GetAlphaFrame();
+    private IToolListener toolListener;
 
+    public void setToolListener(IToolListener toolListener) {
+        this.toolListener = toolListener;
+    }
 
     /**
      * @param commonArg
@@ -99,7 +103,12 @@ public class AnimTool {
                     for(int i = threadIndexSet[k][0]; i<threadIndexSet[k][1]; i++) {
                         synchronized (AnimTool.class) {
                             totalP++;
-                            TLog.i(TAG, "progress " + (totalP * 1.0f / commonArg.totalFrame));
+                            float progress = totalP * 1.0f / commonArg.totalFrame;
+                            if (toolListener != null) {
+                                toolListener.onProgress(progress);
+                            } else {
+                                TLog.i(TAG, "progress " + progress);
+                            }
                         }
                         try {
                             createFrame(commonArg, i);
@@ -115,6 +124,9 @@ public class AnimTool {
                             }
                             long cost = System.currentTimeMillis() - time;
                             TLog.i(TAG,"Finish cost=" + cost);
+                            if (toolListener != null) {
+                                toolListener.onComplete();
+                            }
                         }
                     }
                 }
@@ -292,4 +304,10 @@ public class AnimTool {
         return mp4BoxTool.create(inputFile, outputPath);
     }
 
+
+    public interface IToolListener {
+        void onProgress(float progress);
+        void onComplete();
+    }
+
 }

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/CommonArgTool.java

@@ -22,6 +22,11 @@ class CommonArgTool {
         String os = System.getProperty("os.name");
         TLog.i(TAG, os);
 
+        if (commonArg.inputPath == null && commonArg.inputPath == "") {
+            TLog.i(TAG, "error: input path invalid");
+            return false;
+        }
+
         //  路径检查
         File input = new File(commonArg.inputPath);
         if (!input.exists()) {

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/Main.java

@@ -16,11 +16,16 @@
 package com.tencent.qgame.playerproj.animtool;
 
 
+import com.tencent.qgame.playerproj.animtool.ui.ToolUI;
+
 public class Main {
 
 
     public static void main(String[] args) throws Exception {
-        animTool();
+        // 启动UI界面
+        new ToolUI().run();
+        // java工具
+        // animTool();
     }
 
 

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/TLog.java

@@ -16,7 +16,18 @@
 package com.tencent.qgame.playerproj.animtool;
 
 public class TLog {
+
+    public static ITLog logger;
+
     public static void i(String tag, String msg) {
-        System.out.println(tag + "\t" + msg);
+        if (logger != null) {
+            logger.i(tag, msg);
+        } else {
+            System.out.println(tag + "\t" + msg);
+        }
+    }
+
+    public interface ITLog {
+        void i(String tag, String  msg);
     }
 }

Android/PlayerProj/animtool/src/main/java/com/tencent/qgame/playerproj/animtool/ui/ToolUI.java

@@ -0,0 +1,297 @@
+package com.tencent.qgame.playerproj.animtool.ui;
+
+import com.tencent.qgame.playerproj.animtool.AnimTool;
+import com.tencent.qgame.playerproj.animtool.CommonArg;
+import com.tencent.qgame.playerproj.animtool.TLog;
+
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+
+public class ToolUI {
+
+    private static final String TAG = "ToolUI";
+    private static final String PROPERTIES_FILE = "setting.properties";
+    private final int WIDTH = 550;
+    private final int HEIGHT = 300;
+
+    private final ButtonGroup group = new ButtonGroup();
+    private final JRadioButton btnH265 = new JRadioButton("h265");
+    private final JRadioButton btnH264 = new JRadioButton("h264");
+    private final SpinnerModel modelFps = new SpinnerNumberModel(24, 1, 60, 1);
+    private final JTextField textInputPath = new JTextField();
+    private final JTextArea txtAreaLog = new JTextArea();
+    private final JLabel labelOutInfo = new JLabel();
+    private final Dimension labelSize = new Dimension(100, 20);
+    private final Properties props = new Properties();
+
+
+
+    public void run() {
+        TLog.logger = new TLog.ITLog() {
+            @Override
+            public void i(String tag, String msg) {
+                log(tag, msg);
+            }
+        };
+        createUI();
+        try {
+            File file = new File(PROPERTIES_FILE);
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+            props.load(new FileInputStream(PROPERTIES_FILE));
+            CommonArg commonArg = getProperties();
+            group.setSelected(commonArg.enableH265 ? btnH265.getModel() : btnH264.getModel(), true);
+            modelFps.setValue(commonArg.fps);
+            textInputPath.setText(commonArg.inputPath);
+        } catch (Exception e) {
+            TLog.i(TAG, "ERROR -> " + e.getMessage());
+        }
+    }
+
+
+    private void runTool() {
+        txtAreaLog.setText("");
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    runAnimTool();
+                } catch (Exception e) {
+                    TLog.i(TAG, "ERROR -> " + e.getMessage());
+                }
+            }
+        }).start();
+    }
+
+    private void runAnimTool() throws Exception {
+        final CommonArg commonArg = new CommonArg();
+        commonArg.ffmpegCmd = "ffmpeg";
+        commonArg.mp4editCmd = "mp4edit";
+        commonArg.enableH265 = group.isSelected(btnH265.getModel());
+        commonArg.fps = (Integer)modelFps.getValue();
+        commonArg.inputPath = textInputPath.getText();
+
+        AnimTool animTool = new AnimTool();
+        animTool.setToolListener(new AnimTool.IToolListener() {
+            @Override
+            public void onProgress(float progress) {
+                int p = (int)(progress * 100f);
+                labelOutInfo.setText((Math.min(p, 99)) + "%");
+            }
+
+            @Override
+            public void onComplete() {
+                labelOutInfo.setText("output: " + commonArg.outputPath);
+                try {
+                    setProperties(commonArg);
+                    Desktop.getDesktop().open(new File(commonArg.outputPath));
+                } catch (IOException e) {
+                    TLog.i(TAG, "ERROR -> " + e.getMessage());
+                }
+            }
+        });
+
+        animTool.create(commonArg, true);
+    }
+
+    private void createUI() {
+        // 创建 JFrame 实例
+        JFrame frame = new JFrame("VAP tool");
+        frame.setSize(WIDTH, HEIGHT);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        int w = (Toolkit.getDefaultToolkit().getScreenSize().width - WIDTH) / 2;
+        int h = (Toolkit.getDefaultToolkit().getScreenSize().height - HEIGHT) / 2;
+        frame.setLocation(w, h);
+
+
+        JPanel panel = new JPanel();
+        frame.add(panel);
+
+        layout(panel);
+
+        // 设置界面可见
+        frame.setVisible(true);
+    }
+
+    private void layout(JPanel panel) {
+        BoxLayout layout = new BoxLayout(panel, BoxLayout.PAGE_AXIS);
+        panel.setLayout(layout);
+        // codec
+        panel.add(getCodecLayout());
+        // fps
+        panel.add(getFpsLayout());
+        // path
+        panel.add(getPathLayout());
+        // create
+        panel.add(getCreateLayout());
+        // log
+        panel.add(getLogLayout());
+
+    }
+
+    private JPanel getCodecLayout() {
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout(FlowLayout.LEFT));
+
+        JLabel label = new JLabel("codec");
+        label.setPreferredSize(labelSize);
+        panel.add(label);
+
+        JPanel panelRadio = new JPanel();
+        panelRadio.setLayout(new GridLayout(1, 2));
+        panelRadio.add(btnH265);
+        panelRadio.add(btnH264);
+        group.add(btnH265);
+        group.add(btnH264);
+        group.setSelected(btnH265.getModel(), true);
+        panel.add(panelRadio);
+
+        return panel;
+    }
+
+    private JPanel getFpsLayout() {
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout(FlowLayout.LEFT));
+        JLabel label = new JLabel("fps");
+        label.setPreferredSize(labelSize);
+        panel.add(label);
+        JSpinner spinner = new JSpinner(modelFps);
+        spinner.setPreferredSize(new Dimension(60, 20));
+        panel.add(spinner);
+        return panel;
+    }
+
+    private JPanel getPathLayout() {
+        JPanel panel = new JPanel();
+
+        panel.setLayout(new FlowLayout(FlowLayout.LEFT));
+        JLabel label = new JLabel("input path");
+        label.setPreferredSize(labelSize);
+        panel.add(label);
+        JPanel gPanel = new JPanel();
+        panel.add(gPanel);
+
+        BoxLayout layout = new BoxLayout(gPanel, BoxLayout.LINE_AXIS);
+        gPanel.setLayout(layout);
+
+        textInputPath.setPreferredSize(new Dimension(300,20));
+        gPanel.add(textInputPath);
+
+        JButton btnInputPath = new JButton("choose");
+        gPanel.add(btnInputPath);
+        btnInputPath.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent actionEvent) {
+                JFileChooser fileChooser = new JFileChooser();
+                fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                int returnVal = fileChooser.showOpenDialog(fileChooser);
+                if(returnVal == JFileChooser.APPROVE_OPTION) {
+                    // 文件夹路径
+                    String filePath = fileChooser.getSelectedFile().getAbsolutePath();
+                    textInputPath.setText(filePath);
+                }
+            }
+        });
+
+
+
+        return panel;
+    }
+
+
+    private JPanel getCreateLayout() {
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout(FlowLayout.LEFT));
+        JButton btnCreate = new JButton("create VAP");
+        panel.add(btnCreate);
+        btnCreate.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent actionEvent) {
+                runTool();
+            }
+        });
+
+        panel.add(labelOutInfo);
+
+        return panel;
+    }
+
+
+    private JPanel getLogLayout() {
+        JPanel panel = new JPanel();
+        panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
+
+        txtAreaLog.setEditable(false);
+        txtAreaLog.setLineWrap(true);
+        txtAreaLog.setWrapStyleWord(true);
+        JScrollPane areaScrollPane = new JScrollPane(txtAreaLog);
+        areaScrollPane.setVerticalScrollBarPolicy(
+                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+        areaScrollPane.setPreferredSize(new Dimension(WIDTH, 200));
+
+        panel.add(areaScrollPane);
+        panel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
+
+        return panel;
+    }
+
+    // private JPanel
+
+    private void log(String tag, String msg) {
+        txtAreaLog.append("[" + tag + "]:" + msg + "\n");
+        txtAreaLog.setCaretPosition(txtAreaLog.getText().length());
+    }
+
+
+    private CommonArg getProperties() {
+        CommonArg commonArg = new CommonArg();
+        String enableH265 = props.getProperty("enableH265", Boolean.TRUE.toString());
+        String fps = props.getProperty("fps", "24");
+        String inputPath = props.getProperty("inputPath", "");
+
+        commonArg.enableH265 = Boolean.TRUE.toString().equals(enableH265);
+        try {
+            commonArg.fps = Integer.parseInt(fps);
+        } catch (Exception e) {
+            commonArg.fps = 24;
+        }
+        commonArg.inputPath = inputPath;
+        return commonArg;
+    }
+
+
+    private void setProperties(CommonArg commonArg) throws IOException {
+        props.setProperty("enableH265", commonArg.enableH265? Boolean.TRUE.toString() : Boolean.FALSE.toString());
+        props.setProperty("fps", commonArg.fps + "");
+        props.setProperty("inputPath", commonArg.inputPath == null ? "" : commonArg.inputPath);
+        props.store(new FileOutputStream(PROPERTIES_FILE), "");
+    }
+}