wangh
/
mom-pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHANGE(device):部分字段从int改为Long，body.getData().toString()改成gson.toJson(body.getData())

Browse Source
master
zch 4 weeks ago
parent f254ae28a5
commit 394fea7d36
8 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/com/example/haiwei_mom/base/MyApplication.java
Unescape Escape View File

@ -59,9 +59,9 @@ public class MyApplication extends Application {
HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory(); // 方法一：信任所有证书,不安全有风险 HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory(); // 方法一：信任所有证书,不安全有风险
builder.sslSocketFactory(sslParams1.sSLSocketFactory, sslParams1.trustManager); builder.sslSocketFactory(sslParams1.sSLSocketFactory, sslParams1.trustManager);
builder.addInterceptor(loggingInterceptor); builder.addInterceptor(loggingInterceptor);
builder.readTimeout(6000, TimeUnit.MILLISECONDS); // 全局的读取超时时间 builder.readTimeout(24000, TimeUnit.MILLISECONDS); // 全局的读取超时时间
builder.writeTimeout(6000, TimeUnit.MILLISECONDS); // 全局的写入超时时间 builder.writeTimeout(24000, TimeUnit.MILLISECONDS); // 全局的写入超时时间
builder.connectTimeout(6000, TimeUnit.MILLISECONDS); // 全局的连接超时时间 builder.connectTimeout(24000, TimeUnit.MILLISECONDS); // 全局的连接超时时间
builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); // 使用内存保持cookie，app退出后，cookie消失 builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); // 使用内存保持cookie，app退出后，cookie消失
OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的 OkGo.getInstance().init(this).setOkHttpClient(builder.build()) // 建议设置OkHttpClient，不设置将使用默认的
.setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传 .setCacheMode(CacheMode.NO_CACHE) // 全局统一缓存模式，默认不使用缓存，可以不传

12
app/src/main/java/com/example/haiwei_mom/data/device/InstanceFile.java
Unescape Escape View File

@ -18,16 +18,16 @@ public class InstanceFile {
* filePath : http://127.0.0.1:9300/statics/2024/03/13/1709885329511_20240313181334A001.png * filePath : http://127.0.0.1:9300/statics/2024/03/13/1709885329511_20240313181334A001.png
*/ */
private int instanceFileId; private Long instanceFileId;
private String targetType; private String targetType;
private int targetId; private Long targetId;
private String filePath; private String filePath;
public int getInstanceFileId() { public Long getInstanceFileId() {
return instanceFileId; return instanceFileId;
} }
public void setInstanceFileId(int instanceFileId) { public void setInstanceFileId(Long instanceFileId) {
this.instanceFileId = instanceFileId; this.instanceFileId = instanceFileId;
} }
@ -39,11 +39,11 @@ public class InstanceFile {
this.targetType = targetType; this.targetType = targetType;
} }
public int getTargetId() { public Long getTargetId() {
return targetId; return targetId;
} }
public void setTargetId(int targetId) { public void setTargetId(Long targetId) {
this.targetId = targetId; this.targetId = targetId;
} }

4
app/src/main/java/com/example/haiwei_mom/device/DeviceCheckActivity.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class DeviceCheckActivity extends BaseActivity implements ItemClickCall {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
deviceInspection= gson.fromJson(body.getData().toString(), DeviceInspection.class); deviceInspection = gson.fromJson(gson.toJson(body.getData()), DeviceInspection.class);
binding.setVm(deviceInspection); binding.setVm(deviceInspection);
list=deviceInspection.getDmsInspectInstanceDetailList(); list=deviceInspection.getDmsInspectInstanceDetailList();
adapter.setList(list); adapter.setList(list);
@ -83,7 +83,7 @@ public class DeviceCheckActivity extends BaseActivity implements ItemClickCall {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
intent.putExtra("json",body.getData().toString()); intent.putExtra("json", gson.toJson(body.getData()));
startActivity(intent); startActivity(intent);
} }
} }

6
app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java
Unescape Escape View File

@ -227,7 +227,7 @@ public class DeviceRepairInfoActivity extends BaseActivity {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
List<Dict> list = gson.fromJson(body.getData().toString(), new TypeToken<List<Dict>>() { List<Dict> list = gson.fromJson(gson.toJson(body.getData()), new TypeToken<List<Dict>>() {
}.getType()); }.getType());
List<String> strings = new ArrayList<>(); List<String> strings = new ArrayList<>();
list.forEach(t -> strings.add(t.getDictLabel())); list.forEach(t -> strings.add(t.getDictLabel()));
@ -268,7 +268,7 @@ public class DeviceRepairInfoActivity extends BaseActivity {
myToastUitls.show("设备扫描错误"); myToastUitls.show("设备扫描错误");
return; return;
} }
OkGo.<MyResult>post(url + "/dms/mobile/startRepair").headers("Authorization", SharedPreferencesUtils.getstring("access_token", "")).upRequestBody(RequestBody.create(JSON, gson.toJson(deviceRepair))).execute(new MyRecultCall(dialog, this) { OkGo.<MyResult>post(url + "/dms/mobile/startRepair").upRequestBody(RequestBody.create(JSON, gson.toJson(deviceRepair))).execute(new MyRecultCall(dialog, this) {
@Override @Override
public void onSuccess(Response<MyResult> response) { public void onSuccess(Response<MyResult> response) {
if (response.body().getCode() == 200) { if (response.body().getCode() == 200) {
@ -337,7 +337,7 @@ public class DeviceRepairInfoActivity extends BaseActivity {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { if (body.getCode() == 200) {
List<Outsourcing> outsourcingList = gson.fromJson(body.getData().toString(), new TypeToken<List<Outsourcing>>() { List<Outsourcing> outsourcingList = gson.fromJson(gson.toJson(body.getData()), new TypeToken<List<Outsourcing>>() {
}.getType()); }.getType());
deviceRepair.setOutsourcingList(outsourcingList); deviceRepair.setOutsourcingList(outsourcingList);
return; return;

5
app/src/main/java/com/example/haiwei_mom/device/DeviceRepairListActivity.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.example.haiwei_mom.device;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import androidx.databinding.DataBindingUtil; import androidx.databinding.DataBindingUtil;
@ -65,7 +66,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode()==200){ if (body.getCode()==200){
intent.putExtra("json",body.getData().toString()); intent.putExtra("json",gson.toJson(body.getData()));
intent.putExtra("activityType",true); intent.putExtra("activityType",true);
startActivity(intent); startActivity(intent);
return; return;
@ -86,7 +87,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode()==200){ if (body.getCode()==200){
intent.putExtra("json",body.getData().toString()); intent.putExtra("json",gson.toJson(body.getData()));
intent.putExtra("activityType",false); intent.putExtra("activityType",false);
startActivity(intent); startActivity(intent);
return; return;

2
app/src/main/java/com/example/haiwei_mom/device/LubricationActivity.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class LubricationActivity extends BaseActivity implements ItemClickCall {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { 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); binding.setVm(been);
list = been.getDmsBillsLubeDetailList(); list = been.getDmsBillsLubeDetailList();

2
app/src/main/java/com/example/haiwei_mom/device/MaintainActivity.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class MaintainActivity extends BaseActivity implements ItemClickCall {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { 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); binding.setVm(been);
list = been.getDmsBillsMaintDetailList(); list = been.getDmsBillsMaintDetailList();

2
app/src/main/java/com/example/haiwei_mom/device/MaintainInfoActivity.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class MaintainInfoActivity extends BaseActivity {
super.onSuccess(response); super.onSuccess(response);
var body = response.body(); var body = response.body();
if (body.getCode() == 200) { 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); state.set(maintainDetail.getMaintStatus() == 3);
list = maintainDetail.getDmsBillsMaintDetailProjectList(); list = maintainDetail.getDmsBillsMaintDetailProjectList();
adapter.setList(list); adapter.setList(list);

Write Preview
Loading…
Cancel
Save