diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0200731..5386346 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -32,7 +32,7 @@ categoryView.text = data.categoryName standardLevelView.text = data.standardLevelName transmitRangeView.text = data.transmitRangeName - totalInvestmentView.text = data.totalInvestment + totalInvestmentView.text = "¥ ${data.totalInvestment}" organizeCodeView.text = data.organizeNo constructUnitView.text = data.constructionStandardUnitName standardOwnerNameView.text = data.standardOwnerName diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0200731..5386346 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -32,7 +32,7 @@ categoryView.text = data.categoryName standardLevelView.text = data.standardLevelName transmitRangeView.text = data.transmitRangeName - totalInvestmentView.text = data.totalInvestment + totalInvestmentView.text = "¥ ${data.totalInvestment}" organizeCodeView.text = data.organizeNo constructUnitView.text = data.constructionStandardUnitName standardOwnerNameView.text = data.standardOwnerName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 073a049..7e87a51 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -47,7 +47,7 @@ R.id.nameTagView, item.fileName.last().toString() ).setText(R.id.fileNameView, item.fileName) .setText(R.id.effectiveStatusView, item.effectiveStatusName) - .setText(R.id.fileCodeView, "文件编号:${item.fileCode}") + .setText(R.id.fileCodeView, "文件编号:${item.fileNo}") .setText( R.id.effectiveTimeView, "有效期至:${item.effectiveTime.formatToYearMonthDay()}" diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0200731..5386346 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -32,7 +32,7 @@ categoryView.text = data.categoryName standardLevelView.text = data.standardLevelName transmitRangeView.text = data.transmitRangeName - totalInvestmentView.text = data.totalInvestment + totalInvestmentView.text = "¥ ${data.totalInvestment}" organizeCodeView.text = data.organizeNo constructUnitView.text = data.constructionStandardUnitName standardOwnerNameView.text = data.standardOwnerName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 073a049..7e87a51 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -47,7 +47,7 @@ R.id.nameTagView, item.fileName.last().toString() ).setText(R.id.fileNameView, item.fileName) .setText(R.id.effectiveStatusView, item.effectiveStatusName) - .setText(R.id.fileCodeView, "文件编号:${item.fileCode}") + .setText(R.id.fileCodeView, "文件编号:${item.fileNo}") .setText( R.id.effectiveTimeView, "有效期至:${item.effectiveTime.formatToYearMonthDay()}" diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index 9f007ed..cba2114 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -38,7 +38,7 @@ userView.text = data.usePersonName managementStatusView.text = data.managerStateName verificationDeptView.text = data.useDeptName - verificationPeriodView.text = data.mesureCycle + verificationPeriodView.text = "${data.mesureCycle}月" verificationDateView.text = data.mesureDate.formatToYearMonthDay() effectiveDateView.text = data.validDate.formatToYearMonthDay() verificationResultsView.text = data.mesureResultName diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0200731..5386346 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -32,7 +32,7 @@ categoryView.text = data.categoryName standardLevelView.text = data.standardLevelName transmitRangeView.text = data.transmitRangeName - totalInvestmentView.text = data.totalInvestment + totalInvestmentView.text = "¥ ${data.totalInvestment}" organizeCodeView.text = data.organizeNo constructUnitView.text = data.constructionStandardUnitName standardOwnerNameView.text = data.standardOwnerName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 073a049..7e87a51 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -47,7 +47,7 @@ R.id.nameTagView, item.fileName.last().toString() ).setText(R.id.fileNameView, item.fileName) .setText(R.id.effectiveStatusView, item.effectiveStatusName) - .setText(R.id.fileCodeView, "文件编号:${item.fileCode}") + .setText(R.id.fileCodeView, "文件编号:${item.fileNo}") .setText( R.id.effectiveTimeView, "有效期至:${item.effectiveTime.formatToYearMonthDay()}" diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index 9f007ed..cba2114 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -38,7 +38,7 @@ userView.text = data.usePersonName managementStatusView.text = data.managerStateName verificationDeptView.text = data.useDeptName - verificationPeriodView.text = data.mesureCycle + verificationPeriodView.text = "${data.mesureCycle}月" verificationDateView.text = data.mesureDate.formatToYearMonthDay() effectiveDateView.text = data.validDate.formatToYearMonthDay() verificationResultsView.text = data.mesureResultName diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index cc35c9d..9b331be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -26,7 +26,7 @@ val data = it.data!! priceCodeView.text = data.priceNo - checkTypeView.text = data.checkType + checkTypeView.text = data.checkTypeName createView.text = data.createTime categoryView.text = data.categoryName projectView.text = data.itemName diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index b1d5916..cea9cd5 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -214,7 +214,7 @@ fun String.watchAttachFile(context: Context) { if (this.endsWith("pdf")) { context.navigatePageTo(this) - } else if (this.endsWith("txt")) { + } else if (this.endsWith("txt") || this.endsWith(".json")) { context.navigatePageTo(this) } else if ( this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0200731..5386346 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -32,7 +32,7 @@ categoryView.text = data.categoryName standardLevelView.text = data.standardLevelName transmitRangeView.text = data.transmitRangeName - totalInvestmentView.text = data.totalInvestment + totalInvestmentView.text = "¥ ${data.totalInvestment}" organizeCodeView.text = data.organizeNo constructUnitView.text = data.constructionStandardUnitName standardOwnerNameView.text = data.standardOwnerName diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 073a049..7e87a51 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -47,7 +47,7 @@ R.id.nameTagView, item.fileName.last().toString() ).setText(R.id.fileNameView, item.fileName) .setText(R.id.effectiveStatusView, item.effectiveStatusName) - .setText(R.id.fileCodeView, "文件编号:${item.fileCode}") + .setText(R.id.fileCodeView, "文件编号:${item.fileNo}") .setText( R.id.effectiveTimeView, "有效期至:${item.effectiveTime.formatToYearMonthDay()}" diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index 9f007ed..cba2114 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -38,7 +38,7 @@ userView.text = data.usePersonName managementStatusView.text = data.managerStateName verificationDeptView.text = data.useDeptName - verificationPeriodView.text = data.mesureCycle + verificationPeriodView.text = "${data.mesureCycle}月" verificationDateView.text = data.mesureDate.formatToYearMonthDay() effectiveDateView.text = data.validDate.formatToYearMonthDay() verificationResultsView.text = data.mesureResultName diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index cc35c9d..9b331be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -26,7 +26,7 @@ val data = it.data!! priceCodeView.text = data.priceNo - checkTypeView.text = data.checkType + checkTypeView.text = data.checkTypeName createView.text = data.createTime categoryView.text = data.categoryName projectView.text = data.itemName diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml index bd8c086..d1675be 100644 --- a/app/src/main/res/layout/activity_preview_txt.xml +++ b/app/src/main/res/layout/activity_preview_txt.xml @@ -8,9 +8,14 @@ - + android:layout_height="wrap_content" + android:paddingHorizontal="@dimen/dp_10"> + + + \ No newline at end of file