1.2.0 去除生成代码，加入加载提示

Author: pengwei1024

jar/apkReSign_1.2.0.jar

@@ -4,7 +4,7 @@
  * Created by pengwei on 16/4/15.
  */
 public class Global {
-    public static final String VERSION = "1.1.0";
+    public static final String VERSION = "1.2.0";
 
     public static final String ABOUT_UEL = "https://github.com/pengwei1024/apkReSign";
 }

src/com/apkfuns/apkresign/Global.java

@@ -13,9 +13,7 @@
  */
 package de.troido.resigner.ui;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.dnd.DnDConstants;
@@ -35,11 +33,11 @@
 import com.apkfuns.apkresign.BrowserUtil;
 import com.apkfuns.apkresign.Global;
 import de.troido.resigner.controll.ReSignerLogic;
-import de.troido.resigner.utils.PropertiesUtil;
 
 public class MainWindow extends JPanel implements DropTargetListener, ActionListener {
     private BufferedImage img;
     public static PathSettingWindow pathSetting;
+    public JLabel progressLabel;
 
     @Override
     protected void paintComponent(Graphics g) {
@@ -59,6 +57,10 @@ public MainWindow() throws Exception {
         DropTarget dt = new DropTarget(f, this);
         this.setDropTarget(dt);
         f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        progressLabel = new JLabel("正在重签名中,请稍等...");
+        progressLabel.setFont(new Font("Dialog", 1, 16));
+        setProgressLabel(false);
+        add(progressLabel);
         f.getContentPane().add(this);
         f.setSize(318, 335);
         f.setResizable(false);
@@ -79,6 +81,15 @@ public MainWindow() throws Exception {
         checkEnvironment();
     }
 
+    /**
+     * 设置进度提示是否显示
+     *
+     * @param show
+     */
+    public void setProgressLabel(boolean show) {
+        progressLabel.setVisible(show);
+    }
+
     private boolean checkEnvironment() {
         try {
             ReSignerLogic.checkEnvironment();
@@ -131,6 +142,7 @@ public void drop(DropTargetDropEvent dtde) {
             if (!checkEnvironment()) {
                 return;
             }
+            setProgressLabel(true);
             String inFileName = "";
             try {
                 java.util.List files = (java.util.List) dtde.getTransferable()
@@ -148,7 +160,6 @@ public void drop(DropTargetDropEvent dtde) {
             fc.setSelectedFile(outFile);
             // In response to a button click:
             int returnVal = fc.showSaveDialog(this);
-
             if (returnVal != JFileChooser.APPROVE_OPTION)
                 return;
             outFile = fc.getSelectedFile();
@@ -157,13 +168,15 @@ public void drop(DropTargetDropEvent dtde) {
                 outFileName = outFileName + ".apk";
             String result[] = ReSignerLogic.resign(inFileName, outFileName);
             if (result != null) {
-                /*JOptionPane.showMessageDialog(this,
+                JOptionPane.showMessageDialog(this,
                         "apk successfully re-signed\n\nPackage name: "
-								+ result[0] + "\nMain activity: " + result[1]);*/
-                new ShowCodeWindow(result[0], result[1]);
+                                + result[0] + "\nMain activity: " + result[1]);
+//                new ShowCodeWindow(result[0], result[1]);
             }
         } catch (Exception e) {
             JOptionPane.showMessageDialog(this, "ERROR: " + e.getMessage());
+        } finally {
+            setProgressLabel(false);
         }
 
     }