气密泄露点位补充

src/com/mes/ui/MesClient.java

@@ -372,6 +372,7 @@ public class MesClient extends JFrame {
         pendingNgTestParam = null;
         MesClient.finish_ok_bt.setEnabled(false);
         MesClient.finish_ng_bt.setEnabled(false);
+        MesClient.finish_ng_bt.setVisible(false);
         product_sn.setText("");
         product_sn.setEditable(true);
         tjFlag = 0;
@@ -385,8 +386,10 @@ public class MesClient extends JFrame {
 
         updateMaterailData();
 
-//        MesClient.result.setText("等待结果");
-//        MesClient.result.setForeground(Color.GRAY);
+        if (MesClient.result != null) {
+            MesClient.result.setText("");
+            MesClient.result.setVisible(false);
+        }
     }
 
     /**
@@ -411,6 +414,7 @@ public class MesClient extends JFrame {
             boolean leakEmpty = testParam.getNgLeakPoints() == null || testParam.getNgLeakPoints().trim().isEmpty();
             if (mes_enable && isNg && leakEmpty) {
                 pendingNgTestParam = testParam;
+                MesClient.finish_ng_bt.setVisible(true);
                 MesClient.finish_ng_bt.setEnabled(true);
                 MesClient.setMenuStatus("气密 NG，请选择漏点点位", -1);
                 if (SwingUtilities.isEventDispatchThread()) {
@@ -469,6 +473,7 @@ public class MesClient extends JFrame {
         }
         String ngLeakPoints = LeakNgPointDialog.showDialog(mesClientFrame);
         if (ngLeakPoints == null) {
+            MesClient.finish_ng_bt.setVisible(true);
             MesClient.finish_ng_bt.setEnabled(true);
             MesClient.setMenuStatus("气密 NG，请选择漏点点位", -1);
             return;
@@ -877,6 +882,7 @@ public class MesClient extends JFrame {
                 if(MesClient.configParam.getStartMode().equals("自动启动")){
                     MesClient.serialPortUtils.start();
                 }
+                MesClient.result.setVisible(true);
                 MesClient.result.setText("等待结果");
                 MesClient.result.setForeground(Color.GRAY);
             }
@@ -1218,6 +1224,7 @@ public class MesClient extends JFrame {
         result.setFont(new Font("微软雅黑", Font.BOLD, 50));
 //        result.setBounds(290, 392, 356, 89);
         result.setBounds(290, 332, 356, 89);
+        result.setVisible(false);
         indexPanelA.add(result);
 
         finish_ok_bt = new JButton("OK");
@@ -1245,6 +1252,7 @@ public class MesClient extends JFrame {
 
         finish_ng_bt = new JButton("NG");
         finish_ng_bt.setEnabled(false);
+        finish_ng_bt.setVisible(false);
         finish_ng_bt.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 submitPendingNgWithLeakPoints();

src/com/mes/ui/MesRevice.java

@@ -21,6 +21,7 @@ public class MesRevice {
                 if(MesClient.configParam.getStartMode().equals("自动启动")){
                     MesClient.serialPortUtils.start();
                 }
+                MesClient.result.setVisible(true);
                 MesClient.result.setText("等待结果");
                 MesClient.result.setForeground(Color.GRAY);
             }else {

src/com/mes/util/SerialPortUtils.java

@@ -146,10 +146,12 @@ public class SerialPortUtils {
                                                         MesClient.param2.setText(leakValue + leakUnit);
                                                         String lastRet = "NG";
                                                         if(result.equals("OK")){
+                                                            MesClient.result.setVisible(true);
                                                             MesClient.result.setText("OK");
                                                             MesClient.result.setForeground(Color.GREEN);
                                                             lastRet = "OK";
                                                         }else{
+                                                            MesClient.result.setVisible(true);
                                                             MesClient.result.setText("NG");
                                                             MesClient.result.setForeground(Color.RED);
                                                         }

src/com/mes/util/WorkTimer.java

@@ -85,9 +85,11 @@ public class WorkTimer {
                         String lastRet = lastResult.isPass ? "OK" : "NG";
 
                         if(lastRet.equals("OK")){
+                            MesClient.result.setVisible(true);
                             MesClient.result.setText("OK");
                             MesClient.result.setForeground(Color.GREEN);
                         }else{
+                            MesClient.result.setVisible(true);
                             MesClient.result.setText("NG");
                             MesClient.result.setForeground(Color.RED);
                         }