调整部分http api为异步请求

obsolete-acexy · Oct 11, 2018 · 4c0e89a · 4c0e89a
1 parent 4c2de14
commit 4c0e89a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/src/main/java/com/thankjava/wqq/WQQClient.java b/src/main/java/com/thankjava/wqq/WQQClient.java
@@ -75,8 +75,9 @@ public GroupsList getGroupsList(boolean isFromServer) {
 
     @Override
     public FriendsList getFriendsList(boolean isFromServer) {
+        FriendsList friendsList = null;
         if (isFromServer) {
-            FriendsList friendsList = getInfo.getFriendsList();
+            friendsList = getInfo.getFriendsList();
             if (friendsList == null) {
                 return null;
             } else {
@@ -86,7 +87,11 @@ public FriendsList getFriendsList(boolean isFromServer) {
                 }
             }
         }
-        return session.getFriendsList();
+        friendsList = session.getFriendsList();
+        if (friendsList == null) {
+            friendsList = getFriendsList(true);
+        }
+        return friendsList;
     }
 
 }
diff --git a/src/main/java/com/thankjava/wqq/core/action/GetInfoAction.java b/src/main/java/com/thankjava/wqq/core/action/GetInfoAction.java
@@ -241,7 +241,6 @@ public void onListener(ActionListener actionListener) {
      * @date 2016年12月22日 下午1:56:17
      * @version 1.0
      */
-    @Deprecated
     public GroupsList getGroupsList() {
         AsyncResponse response = null;
         GroupsList groupList = null;

diff --git a/src/main/java/com/thankjava/wqq/core/action/LoginAction.java b/src/main/java/com/thankjava/wqq/core/action/LoginAction.java
@@ -244,22 +244,6 @@ public void onListener(ActionListener actionListener) {
                 }
             });
 
-//            FriendsList friendsList = getInfo.getFriendsList();
-//            if (friendsList == null) {
-//                logger.error("获取好友列表失败");
-//            } else {
-//                friendsList = getInfo.getOnlineStatus();
-//                if (friendsList == null) {
-//                    logger.error("为好友列表查询在线状态失败");
-//                }
-//            }
-//            getInfo.getGroupsList();
-//            getInfo.getDiscusList();
-//            getInfo.getSelfInfo();
-//            getInfo.getRecentList();
-
-
-
         }