common 登录接口添加语言

app/build.gradle

@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "com.sobot.moduletest"
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_1.3.1.jar'
+        delete 'build/libs/sobot_common_1.3.4.jar'
         //原地址
         from('build/intermediates/packaged-classes/release/')
         //导出jar包的地址
@@ -19,7 +19,7 @@ android {
         //包含的jar包
         include('classes.jar')
         //重命名jar包为mysdk
-        rename ('classes.jar', 'sobot_common_1.3.1.jar')
+        rename ('classes.jar', 'sobot_common_1.3.4.jar')
     }
     makeJar.dependsOn(build)
 }

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -13,7 +13,7 @@ ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'sobotcommon'            //项目名
 //    PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
-    PUBLISH_VERSION = '1.3.3'                    //版本号
+    PUBLISH_VERSION = '1.3.4'                    //版本号
 }
 
 

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

@@ -52,8 +52,8 @@ public class SobotLoginTools {
     }
 
     // 执行APP登录接口
-    public static void doAppLogin(final Object cancelTag, final Context mContext, final String host,long timeout, Map<String, Object> params, Map<String, String> headers, final SobotResultBlock resultBlock) {
-        SobotHttpUtils.doPost(cancelTag, host + "/chat-sdk/sdk/admin/v1/login.action", timeout,params, headers, new HttpBaseUtils.StringCallBack() {
+    public static void doAppLogin(final Object cancelTag, final Context mContext, final String host, long timeout, Map<String, Object> params, Map<String, String> headers, final SobotResultBlock resultBlock) {
+        SobotHttpUtils.doPost(cancelTag, host + "/chat-sdk/sdk/admin/v1/login.action", timeout, params, headers, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String result) {
                 if (!TextUtils.isEmpty(result)) {
@@ -63,7 +63,7 @@ public class SobotLoginTools {
                         //登录接口和获取坐席信息权限接口都成功才算真正登录成功
                         if ("1".equals(baseModel.getCode()) && baseModel.getData() != null) {
                             LoginUserInfoUtils.setUser(baseModel.getData());
-                            getLoginUserInfo(cancelTag, mContext, baseModel.getData(), host, baseModel.getData().getToken(), resultBlock);
+                            getLoginUserInfo(cancelTag, mContext, baseModel.getData(), host, baseModel.getData().getToken(), baseModel.getData().getLanguage(), resultBlock);
                         } else {
                             resultBlock.resultBolok(SobotResultCode.CODE_FAILED, baseModel.getMsg(), baseModel.getCode());
                         }
@@ -94,8 +94,8 @@ public class SobotLoginTools {
      * @param token
      * @param resultBlock 返回坐席信息
      */
-    public static void getLoginUserInfo(final Object cancelTag, final Context mContext, String host, final String token, final SobotResultBlock resultBlock) {
-        getLoginUserInfo(cancelTag, mContext, null, host, token, resultBlock);
+    public static void getLoginUserInfo(Object cancelTag, Context mContext, String host, String token, String language, SobotResultBlock resultBlock) {
+        getLoginUserInfo(cancelTag, mContext, null, host, token, language, resultBlock);
     }
 
     /**
@@ -108,10 +108,15 @@ public class SobotLoginTools {
      * @param token
      * @param resultBlock
      */
-    public static void getLoginUserInfo(final Object cancelTag, final Context mContext, final LoginUserEntity loginUser, String host, final String token, final SobotResultBlock resultBlock) {
+    public static void getLoginUserInfo(Object cancelTag, final Context mContext, final LoginUserEntity loginUser, String host, String token, String language, final SobotResultBlock resultBlock) {
         final String url = host + "/basic-config-service/consoleAuth/queryAppAgentMenus";
         Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("temp-id", token);
+        if (!TextUtils.isEmpty(token)) {
+            headerMap.put("temp-id", token);
+        }
+        if (!TextUtils.isEmpty(language)) {
+            headerMap.put("language", language);
+        }
         SobotHttpUtils.doGet(cancelTag, url, null, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String result) {