Browse Source

提交燃气大炒 工艺配置界面

燃气自翻炒锅
fyf 1 year ago
parent
commit
0d24bc7fea
8 changed files with 19 additions and 8 deletions
  1. +2
    -1
      app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
  2. +1
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java
  3. +1
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java
  4. +2
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java
  5. +2
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdate1Activity.java
  6. +1
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java
  7. +8
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/fragment_gx.java
  8. +2
    -2
      app/src/main/res/layout/item/layout/fragment_item_gx.xml

+ 2
- 1
app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java View File

@@ -413,8 +413,9 @@ public class ConfigName {
public List<ProcessT> Process_燃气大炒 = new ArrayList<ProcessT>() {{
add(new ProcessT("搅拌", Arrays.asList("搅拌速度", "等待(秒)")));
add(new ProcessT("打火", Arrays.asList("打火动作", "等待(秒)")));
add(new ProcessT("抽油", Arrays.asList("出料克数", "一环功率", "二环功率", "三环功率", "四环功率", "温度设定", "锅内重量", "热油(秒)")));
add(new ProcessT("约束条件", Arrays.asList("一环功率", "二环功率", "三环功率", "四环功率", "温度设定", "锅内重量", "等待(秒)")));
add(new ProcessT("主料", Arrays.asList("主料名称", "一环功率", "二环功率", "三环功率", "四环功率", "温度设定", "锅内重量", "烹饪(秒)")));
add(new ProcessT("物料", Arrays.asList()));
add(new ProcessT("延迟", Arrays.asList("等待(秒)")));
add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
add(new ProcessT("清洗", Arrays.asList("等待(秒)")));


+ 1
- 0
app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java View File

@@ -420,6 +420,7 @@ public class BottomNavigationNewActivity extends BaseActivity {
{
ExecuteTheRecipe.WriteMainPLC("强制结束任务完成", true, null);//复位
}
ExecuteTheRecipe.StopForcedEnd();
}
}
});


+ 1
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java View File

@@ -627,6 +627,7 @@ public class Home1Fragment extends BaseFragment {
{
ExecuteTheRecipe.WriteMainPLC("强制结束任务完成", true, null);//复位
}
ExecuteTheRecipe.StopForcedEnd();
}
}
});


+ 2
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java View File

@@ -305,7 +305,8 @@ public class DiyActivity extends BaseActivity {
// 延迟,100|延迟,100|延迟,100|延迟,100|
String data = "";
String desc = "";
if (name.contains("液体料")) {
if(name.contains("液体料") || name.contains("物料"))
{
pf.materialType = 0;
for (int i = 0; i < gxchid.getChildCount(); i++) {
fragment_gx gongxu = (fragment_gx) gxchid.getChildAt(i);


+ 2
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdate1Activity.java View File

@@ -316,7 +316,8 @@ public class DiyUpdate1Activity extends BaseActivity {
// 延迟,100|延迟,100|延迟,100|延迟,100|
String data = "";
String desc = "";
if (name.contains("液体料")) {
if(name.contains("液体料") || name.contains("物料"))
{
pf.materialType = 0;
for (int i = 0; i < gxchid.getChildCount(); i++) {
fragment_gx gongxu = (fragment_gx) gxchid.getChildAt(i);


+ 1
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java View File

@@ -344,7 +344,7 @@ public class DiyUpdateActivity extends BaseActivity {
// 延迟,100|延迟,100|延迟,100|延迟,100|
String data="";
String desc="";
if(name.contains("液体料"))
if(name.contains("液体料") || name.contains("物料"))
{
pf.materialType=0;
for (int i = 0; i < gxchid.getChildCount(); i++) {


+ 8
- 2
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/fragment_gx.java View File

@@ -63,6 +63,12 @@ public class fragment_gx extends LinearLayout {
check.setVisibility(View.GONE);
}
check.setChecked(false);
nifty_slider.setOnValueChangeListener(new NiftySlider.OnValueChangeListener() {
@Override
public void onValueChange(@NonNull NiftySlider niftySlider, float v, boolean b) {
nifty_slider.setThumbText((int) v + "");
}
});
switch (model.datatype)
{
case 0://数字
@@ -79,7 +85,7 @@ public class fragment_gx extends LinearLayout {
nifty_slider.setValueTo(100);
}else if(model.name.contains("温度") )
{
nifty_slider.setValueTo(1000);
nifty_slider.setValueTo(400);
}
}else
{
@@ -142,7 +148,7 @@ public class fragment_gx extends LinearLayout {
case 0://数字
if(model.name.contains("速度") || model.name.contains("功率") || model.name.contains("温度"))
{
ResStu=String.valueOf(nifty_slider.getValue());
ResStu= String.valueOf((int)nifty_slider.getValue());
}else
{
String text= edittext.getText().toString();


+ 2
- 2
app/src/main/res/layout/item/layout/fragment_item_gx.xml View File

@@ -46,7 +46,7 @@
android:valueTo="60"
app:enableDrawHalo="false"
app:thumbColor="@color/we_read_thumb_color"
app:thumbRadius="13dp"
app:thumbRadius="11dp"
app:thumbText="0"
app:thumbTextBold="true"
app:thumbTextColor="@color/we_read_theme_color"
@@ -54,5 +54,5 @@
app:thumbWithinTrackBounds="true"
app:trackColor="@color/pro1"
app:trackColorInactive="@color/pro2"
app:trackHeight="26dp" />
app:trackHeight="15dp" />
</LinearLayout>

Loading…
Cancel
Save