|
|
@ -3,6 +3,7 @@ package com.example.jingyuan_mes.device;
|
|
|
|
import androidx.appcompat.app.AppCompatActivity;
|
|
|
|
import androidx.appcompat.app.AppCompatActivity;
|
|
|
|
import androidx.databinding.DataBindingUtil;
|
|
|
|
import androidx.databinding.DataBindingUtil;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 android.util.Log;
|
|
|
@ -29,6 +30,7 @@ import com.google.gson.reflect.TypeToken;
|
|
|
|
import com.lzy.okgo.OkGo;
|
|
|
|
import com.lzy.okgo.OkGo;
|
|
|
|
import com.lzy.okgo.model.Response;
|
|
|
|
import com.lzy.okgo.model.Response;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
@ -83,17 +85,12 @@ public class DeviceRepairInfoActivity extends BaseActivity implements DisposalFi
|
|
|
|
designOperations= designOperations.replace(tagStr,"")
|
|
|
|
designOperations= designOperations.replace(tagStr,"")
|
|
|
|
.replace(addStr,"");
|
|
|
|
.replace(addStr,"");
|
|
|
|
deviceRepair.setDesignOperations(designOperations);
|
|
|
|
deviceRepair.setDesignOperations(designOperations);
|
|
|
|
|
|
|
|
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
|
|
|
|
|
|
|
|
deviceRepair.setDesignOperations(Optional.ofNullable(designOperations).map(t ->t.isEmpty()?t: t + ",").orElse("") + addStr);
|
|
|
|
deviceRepair.setDesignOperations(Optional.ofNullable(designOperations).map(t ->t.isEmpty()?t: t + ",").orElse("") + addStr);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
opeLpw.dismiss();
|
|
|
|
opeLpw.dismiss();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
initRequest("dms_fault_type");
|
|
|
|
initRequest("dms_fault_type");
|
|
|
@ -274,5 +271,16 @@ public class DeviceRepairInfoActivity extends BaseActivity implements DisposalFi
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@SuppressLint("NotifyDataSetChanged")
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void tekePhotoResult(String fileUrl, File file) {
|
|
|
|
|
|
|
|
super.tekePhotoResult(fileUrl, file);
|
|
|
|
|
|
|
|
CheckInstanceFiles checkInstanceFiles = new CheckInstanceFiles();
|
|
|
|
|
|
|
|
checkInstanceFiles.setFaultFile(fileUrl);
|
|
|
|
|
|
|
|
checkInstanceFiles.setState(true);
|
|
|
|
|
|
|
|
filesList.add(checkInstanceFiles);
|
|
|
|
|
|
|
|
fileAdapter.notifyDataSetChanged();
|
|
|
|
|
|
|
|
// files.add(file);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|