diff --git a/app/build.gradle b/app/build.gradle index ee44bd4..e5e12da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 29 versionCode 1 - versionName "1.0.6" + versionName "1.0.7" 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 7a4250c..a13e489 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.6","enabled":true,"outputFile":"维科上料报工系统_v1.0.6.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.6.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.7","enabled":true,"outputFile":"维科上料报工系统_v1.0.7.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.7.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/techscan/wk/model/FlowOrderQueryBean.java b/app/src/main/java/com/techscan/wk/model/FlowOrderQueryBean.java index 6cc75f8..bde9c75 100644 --- a/app/src/main/java/com/techscan/wk/model/FlowOrderQueryBean.java +++ b/app/src/main/java/com/techscan/wk/model/FlowOrderQueryBean.java @@ -3,6 +3,15 @@ package com.techscan.wk.model; public class FlowOrderQueryBean { private String flowReport; private String zxtpc; + private String createTime; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } public String getFlowReport() { return flowReport; diff --git a/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java b/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java index 7310cc5..ee515f2 100644 --- a/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java +++ b/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java @@ -5,6 +5,7 @@ public class ReportWorkErrorInfoBean{ private boolean select; private String arbpl; private String aufnr; + private String matnr; private String createTime; private int createUser; private int dr; @@ -26,6 +27,14 @@ public class ReportWorkErrorInfoBean{ private String zpc; private String zzt; + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + public String getZpc() { return zpc; } diff --git a/app/src/main/java/com/techscan/wk/model/ReportWorkOffsetBean.java b/app/src/main/java/com/techscan/wk/model/ReportWorkOffsetBean.java index 8bed4fb..9861d43 100644 --- a/app/src/main/java/com/techscan/wk/model/ReportWorkOffsetBean.java +++ b/app/src/main/java/com/techscan/wk/model/ReportWorkOffsetBean.java @@ -1,9 +1,10 @@ package com.techscan.wk.model; public class ReportWorkOffsetBean { - private String select; + private boolean select; private String arbpl; private String aufnr; + private String matnr; private String budat; private String createTime; private int createUser; @@ -26,6 +27,14 @@ public class ReportWorkOffsetBean { private String zpc; private String zzt; + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + public String getZpc() { return zpc; } @@ -34,11 +43,11 @@ public class ReportWorkOffsetBean { this.zpc = zpc; } - public String getSelect() { + public boolean isSelect() { return select; } - public void setSelect(String select) { + public void setSelect(boolean select) { this.select = select; } diff --git a/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java b/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java index a8286a5..4a90d80 100644 --- a/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java +++ b/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java @@ -90,7 +90,7 @@ public interface ApiService { Observable getlgort(); @POST("/web/report/saveCX") - Observable saveCX(@Body String requestBean); + Observable saveCX(@Body Map requestBean); @POST("/web/order/saveBackPick") Observable saveBackPick(@Body String requestBean); diff --git a/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java b/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java index 512f0cc..e04603d 100644 --- a/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java +++ b/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java @@ -284,8 +284,8 @@ public class HttpMethods { .subscribe(observer); } - public void saveCX(String obj, Observer observer) { - getApiService().saveCX(obj) + public void saveCX(Map map, Observer observer) { + getApiService().saveCX(map) .subscribeOn(Schedulers.io()) .unsubscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java b/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java index e17593a..0fd920f 100644 --- a/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java @@ -87,6 +87,7 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { private Column flowReport; private Column zxtpc; + private Column createTime; QBadgeView qTaskBadgeView, qDetailBadgeView; @@ -132,7 +133,7 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { FontStyle columnTitleStyle = config.getColumnTitleStyle(); columnTitleStyle.setTextSpSize(this, 16); int screenWidth = ScreenUtils.getScreenWidth(); - int i = screenWidth / 2; + int i = screenWidth / 3; config.setMinTableWidth(screenWith); config.setColumnTitleHorizontalPadding(2); config.setColumnTitleVerticalPadding(12); @@ -145,17 +146,20 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { flowReport = new Column<>(getString(R.string.Flow_order_number), "flowReport"); zxtpc = new Column<>(getString(R.string.Case_number), "zxtpc"); + createTime = new Column<>(getString(R.string.Creation_time), "createTime"); flowReport.setFast(true); flowReport.setMinWidth(i); zxtpc.setFast(true); zxtpc.setMinWidth(i); + createTime.setFast(true); + createTime.setMinWidth(i); setTableData(); } private void setTableData() { - mTableData = new TableData<>("", list, zxtpc, flowReport); + mTableData = new TableData<>("", list, zxtpc, flowReport,createTime); smartTable.setTableData(mTableData); smartTable.invalidate(); } diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java index 2b0bdf2..2eedf6f 100644 --- a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java @@ -112,6 +112,8 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { private Column select; private Column AUFNR; private Column GMNGA; + private Column createTime; + private Column resultMsg; private DynamicFormAdapter dynamicFormAdapter; @@ -163,11 +165,15 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { select = new Column<>(getString(R.string.select_all), "select"); AUFNR = new Column<>(getString(R.string.Work_order_number), "aufnr"); GMNGA = new Column<>(getString(R.string.Quantity_reported), "gmnga"); + createTime = new Column<>(getString(R.string.Creation_time), "createTime"); + resultMsg = new Column<>(getString(R.string.Abnormal_cause), "resultMsg"); select.setFixed(true); select.setFast(true); select.setMinWidth(90); AUFNR.setFast(true); GMNGA.setFast(true); + createTime.setFast(true); + resultMsg.setFast(true); final int imgSize = DensityUtils.dp2px(this, 20); select.setDrawFormat(new ImageResDrawFormat(imgSize, imgSize) { @@ -264,7 +270,7 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { } private void setTableData() { - mTableData = new TableData<>("", list, select, AUFNR, GMNGA); + mTableData = new TableData<>("", list, select, AUFNR, GMNGA,createTime,resultMsg); smartTable.setTableData(mTableData); smartTable.invalidate(); } @@ -420,6 +426,7 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { @Override protected void onFailure(Throwable e) throws Exception { CustomErrorDialog(e, ReportWorkErrorListActivity.this); + select.setColumnName(getString(R.string.select_all)); if (!isLoadMore) { list.clear(); setTableData(); diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java index e89822f..98dac7f 100644 --- a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java @@ -7,6 +7,8 @@ import static com.techscan.wk.app.AppConst.REQUEST_CODE_SCAN_FOR_GROUP; import android.Manifest; import android.annotation.SuppressLint; +import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; @@ -32,8 +34,10 @@ import com.bin.david.form.data.column.Column; import com.bin.david.form.data.format.bg.BaseBackgroundFormat; import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat; import com.bin.david.form.data.format.bg.IBackgroundFormat; +import com.bin.david.form.data.format.draw.ImageResDrawFormat; import com.bin.david.form.data.style.FontStyle; import com.bin.david.form.data.table.TableData; +import com.bin.david.form.utils.DensityUtils; import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.StringUtils; import com.blankj.utilcode.util.ToastUtils; @@ -47,6 +51,7 @@ import com.techscan.wk.adapter.DynamicFormAdapter; import com.techscan.wk.base.CommonFunctionActivity; import com.techscan.wk.model.DetailShowBean; import com.techscan.wk.model.DynamicFormBean; +import com.techscan.wk.model.ReportWorkErrorInfoBean; import com.techscan.wk.model.ReportWorkOffsetBean; import com.techscan.wk.rxbus.Event; import com.techscan.wk.rxbus.RxBus; @@ -67,7 +72,9 @@ import com.techscan.wk.widgets.MySmartTable; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import butterknife.BindView; import butterknife.ButterKnife; @@ -94,9 +101,10 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { @BindView(R.id.smartTable) MySmartTable smartTable; - private Column select; + private Column select; private Column AUFNR; private Column GMNGA; + private Column createTime; private Column zxtpc; private Column zpc; @@ -151,17 +159,19 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { config.setShowXSequence(false); config.setShowYSequence(false); config.setShowTableTitle(false); - select = new Column<>(getString(R.string.choice), "select"); + select = new Column<>(getString(R.string.select_all), "select"); AUFNR = new Column<>(getString(R.string.Work_order_number), "aufnr"); GMNGA = new Column<>(getString(R.string.Quantity_reported), "gmnga"); + createTime = new Column<>(getString(R.string.Creation_time), "createTime"); zxtpc = new Column<>(getString(R.string.Case_number), "zxtpc"); zpc = new Column<>(getString(R.string.batch), "zpc"); select.setFixed(true); select.setFast(true); - select.setMinWidth(110); + select.setMinWidth(90); AUFNR.setFast(true); GMNGA.setFast(true); + createTime.setFast(true); zxtpc.setFast(true); zpc.setFast(true); @@ -186,19 +196,119 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { } }); + final int imgSize = DensityUtils.dp2px(this, 20); + select.setDrawFormat(new ImageResDrawFormat(imgSize, imgSize) { + @Override + protected Context getContext() { + return ReportWorkOffsetActivity.this; + } + + @Override + protected int getResourceID(Boolean val, String value, int position) { + if (list.get(position).isSelect()) { + return R.mipmap.ic_select_check; + } else { + return R.mipmap.ic_unselect_check; + } + } + }); + smartTable.setOnColumnClickListener(columnInfo -> { + String columnName = columnInfo.column.getColumnName(); + if (columnInfo.column.getFieldName().equals("select")) { + List beanList = smartTable.getTableData().getT(); + if (beanList != null && beanList.size() != 0) { + if (columnName.equals(getString(R.string.select_all))) { + select.setColumnName(getString(R.string.cancel_info)); + for (int i = 0; i < beanList.size(); i++) { + beanList.get(i).setSelect(true); + } + } else { + select.setColumnName(getString(R.string.select_all)); + for (int i = 0; i < beanList.size(); i++) { + beanList.get(i).setSelect(false); + } + } + smartTable.refreshDrawableState(); + smartTable.invalidate(); + } + } + }); + setTableData(); + setTableRowClickListener(); + } + + private void setTableRowClickListener() { + smartTable.getTableData().setOnRowClickListener((column, reportWorkOffsetBean, coIndex, row) -> { + if (column.getFieldName().equals("select")) { + List beanList = smartTable.getTableData().getT(); + if (beanList.get(row).isSelect()) { + beanList.get(row).setSelect(false); + } else { + beanList.get(row).setSelect(true); + } + int selectCount = 0; + for (int i = 0; i < beanList.size(); i++) { + if (beanList.get(i).isSelect()) { + selectCount++; + } + } + if (beanList.size() > 0 && selectCount == beanList.size()) { + select.setColumnName(getString(R.string.cancel_info)); + } else { + select.setColumnName(getString(R.string.select_all)); + } + smartTable.refreshDrawableState(); + smartTable.invalidate(); + + } else { + + List list = new ArrayList<>(); + list.add(new DetailShowBean(getString(R.string.Work_order_number), reportWorkOffsetBean.getAufnr())); + list.add(new DetailShowBean(getString(R.string.Creation_time), reportWorkOffsetBean.getCreateTime())); + list.add(new DetailShowBean(getString(R.string.Process_confirmation_number), reportWorkOffsetBean.getResultRueck())); + list.add(new DetailShowBean(getString(R.string.counter), reportWorkOffsetBean.getResultRmzhl())); + list.add(new DetailShowBean(getString(R.string.Factory), reportWorkOffsetBean.getWerks())); + list.add(new DetailShowBean(getString(R.string.Case_number), reportWorkOffsetBean.getZxtpc())); + list.add(new DetailShowBean(getString(R.string.batch), reportWorkOffsetBean.getZpc())); + list.add(new DetailShowBean(getString(R.string.Quantity_reported), reportWorkOffsetBean.getGmnga() + "")); + list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_reported_quantity), reportWorkOffsetBean.getMeinh() + "")); + list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkOffsetBean.getLmnga() + "")); + list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkOffsetBean.getGmein())); + DetailBottomSheet detailBottomSheet = new DetailBottomSheet<>(context, getResources().getString(R.string.detail_info), list); + new XPopup.Builder(context) + .moveUpToKeyboard(false) //濡傛灉涓嶅姞杩欎釜锛岃瘎璁哄脊绐椾細绉诲姩鍒拌蒋閿洏涓婇潰 + .isRequestFocus(false) + .autoFocusEditText(false) + .autoOpenSoftInput(true) + .asCustom(detailBottomSheet) + .show(); + } + }); } /** * 淇濆瓨鏁版嵁 - * @param reportWorkOffsetBean 闇瑕佹彁浜ょ殑宸ュ崟鏁版嵁 - * @param row 褰撳墠鍒楄〃琛岋紝鐢ㄤ簬鍒犻櫎row鏁版嵁 */ - private void saveData(ReportWorkOffsetBean reportWorkOffsetBean, int row) { - reportWorkOffsetBean.setRueck(reportWorkOffsetBean.getResultRueck()); - reportWorkOffsetBean.setRmzhl(reportWorkOffsetBean.getResultRmzhl()); - HttpMethods.getInstance().saveCX(gson.toJson(reportWorkOffsetBean), new BaseObserver(this) { + private void saveData() { + List workErrorInfoBeanList = smartTable.getTableData().getT(); + List savaBeanList = new ArrayList<>(); + for (int i = 0; i < workErrorInfoBeanList.size(); i++) { + ReportWorkOffsetBean reportWorkOffsetBean = workErrorInfoBeanList.get(i); + if (reportWorkOffsetBean.isSelect()) { + reportWorkOffsetBean.setRueck(reportWorkOffsetBean.getResultRueck()); + reportWorkOffsetBean.setRmzhl(reportWorkOffsetBean.getResultRmzhl()); + savaBeanList.add(reportWorkOffsetBean); + } + } + if (savaBeanList.size() == 0) { + ToastUtils.showLong(R.string.Please_select_the_data_you_want_to_save); + return; + } + Map saveItemRequestBean = new HashMap<>(); + saveItemRequestBean.put("imports", savaBeanList); + HttpMethods.getInstance().saveCX(saveItemRequestBean, new BaseObserver(this) { @Override protected void onSuccess(ResponseBody responseBody) throws Exception { String string = responseBody.string(); @@ -206,7 +316,8 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { }.getType(); BaseResponseBean baseResponseBean = gson.fromJson(string, objectType); if (baseResponseBean.getCode() == 200) { - new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title)) + QMUIDialog.MessageDialogBuilder messageDialogBuilder = new QMUIDialog.MessageDialogBuilder(context); + messageDialogBuilder.setTitle(getResources().getString(R.string.tips_title)) .setCancelable(false) .setMessage(getString(R.string.Data_saved_successfully)) .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss()) @@ -214,8 +325,7 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { dialog.dismiss(); }) .create(R.style.QMUI_Dialog).show(); - list.remove(row); - setTableData(); + messageDialogBuilder.show().setOnDismissListener(dialogInterface -> query()); } else { showError(baseResponseBean.getMsg()); } @@ -230,50 +340,10 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { } private void setTableData() { - for (int i = 0; i < list.size(); i++) { - list.get(i).setSelect(getString(R.string.write_off)); - } - mTableData = new TableData<>("", list, select, AUFNR, GMNGA,zxtpc,zpc); + mTableData = new TableData<>("", list, select, AUFNR, GMNGA,createTime,zxtpc,zpc); smartTable.setTableData(mTableData); smartTable.invalidate(); - smartTable.getTableData().setOnRowClickListener((column, reportWorkOffsetBean, i, row) -> { - if (column.getFieldName().equals("select")) { - if (AntiShakeUtils.isInvalidClick2(smartTable, 1500)) - return; - new QMUIDialog.MessageDialogBuilder(context) - .setTitle(getResources().getString(R.string.tips_title)) - .setMessage(getString(R.string.Confirm_to_submit_data)) - .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss()) - .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> { - dialog.dismiss(); - saveData(reportWorkOffsetBean, row); - }) - .show(); - } else { - List list = new ArrayList<>(); - list.add(new DetailShowBean(getString(R.string.Work_order_number), reportWorkOffsetBean.getAufnr())); - list.add(new DetailShowBean(getString(R.string.Creation_time), reportWorkOffsetBean.getCreateTime())); - list.add(new DetailShowBean(getString(R.string.Process_confirmation_number), reportWorkOffsetBean.getResultRueck())); - list.add(new DetailShowBean(getString(R.string.counter), reportWorkOffsetBean.getResultRmzhl())); - list.add(new DetailShowBean(getString(R.string.Factory), reportWorkOffsetBean.getWerks())); - list.add(new DetailShowBean(getString(R.string.Case_number), reportWorkOffsetBean.getZxtpc())); - list.add(new DetailShowBean(getString(R.string.batch), reportWorkOffsetBean.getZpc())); - list.add(new DetailShowBean(getString(R.string.Quantity_reported), reportWorkOffsetBean.getGmnga() + "")); - list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_reported_quantity), reportWorkOffsetBean.getMeinh() + "")); - list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkOffsetBean.getLmnga() + "")); - list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkOffsetBean.getGmein())); - DetailBottomSheet detailBottomSheet = new DetailBottomSheet<>(context, getResources().getString(R.string.detail_info), list); - new XPopup.Builder(context) - .moveUpToKeyboard(false) //濡傛灉涓嶅姞杩欎釜锛岃瘎璁哄脊绐椾細绉诲姩鍒拌蒋閿洏涓婇潰 - .isRequestFocus(false) - .autoFocusEditText(false) - .autoOpenSoftInput(true) - .asCustom(detailBottomSheet) - .show(); - } - - }); } @@ -374,6 +444,7 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { Type objectType = new TypeToken>>() { }.getType(); BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); + select.setColumnName(getString(R.string.select_all)); if (baseResponseBean.getCode() == 200) { list.clear(); if (baseResponseBean.getData().size() > 0) { @@ -381,25 +452,27 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { } else { ToastUtils.showLong(getString(R.string.No_data_was_obtained)); } - setTableData(); } else { list.clear(); - setTableData(); showError(baseResponseBean.getMsg()); } + setTableData(); + setTableRowClickListener(); } @Override protected void onFailure(Throwable e) throws Exception { + select.setColumnName(getString(R.string.select_all)); list.clear(); setTableData(); + setTableRowClickListener(); CustomErrorDialog(e, ReportWorkOffsetActivity.this); } }); } - @OnClick({R.id.iv_scan}) + @OnClick({R.id.iv_scan, R.id.btn_submit}) public void onViewClicked(View view) { if (AntiShakeUtils.isInvalidClick(view)) return; @@ -411,6 +484,9 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { else startScan(getResources().getString(R.string.scan_title)); break; + case R.id.btn_submit: + saveData(); + break; } } diff --git a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java b/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java index 75d9092..8610810 100644 --- a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java +++ b/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java @@ -20,8 +20,8 @@ public class BarAnalysisUtils { return true; } - /** - * 鎸夎鍒欒В鏋愭潯鐮 [)>@06@QRPART@10V101010@1P31102260@3SX001@1T20240724001@Q100@14D20240724@@ + /** 娴佽浆鍗曞彿锛 T10000194000001 + * 鎸夎鍒欒В鏋愭潯鐮 [)>@06@QRPART@10V101010@1P31107550@3SX001@1T20240724001@Q100@14D20240724@@ * @param barcode * @return */ diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index f294619..976cb83 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -44,7 +44,7 @@ android:id="@+id/et_old_pwd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="璇疯緭鍏ュ師瀵嗙爜" + android:hint="@string/Please_enter_the_old_password" android:imeOptions="actionDone" android:textSize="@dimen/sp_16" android:inputType="textPassword" @@ -61,7 +61,7 @@ android:id="@+id/et_new_pwd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="璇疯緭鍏ユ柊瀵嗙爜" + android:hint="@string/Please_enter_your_new_password" android:textSize="@dimen/sp_16" android:imeOptions="actionDone" android:inputType="textPassword" @@ -78,7 +78,7 @@ android:id="@+id/et_new_pwd2" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="璇风‘璁ゆ柊瀵嗙爜" + android:hint="@string/Please_confirm_the_new_password" android:imeOptions="actionDone" android:inputType="textPassword" tools:ignore="Autofill,TextFields" /> @@ -92,7 +92,7 @@ android:background="@drawable/bg_login_btn" android:focusable="false" android:focusableInTouchMode="false" - android:text="淇敼" + android:text="@string/save_info" android:textColor="@color/qmui_config_color_white" /> diff --git a/app/src/main/res/layout/activity_report_work_offse.xml b/app/src/main/res/layout/activity_report_work_offse.xml index c5cd2be..936cd8a 100644 --- a/app/src/main/res/layout/activity_report_work_offse.xml +++ b/app/src/main/res/layout/activity_report_work_offse.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@id/btn_submit" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/ll_scan"> @@ -50,5 +50,16 @@ - +