3444

app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java

@@ -820,7 +820,7 @@ public class ExecuteTheRecipe {
                             Object jsf= ReadPLC("水池进水阀");
                             if(jsf!=null && (boolean)jsf)
                             {
-                                new Handler().postDelayed(new Runnable() {
+                                new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
                                     @Override
                                     public void run() {
                                         WritePLC("水池进水阀",false,null);

app/src/main/java/com/bonait/bnframework/modules/home/adapter/wdsz_adapter.java

@@ -63,6 +63,8 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
                 myViewHolder.name.setText(goodsMake.name+"");
                 myViewHolder.edittext_sx.setText(goodsMake.tempup+"");
+                myViewHolder.zdbs3.setVisibility(View.GONE);
+                myViewHolder.control_switch_bs.setChecked(false);
                 if(goodsMake.name.equals("水池温度"))
                 {
                     myViewHolder.zdbs1.setVisibility(View.VISIBLE);
@@ -71,6 +73,8 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     myViewHolder.edittext_sx.setFilters(new InputFilter[]{ new InputFilterMinMax("0", "45")});
 
                     myViewHolder.control_switch_bs.setChecked(ConfigName.getInstance().AutomaticWaterRefill);
+                    myViewHolder.zdbs3.setVisibility(ConfigName.getInstance().AutomaticWaterRefill==false?View.VISIBLE:View.GONE);
+
                     myViewHolder.edittext_ycsj.setText(ConfigName.getInstance().AutomaticWaterRefillTime);
                 } else if (goodsMake.name.equals("果糖左温度")) {
                     myViewHolder.zdbs1.setVisibility(View.GONE);
@@ -136,6 +140,7 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                         //设置
                         ConfigName.getInstance().AutomaticWaterRefill=isChecked;
                         ConfigData.getInstance().SavePZ();
+                        myViewHolder.zdbs3.setVisibility(ConfigName.getInstance().AutomaticWaterRefill==false?View.VISIBLE:View.GONE);
                         if(!isChecked) //关闭
                         {
                             ExecuteTheRecipe.WritePLC("水池进水阀",false,null);
@@ -143,6 +148,32 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     }
                 });
 
+                myViewHolder.control_switch_ps.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(SwitchButton view, boolean isChecked) {
+                        //设置
+                        if (ConfigName.getInstance().versionSelectionEnum.equals("配料吧台"))
+                        {
+                            if(isChecked) //关闭
+                            {
+                                ExecuteTheRecipe.WritePLC("水池排水阀-开",true,null);
+                            }else
+                            {
+                                ExecuteTheRecipe.WritePLC("水池排水阀-关",false,null);
+                            }
+                        }else
+                        {
+                            if(isChecked) //关闭
+                            {
+                                ExecuteTheRecipe.WritePLC("水池排水阀-开",true,null);
+                            }else
+                            {
+                                ExecuteTheRecipe.WritePLC("水池排水阀-关",true,null);
+                            }
+                        }
+                    }
+                });
+
                 myViewHolder.control_switch.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() {
                     @Override
                     public void onCheckedChanged(SwitchButton view, boolean isChecked) {
@@ -286,13 +317,13 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         /**
          * 自动加热
          */
-        SwitchButton control_switch,control_switch_bs;
+        SwitchButton control_switch,control_switch_bs,control_switch_ps;
         /**
          * 保存值
          */
         Button save_value;
 
-        RelativeLayout zdbs1,zdbs2,show_wdsz,show_wd;
+        RelativeLayout zdbs1,zdbs2,zdbs3,show_wdsz,show_wd;
         public WDSZViewHolder(View view) {
             super(view);
             name = (TextView) view.findViewById(R.id.name);
@@ -301,10 +332,13 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             temp = (TextView) view.findViewById(R.id.temp);
             control_switch = (SwitchButton)view.findViewById(R.id.control_switch);
             control_switch_bs= (SwitchButton)view.findViewById(R.id.control_switch_bs);
+            control_switch_ps= (SwitchButton)view.findViewById(R.id.control_switch_ps);
+
             save_value=(Button) view.findViewById(R.id.save_value);
 
             zdbs1=view.findViewById(R.id.zdbs1);
             zdbs2=view.findViewById(R.id.zdbs2);
+            zdbs3=view.findViewById(R.id.zdbs3);
             show_wdsz=view.findViewById(R.id.show_wdsz);
             show_wd=view.findViewById(R.id.show_wd);
         }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java

@@ -245,37 +245,37 @@ public class MakeGoodFragment extends BaseFragment {
         @Override
         public void clickListener(View v, Object data) {
             ResGoodsMake makegood = (ResGoodsMake) data;
-//            if (!ConfigName.getInstance().PlcIsConnect) {
-//                ToastUtils.warning("设备已离线,请检查设备...");
-//                return;
-//            }
-//
-//            if (DataBus.getInstance().ZDQX_IsStart) {
-//                ToastUtils.warning("自动清洗中,请等待清洗完成！");
-//                return;
-//            }
-//
-//            if (ExecuteTheRecipe.IsMakeGood) {
-//                ToastUtils.warning("请耐心等待上一商品制作完成...");
-//                return;
-//            }
-//
-//            if (makegood.subOrder.status == 1) {
-//                ToastUtils.warning("商品:" + makegood.good.name + ",已在制作中...");
-//                return;
-//            }
-//
-//            if (makegood.subOrder.status == 2) {
-//                ToastUtils.warning("商品:" + makegood.good.name + ",已制作完成...");
-//                return;
-//            }
-//
-//            if (ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) {
-//                if (!ExecuteTheRecipe.IsCup) {
-//                    ToastUtils.warning("出料口没有检测到器皿！");
-//                    return;
-//                }
-//            }
+            if (!ConfigName.getInstance().PlcIsConnect) {
+                ToastUtils.warning("设备已离线,请检查设备...");
+                return;
+            }
+
+            if (DataBus.getInstance().ZDQX_IsStart) {
+                ToastUtils.warning("自动清洗中,请等待清洗完成！");
+                return;
+            }
+
+            if (ExecuteTheRecipe.IsMakeGood) {
+                ToastUtils.warning("请耐心等待上一商品制作完成...");
+                return;
+            }
+
+            if (makegood.subOrder.status == 1) {
+                ToastUtils.warning("商品:" + makegood.good.name + ",已在制作中...");
+                return;
+            }
+
+            if (makegood.subOrder.status == 2) {
+                ToastUtils.warning("商品:" + makegood.good.name + ",已制作完成...");
+                return;
+            }
+
+            if (ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) {
+                if (!ExecuteTheRecipe.IsCup) {
+                    ToastUtils.warning("出料口没有检测到器皿！");
+                    return;
+                }
+            }
 
             String title = "温馨提示！";
             String message = "客官确定要开始制作【" + makegood.good.name + "】吗？";
@@ -286,13 +286,17 @@ public class MakeGoodFragment extends BaseFragment {
                     dialog.dismiss();
                 }
             });
-            ExecuteTheRecipe.OnIngredientButtonPressedNotify = new IRun() {
-                @Override
-                public void Run() {
-                    make(makegood);
-                    dialog.dismiss();
-                }
-            };
+
+            if (ConfigName.getInstance().versionSelectionEnum.equals("配料吧台"))
+            {
+                ExecuteTheRecipe.OnIngredientButtonPressedNotify = new IRun() {
+                    @Override
+                    public void Run() {
+                        make(makegood);
+                        dialog.dismiss();
+                    }
+                };
+            }
             dialog.show();
         }
 

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseActivity;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.constant.DataBus;
 import com.bonait.bnframework.common.constant.MessageName;
 import com.bonait.bnframework.common.db.res.lcMode;
@@ -17,6 +18,7 @@ import com.bonait.bnframework.common.linktab.LinkMode;
 import com.bonait.bnframework.common.message.MessageLooper;
 import com.bonait.bnframework.common.message.MessageManager;
 import com.bonait.bnframework.common.utils.ToastUtils;
+import com.bonait.bnframework.modules.home.fragment.mode.ImageButtonControl;
 import com.bonait.bnframework.modules.home.fragment.mode.Silos_item_fragment;
 import com.bonait.bnframework.modules.home.fragment.mode.add_silos_ck;
 import com.bonait.bnframework.modules.home.fragment.mode.add_yijian_controlextends;
@@ -64,6 +66,9 @@ public class SilosNewActivity extends BaseActivity {
     @BindView(R.id.silos_jz)
     silos_jiaoyan silos_jz;
 
+    @BindView(R.id.yijian3)
+    ImageButtonControl yijian3;
+
     private Context context;
 
     Activity activity;
@@ -155,7 +160,6 @@ public class SilosNewActivity extends BaseActivity {
             @Override
             public void clickListenerNew(View v, int k, Object data) {
                 if (k == 0) {
-                    MessageManager.getInstance().sendMessage(MessageName.RefreshSilos,"RefreshSilos");
                     silos_jz.setVisibility(View.GONE);
                 }
             }
@@ -177,7 +181,7 @@ public class SilosNewActivity extends BaseActivity {
             @Override
             public QMUIFragment createFragment(int position) {
                 Silos_item_fragment fragment = new Silos_item_fragment();
-                fragment.SetData(position);
+                fragment.SetData(position,activity);
                 return fragment;
             }
             @Override
@@ -187,6 +191,14 @@ public class SilosNewActivity extends BaseActivity {
         };
         viewpager_silos.setAdapter(adapter);
         tabs.setupWithViewPager(viewpager_silos, true);
+
+        if (ConfigName.getInstance().versionSelectionEnum.equals("配料吧台"))
+        {
+            yijian3.setVisibility(View.GONE);
+        }else
+        {
+            yijian3.setVisibility(View.VISIBLE);
+        }
     }
 
 

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/WdszActivity.java

@@ -10,7 +10,9 @@ import android.os.Bundle;
 import android.view.View;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.base.BaseActivity;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.constant.DataBus;
 import com.bonait.bnframework.common.helper.WrapContentLinearLayoutManager;
 import com.bonait.bnframework.modules.home.adapter.wdsz_adapter;
@@ -43,6 +45,13 @@ public class WdszActivity extends BaseActivity {
         mTopBar.addLeftImageButton(R.mipmap.fanhui,R.id.topbar).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if (ConfigName.getInstance().versionSelectionEnum.equals("配料吧台"))
+                {
+                    ExecuteTheRecipe.WritePLC("水池排水阀-关",false,null);
+                }else
+                {
+                    ExecuteTheRecipe.WritePLC("水池排水阀-关",true,null);
+                }
                 finish();
             }
         });

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_fragment.java

@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -34,7 +35,7 @@ public class Silos_item_fragment extends BaseFragment {
     @BindView(R.id.recycler_view_lll)
     RecyclerView recycler_view_lll;
     private Context context;
-
+    private Activity activity=null;
     @Override
     protected View onCreateView() {
 
@@ -55,8 +56,9 @@ public class Silos_item_fragment extends BaseFragment {
     //当前集合数据
     public int index = -1;
 
-    public void SetData(int _index) {
+    public void SetData(int _index,Activity _activity) {
         index = _index;
+        activity=_activity;
     }
 
     public void InitEvent()
@@ -65,13 +67,35 @@ public class Silos_item_fragment extends BaseFragment {
             @Override
             public void onMessage(Object msg) {
                 if (msg != null) {
-                    DataBus.getInstance().RefreshSilos();
-                    InitView();
+                    InitViewData();
                 }
             }
         });
     }
 
+    /**
+     * 刷新
+     */
+    public void InitViewData()
+    {
+//        new Thread(new Runnable() {
+//            @Override
+//            public void run() {
+//                if(activity!=null)
+//                {
+//                    activity.runOnUiThread(new Runnable() {
+//                        @Override
+//                        public void run() {
+//
+//                        }
+//                    });
+//                }
+//            }
+//        });
+
+        DataBus.getInstance().RefreshSilos();
+        InitView();
+    }
     /**
      * 初始化界面
      */

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_manguan_control.java

@@ -80,10 +80,18 @@ public class add_manguan_control extends LinearLayout {
         initEvent();
     }
 
-
+    public  int zongliang=0;
     private void initData() {
         //2.填充规则数据，查询所有属性大类
         siloslist= QueryDB.GetSilosALL();
+
+        zongliang=0;
+        for (BPA_SILOS item:siloslist) {
+            if (!item.name.equals("果糖仓") && !item.name.equals("粉料仓"))
+            {
+                zongliang++;
+            }
+        }
     }
 
     /**
@@ -132,7 +140,7 @@ public class add_manguan_control extends LinearLayout {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case 0:
-                    if(i>=siloslist.size())
+                    if(i>=zongliang)
                     {
                         StopTime();
                         ToastUtils.info("料仓满管完成！");

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_yijian_controlextends.java

@@ -97,11 +97,20 @@ public class add_yijian_controlextends extends LinearLayout {
         //初始化界面控件的事件
         initEvent();
     }
-
+     public  int zongliang=0;
     Map<String,String> map_fl = new LinkedHashMap<>();
     private void initData() {
         //2.填充规则数据，查询所有属性大类
         siloslist= QueryDB.GetSilosALL();
+
+
+        zongliang=0;
+        for (BPA_SILOS item:siloslist) {
+            if (!item.name.equals("果糖仓") && !item.name.equals("粉料仓"))
+            {
+                zongliang++;
+            }
+        }
         switch (ShowType)
         {
             case 1://一键满管
@@ -253,7 +262,7 @@ public class add_yijian_controlextends extends LinearLayout {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case 0:
-                    if(i>=siloslist.size())
+                    if(i>=zongliang)
                     {
                         StopTime();
                         ToastUtils.info("料仓满管完成！");

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java

@@ -168,6 +168,8 @@ public class silos_jiaoyan extends LinearLayout {
     TextView text_jlkz1;
     @BindView(R.id.text_bckz1)
     TextView text_bckz1;
+
+
     /**
      * 初始化数据
      */
@@ -180,12 +182,20 @@ public class silos_jiaoyan extends LinearLayout {
             text_bckz.setVisibility(View.VISIBLE);
             text_jlkz1.setVisibility(View.VISIBLE);
             text_bckz1.setVisibility(View.VISIBLE);
+
+
+            text_wljz2.setVisibility(View.GONE);
+            wljz2.setVisibility(View.GONE);
         }else
         {
             text_jlkz.setVisibility(View.GONE);
             text_bckz.setVisibility(View.GONE);
             text_jlkz1.setVisibility(View.GONE);
             text_bckz1.setVisibility(View.GONE);
+
+
+            text_wljz2.setVisibility(View.GONE);
+            wljz2.setVisibility(View.GONE);
         }
     }
 
@@ -195,17 +205,17 @@ public class silos_jiaoyan extends LinearLayout {
         close_from.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            ExecuteTheRecipe.WritePLC("通道" + lcMode.num + "校准开关", false, null);
-                            ExecuteTheRecipe.WritePLC("手自切换", true, null);
-                        } catch (Exception e) {
-
-                        }
-                    }
-                }).start();
+//                new Thread(new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        try {
+//                            ExecuteTheRecipe.WritePLC("通道" + lcMode.num + "校准开关", false, null);
+//                            ExecuteTheRecipe.WritePLC("手自切换", true, null);
+//                        } catch (Exception e) {
+//
+//                        }
+//                    }
+//                }).start();
                 if (mListener != null) {
                     mListener.clickListenerNew(v,0,null);
                 }
@@ -619,13 +629,20 @@ public class silos_jiaoyan extends LinearLayout {
             ToastUtils.error("时间异常！" + e.getMessage());
             return;
         }
+        double zhongl= 0;
 
         try {
-            Double.parseDouble(zl);
+            zhongl=Double.parseDouble(zl);
         } catch (Exception e) {
-            ToastUtils.error("重量异常！" + e.getMessage());
+            ToastUtils.error("校准重量获取异常！" + e.getMessage());
+            return;
+        }
+        if (zhongl <= 0) {
+            ToastUtils.warning("校准重量至少大于0g！");
             return;
         }
+
+
         if (!ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) {
             if (ftime.equals("")) {
                 ToastUtils.warning("反转基准时间不能为空！");
@@ -670,6 +687,8 @@ public class silos_jiaoyan extends LinearLayout {
                 ToastUtils.error("校准基准时间保存失败！");
             }
         });
+        int kkk= lcMode.num;
+        ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) (short) ((int) (zhongl * 10)), null);
     }
     //endregion
 

app/src/main/res/layout/activity_silos_new.xml

@@ -130,7 +130,6 @@
 
                     <com.bonait.bnframework.modules.home.fragment.mode.ImageButtonControl
                         android:id="@+id/yijian3"
-
                         android:layout_width="match_parent"
                         android:layout_height="100dp"
                         app:imagesrc="@mipmap/silos3"

app/src/main/res/layout/item/layout/wdsz_item.xml

@@ -188,6 +188,36 @@
                 </LinearLayout>
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/zdbs3"
+                android:layout_marginTop="30dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:layout_centerInParent="true"
+                    android:layout_width="175dp"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:text="管道排水："
+                        android:textAlignment="center"
+                        android:textColor="@color/black"/>
+                    <com.suke.widget.SwitchButton
+                        android:layout_centerInParent="true"
+                        app:sb_uncheck_color="@color/app_color_blue"
+                        app:sb_uncheckcircle_color="@color/app_color_blue"
+                        app:sb_button_color="@color/app_color_blue"
+                        android:id="@+id/control_switch_ps"
+                        android:layout_width="80dp"
+                        android:layout_height="wrap_content"
+                        android:focusable="true"
+                        />
+                </LinearLayout>
+            </RelativeLayout>
+
             <RelativeLayout
                 android:layout_marginTop="30dp"
                 android:layout_width="match_parent"