From 00a95d712628c6006886a1510ad074029484a775 Mon Sep 17 00:00:00 2001 From: liup <1454939542@qq.com> Date: Mon, 13 May 2024 11:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonait/bnframework/business/MainInit.java | 2 +- .../modules/home/adapter/goodpf_apapter.java | 5 +- .../home/fragment/MakeGoodFragment.java | 6 +- .../home/fragment/mode/GoodInformation.java | 4 +- .../home/fragment/mode/add_pf_control.java | 2 +- .../res/layout/datatab/layout/wl_item.xml | 6 +- .../main/res/layout/fragment_make_good.xml | 9 +-- .../item/layout/dialog_add_silos_ck.xml | 10 +-- .../layout/item/layout/loadinggood_item.xml | 15 +++-- .../res/layout/item/layout/newmakegood.xml | 2 +- .../item/layout/silos_jiaoyan_item_edit.xml | 62 ++++++++++++------- 11 files changed, 75 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java index d7f8af17..e17d262c 100644 --- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java +++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java @@ -82,7 +82,7 @@ public class MainInit { MainNotification.initNotificationChannel(app); // 内存泄漏检测 - initLeakCanary(true,app); + initLeakCanary(BuildConfig.DEBUG,app); // Log日志打印框架 initLogCat(); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java index 85f3c696..016a070e 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java @@ -7,6 +7,7 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -43,8 +44,8 @@ public class goodpf_apapter extends ArrayAdapter { View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false); //分别获取 image view 和 textview 的实例 TextView name = view.findViewById(R.id.name); - ImageView button = view.findViewById(R.id.button_item); - ImageView button_update = view.findViewById(R.id.button_update); + RelativeLayout button = view.findViewById(R.id.button_item); + RelativeLayout button_update = view.findViewById(R.id.button_update); // 设置要显示的图片和文字 name.setText(bpa_goodsrecipename.name); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java index 7cbf1e9a..7ed5bb5b 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java @@ -666,7 +666,11 @@ public class MakeGoodFragment extends BaseFragment { activity.runOnUiThread(new Runnable() { @Override public void run() { - String msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | "; + String msg = msg2; + + if(ConfigName.TEST){ + msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | "; + } if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) { //拿到扫码数据 //例如 ORD001|P0003|A001,M002,T001|2 diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java index 3345122c..5ccb8a2b 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java @@ -469,7 +469,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener { { BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id); if (goodsrecipename != null) { - ToastUtils.warning("已有改做法配方,不能在新增了!"); + ToastUtils.warning("已有该做法配方,不能再新增了!"); return; } } @@ -538,7 +538,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener { //判断配方是否有相同规格的了 BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id); if (goodsrecipename != null) { - ToastUtils.warning("已有改做法配方,不能在新增了!"); + ToastUtils.warning("已有该做法配方,不能再新增了!"); return; } //新增配方名称 diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java index 3ba9e9ae..dd9a92bb 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java @@ -446,7 +446,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener { { BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id); if (goodsrecipename != null) { - ToastUtils.warning("已有改做法配方,不能在新增了!"); + ToastUtils.warning("已有该做法配方,不能再新增了!"); return isSuceess; } } diff --git a/app/src/main/res/layout/datatab/layout/wl_item.xml b/app/src/main/res/layout/datatab/layout/wl_item.xml index fbce4ddc..27d92d20 100644 --- a/app/src/main/res/layout/datatab/layout/wl_item.xml +++ b/app/src/main/res/layout/datatab/layout/wl_item.xml @@ -57,25 +57,25 @@ android:layout_weight="1" android:background="@drawable/border"> diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml index 5aa8614a..1bdc158b 100644 --- a/app/src/main/res/layout/fragment_make_good.xml +++ b/app/src/main/res/layout/fragment_make_good.xml @@ -18,7 +18,7 @@ android:layout_weight="1" android:orientation="horizontal"> @@ -138,8 +138,8 @@ android:orientation="vertical">