Commit 0c925e35 by 郭倩芳

common 多语言

parent 8d980ec5
...@@ -49,7 +49,7 @@ public class SobotCommonHttpUtils { ...@@ -49,7 +49,7 @@ public class SobotCommonHttpUtils {
private static String getLanguage(Context context) { private static String getLanguage(Context context) {
String languageStr = ""; String languageStr = "";
if (SobotLoginTools.getInstance().getServiceInfo() != null) { if (SobotLoginTools.getInstance().getServiceInfo() != null) {
languageStr = SobotStringUtils.checkStringIsNull(SobotLoginTools.getInstance().getServiceInfo().getServiceLanguage()); languageStr = SobotStringUtils.checkStringIsNull(SobotLoginTools.getInstance().getServiceInfo().getServiceWorkbenchLang());
} }
return languageStr; return languageStr;
} }
......
package com.sobot.common.login; package com.sobot.common.login;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import com.sobot.common.login.callback.SobotResultBlock; import com.sobot.common.login.callback.SobotResultBlock;
import com.sobot.common.login.callback.SobotResultCode; import com.sobot.common.login.callback.SobotResultCode;
...@@ -25,6 +26,7 @@ import com.sobot.utils.SobotSharedPreferencesUtil; ...@@ -25,6 +26,7 @@ import com.sobot.utils.SobotSharedPreferencesUtil;
import com.sobot.utils.SobotStringUtils; import com.sobot.utils.SobotStringUtils;
import org.json.JSONArray; import org.json.JSONArray;
import org.w3c.dom.Text;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -50,6 +52,7 @@ public class SobotLoginTools { ...@@ -50,6 +52,7 @@ public class SobotLoginTools {
private SobotServiceInfoModel mServiceInfoModel; private SobotServiceInfoModel mServiceInfoModel;
private String lang= "";
public SobotServiceInfoModel getServiceInfo() { public SobotServiceInfoModel getServiceInfo() {
if (mServiceInfoModel == null) { if (mServiceInfoModel == null) {
...@@ -57,6 +60,18 @@ public class SobotLoginTools { ...@@ -57,6 +60,18 @@ public class SobotLoginTools {
} }
return mServiceInfoModel; return mServiceInfoModel;
} }
public String getServicLang(){
if(lang!=null && TextUtils.isEmpty(lang)) {
SobotServiceInfoModel infoModel = getServiceInfo();
if (infoModel != null) {
lang = infoModel.getServiceWorkbenchLang();
}
}
if(lang ==null || TextUtils.isEmpty(lang)){
lang = "zh";
}
return lang;
}
private List<ServiceFunctionVoModel> functionVoModelList; private List<ServiceFunctionVoModel> functionVoModelList;
...@@ -75,8 +90,10 @@ public class SobotLoginTools { ...@@ -75,8 +90,10 @@ public class SobotLoginTools {
ServiceInfoManager.getInstance().deleteAll(); ServiceInfoManager.getInstance().deleteAll();
mServiceInfoModel = newServiceInfo; mServiceInfoModel = newServiceInfo;
if (mServiceInfoModel != null) { if (mServiceInfoModel != null) {
lang = mServiceInfoModel.getServiceWorkbenchLang();
ServiceInfoManager.getInstance().insert(mServiceInfoModel); ServiceInfoManager.getInstance().insert(mServiceInfoModel);
} else { } else {
lang = "";
ServiceInfoManager.getInstance().deleteAll(); ServiceInfoManager.getInstance().deleteAll();
} }
} }
...@@ -714,7 +731,7 @@ public void requestLanguage(String host,String token, String language ){ ...@@ -714,7 +731,7 @@ public void requestLanguage(String host,String token, String language ){
Map<String, String> headerMap = new HashMap<>(); Map<String, String> headerMap = new HashMap<>();
headerMap.put("authorization", "Bearer " + SobotStringUtils.checkStringIsNull(infoModel.getToken())); headerMap.put("authorization", "Bearer " + SobotStringUtils.checkStringIsNull(infoModel.getToken()));
headerMap.put("temp-id", SobotStringUtils.checkStringIsNull(infoModel.getToken())); headerMap.put("temp-id", SobotStringUtils.checkStringIsNull(infoModel.getToken()));
headerMap.put("language", SobotStringUtils.checkStringIsNull(infoModel.getServiceLanguage())); headerMap.put("language", SobotStringUtils.checkStringIsNull(infoModel.getServiceWorkbenchLang()));
headerMap.put("from", "2"); headerMap.put("from", "2");
SobotHttpUtils.doGet(cancelTag, host + "/chat-sdk/sdk/admin/v2/appEnter", 8000, params, headerMap, new HttpBaseUtils.StringCallBack() { SobotHttpUtils.doGet(cancelTag, host + "/chat-sdk/sdk/admin/v2/appEnter", 8000, params, headerMap, new HttpBaseUtils.StringCallBack() {
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment