diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java index b2f3069f..9193e74e 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java @@ -62,6 +62,7 @@ import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; import com.qmuiteam.qmui.widget.textview.QMUILinkTextView; +import com.suke.widget.SwitchButton; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -279,7 +280,7 @@ public class Home1Fragment extends BaseFragment { } zhuandong_control_left.SetStatus(status); int jd = (int) nifty_slider3.getValue(); - ToastUtils.info("点击按钮:搅拌" + status + ".转动频率:" + jd); + ToastUtils.info("点击按钮:转动" + status + ".转动频率:" + jd); ExecuteTheRecipe.WritePLC("转动速度", jd, new IWriteCallBack() { @Override public void onSuccess() { @@ -515,7 +516,7 @@ public class Home1Fragment extends BaseFragment { /** * 计时器 - * + *_ * @param alltime * @param status */ @@ -549,7 +550,7 @@ public class Home1Fragment extends BaseFragment { * * @param view */ - @OnClick({R.id.xzcp, R.id.startbutton, R.id.qdjb, R.id.tzjb + @OnClick({R.id.xzcp, R.id.startbutton, R.id.qdjb , R.id.yaoqian, R.id.tingyao , R.id.ydw, R.id.dcw, R.id.clw, R.id.qxw, R.id.ccw1, R.id.ccw2, R.id.ccw3 , R.id.chushihua, R.id.jiting}) @@ -595,11 +596,7 @@ public class Home1Fragment extends BaseFragment { break; case R.id.qdjb://开始清洗 if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Clean(MyStatus.Start); - break; - case R.id.tzjb://停止清洗 - if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Clean(MyStatus.Stop); + ExecuteTheRecipe.BottomClick("炒锅清洗"); break; case R.id.yaoqian: if (!IsMake(true)) { return; } @@ -611,51 +608,39 @@ public class Home1Fragment extends BaseFragment { break; case R.id.ydw://R.id.ydw, R.id.dcw, R.id.clw,R.id.qxw,R.id.ccw1,R.id.ccw2,R.id.ccw3 if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("原点位"); + ExecuteTheRecipe.BottomClick("原点位"); break; case R.id.dcw: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("倒菜位"); + ExecuteTheRecipe.BottomClick("倒菜位"); break; case R.id.clw: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("抽料位"); + ExecuteTheRecipe.BottomClick("抽料位"); break; case R.id.qxw: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("清洗位"); + ExecuteTheRecipe.BottomClick("清洗位"); break; case R.id.ccw1: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("炒菜位1"); + ExecuteTheRecipe.BottomClick("炒菜位1"); break; case R.id.ccw2: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("炒菜位2"); + ExecuteTheRecipe.BottomClick("炒菜位2"); break; case R.id.ccw3: if (!IsMake(true)) { return; } - ExecuteTheRecipe.Write_PLC_Location("炒菜位3"); + ExecuteTheRecipe.BottomClick("炒菜位3"); break; case R.id.chushihua: ToastUtils.info("点击按钮:初始化"); - ExecuteTheRecipe.WritePLC("初始化", true, null); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - ExecuteTheRecipe.WritePLC("初始化", false, null); - } - }, 500); + ExecuteTheRecipe.BottomClick("初始化"); break; case R.id.jiting: ToastUtils.info("点击按钮:急停"); - ExecuteTheRecipe.WritePLC("停止", true, null); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - ExecuteTheRecipe.WritePLC("停止", false, null); - } - }, 500); + ExecuteTheRecipe.BottomClick("停止"); break; } }