支持从任意状态变为已解决

Author: foxjojo

src/main/java/tech/foxdev/tapdvcs/TapdBugData.java

@@ -6,5 +6,12 @@ public class TapdBugData {
     public String ID;
     public String CreateName;
 
+    public enum Status {
+        New,
+        Accept,
+        ReOpen
+    }
+
+    public Status CurStatus;
     public String OwnName;
 }

src/main/java/tech/foxdev/tapdvcs/TapdBugListDialog.java

@@ -2,15 +2,18 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.CommitMessageI;
+import org.apache.commons.lang.CharSet;
 import org.jsoup.Jsoup;
 
 import javax.swing.*;
 import java.awt.event.*;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 
@@ -32,7 +35,7 @@ public TapdBugListDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
         bugList.setCellRenderer(new CheckboxListCellRenderer());
-        contentPanel.setSize(550,150);
+        contentPanel.setSize(550, 150);
         contentPanel.updateUI();
         buttonOK.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -138,11 +141,24 @@ private void GetAllBug() {
             var ownName = doc.getElementsByClass(" left-tree-brick nav-iconbtn dropdown user").first().getElementsByTag("a").first().attr("title");
             VcsHandler.ClearData();
             for (int i = 0; i < allBugs.size(); i++) {
+                var itemID = allBugs.get(i).attr("data-item-id");
+                String bugStatus = allBugs.get(i).getElementsByTag("td").get(3).text();
                 var bug = allBugs.get(i).getElementsByClass("card-title content-cardtitle namecol preview-title J-worktablePreview").first();
                 var data = new TapdBugData();
                 data.DisplayName = bug.attr("title");
                 data.Url = bug.attr("href");
                 data.ID = bug.attr("data-entityid");
+                String NewS = "\u65B0";
+                String AccS = "\u63A5\u53D7/\u5904\u7406";
+                String ReOpenS = "\u91CD\u65B0\u6253\u5F00";
+
+                if (bugStatus.equals(NewS)) {
+                    data.CurStatus = TapdBugData.Status.New;
+                } else if (bugStatus.equals(AccS)) {
+                    data.CurStatus = TapdBugData.Status.Accept;
+                } else if (bugStatus.equals(ReOpenS)) {
+                    data.CurStatus = TapdBugData.Status.ReOpen;
+                }
                 var nameItem = allBugs.get(i).getElementById("td_bug_reporter_" + data.ID);
                 if (nameItem == null) {
                     continue;
@@ -163,5 +179,4 @@ private void GetAllBug() {
     }
 
 
-
 }

src/main/java/tech/foxdev/tapdvcs/TapdTaskProcess.java

@@ -1,9 +1,7 @@
 package tech.foxdev.tapdvcs;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.jr.ob.JSON;
 import com.intellij.openapi.diagnostic.Logger;
-import org.apache.commons.httpclient.Cookie;
 
 import javax.swing.*;
 import java.awt.event.*;
@@ -15,9 +13,6 @@
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Timer;
-import java.util.regex.Matcher;
 
 public class TapdTaskProcess extends JDialog {
     private static String comment;
@@ -198,7 +193,12 @@ private void BuildUrl(Status status, TapdBugData tapdBugData) {
         String url = "https://www.tapd.cn/api/entity/workflow/change_bug_status";
         switch (status) {
             case InProcess:
-                Send(url, BuildPostData(tapdBugData, "new", "in_progress", tapdBugData.OwnName, tapdBugData.OwnName, ""));
+                if(tapdBugData.CurStatus == TapdBugData.Status.Accept)
+                    break;
+                String curStatus = "new";
+                if(tapdBugData.CurStatus == TapdBugData.Status.ReOpen)
+                    curStatus = "reopened";
+                Send(url, BuildPostData(tapdBugData, curStatus, "in_progress", tapdBugData.OwnName, tapdBugData.OwnName, ""));
                 break;
             case FixedAndAddComment:
                 String data = BuildPostData(tapdBugData,"in_progress", "resolved", tapdBugData.CreateName, tapdBugData.CreateName, comment+"\n"+TapdBugListDialog.TapdComment);