diff --git a/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java b/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java index 189f554..e1ab1da 100644 --- a/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java +++ b/app/src/main/java/com/example/haiwei_mom/base/MyApplication.java @@ -59,9 +59,9 @@ public class MyApplication extends Application { HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory(); // 方法一：信任所有证书,不安全有风险 builder.sslSocketFactory(sslParams1.sSLSocketFactory, sslParams1.trustManager); builder.addInterceptor(loggingInterceptor); - builder.readTimeout(6000, TimeUnit.MILLISECONDS); // 全局的读取超时时间 - builder.writeTimeout(6000, TimeUnit.MILLISECONDS); // 全局的写入超时时间 - builder.connectTimeout(6000, TimeUnit.MILLISECONDS); // 全局的连接超时时间 + builder.readTimeout(24000, TimeUnit.MILLISECONDS); // 全局的读取超时时间 + builder.writeTimeout(24000, TimeUnit.MILLISECONDS); // 全局的写入超时时间 + builder.connectTimeout(24000, TimeUnit.MILLISECONDS); // 全局的连接超时时间 builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); // 使用内存保持cookie，app退出后，cookie消失 OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的 .setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传 diff --git a/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java b/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java index 9c8d929..3fd22ad 100644 --- a/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java +++ b/app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java @@ -18,16 +18,16 @@ public class InstanceFile { * filePath : http://127.0.0.1:9300/statics/2024/03/13/1709885329511_20240313181334A001.png */ - private int instanceFileId; + private Long instanceFileId; private String targetType; - private int targetId; + private Long targetId; private String filePath; - public int getInstanceFileId() { + public Long getInstanceFileId() { return instanceFileId; } - public void setInstanceFileId(int instanceFileId) { + public void setInstanceFileId(Long instanceFileId) { this.instanceFileId = instanceFileId; } @@ -39,11 +39,11 @@ public class InstanceFile { this.targetType = targetType; } - public int getTargetId() { + public Long getTargetId() { return targetId; } - public void setTargetId(int targetId) { + public void setTargetId(Long targetId) { this.targetId = targetId; } diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java index 7b4a0c9..5699897 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java @@ -53,7 +53,7 @@ public class DeviceCheckActivity extends BaseActivity implements ItemClickCall { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - deviceInspection= gson.fromJson(body.getData().toString(), DeviceInspection.class); + deviceInspection = gson.fromJson(gson.toJson(body.getData()), DeviceInspection.class); binding.setVm(deviceInspection); list=deviceInspection.getDmsInspectInstanceDetailList(); adapter.setList(list); @@ -83,7 +83,7 @@ public class DeviceCheckActivity extends BaseActivity implements ItemClickCall { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - intent.putExtra("json",body.getData().toString()); + intent.putExtra("json", gson.toJson(body.getData())); startActivity(intent); } } diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java index 99fc824..bc24d81 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java @@ -227,7 +227,7 @@ public class DeviceRepairInfoActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - List list = gson.fromJson(body.getData().toString(), new TypeToken>() { + List list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { }.getType()); List strings = new ArrayList<>(); list.forEach(t -> strings.add(t.getDictLabel())); @@ -268,7 +268,7 @@ public class DeviceRepairInfoActivity extends BaseActivity { myToastUitls.show("设备扫描错误"); return; } - OkGo.post(url + "/dms/mobile/startRepair").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).upRequestBody(RequestBody.create(JSON, gson.toJson(deviceRepair))).execute(new MyRecultCall(dialog, this) { + OkGo.post(url + "/dms/mobile/startRepair").upRequestBody(RequestBody.create(JSON, gson.toJson(deviceRepair))).execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { if (response.body().getCode() == 200) { @@ -337,7 +337,7 @@ public class DeviceRepairInfoActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - List outsourcingList = gson.fromJson(body.getData().toString(), new TypeToken>() { + List outsourcingList = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { }.getType()); deviceRepair.setOutsourcingList(outsourcingList); return; diff --git a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java index 80faa67..27052ff 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java @@ -3,6 +3,7 @@ package com.example.haiwei_mom.device; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import androidx.databinding.DataBindingUtil; @@ -65,7 +66,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa super.onSuccess(response); var body = response.body(); if (body.getCode()==200){ - intent.putExtra("json",body.getData().toString()); + intent.putExtra("json",gson.toJson(body.getData())); intent.putExtra("activityType",true); startActivity(intent); return; @@ -86,7 +87,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa super.onSuccess(response); var body = response.body(); if (body.getCode()==200){ - intent.putExtra("json",body.getData().toString()); + intent.putExtra("json",gson.toJson(body.getData())); intent.putExtra("activityType",false); startActivity(intent); return; diff --git a/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java b/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java index 42ffa06..17c4bfd 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java @@ -46,7 +46,7 @@ public class LubricationActivity extends BaseActivity implements ItemClickCall { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - LubricationBeen been = gson.fromJson(body.getData().toString(), LubricationBeen.class); + LubricationBeen been = gson.fromJson(gson.toJson(body.getData()), LubricationBeen.class); binding.setVm(been); list = been.getDmsBillsLubeDetailList(); diff --git a/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java b/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java index f60b0d8..5869f41 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java @@ -50,7 +50,7 @@ public class MaintainActivity extends BaseActivity implements ItemClickCall { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - MaintainBeen been = gson.fromJson(body.getData().toString(), MaintainBeen.class); + MaintainBeen been = gson.fromJson(gson.toJson(body.getData()), MaintainBeen.class); binding.setVm(been); list = been.getDmsBillsMaintDetailList(); diff --git a/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java b/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java index 7e65a1b..3a2ed43 100644 --- a/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java +++ b/app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java @@ -48,7 +48,7 @@ public class MaintainInfoActivity extends BaseActivity { super.onSuccess(response); var body = response.body(); if (body.getCode() == 200) { - maintainDetail = gson.fromJson(body.getData().toString(), MaintainDetail.class); + maintainDetail = gson.fromJson(gson.toJson(body.getData()), MaintainDetail.class); state.set(maintainDetail.getMaintStatus() == 3); list = maintainDetail.getDmsBillsMaintDetailProjectList(); adapter.setList(list);