diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java
index a3015f69..5bac8607 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java
@@ -71,8 +71,8 @@ public class DiyMemoryActivity extends BaseActivity {
@BindView(R.id.nifty_slider2)
NiftySlider nifty_slider2;//搅拌挡位
- @BindView(R.id.nifty_slider3)
- NiftySlider nifty_slider3;//移动挡位
+// @BindView(R.id.nifty_slider3)
+// NiftySlider nifty_slider3;//移动挡位
private Context context;
@@ -136,14 +136,14 @@ public class DiyMemoryActivity extends BaseActivity {
}
});
- nifty_slider3.setOnValueChangeListener(new NiftySlider.OnValueChangeListener() {
- @Override
- public void onValueChange(@NonNull NiftySlider niftySlider, float v, boolean b) {
- nifty_slider3.setThumbText((int) v + "");
- }
- });
+// nifty_slider3.setOnValueChangeListener(new NiftySlider.OnValueChangeListener() {
+// @Override
+// public void onValueChange(@NonNull NiftySlider niftySlider, float v, boolean b) {
+// nifty_slider3.setThumbText((int) v + "");
+// }
+// });
nifty_slider2.setValue(0, true);
- nifty_slider3.setValue(0, true);
+// nifty_slider3.setValue(0, true);
huoli.mListener = new MyClickListener() {
@Override
@@ -345,9 +345,14 @@ public class DiyMemoryActivity extends BaseActivity {
{
DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
}
+
+ //控制去炒菜位
+ BPA_GOODSRECIPE data1=Get位置("最高","炒菜位1");
+ DataBus.getInstance().bpa_goodsrecipes.add(data1);
+
BPA_GOODSRECIPE data=Get主料(num);
DataBus.getInstance().bpa_goodsrecipes.add(data);
- MakeRecipe(data);
+ MakeRecipe(data);//执行主料
ClikTime=time;
}
}
@@ -360,9 +365,9 @@ public class DiyMemoryActivity extends BaseActivity {
DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
}
- int sd = (int) nifty_slider3.getValue();
- String sdstr= Get速度(sd);
- BPA_GOODSRECIPE data=Get位置(sdstr,name);
+// int sd = (int) nifty_slider3.getValue();
+// String sdstr= Get速度(sd);
+ BPA_GOODSRECIPE data=Get位置("最高",name);
DataBus.getInstance().bpa_goodsrecipes.add(data);
MakeRecipe(data);
ClikTime=time;
@@ -382,7 +387,16 @@ public class DiyMemoryActivity extends BaseActivity {
ExecuteTheRecipe.ExecuteMaterialIssuance(recipe.processvalue);
} else if (recipe.materialType == 1)//工序模型
{
- ExecuteTheRecipe.ExecuteOperationSteps(recipe.processname,recipe.processvalue);
+ if(recipe.processname.equals("主料"))
+ {
+ BPA_GOODSRECIPE data1=Get位置("最高","炒菜位1");
+ ExecuteTheRecipe.ExecuteOperationSteps(data1.processname,data1.processvalue);
+
+ ExecuteTheRecipe.ExecuteOperationSteps(recipe.processname,recipe.processvalue);
+ }else
+ {
+ ExecuteTheRecipe.ExecuteOperationSteps(recipe.processname,recipe.processvalue);
+ }
}
isMake=false;
}
diff --git a/app/src/main/res/layout/activity_diy_memory.xml b/app/src/main/res/layout/activity_diy_memory.xml
index 0ecd4a95..2b175ca7 100644
--- a/app/src/main/res/layout/activity_diy_memory.xml
+++ b/app/src/main/res/layout/activity_diy_memory.xml
@@ -321,57 +321,57 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+