增加加速器

Author: lamborc

conf/nbs.db

@@ -49,4 +49,12 @@ public void setVolumeText(String text){
     public void setHorizontalAlignment(int horizontalAlignment){
         this.label.setHorizontalAlignment(horizontalAlignment);
     }
+
+    public JLabel getLabel() {
+        return label;
+    }
+
+    public LCJTextArea getTextArea() {
+        return textArea;
+    }
 }

src/main/java/io/nbs/client/ui/components/forms/LCFormLabel.java

@@ -106,6 +106,11 @@ private void setListeners() {
      * @param who
      */
     public void showPanel(MMNames who){
+        if(who==MMNames.TIP){
+            MMMonitPanel.CtrlSign = false;
+        }else {
+            MMMonitPanel.CtrlSign = true;
+        }
         cardLayout.show(cardPanel,who.name());
     }
 

src/main/java/io/nbs/client/ui/panels/manage/MMBodyPanel.java

@@ -53,7 +53,7 @@ public class MMMonitPanel extends JPanel {
     //private SizeAutoAdjustTextArea textArea;
     private JPanel wantListPanel;
 
-    private static boolean CtrlSign = false;
+    public static boolean CtrlSign = false;
     private long fsize = 0l;
     private String rhash;
     private IPFS ipfs;
@@ -154,7 +154,7 @@ public void startMonitor(String rhash,BlockStat stat){
         this.rhash = rhash;
         this.fsize = stat.getCumulativeSize();
         Multihash multihash = Multihash.fromBase58(stat.getHash());
-        statusLabel.setText("浏览器打开，正在加载数据...");
+
 
         new Thread(()->{
             int sec = 0;
@@ -177,7 +177,7 @@ public void startMonitor(String rhash,BlockStat stat){
             generateHash(multihash);
         }).start();
 
-        monitorList();
+        //monitorList();
         boosterPined();
         this.setVisible(true);
     }
@@ -205,9 +205,11 @@ private void generateHash(Multihash multihash){
     /**
      *
      */
-    private void boosterPined(){
+    public void boosterPined(){
+        if(CtrlSign)return;
         new Thread(()->{
             while (completeSize.get()<fsize){
+                CtrlSign = true;
                 try {
                     Multihash multihash = pinedBooster.take();
 
@@ -229,14 +231,20 @@ private void boosterPined(){
                     e.printStackTrace();
                 }
             }
+            CtrlSign = false;
         }).start();
     }
 
-    private void monitorList(){
+    /**
+     *
+     */
+    public void monitorList(){
+
         new Thread(()->{
-            while (completeSize.get()<fsize){
+            while (!CtrlSign){
                 ResData<BitSwap> resData = bitSwapService.getBitSwapStat();
                 if(resData.getCode()==0){
+                    statusLabel.setText("浏览器打开，正在加载数据...");
                     BitSwap bitSwap = resData.getData();
                     if(bitSwap!=null&&bitSwap.getWantlist().size()>0){
                         wantListPanel.removeAll();
@@ -261,7 +269,7 @@ public void mouseEntered(MouseEvent e) {
                         }
 
                         try {
-                            TimeUnit.SECONDS.sleep(2);
+                            TimeUnit.SECONDS.sleep(5);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
@@ -271,4 +279,6 @@ public void mouseEntered(MouseEvent e) {
         }).start();
 
     }
+
+
 }

src/main/java/io/nbs/client/ui/panels/manage/body/MMMonitPanel.java

@@ -174,16 +174,15 @@ private void initView() {
         contentPanel.add(dataSize,"split,span ,growx ,gaptop 5");
         contentPanel.add(dataSizeVol,"span ,growx ,gaptop 5");
         contentPanel.add(numLinks,"span ,growx ,gaptop 5");
-        contentPanel.add(numLinksVol,"span ,growx ,gaptop 5");
+        contentPanel.add(numLinksVol,"span ,growx ,gaptop 5,wrap");
+        contentPanel.add(errorLabel,"split ,span 1 ,wrap,grow");
     }
 
     private void setListeners() {
         openBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-
-
-
+                monitPanel.monitorList();
                 BrowserOperationHelper.getInstance().openURL(hash58);
             }
         });
@@ -207,6 +206,7 @@ public void setHash(String hash){
     public void setBlkStat(BlockStat stat,String errorMSG,long usedSecd){
         String timeUsed = DateHelper.calcUsedTime(usedSecd);
         searchUsed.setVolumeText(timeUsed);
+        searchUsed.getTextArea().setBackground(ColorCnst.WINDOW_BACKGROUND);
         if(errorMSG==null&&stat!=null){
             this.stat = stat;
             errorLabel.setVisible(false);