diff --git a/app/build.gradle b/app/build.gradle index d445782..ee44bd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 29 versionCode 1 - versionName "1.0.5" + versionName "1.0.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' diff --git a/app/release/output.json b/app/release/output.json index a6097d7..7a4250c 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.5","enabled":true,"outputFile":"维科上料报工系统_v1.0.5.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.5.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.6","enabled":true,"outputFile":"维科上料报工系统_v1.0.6.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.6.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/assets/ProReqBodyUI.json b/app/src/main/assets/ProReqBodyUI.json index 4b7547a..6f5f987 100644 --- a/app/src/main/assets/ProReqBodyUI.json +++ b/app/src/main/assets/ProReqBodyUI.json @@ -1,21 +1,4 @@ [ - { - "id": 1, - "type": 5, - "fieldName": "ZLYSJ", - "name": "棰嗙敤鏃堕棿", - "value": "", - "editExp": 0, - "values": [], - "mast": false, - "canChange": true, - "isShow": true, - "language": { - "zh": "棰嗙敤鏃堕棿", - "en": "Claim time", - "th": "喙冟笂喙夃箑喔о弗喔" - } - }, { "id": 2, "type": 2, diff --git a/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java b/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java index c21f295..434633d 100644 --- a/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java @@ -479,7 +479,7 @@ public class ProReqActivity extends CommonFunctionActivity { * 鍔犲叆鏄庣粏鏂规硶 */ private void addDetail() { - DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//棰嗙敤鏃堕棿 + //DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//棰嗙敤鏃堕棿 DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//杞﹂棿缂栫爜 DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//宸ヤ綅鍙 DynamicFormBean lgortItem = dynamicFormAdapter.getItemByFieldName("lgort");//搴撳瓨鍦扮偣 @@ -556,7 +556,7 @@ public class ProReqActivity extends CommonFunctionActivity { detailBean.setZcjbm(ZCJBMItem.getValue()); detailBean.setZgwh(ZGWHItem.getValue()); detailBean.setZitemo(bean.getRspos()); - detailBean.setZlysj(ZLYSJItem.getValue()); + detailBean.setZlysj(""); detailBean.setZboxid(ZXTPCItem.getValue()); detailBean.setZpc(ZPCItem.getValue()); detailBean.setZreqlineid(""); diff --git a/app/src/main/java/com/techscan/wk/utils/update/UpdateUtil.java b/app/src/main/java/com/techscan/wk/utils/update/UpdateUtil.java index 91d8d56..00449e8 100644 --- a/app/src/main/java/com/techscan/wk/utils/update/UpdateUtil.java +++ b/app/src/main/java/com/techscan/wk/utils/update/UpdateUtil.java @@ -33,18 +33,19 @@ public class UpdateUtil { // .setIcon(R.mipmap.ic_launcher) .setTitle(R.string.checked_new_version) .setMessage(sFinalAge) + .setCancelable(false) .setPositiveButton(R.string.update_version_true, (dialogInterface, i) -> { //涓嬭浇APK toDownload(activity, url); alertDialog.dismiss(); }) - .setNegativeButton(R.string.update_version_false, (dialogInterface, i) -> { - ToastUtil.showShortToast(activity, activity.getString(R.string.update_cancel_update)); - if (callBack!=null){ - callBack.onCancelUpdate(); - } - alertDialog.dismiss(); - }) +// .setNegativeButton(R.string.update_version_false, (dialogInterface, i) -> { +// ToastUtil.showShortToast(activity, activity.getString(R.string.update_cancel_update)); +// if (callBack!=null){ +// callBack.onCancelUpdate(); +// } +// alertDialog.dismiss(); +// }) .create(); alertDialog.show(); } diff --git a/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java b/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java index f6fab93..cc48413 100644 --- a/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java +++ b/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java @@ -153,7 +153,6 @@ public class CustomBottomSheet extends BottomPopupView { } else if (infoBean instanceof ProReqDetailBean) { holder.setText(R.id.name, ((ProReqDetailBean) infoBean).getMatnr()); holder.setText(R.id.detail, - getContext().getString(R.string.Claim_time) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZlysj() + "\n" + getContext().getString(R.string.Stock_location) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getLgortName() + "\n" + getContext().getString(R.string.Case_number) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZboxid() + "\n" + getContext().getString(R.string.batch) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZpc() + "\n" +