common 1.5.8 退出登录3

app/src/main/java/com/sobot/moduletest/MainActivity.java

@@ -204,30 +204,29 @@ public class MainActivity extends SobotBaseActivity {
 //            });
 //        }
 
-//        Map<String, Object> map1 = new HashMap<>();
-//        map1.put("email", "zhengnw@sobot.com");
-//        map1.put("passwd", "znw123456");
-//        map1.put("loginStatus", "1");
-//        map1.put("from", 2 + "");
-//        map1.put("way", "10");
-//        map1.put("ack", "1");
-//        Map<String, String> headers1 = new HashMap<>();
-//        headers1.put("language", "zh");
-//        HostModel hostModel=null;
-//        hostModel=  SobotLoginTools.getInstance().getHostModel();
-//        if(hostModel==null){
-//            hostModel=new HostModel();
-//            hostModel.setHost("https://api-c.sobot.com");
-//            SobotLoginTools.getInstance().setHostModel(hostModel);
-//        }
-//
-//        SobotLoginTools.getInstance().doAppLogin(MainActivity.this, MainActivity.this, hostModel.getHost(),"https://api-c.soboten.com/text", 8000, map1, headers1, new SobotResultBlock() {
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("email", "zhengnw@sobot.com");
+        map1.put("passwd", "znw123456");
+        map1.put("loginStatus", "1");
+        map1.put("from", 2 + "");
+        map1.put("way", "10");
+        map1.put("ack", "1");
+        Map<String, String> headers1 = new HashMap<>();
+        headers1.put("language", "zh");
+
+//        SobotLoginTools.getInstance().doAppLogin(MainActivity.this, getSobotBaseContext(), "https://api-c.sobot.com/text","https://api-c.soboten.com/text", 8000, map1, headers1,"zhengnw@sobot.com","znw123456", new SobotResultBlock() {
 //            @Override
 //            public void resultBolok(SobotResultCode code, String msg, Object obj) {
 //                SobotLoginTools.getInstance().checkExpiresToken();
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getAccessToken()+"");
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getTempId());
 //                SobotLogUtils.i(SobotLoginTools.getInstance().getToken()+"");
+//                SobotLoginTools.getInstance().logOut(MainActivity.this, "https://api-c.sobot.com/text", "zhengnw@sobot.com", new SobotResultBlock() {
+//                    @Override
+//                    public void resultBolok(SobotResultCode code, String msg, Object obj) {
+//
+//                    }
+//                });
 //            }
 //        });
 

sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java

@@ -458,45 +458,51 @@ public class SobotLoginTools {
 
     // sdk 执行退出登录
     public void logOut(Object cancelTag, String host, String loginAcount, final SobotResultBlock resultBlock) {
-        if (!SobotStringUtils.isEmpty(loginAcount) && isLogin(loginAcount)) {
-            Map<String, Object> params = new HashMap<>();
-            params.put("loginUser", loginAcount);
-            Map<String, String> headerParams = new HashMap<>();
-            headerParams.put("temp-id", getToken());
-            headerParams.put("from", 2 + "");
-            SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceLogOut/4", 8000, params, headerParams, new HttpBaseUtils.StringCallBack() {
-                @Override
-                public void onResponse(String response) {
-                    SobotCallBaseCode result = SobotGsonUtil.jsonToBean(response, SobotCallBaseCode.class);
-                    if (result != null && !SobotStringUtils.isEmpty(result.getRetCode()) && "000000".equals(result.getRetCode())) {
-                        clearLoginInfo();
-                        if (resultBlock != null) {
-                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, "退出登录成功", null);
-                        }
-                    } else {
-                        if (resultBlock != null) {
-                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, (result != null && SobotStringUtils.isNoEmpty(result.getRetMsg())) ? result.getRetMsg() : "退出登录失败", null);
-                        }
+        if (SobotStringUtils.isEmpty(loginAcount)) {
+            if (resultBlock != null) {
+                resultBlock.resultBolok(SobotResultCode.CODE_FAILED, "账号为空，退出失败", null);
+            }
+            return;
+        }
+        if (!isLogin(loginAcount)) {
+            if (resultBlock != null) {
+                resultBlock.resultBolok(SobotResultCode.CODE_SUCCEEDED, "上次登录的保存信息为空，不用再次退出登录", null);
+            }
+            return;
+        }
+        Map<String, Object> params = new HashMap<>();
+        params.put("loginUser", loginAcount);
+        Map<String, String> headerParams = new HashMap<>();
+        headerParams.put("temp-id", getToken());
+        headerParams.put("from", 2 + "");
+        SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceLogOut/4", 8000, params, headerParams, new HttpBaseUtils.StringCallBack() {
+            @Override
+            public void onResponse(String response) {
+                SobotCallBaseCode result = SobotGsonUtil.jsonToBean(response, SobotCallBaseCode.class);
+                if (result != null && !SobotStringUtils.isEmpty(result.getRetCode()) && "000000".equals(result.getRetCode())) {
+                    clearLoginInfo();
+                    if (resultBlock != null) {
+                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, "退出登录成功", null);
                     }
-                }
-
-                @Override
-                public void onError(Exception e, String msg, int responseCode) {
+                } else {
                     if (resultBlock != null) {
-                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, msg, null);
+                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, (result != null && SobotStringUtils.isNoEmpty(result.getRetMsg())) ? result.getRetMsg() : "退出登录失败", null);
                     }
                 }
+            }
 
-                @Override
-                public void inProgress(int progress) {
-
+            @Override
+            public void onError(Exception e, String msg, int responseCode) {
+                if (resultBlock != null) {
+                    resultBlock.resultBolok(SobotResultCode.CODE_FAILED, msg, null);
                 }
-            });
-        } else {
-            if (resultBlock != null) {
-                resultBlock.resultBolok(SobotResultCode.CODE_FAILED, "账号为空，退出失败", null);
             }
-        }
+
+            @Override
+            public void inProgress(int progress) {
+
+            }
+        });
     }
 
 
@@ -509,7 +515,8 @@ public class SobotLoginTools {
      * @param token
      * @param resultBlock
      */
-    public void getLoginUserInfo(final Object cancelTag, final Context mContext, final String host, String token, String language, final SobotResultBlock resultBlock) {
+    public void getLoginUserInfo(final Object cancelTag, final Context mContext,
+                                 final String host, String token, String language, final SobotResultBlock resultBlock) {
         final String url = host + "/basic-config-service/consoleAuth/queryAppAgentMenus";
         Map<String, String> headerMap = new HashMap<>();
         if (!SobotStringUtils.isEmpty(token)) {
@@ -607,7 +614,8 @@ public class SobotLoginTools {
      * 获取accessToken
      */
 
-    public void doAccessToken(Object cancelTag, String host, String token, final SobotResultBlock resultBlock) {
+    public void doAccessToken(Object cancelTag, String host, String token,
+                              final SobotResultBlock resultBlock) {
         Map<String, String> headerMap = new HashMap<>();
         if (!SobotStringUtils.isEmpty(token)) {
             headerMap.put("temp-id", token);