From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/net/RetrofitClient.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/RetrofitClient.java b/app/src/main/java/com/dayu/pipirrapp/net/RetrofitClient.java
index bc4474c..114316c 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/RetrofitClient.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/RetrofitClient.java
@@ -1,7 +1,6 @@
package com.dayu.pipirrapp.net;
-
import java.util.concurrent.TimeUnit;
import okhttp3.OkHttpClient;
@@ -18,9 +17,9 @@
public class RetrofitClient {
private static RetrofitClient mInstance;
- private Retrofit retrofit;
- private static final int READ_TIME_OUT = 10;
- private static final int CONNECT_TIME_OUT = 10;
+ private final Retrofit retrofit;
+ private static final int READ_TIME_OUT = 5;
+ private static final int CONNECT_TIME_OUT = 5;
private RetrofitClient() {
HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor();
@@ -29,19 +28,25 @@
// loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS);
OkHttpClient.Builder builder = new OkHttpClient().newBuilder();
//璁剧疆杩炴帴鍜岃鍙栨椂闂�
- builder.readTimeout(READ_TIME_OUT, TimeUnit.SECONDS);
- builder.connectTimeout(CONNECT_TIME_OUT, TimeUnit.SECONDS);
- builder.writeTimeout(CONNECT_TIME_OUT, TimeUnit.SECONDS);
+ builder.readTimeout(READ_TIME_OUT, TimeUnit.MINUTES);
+ builder.connectTimeout(CONNECT_TIME_OUT, TimeUnit.MINUTES);
+ builder.writeTimeout(CONNECT_TIME_OUT, TimeUnit.MINUTES);
//娣诲姞缁熶竴鐨刪eader
builder.addInterceptor(new MyIntercepterApplication());
//娣诲姞鏃ュ織鎷︽埅鍣�
//娣诲姞鏁版嵁璇锋眰缁熶竴澶勭悊鎷︽埅鍣�
// if (BuildConfig.DEBUG) {
- builder.addInterceptor(loggingInterceptor);
+ builder.addInterceptor(loggingInterceptor);
// }
OkHttpClient client = builder.build();
-
+// // 鍒涘缓GsonBuilder骞惰缃暱鏁村瀷搴忓垪鍖栫瓥鐣ヤ负瀛楃涓�
+// GsonBuilder gsonBuilder = new GsonBuilder();
+// gsonBuilder.registerTypeAdapter(String.class, new LongTypeAdapter());
+// gsonBuilder.registerTypeAdapter(long.class, new LongTypeAdapter()); // 濡傛灉鏄� long 绫诲瀷鐨勫熀鏈暟鎹被鍨嬶紝涔熼渶瑕佹敞鍐�
+// gsonBuilder.setLongSerializationPolicy(LongSerializationPolicy.STRING);
+//// 鍒涘缓Gson瀹炰緥
+// Gson gson = gsonBuilder.create();
retrofit = new Retrofit.Builder()
.baseUrl(Constants.BASE_URL)
.addConverterFactory(GsonConverterFactory.create())
--
Gitblit v1.8.0