From c26d344da4c54ad8456a2dc145cde0b424722f0e Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期四, 09 七月 2026 13:55:17 +0800
Subject: [PATCH] 修复初始语言非法语的问题
---
app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java b/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
index c96a14b..74a5e36 100644
--- a/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
+++ b/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
@@ -1,6 +1,8 @@
package com.driver.igotrip.netUtls;
+import static com.driver.igotrip.netUtls.NetKitKt.getToken;
+
import android.util.Log;
import com.driver.igotrip.BuildConfig;
@@ -38,8 +40,6 @@
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
-import static com.driver.igotrip.netUtls.NetKitKt.getToken;
-
/**
* 网络请求管理类
@@ -70,7 +70,7 @@
map = new HashMap<>();
// 传参方式为json
// headerParams.put("Content-Type", "application/json");
- headerParams.put("Authorization", "Bearer "+getToken());
+ headerParams.put("Authorization", "Bearer " + getToken());
}
public HashMap<String, Object> getMap() {
@@ -106,8 +106,8 @@
// 监听请求条件
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(3, TimeUnit.MINUTES);
- builder.readTimeout(3,TimeUnit.MINUTES);
- builder.writeTimeout(3,TimeUnit.MINUTES);
+ builder.readTimeout(3, TimeUnit.MINUTES);
+ builder.writeTimeout(3, TimeUnit.MINUTES);
// builder.addInterceptor(new Interceptor() {
// @Override
// public Response intercept(Chain chain) throws IOException {
@@ -154,12 +154,12 @@
* @param observer observer
*/
// public <T extends BaseBean> void get(final String action,
- public void get(final String action, Map<String, String> params, Observer<ResponseBody> observer) {
+ public void get(final String action, Map<String, String> params, Observer<ResponseBody> observer) {
if (params == null) {
params = new HashMap<>();
}
int type = getTypeByLanguage();
- params.put(Const.language,type+""); // 1 中文 2 英文 3 法文
+ params.put(Const.language, type + ""); // 1 中文 2 英文 3 法文
if (gson == null) {
gson = new Gson();
}
@@ -178,14 +178,12 @@
public static int getTypeByLanguage() {
String lang = SPUtils.getString(Const.language, Const.Language.DEFAULT_LANGUAGE);
int type = 0;
- if (lang == null || lang.isEmpty() || lang.equals(Const.Language.ENGLISH)){
- type = 2;
- }
- else if (lang.equals(Const.Language.CHINESE) || lang.equals("zh")){
- type = 1;
- }
- else if (lang.equals(Const.Language.FRENCH)){
+ if (lang == null || lang.isEmpty() || lang.equals(Const.Language.FRENCH)) {
type = 3;
+ } else if (lang.equals(Const.Language.CHINESE) || lang.equals("zh")) {
+ type = 1;
+ } else if (lang.equals(Const.Language.ENGLISH)) {
+ type = 2;
}
return type;
}
@@ -198,22 +196,22 @@
*/
// public <T extends BaseBean> void post(final String action, Map<String, Object> params,
public void post(final String action, Map<String, Object> params,
- Observer<ResponseBody> observer) {
+ Observer<ResponseBody> observer) {
if (params == null) {
params = new HashMap<>();
}
int type = getTypeByLanguage();
- params.put(Const.language,type); // 1 中文 2 英文 3 法文
+ params.put(Const.language, type); // 1 中文 2 英文 3 法文
StringBuilder pwd = new StringBuilder();
pwd.append(action);
- if (params.size() != 0){
+ if (params.size() != 0) {
pwd.append("?");
}
- Iterator<Map.Entry<String,Object>> iterator = params.entrySet().iterator();
- while (iterator.hasNext()){
+ Iterator<Map.Entry<String, Object>> iterator = params.entrySet().iterator();
+ while (iterator.hasNext()) {
Map.Entry<String, Object> entry = iterator.next();
pwd.append(entry.getKey()).append("=").append(entry.getValue());
- if (iterator.hasNext()){
+ if (iterator.hasNext()) {
pwd.append("&");
}
}
@@ -221,7 +219,7 @@
Map<String, Object> par = new HashMap<>();
ApiServics jsonService = initBaseData(action).create(ApiServics.class);
LogUtils.d("post", params.toString());
- jsonService.postResult(action,headerParams, params)
+ jsonService.postResult(action, headerParams, params)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(observer);
@@ -229,10 +227,11 @@
/**
* 将map数据转换为 普通的 json RequestBody
+ *
* @param map 以前的请求参数
* @return
*/
- public static RequestBody convertMapToBody(Map<?,?> map) {
+ public static RequestBody convertMapToBody(Map<?, ?> map) {
return RequestBody.create(MediaType.parse("application/json; charset=utf-8"), new JSONObject(map).toString());
}
--
Gitblit v1.7.1