pref(account):logging operation

idoknow · Sep 11, 2021 · d612434 · d612434
1 parent 9926cdd
commit d612434
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/.idea/artifacts/esn_terminal_swing_jar.xml b/.idea/artifacts/esn_terminal_swing_jar.xml
diff --git a/.idea/libraries/esn_api_java_0_7.xml → .idea/libraries/esn_api_java_0_9.xml b/.idea/libraries/esn_api_java_0_7.xml → .idea/libraries/esn_api_java_0_9.xml
diff --git a/config/esn-terminal.conf b/config/esn-terminal.conf
diff --git a/esn-terminal-swing.iml b/esn-terminal-swing.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="esn-api-java-0.7" level="project" />
+    <orderEntry type="library" name="esn-api-java-0.9" level="project" />
   </component>
 </module>
diff --git a/libs/esn-api-java-0.7.jar → libs/esn-api-java-0.9.jar b/libs/esn-api-java-0.7.jar → libs/esn-api-java-0.9.jar
diff --git a/src/main/boot/TerminalMain.java b/src/main/boot/TerminalMain.java
@@ -27,7 +27,7 @@ public class TerminalMain {
     public static AddDialog addDialog;
     public static RemoveDialog removeDialog;
     public static TrayMgr trayMgr;
-    public static final String version="1.0";
+    public static final String version="1.2";
     public static void main(String[] args) throws Exception{
 //        Debug.debug=true;
         //load config

diff --git a/src/main/gui/setting/Account.java b/src/main/gui/setting/Account.java
@@ -9,6 +9,7 @@
 import main.util.Out;
 import packs.PackRespNotification;
 import packs.PackResult;
+import util.Debug;
 
 import javax.swing.*;
 import java.awt.*;
@@ -130,9 +131,21 @@ public void sessionLogout(PackResult packResult) {
                             //request notifications pushed after last logout
                             if ((lastID==-1&&TerminalMain.preference.requestHistoryNotificationsWhenLoginToAAccount)){
                                 setLastID(0,name);
-                                session.requestNotifications(0,40);
+//                                session.requestNotifications(0,200);
+
+
+                                Out.sayWithTimeLn(name+":request recent for new account");
+                                session.requestRecent(10);
                             }else if (lastID!=-1){
-                                session.requestNotifications(lastID, 40);
+//                                session.requestNotifications(lastID, 100);
+//                                Debug.debug=true;
+//                                System.out.println("count lastID:"+lastID);
+                                int count=session.countNotifications(lastID,0);
+//                                System.out.println("count");
+                                Out.sayWithTimeLn(name+":request recent amount:"+count);
+                                Debug.debug=true;
+                                session.requestRecent(count);
+//                                session.requestRecent(100);
                             }
 
 
@@ -163,6 +176,7 @@ public void dispose(){
     public ArrayList<Entry> entries=new ArrayList<>();
     public JButton addAcc=new JButton("+Add");
     public JLabel serviceTips=new JLabel();
+    public JButton deleteService=new JButton("X");
     public ConfigAccount configAccount=new ConfigAccount();
     public Account(){
         this.setLayout(null);
@@ -179,15 +193,28 @@ public Account(){
         }));
         this.add(addAcc);
 
-        serviceTips.setBounds(addAcc.getX()+addAcc.getWidth()+10,addAcc.getY(),250,20);
+
+
+        serviceTips.setBounds(addAcc.getX()+addAcc.getWidth()+10,addAcc.getY(),207,20);
         if (TerminalMain.preference!=null&&TerminalMain.preference.service!=null){
             serviceTips.setText("Service:"+TerminalMain.preference.service);
         }else {
             serviceTips.setText("Service address undefined.");
         }
         this.add(serviceTips);
 
-
+        deleteService.setBounds(serviceTips.getX()+serviceTips.getWidth()+8,addAcc.getY(),45,20);
+        deleteService.addActionListener(e->{
+            String newService=javax.swing.JOptionPane.showInputDialog(this,"Please new service address to change to:");
+            if (!"".equals(newService)&&newService!=null){
+                TerminalMain.preference.service=newService;
+                TerminalMain.serializePreference();
+                this.serviceTips.setText("Service:"+newService);
+            }else {
+                javax.swing.JOptionPane.showMessageDialog(this,"Please type service address!");
+            }
+        });
+        this.add(deleteService);
     }
     public void addAccount(String name,String pass,int selectFrom){
         Entry e=new Entry(name,pass,selectFrom);