From ca13f1f1854429fc8852bfa1f3885c7d01de2ec6 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Mon, 27 May 2024 15:56:33 +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

---
 .../bnframework/ui/fragment/HomeDevicesFragment.java |  3 +++
 .../bnframework/ui/fragment/HomeFoodsFragment.java   |  1 +
 app/src/main/res/layout/fragment_home_foods.xml      | 12 ++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeDevicesFragment.java b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeDevicesFragment.java
index 034a9526..e52715b4 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeDevicesFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeDevicesFragment.java
@@ -279,6 +279,9 @@ public class HomeDevicesFragment extends BaseFragment {
      * @param type 1加热 2液体 3主料 4搅拌
      */
     private void showControlDialog(int type){
+        if(ConfigName.getInstance().isFastClick()){
+            return;
+        }
         if(ModbusHelper.get().isBtnStop()){
             NewToastUtil.getInstance().showToast("设备已急停，请关闭急停按钮再调试！");
             return;
diff --git a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java
index 53340369..2e06134c 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/fragment/HomeFoodsFragment.java
@@ -100,6 +100,7 @@ public class HomeFoodsFragment extends BaseFragment {
         viewBinding.topbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.topbj1));
         viewBinding.topbar.setTitle("菜谱");
         viewBinding.topbar.addRightTextButton("设备状态："+ (ModbusHelper.get().getConnected() ? "已连接" : "未连接"),R.id.status_image);
+        viewBinding.back.setVisibility(View.GONE);
         handler.sendEmptyMessageDelayed(1,1000L);
 
     }
diff --git a/app/src/main/res/layout/fragment_home_foods.xml b/app/src/main/res/layout/fragment_home_foods.xml
index a899176d..9bde06b1 100644
--- a/app/src/main/res/layout/fragment_home_foods.xml
+++ b/app/src/main/res/layout/fragment_home_foods.xml
@@ -7,6 +7,18 @@
         android:id="@+id/topbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/qmui_topbar_height" >
+        <TextView
+            android:id="@+id/back"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_32"
+            android:text="返回"
+            android:drawableLeft="@mipmap/fanhui"
+            android:gravity="center"
+            android:paddingLeft="@dimen/dp_5"
+            android:drawablePadding="@dimen/dp_5"
+            />
     </com.qmuiteam.qmui.widget.QMUITopBarLayout>
 
     <RelativeLayout