diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index e1cce6e..c004ba8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -34,7 +34,7 @@ val remindDeviceCount = MutableLiveData() val remindDeviceList = MutableLiveData() val remindDeviceResult = MutableLiveData() - val scanResult = MutableLiveData() + val scanDeviceResult = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -385,8 +385,8 @@ val response = RetrofitServiceManager.getScanResult(strSet) val responseCode = response.separateResponseCode() if (responseCode == 200) { - scanResult.value = gson.fromJson( - response, object : TypeToken() {}.type + scanDeviceResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) loadState.value = LoadState.Success } else { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index e1cce6e..c004ba8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -34,7 +34,7 @@ val remindDeviceCount = MutableLiveData() val remindDeviceList = MutableLiveData() val remindDeviceResult = MutableLiveData() - val scanResult = MutableLiveData() + val scanDeviceResult = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -385,8 +385,8 @@ val response = RetrofitServiceManager.getScanResult(strSet) val responseCode = response.separateResponseCode() if (responseCode == 200) { - scanResult.value = gson.fromJson( - response, object : TypeToken() {}.type + scanDeviceResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) loadState.value = LoadState.Success } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 12f5f6a..4584f1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.SampleListModel +import com.casic.xz.meterage.model.ScanSampleResultModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -23,6 +24,7 @@ private val gson by lazy { Gson() } val sampleList = MutableLiveData() val writeResult = MutableLiveData() + val scanSampleResult = MutableLiveData() fun getSampleList( customerName: String, @@ -119,4 +121,22 @@ loadState.value = LoadState.Fail it.convertChinese().show(BaseApplication.get()) }) + + fun getScanSampleResult(sceneNo: String, strSet: Array, status: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getScanSampleResult(sceneNo, strSet, status) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + scanSampleResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.convertChinese().show(BaseApplication.get()) + }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index e1cce6e..c004ba8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -34,7 +34,7 @@ val remindDeviceCount = MutableLiveData() val remindDeviceList = MutableLiveData() val remindDeviceResult = MutableLiveData() - val scanResult = MutableLiveData() + val scanDeviceResult = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -385,8 +385,8 @@ val response = RetrofitServiceManager.getScanResult(strSet) val responseCode = response.separateResponseCode() if (responseCode == 200) { - scanResult.value = gson.fromJson( - response, object : TypeToken() {}.type + scanDeviceResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) loadState.value = LoadState.Success } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 12f5f6a..4584f1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.SampleListModel +import com.casic.xz.meterage.model.ScanSampleResultModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -23,6 +24,7 @@ private val gson by lazy { Gson() } val sampleList = MutableLiveData() val writeResult = MutableLiveData() + val scanSampleResult = MutableLiveData() fun getSampleList( customerName: String, @@ -119,4 +121,22 @@ loadState.value = LoadState.Fail it.convertChinese().show(BaseApplication.get()) }) + + fun getScanSampleResult(sceneNo: String, strSet: Array, status: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getScanSampleResult(sceneNo, strSet, status) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + scanSampleResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.convertChinese().show(BaseApplication.get()) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml new file mode 100644 index 0000000..1c56622 --- /dev/null +++ b/app/src/main/res/layout/activity_scan_device_result.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index e1cce6e..c004ba8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -34,7 +34,7 @@ val remindDeviceCount = MutableLiveData() val remindDeviceList = MutableLiveData() val remindDeviceResult = MutableLiveData() - val scanResult = MutableLiveData() + val scanDeviceResult = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -385,8 +385,8 @@ val response = RetrofitServiceManager.getScanResult(strSet) val responseCode = response.separateResponseCode() if (responseCode == 200) { - scanResult.value = gson.fromJson( - response, object : TypeToken() {}.type + scanDeviceResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) loadState.value = LoadState.Success } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 12f5f6a..4584f1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.SampleListModel +import com.casic.xz.meterage.model.ScanSampleResultModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -23,6 +24,7 @@ private val gson by lazy { Gson() } val sampleList = MutableLiveData() val writeResult = MutableLiveData() + val scanSampleResult = MutableLiveData() fun getSampleList( customerName: String, @@ -119,4 +121,22 @@ loadState.value = LoadState.Fail it.convertChinese().show(BaseApplication.get()) }) + + fun getScanSampleResult(sceneNo: String, strSet: Array, status: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getScanSampleResult(sceneNo, strSet, status) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + scanSampleResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.convertChinese().show(BaseApplication.get()) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml new file mode 100644 index 0000000..1c56622 --- /dev/null +++ b/app/src/main/res/layout/activity_scan_device_result.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml new file mode 100644 index 0000000..a2de350 --- /dev/null +++ b/app/src/main/res/layout/activity_scan_sample_result.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fc7e18..c0ad556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,8 @@ - + + data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private String abc; + private String abcName; + private String applyRelationId; + private String assetNo; + private String assetSource; + private String assetType; + private String assetTypeName; + private String attribute; + private String capitalSource; + private String capitalSourceName; + private String cardEstablishmentDate; + private int compulsoryVerification; + private String createTime; + private String createUser; + private String depreciationMethod; + private String depreciationMethodName; + private String depreciationPeriod; + private String enableDate; + private String equipmentCategory; + private String equipmentCategoryName; + private String equipmentName; + private String equipmentNo; + private String equipmentSpecifications; + private String equipmentType; + private String equipmentTypeName; + private String fileList; + private String id; + private String installIncidentalExpenses; + private String installPlace; + private String intactState; + private int isCalibrationTestEquipment; + private int isDel; + private String isFixedAssets; + private int isMeasureAccount; + private int isStandardSupportEquipment; + private String labelBind; + private String majorCategory; + private String majorCategoryName; + private String managerLevel; + private String managerLevelName; + private String managerState; + private String managerStateName; + private String manufacturer; + private String manufacturerCountry; + private String manufacturingDate; + private String manufacturingNo; + private int mesureCycle; + private String mesureDate; + private String mesureDeptName; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String mesureType; + private String mesureTypeName; + private String modelNo; + private String originValue; + private String overallDimension; + private String presentOriginValue; + private String purpose; + private String remark; + private String singlePrice; + private String supportStandardEquipmentName; + private String supportStandardEquipmentNo; + private String technicalLevel; + private String uncertainty; + private String updateTime; + private String useDept; + private String useDeptName; + private String usePerson; + private String usePersonName; + private String validDate; + private int version; + private String weight; + private String 到期时间; + private String 设备名称; + private String 负责人; + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + + public String getAbcName() { + return abcName; + } + + public void setAbcName(String abcName) { + this.abcName = abcName; + } + + public String getApplyRelationId() { + return applyRelationId; + } + + public void setApplyRelationId(String applyRelationId) { + this.applyRelationId = applyRelationId; + } + + public String getAssetNo() { + return assetNo; + } + + public void setAssetNo(String assetNo) { + this.assetNo = assetNo; + } + + public String getAssetSource() { + return assetSource; + } + + public void setAssetSource(String assetSource) { + this.assetSource = assetSource; + } + + public String getAssetType() { + return assetType; + } + + public void setAssetType(String assetType) { + this.assetType = assetType; + } + + public String getAssetTypeName() { + return assetTypeName; + } + + public void setAssetTypeName(String assetTypeName) { + this.assetTypeName = assetTypeName; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getCapitalSource() { + return capitalSource; + } + + public void setCapitalSource(String capitalSource) { + this.capitalSource = capitalSource; + } + + public String getCapitalSourceName() { + return capitalSourceName; + } + + public void setCapitalSourceName(String capitalSourceName) { + this.capitalSourceName = capitalSourceName; + } + + public String getCardEstablishmentDate() { + return cardEstablishmentDate; + } + + public void setCardEstablishmentDate(String cardEstablishmentDate) { + this.cardEstablishmentDate = cardEstablishmentDate; + } + + public int getCompulsoryVerification() { + return compulsoryVerification; + } + + public void setCompulsoryVerification(int compulsoryVerification) { + this.compulsoryVerification = compulsoryVerification; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getDepreciationMethod() { + return depreciationMethod; + } + + public void setDepreciationMethod(String depreciationMethod) { + this.depreciationMethod = depreciationMethod; + } + + public String getDepreciationMethodName() { + return depreciationMethodName; + } + + public void setDepreciationMethodName(String depreciationMethodName) { + this.depreciationMethodName = depreciationMethodName; + } + + public String getDepreciationPeriod() { + return depreciationPeriod; + } + + public void setDepreciationPeriod(String depreciationPeriod) { + this.depreciationPeriod = depreciationPeriod; + } + + public String getEnableDate() { + return enableDate; + } + + public void setEnableDate(String enableDate) { + this.enableDate = enableDate; + } + + public String getEquipmentCategory() { + return equipmentCategory; + } + + public void setEquipmentCategory(String equipmentCategory) { + this.equipmentCategory = equipmentCategory; + } + + public String getEquipmentCategoryName() { + return equipmentCategoryName; + } + + public void setEquipmentCategoryName(String equipmentCategoryName) { + this.equipmentCategoryName = equipmentCategoryName; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getEquipmentSpecifications() { + return equipmentSpecifications; + } + + public void setEquipmentSpecifications(String equipmentSpecifications) { + this.equipmentSpecifications = equipmentSpecifications; + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getFileList() { + return fileList; + } + + public void setFileList(String fileList) { + this.fileList = fileList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInstallIncidentalExpenses() { + return installIncidentalExpenses; + } + + public void setInstallIncidentalExpenses(String installIncidentalExpenses) { + this.installIncidentalExpenses = installIncidentalExpenses; + } + + public String getInstallPlace() { + return installPlace; + } + + public void setInstallPlace(String installPlace) { + this.installPlace = installPlace; + } + + public String getIntactState() { + return intactState; + } + + public void setIntactState(String intactState) { + this.intactState = intactState; + } + + public int getIsCalibrationTestEquipment() { + return isCalibrationTestEquipment; + } + + public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { + this.isCalibrationTestEquipment = isCalibrationTestEquipment; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getIsFixedAssets() { + return isFixedAssets; + } + + public void setIsFixedAssets(String isFixedAssets) { + this.isFixedAssets = isFixedAssets; + } + + public int getIsMeasureAccount() { + return isMeasureAccount; + } + + public void setIsMeasureAccount(int isMeasureAccount) { + this.isMeasureAccount = isMeasureAccount; + } + + public int getIsStandardSupportEquipment() { + return isStandardSupportEquipment; + } + + public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { + this.isStandardSupportEquipment = isStandardSupportEquipment; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getMajorCategory() { + return majorCategory; + } + + public void setMajorCategory(String majorCategory) { + this.majorCategory = majorCategory; + } + + public String getMajorCategoryName() { + return majorCategoryName; + } + + public void setMajorCategoryName(String majorCategoryName) { + this.majorCategoryName = majorCategoryName; + } + + public String getManagerLevel() { + return managerLevel; + } + + public void setManagerLevel(String managerLevel) { + this.managerLevel = managerLevel; + } + + public String getManagerLevelName() { + return managerLevelName; + } + + public void setManagerLevelName(String managerLevelName) { + this.managerLevelName = managerLevelName; + } + + public String getManagerState() { + return managerState; + } + + public void setManagerState(String managerState) { + this.managerState = managerState; + } + + public String getManagerStateName() { + return managerStateName; + } + + public void setManagerStateName(String managerStateName) { + this.managerStateName = managerStateName; + } + + public String getManufacturer() { + return manufacturer; + } + + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturerCountry() { + return manufacturerCountry; + } + + public void setManufacturerCountry(String manufacturerCountry) { + this.manufacturerCountry = manufacturerCountry; + } + + public String getManufacturingDate() { + return manufacturingDate; + } + + public void setManufacturingDate(String manufacturingDate) { + this.manufacturingDate = manufacturingDate; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public int getMesureCycle() { + return mesureCycle; + } + + public void setMesureCycle(int mesureCycle) { + this.mesureCycle = mesureCycle; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureDeptName() { + return mesureDeptName; + } + + public void setMesureDeptName(String mesureDeptName) { + this.mesureDeptName = mesureDeptName; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getMesureType() { + return mesureType; + } + + public void setMesureType(String mesureType) { + this.mesureType = mesureType; + } + + public String getMesureTypeName() { + return mesureTypeName; + } + + public void setMesureTypeName(String mesureTypeName) { + this.mesureTypeName = mesureTypeName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getOriginValue() { + return originValue; + } + + public void setOriginValue(String originValue) { + this.originValue = originValue; + } + + public String getOverallDimension() { + return overallDimension; + } + + public void setOverallDimension(String overallDimension) { + this.overallDimension = overallDimension; + } + + public String getPresentOriginValue() { + return presentOriginValue; + } + + public void setPresentOriginValue(String presentOriginValue) { + this.presentOriginValue = presentOriginValue; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getSinglePrice() { + return singlePrice; + } + + public void setSinglePrice(String singlePrice) { + this.singlePrice = singlePrice; + } + + public String getSupportStandardEquipmentName() { + return supportStandardEquipmentName; + } + + public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { + this.supportStandardEquipmentName = supportStandardEquipmentName; + } + + public String getSupportStandardEquipmentNo() { + return supportStandardEquipmentNo; + } + + public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { + this.supportStandardEquipmentNo = supportStandardEquipmentNo; + } + + public String getTechnicalLevel() { + return technicalLevel; + } + + public void setTechnicalLevel(String technicalLevel) { + this.technicalLevel = technicalLevel; + } + + public String getUncertainty() { + return uncertainty; + } + + public void setUncertainty(String uncertainty) { + this.uncertainty = uncertainty; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDept() { + return useDept; + } + + public void setUseDept(String useDept) { + this.useDept = useDept; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getUsePerson() { + return usePerson; + } + + public void setUsePerson(String usePerson) { + this.usePerson = usePerson; + } + + public String getUsePersonName() { + return usePersonName; + } + + public void setUsePersonName(String usePersonName) { + this.usePersonName = usePersonName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String get到期时间() { + return 到期时间; + } + + public void set到期时间(String 到期时间) { + this.到期时间 = 到期时间; + } + + public String get设备名称() { + return 设备名称; + } + + public void set设备名称(String 设备名称) { + this.设备名称 = 设备名称; + } + + public String get负责人() { + return 负责人; + } + + public void set负责人(String 负责人) { + this.负责人 = 负责人; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java deleted file mode 100644 index 0f88f51..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/ScanResultModel.java +++ /dev/null @@ -1,721 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class ScanResultModel { - - private int code; - private List data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private String abc; - private String abcName; - private String applyRelationId; - private String assetNo; - private String assetSource; - private String assetType; - private String assetTypeName; - private String attribute; - private String capitalSource; - private String capitalSourceName; - private String cardEstablishmentDate; - private int compulsoryVerification; - private String createTime; - private String createUser; - private String depreciationMethod; - private String depreciationMethodName; - private String depreciationPeriod; - private String enableDate; - private String equipmentCategory; - private String equipmentCategoryName; - private String equipmentName; - private String equipmentNo; - private String equipmentSpecifications; - private String equipmentType; - private String equipmentTypeName; - private String fileList; - private String id; - private String installIncidentalExpenses; - private String installPlace; - private String intactState; - private int isCalibrationTestEquipment; - private int isDel; - private String isFixedAssets; - private int isMeasureAccount; - private int isStandardSupportEquipment; - private String labelBind; - private String majorCategory; - private String majorCategoryName; - private String managerLevel; - private String managerLevelName; - private String managerState; - private String managerStateName; - private String manufacturer; - private String manufacturerCountry; - private String manufacturingDate; - private String manufacturingNo; - private int mesureCycle; - private String mesureDate; - private String mesureDeptName; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String mesureType; - private String mesureTypeName; - private String modelNo; - private String originValue; - private String overallDimension; - private String presentOriginValue; - private String purpose; - private String remark; - private String singlePrice; - private String supportStandardEquipmentName; - private String supportStandardEquipmentNo; - private String technicalLevel; - private String uncertainty; - private String updateTime; - private String useDept; - private String useDeptName; - private String usePerson; - private String usePersonName; - private String validDate; - private int version; - private String weight; - private String 到期时间; - private String 设备名称; - private String 负责人; - - public String getAbc() { - return abc; - } - - public void setAbc(String abc) { - this.abc = abc; - } - - public String getAbcName() { - return abcName; - } - - public void setAbcName(String abcName) { - this.abcName = abcName; - } - - public String getApplyRelationId() { - return applyRelationId; - } - - public void setApplyRelationId(String applyRelationId) { - this.applyRelationId = applyRelationId; - } - - public String getAssetNo() { - return assetNo; - } - - public void setAssetNo(String assetNo) { - this.assetNo = assetNo; - } - - public String getAssetSource() { - return assetSource; - } - - public void setAssetSource(String assetSource) { - this.assetSource = assetSource; - } - - public String getAssetType() { - return assetType; - } - - public void setAssetType(String assetType) { - this.assetType = assetType; - } - - public String getAssetTypeName() { - return assetTypeName; - } - - public void setAssetTypeName(String assetTypeName) { - this.assetTypeName = assetTypeName; - } - - public String getAttribute() { - return attribute; - } - - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - public String getCapitalSource() { - return capitalSource; - } - - public void setCapitalSource(String capitalSource) { - this.capitalSource = capitalSource; - } - - public String getCapitalSourceName() { - return capitalSourceName; - } - - public void setCapitalSourceName(String capitalSourceName) { - this.capitalSourceName = capitalSourceName; - } - - public String getCardEstablishmentDate() { - return cardEstablishmentDate; - } - - public void setCardEstablishmentDate(String cardEstablishmentDate) { - this.cardEstablishmentDate = cardEstablishmentDate; - } - - public int getCompulsoryVerification() { - return compulsoryVerification; - } - - public void setCompulsoryVerification(int compulsoryVerification) { - this.compulsoryVerification = compulsoryVerification; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getDepreciationMethod() { - return depreciationMethod; - } - - public void setDepreciationMethod(String depreciationMethod) { - this.depreciationMethod = depreciationMethod; - } - - public String getDepreciationMethodName() { - return depreciationMethodName; - } - - public void setDepreciationMethodName(String depreciationMethodName) { - this.depreciationMethodName = depreciationMethodName; - } - - public String getDepreciationPeriod() { - return depreciationPeriod; - } - - public void setDepreciationPeriod(String depreciationPeriod) { - this.depreciationPeriod = depreciationPeriod; - } - - public String getEnableDate() { - return enableDate; - } - - public void setEnableDate(String enableDate) { - this.enableDate = enableDate; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getEquipmentCategoryName() { - return equipmentCategoryName; - } - - public void setEquipmentCategoryName(String equipmentCategoryName) { - this.equipmentCategoryName = equipmentCategoryName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getEquipmentSpecifications() { - return equipmentSpecifications; - } - - public void setEquipmentSpecifications(String equipmentSpecifications) { - this.equipmentSpecifications = equipmentSpecifications; - } - - public String getEquipmentType() { - return equipmentType; - } - - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType; - } - - public String getEquipmentTypeName() { - return equipmentTypeName; - } - - public void setEquipmentTypeName(String equipmentTypeName) { - this.equipmentTypeName = equipmentTypeName; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInstallIncidentalExpenses() { - return installIncidentalExpenses; - } - - public void setInstallIncidentalExpenses(String installIncidentalExpenses) { - this.installIncidentalExpenses = installIncidentalExpenses; - } - - public String getInstallPlace() { - return installPlace; - } - - public void setInstallPlace(String installPlace) { - this.installPlace = installPlace; - } - - public String getIntactState() { - return intactState; - } - - public void setIntactState(String intactState) { - this.intactState = intactState; - } - - public int getIsCalibrationTestEquipment() { - return isCalibrationTestEquipment; - } - - public void setIsCalibrationTestEquipment(int isCalibrationTestEquipment) { - this.isCalibrationTestEquipment = isCalibrationTestEquipment; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getIsFixedAssets() { - return isFixedAssets; - } - - public void setIsFixedAssets(String isFixedAssets) { - this.isFixedAssets = isFixedAssets; - } - - public int getIsMeasureAccount() { - return isMeasureAccount; - } - - public void setIsMeasureAccount(int isMeasureAccount) { - this.isMeasureAccount = isMeasureAccount; - } - - public int getIsStandardSupportEquipment() { - return isStandardSupportEquipment; - } - - public void setIsStandardSupportEquipment(int isStandardSupportEquipment) { - this.isStandardSupportEquipment = isStandardSupportEquipment; - } - - public String getLabelBind() { - return labelBind; - } - - public void setLabelBind(String labelBind) { - this.labelBind = labelBind; - } - - public String getMajorCategory() { - return majorCategory; - } - - public void setMajorCategory(String majorCategory) { - this.majorCategory = majorCategory; - } - - public String getMajorCategoryName() { - return majorCategoryName; - } - - public void setMajorCategoryName(String majorCategoryName) { - this.majorCategoryName = majorCategoryName; - } - - public String getManagerLevel() { - return managerLevel; - } - - public void setManagerLevel(String managerLevel) { - this.managerLevel = managerLevel; - } - - public String getManagerLevelName() { - return managerLevelName; - } - - public void setManagerLevelName(String managerLevelName) { - this.managerLevelName = managerLevelName; - } - - public String getManagerState() { - return managerState; - } - - public void setManagerState(String managerState) { - this.managerState = managerState; - } - - public String getManagerStateName() { - return managerStateName; - } - - public void setManagerStateName(String managerStateName) { - this.managerStateName = managerStateName; - } - - public String getManufacturer() { - return manufacturer; - } - - public void setManufacturer(String manufacturer) { - this.manufacturer = manufacturer; - } - - public String getManufacturerCountry() { - return manufacturerCountry; - } - - public void setManufacturerCountry(String manufacturerCountry) { - this.manufacturerCountry = manufacturerCountry; - } - - public String getManufacturingDate() { - return manufacturingDate; - } - - public void setManufacturingDate(String manufacturingDate) { - this.manufacturingDate = manufacturingDate; - } - - public String getManufacturingNo() { - return manufacturingNo; - } - - public void setManufacturingNo(String manufacturingNo) { - this.manufacturingNo = manufacturingNo; - } - - public int getMesureCycle() { - return mesureCycle; - } - - public void setMesureCycle(int mesureCycle) { - this.mesureCycle = mesureCycle; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureDeptName() { - return mesureDeptName; - } - - public void setMesureDeptName(String mesureDeptName) { - this.mesureDeptName = mesureDeptName; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getMesureType() { - return mesureType; - } - - public void setMesureType(String mesureType) { - this.mesureType = mesureType; - } - - public String getMesureTypeName() { - return mesureTypeName; - } - - public void setMesureTypeName(String mesureTypeName) { - this.mesureTypeName = mesureTypeName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getOriginValue() { - return originValue; - } - - public void setOriginValue(String originValue) { - this.originValue = originValue; - } - - public String getOverallDimension() { - return overallDimension; - } - - public void setOverallDimension(String overallDimension) { - this.overallDimension = overallDimension; - } - - public String getPresentOriginValue() { - return presentOriginValue; - } - - public void setPresentOriginValue(String presentOriginValue) { - this.presentOriginValue = presentOriginValue; - } - - public String getPurpose() { - return purpose; - } - - public void setPurpose(String purpose) { - this.purpose = purpose; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getSinglePrice() { - return singlePrice; - } - - public void setSinglePrice(String singlePrice) { - this.singlePrice = singlePrice; - } - - public String getSupportStandardEquipmentName() { - return supportStandardEquipmentName; - } - - public void setSupportStandardEquipmentName(String supportStandardEquipmentName) { - this.supportStandardEquipmentName = supportStandardEquipmentName; - } - - public String getSupportStandardEquipmentNo() { - return supportStandardEquipmentNo; - } - - public void setSupportStandardEquipmentNo(String supportStandardEquipmentNo) { - this.supportStandardEquipmentNo = supportStandardEquipmentNo; - } - - public String getTechnicalLevel() { - return technicalLevel; - } - - public void setTechnicalLevel(String technicalLevel) { - this.technicalLevel = technicalLevel; - } - - public String getUncertainty() { - return uncertainty; - } - - public void setUncertainty(String uncertainty) { - this.uncertainty = uncertainty; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDept() { - return useDept; - } - - public void setUseDept(String useDept) { - this.useDept = useDept; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getUsePerson() { - return usePerson; - } - - public void setUsePerson(String usePerson) { - this.usePerson = usePerson; - } - - public String getUsePersonName() { - return usePersonName; - } - - public void setUsePersonName(String usePersonName) { - this.usePersonName = usePersonName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { - this.weight = weight; - } - - public String get到期时间() { - return 到期时间; - } - - public void set到期时间(String 到期时间) { - this.到期时间 = 到期时间; - } - - public String get设备名称() { - return 设备名称; - } - - public void set设备名称(String 设备名称) { - this.设备名称 = 设备名称; - } - - public String get负责人() { - return 负责人; - } - - public void set负责人(String 负责人) { - this.负责人 = 负责人; - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java new file mode 100644 index 0000000..844250b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/ScanSampleResultModel.java @@ -0,0 +1,136 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class ScanSampleResultModel { + + private int code; + private List data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private int customerId; + private String customerName; + private String customerNo; + private int id; + private String labelBind; + private String manufacturingNo; + private String orderCode; + private int orderId; + private String sampleModel; + private String sampleName; + private String sampleNo; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getLabelBind() { + return labelBind; + } + + public void setLabelBind(String labelBind) { + this.labelBind = labelBind; + } + + public String getManufacturingNo() { + return manufacturingNo; + } + + public void setManufacturingNo(String manufacturingNo) { + this.manufacturingNo = manufacturingNo; + } + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public String getSampleModel() { + return sampleModel; + } + + public void setSampleModel(String sampleModel) { + this.sampleModel = sampleModel; + } + + public String getSampleName() { + return sampleName; + } + + public void setSampleName(String sampleName) { + this.sampleName = sampleName; + } + + public String getSampleNo() { + return sampleNo; + } + + public void setSampleNo(String sampleNo) { + this.sampleNo = sampleNo; + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index fc64e12..c129106 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -481,6 +481,15 @@ ): String /** + * 扫描样品 + */ + @POST("/business/readWriter/sample/label/readList") + suspend fun getScanSampleResult( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** * 新增委托书 */ @POST("/business/order/add") diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 756813c..2674930 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -1088,6 +1088,22 @@ } /** + * 扫描样品 + */ + suspend fun getScanSampleResult( + sceneNo: String, strSet: Array, status: String + ): String { + val param = JsonObject() + param.addProperty("sceneNo", sceneNo) + param.add("strSet", gson.toJsonTree(strSet, typeToken).asJsonArray) + param.addProperty("status", status) + val requestBody = param.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getScanSampleResult(AuthenticationHelper.token!!, requestBody) + } + + /** * 新增委托书 */ suspend fun addEntrust( diff --git a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt index 514db1d..c1448ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/MainActivity.kt @@ -44,10 +44,14 @@ if (msg.what == 2023071301) { "设备扫描中，松开手机即可停止扫描".show(this) } else if (msg.what == 2023071302) { + if (dataMap.size == 0) { + "没有扫描到设备，请重新扫描".show(this) + return true + } AlertControlDialog.Builder() .setContext(this) .setTitle("温馨提示") - .setMessage("扫描到${dataMap.size}个设备，是否查看详情？") + .setMessage("扫描到${dataMap.size}个设备，是否查看扫描结果？") .setNegativeButton("取消") .setPositiveButton("确定") .setOnDialogButtonClickListener(object : @@ -57,7 +61,7 @@ dataMap.forEach { scanResult.add(it.value) } - navigatePageTo(scanResult) + navigatePageTo(scanResult) //数据处理结束，即刻清除map，防止影响后续扫描 dataMap.clear() } diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt new file mode 100644 index 0000000..5bf4e53 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt @@ -0,0 +1,147 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanDeviceResultModel +import com.casic.xz.meterage.utils.LoadingDialogHub +import com.casic.xz.meterage.view.home.EquipmentDetailActivity +import com.casic.xz.meterage.vm.EquipmentViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.vm.LoadState +import kotlinx.android.synthetic.main.activity_scan_device_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_search_title.* + +class ScanDeviceResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanDeviceResultActivity + private lateinit var equipmentViewModel: EquipmentViewModel + private val tids = ArrayList() + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] + equipmentViewModel.scanDeviceResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和设备绑定，无法查询到详细数据") + } else { + emptyView.hide() + //显示扫描到的列表 + val equipmentAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_rv_l, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ScanDeviceResultModel.DataModel + ) { + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + if (item.validDate.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.red.convertColor(context) + ) + } else { + viewHolder.setTextColor( + R.id.deviceDateView, R.color.gray.convertColor(context) + ) + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText( + R.id.deviceDateView, + "有效期至：${item.validDate.formatToYearMonthDay()}" + ) + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } + } + } + scanDeviceRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanDeviceRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickedListener(object : + NormalRecyclerAdapter.OnItemClickedListener { + override fun onItemClicked( + position: Int, + t: ScanDeviceResultModel.DataModel + ) { + navigatePageTo(t.id) + } + }) + } + } + } + equipmentViewModel.getScanResult(tids.toTypedArray()) + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + } + + override fun initLayoutView(): Int = R.layout.activity_scan_device_result + + override fun observeRequestState() { + equipmentViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt new file mode 100644 index 0000000..400bec7 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt @@ -0,0 +1,98 @@ +package com.casic.xz.meterage.view + +import android.content.Context +import android.content.Intent +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.base.ApplicationBaseActivity +import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.ScanSampleResultModel +import com.casic.xz.meterage.vm.SampleViewModel +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.adapter.MultipleChoiceAdapter +import com.pengxh.kt.lite.adapter.ViewHolder +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.Constant +import kotlinx.android.synthetic.main.activity_scan_sample_result.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* + +class ScanSampleResultActivity : ApplicationBaseActivity() { + + private var context: Context = this@ScanSampleResultActivity + private val tids = ArrayList() + private var sampleModels = ArrayList() + private lateinit var sampleViewModel: SampleViewModel + + override fun initLayoutView(): Int = R.layout.activity_scan_sample_result + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "标签扫描结果" + } + + override fun initData() { + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + args.forEach { + tids.add(it) + } + + sampleViewModel = ViewModelProvider(this)[SampleViewModel::class.java] + sampleViewModel.scanSampleResult.observe(this) { + if (it.code == 200) { + if (it.data.isEmpty()) { + emptyView.showEmptyPage("标签还未和样品绑定，无法查询到详细数据") + } else { + emptyView.hide() + val selectSampleAdapter = + object : MultipleChoiceAdapter( + R.layout.item_select_sample_lv, it.data + ) { + override fun convertView( + viewHolder: ViewHolder, position: Int, + item: ScanSampleResultModel.DataModel + ) { + viewHolder.setText( + R.id.sampleNameView, "${item.sampleName}【${item.sampleModel}】" + ).setText( + R.id.manufacturingCodeView, "出厂编号：${item.manufacturingNo}" + ).setText(R.id.sampleCodeView, "样品编号：${item.sampleNo}") +// .setText(R.id.validDateView, "有效期至：${item.validDeadline}")//TODO 待完善 + } + } + scanSampleRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + scanSampleRecyclerView.adapter = selectSampleAdapter + selectSampleAdapter.setOnItemCheckedListener(object : + MultipleChoiceAdapter.OnItemCheckedListener { + override fun onItemChecked( + position: Int, items: ArrayList + ) { + sampleModels = items + } + }) + } + } + } + sampleViewModel.getScanSampleResult("2", tids.toTypedArray(), "") + } + + override fun observeRequestState() { + + } + + override fun initEvent() { + leftBackView.setOnClickListener { finish() } + + selectedView.setOnClickListener { + val intent = Intent() + intent.putExtra("sampleModels", sampleModels.toJson()) + setResult(RESULT_OK, intent) + finish() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt deleted file mode 100644 index a14a920..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/TagScanResultActivity.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.casic.xz.meterage.view - -import android.content.Context -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.formatToYearMonthDay -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.casic.xz.meterage.extensions.isEarlierThenCurrent -import com.casic.xz.meterage.model.ScanResultModel -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.view.home.EquipmentDetailActivity -import com.casic.xz.meterage.vm.EquipmentViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.activity_tag_scan.* -import kotlinx.android.synthetic.main.include_search_title.* - -class TagScanResultActivity : KotlinBaseActivity() { - - private var context: Context = this@TagScanResultActivity - private lateinit var equipmentViewModel: EquipmentViewModel - private val tids = ArrayList() - - override fun initData() { - val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! - args.forEach { - tids.add(it) - } - - equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.scanResult.observe(this) { - if (it.code == 200) { - //显示扫描到的列表 - val equipmentAdapter = object : NormalRecyclerAdapter( - R.layout.item_equipment_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, item: ScanResultModel.DataModel - ) { - val modelNo = if (item.modelNo.isNullOrBlank()) { - "未知" - } else { - item.modelNo - } - - val remark = if (item.remark.isNullOrBlank()) { - "无" - } else { - item.remark - } - - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } - - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } - - if (item.validDate.isEarlierThenCurrent()) { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.red.convertColor(context) - ) - } else { - viewHolder.setTextColor( - R.id.deviceDateView, R.color.gray.convertColor(context) - ) - } - - viewHolder.setText(R.id.equipmentName, item.equipmentName) - .setText(R.id.modelView, modelNo) - .setText(R.id.equipmentStateView, item.managerStateName) - .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") - .setText(R.id.remarkView, "备注：$remark") - .setText(R.id.useDeptView, useDept) - .setText( - R.id.deviceDateView, - "有效期至：${item.validDate.formatToYearMonthDay()}" - ) - .setText(R.id.usePersonView, "管理员：$usePerson") - - if (!item.managerStateName.contains("在用")) { - viewHolder.setBackgroundColor( - R.id.equipmentStateView, R.color.gray.convertColor(context) - ) - } - } - } - scanDeviceRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) - scanDeviceRecyclerView.adapter = equipmentAdapter - equipmentAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: ScanResultModel.DataModel) { - navigatePageTo(t.id) - } - }) - } - } - equipmentViewModel.getScanResult(tids.toTypedArray()) - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_tag_scan - - override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后") - else -> LoadingDialogHub.dismiss() - } - } - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - titleView.text = "标签扫描结果" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt index e6160dc..d8de81b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt @@ -7,6 +7,7 @@ import android.graphics.Paint import android.os.Handler import android.os.Message +import android.view.KeyEvent import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.contract.ActivityResultContracts @@ -17,13 +18,12 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.DateSelectedCallback import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.callback.OnTagScanResultCallback import com.casic.xz.meterage.extensions.* import com.casic.xz.meterage.model.EntrustDetailModel import com.casic.xz.meterage.model.SampleListModel -import com.casic.xz.meterage.utils.FileType -import com.casic.xz.meterage.utils.GlideLoadEngine -import com.casic.xz.meterage.utils.LoadingDialogHub -import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.utils.* +import com.casic.xz.meterage.view.ScanSampleResultActivity import com.casic.xz.meterage.vm.ConfigViewModel import com.casic.xz.meterage.vm.EntrustViewModel import com.casic.xz.meterage.vm.FileViewModel @@ -39,6 +39,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_entrust_add.* import kotlinx.android.synthetic.main.include_select_title.* @@ -62,9 +63,23 @@ private var isUrgent = "0" private var sampleModels: ArrayList? = null private var dataBeans = ArrayList() + private var isScanning = false + private var dataMap = HashMap() override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) + //扫描枪回调 + TagReaderHub.obtainInstance(this) + .initTagScanResultCallback(object : OnTagScanResultCallback { + override fun onTagTidScanned(isBarCode: Boolean, tid: String) { + if (!isBarCode) { + if (!dataMap.containsKey(tid)) { + dataMap[tid] = tid + } + } + } + }) + //证书 configViewModel = ViewModelProvider(this)[ConfigViewModel::class.java] configViewModel.getDictionaryByCode("certificationType") @@ -176,28 +191,61 @@ }) override fun handleMessage(msg: Message): Boolean { - if (msg.what == 2023070701) { - //刷新列表 - dataBeans.clear() - sampleModels?.forEach { - val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() + when (msg.what) { + 2023070701 -> { + //刷新列表 + dataBeans.clear() + sampleModels?.forEach { + val model = EntrustDetailModel.DataModel.CustomerSampleInfoListModel() - model.customerName = it.customerName - model.customerNo = it.customerNo - model.id = it.id - model.manufacturingNo = it.manufacturingNo - model.measureLastTime = it.measureLastTime - model.measurePeriod = it.measurePeriod - model.orderId = it.orderId - model.remark = it.remark - model.sampleModel = it.sampleModel - model.sampleName = it.sampleName - model.sampleNo = it.sampleNo - model.validDeadline = it.validDeadline + model.customerName = it.customerName + model.customerNo = it.customerNo + model.id = it.id + model.manufacturingNo = it.manufacturingNo + model.measureLastTime = it.measureLastTime + model.measurePeriod = it.measurePeriod + model.orderId = it.orderId + model.remark = it.remark + model.sampleModel = it.sampleModel + model.sampleName = it.sampleName + model.sampleNo = it.sampleNo + model.validDeadline = it.validDeadline - dataBeans.add(model) + dataBeans.add(model) + } + sampleAdapter.notifyDataSetChanged() } - sampleAdapter.notifyDataSetChanged() + 2023071301 -> { + "设备扫描中，松开手机即可停止扫描".show(this) + } + 2023071302 -> { + if (dataMap.size == 0) { + "没有扫描到样品，请重新扫描".show(this) + return true + } + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("扫描到${dataMap.size}个样品，是否查看扫描结果？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + val scanResult = ArrayList() + dataMap.forEach { + scanResult.add(it.value) + } + navigatePageTo(scanResult) + //数据处理结束，即刻清除map，防止影响后续扫描 + dataMap.clear() + } + + override fun onCancelClick() { + + } + }).build().show() + } } return true } @@ -402,4 +450,28 @@ intent.type = "*/*" selectFileLauncher.launch(intent) } + + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (!isScanning) { + isScanning = true + TagReaderHub.obtainInstance(this).startScan() + weakReferenceHandler.sendEmptyMessage(2023071301) + } + return true + } + return super.onKeyDown(keyCode, event) + } + + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { + if (keyCode == 280 || keyCode == 139) { + if (isScanning) { + TagReaderHub.obtainInstance(this).stopScan() + isScanning = false + weakReferenceHandler.sendEmptyMessage(2023071302) + } + return true + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index e1cce6e..c004ba8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -34,7 +34,7 @@ val remindDeviceCount = MutableLiveData() val remindDeviceList = MutableLiveData() val remindDeviceResult = MutableLiveData() - val scanResult = MutableLiveData() + val scanDeviceResult = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -385,8 +385,8 @@ val response = RetrofitServiceManager.getScanResult(strSet) val responseCode = response.separateResponseCode() if (responseCode == 200) { - scanResult.value = gson.fromJson( - response, object : TypeToken() {}.type + scanDeviceResult.value = gson.fromJson( + response, object : TypeToken() {}.type ) loadState.value = LoadState.Success } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 12f5f6a..4584f1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -7,6 +7,7 @@ import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.SampleListModel +import com.casic.xz.meterage.model.ScanSampleResultModel import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -23,6 +24,7 @@ private val gson by lazy { Gson() } val sampleList = MutableLiveData() val writeResult = MutableLiveData() + val scanSampleResult = MutableLiveData() fun getSampleList( customerName: String, @@ -119,4 +121,22 @@ loadState.value = LoadState.Fail it.convertChinese().show(BaseApplication.get()) }) + + fun getScanSampleResult(sceneNo: String, strSet: Array, status: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getScanSampleResult(sceneNo, strSet, status) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + scanSampleResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + loadState.value = LoadState.Success + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.convertChinese().show(BaseApplication.get()) + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml new file mode 100644 index 0000000..1c56622 --- /dev/null +++ b/app/src/main/res/layout/activity_scan_device_result.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml new file mode 100644 index 0000000..a2de350 --- /dev/null +++ b/app/src/main/res/layout/activity_scan_sample_result.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tag_scan.xml b/app/src/main/res/layout/activity_tag_scan.xml deleted file mode 100644 index 1480075..0000000 --- a/app/src/main/res/layout/activity_tag_scan.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file