From d29b507c69591b4f1efc41885aa5bbf2798f5317 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Fri, 22 Nov 2024 17:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/DeviceRepairInfoActivity.java        | 17 ++++++++++++++++-
 .../device/DeviceRepairListActivity.java        |  4 ++--
 .../entity/device/DeviceRepair.java             | 12 ++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
index 87df603..45e152b 100644
--- a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
@@ -22,6 +22,7 @@ import com.example.jingyuan_mes.entity.check.CheckInstanceFiles;
 import com.example.jingyuan_mes.entity.device.DeviceRepair;
 import com.example.jingyuan_mes.entity.device.DeviceRepairPart;
 import com.example.jingyuan_mes.entity.device.Dict;
+import com.example.jingyuan_mes.entity.device.InstanceFile;
 import com.example.jingyuan_mes.entity.device.Outsourcing;
 import com.example.jingyuan_mes.uitls.SharedPreferencesUtils;
 import com.google.gson.reflect.TypeToken;
@@ -105,8 +106,21 @@ public class DeviceRepairInfoActivity extends BaseActivity {
                 repairPartAddDialog.dismiss();
                 deviceRepairPartAdapter.notifyDataSetChanged();
             });
+            // 显示维修完成的图片
+            var dmsInstanceFiles1 = deviceRepair.getDmsInstanceFiles1();
+            if (dmsInstanceFiles1==null || dmsInstanceFiles1.isEmpty()){
+                overRepairLookList = new ArrayList<>();
+            }else {
+                dmsInstanceFiles1.stream().forEach(t->{
+                    CheckInstanceFiles files = new CheckInstanceFiles();
+                    files.setFaultFile(t.getFilePath());
+                    files.setState(false);
+                    overRepairLookList.add(files);
+                });
+            }
+
             // 维修完成的图片
-            overRepairLookList = new ArrayList<>();
+
             fileAdapter2 = new DisposalFileAdapter(this, (position, type) -> {
                 CheckInstanceFiles checkInstanceFiles = overRepairLookList.get(position);
                 if (type) {
@@ -126,6 +140,7 @@ public class DeviceRepairInfoActivity extends BaseActivity {
                 fileAdapter2.notifyDataSetChanged();
             });
             fileAdapter2.setList(overRepairLookList);
+            fileAdapter2.notifyDataSetChanged();
             binding.setAdapter2(fileAdapter2);
         }
 
diff --git a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairListActivity.java b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairListActivity.java
index c16fc07..274060f 100644
--- a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairListActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairListActivity.java
@@ -63,7 +63,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa
     @Override
     public void clickItemForModify(int index) {
         var repairInstanceId = list.get(index).getRepairInstanceId();
-        Toast.makeText(context, repairInstanceId+"", Toast.LENGTH_SHORT).show();
+        // Toast.makeText(context, repairInstanceId+"", Toast.LENGTH_SHORT).show();
         OkGo.<MyResult>get(url+"/dms/mobile/getBillsFaultInstanceByRepairInstanceId/"+repairInstanceId)
                 .headers("Authorization", SharedPreferencesUtils.getstring("access_token", ""))
                 .execute(new MyRecultCall(dialog,this){
@@ -86,7 +86,7 @@ public class DeviceRepairListActivity extends BaseActivity implements DeviceRepa
     @Override
     public void clickItemForSelect(int index) {
         var repairInstanceId = list.get(index).getRepairInstanceId();
-        Toast.makeText(context, repairInstanceId+"", Toast.LENGTH_SHORT).show();
+        // Toast.makeText(context, repairInstanceId+"", Toast.LENGTH_SHORT).show();
         OkGo.<MyResult>get(url+"/dms/mobile/getBillsFaultInstance4Repair/"+repairInstanceId)
                 .headers("Authorization", SharedPreferencesUtils.getstring("access_token", ""))
                 .execute(new MyRecultCall(dialog,this){
diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
index 4c3416a..d36cc86 100644
--- a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
+++ b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
@@ -456,6 +456,15 @@ public class DeviceRepair extends BaseObservable {
     private String repairContent; // 维修内容
     private String protectedMethod;// 保护措施
     private List<DeviceRepairPart> parts;// 所用零部件
+    private List<InstanceFile> dmsInstanceFiles1;//维修完成的图片
+
+    public List<InstanceFile> getDmsInstanceFiles1() {
+        return dmsInstanceFiles1;
+    }
+
+    public void setDmsInstanceFiles1(List<InstanceFile> dmsInstanceFiles1) {
+        this.dmsInstanceFiles1 = dmsInstanceFiles1;
+    }
 
     public List<DeviceRepairPart> getParts() {
         return parts;
@@ -494,4 +503,7 @@ public class DeviceRepair extends BaseObservable {
         this.deviceCodeTag = deviceCodeTag;
         notifyChange();
     }
+
+
+
 }