fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

32323

tags/old_version_1
fyf 1 year ago
parent
daa03c635d
commit
5e1c88b6cf
2 changed files with 79 additions and 65 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +28
    -14
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java
  2. +51
    -51
      app/src/main/res/layout/activity_diy_memory.xml

+ 28
- 14
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java View File

@@ -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;
}


+ 51
- 51
app/src/main/res/layout/activity_diy_memory.xml View File

@@ -321,57 +321,57 @@
</LinearLayout>

<!-- 炒锅位置 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="2dp"
android:background="@color/qmui_config_color_white"
android:padding="5dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.qmuiteam.qmui.widget.textview.QMUILinkTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="锅口位置"
android:textSize="16dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_10">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1">
<com.litao.slider.NiftySlider
android:id="@+id/nifty_slider3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:hapticFeedbackEnabled="true"
android:stepSize="1"
android:value="22"
android:valueFrom="0"
android:valueTo="60"
app:enableDrawHalo="false"
app:thumbColor="@color/we_read_thumb_color"
app:thumbRadius="13dp"
app:thumbText="22"
app:thumbTextBold="true"
app:thumbTextColor="@color/we_read_theme_color"
app:thumbTextSize="12sp"
app:thumbWithinTrackBounds="true"
app:trackColor="@color/pro1"
app:trackColorInactive="@color/pro2"
app:trackHeight="26dp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginTop="2dp"-->
<!-- android:background="@color/qmui_config_color_white"-->
<!-- android:padding="5dp">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent">-->
<!-- <com.qmuiteam.qmui.widget.textview.QMUILinkTextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:text="锅口位置"-->
<!-- android:textSize="16dp" />-->
<!-- </RelativeLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginLeft="@dimen/dp_10">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_weight="1">-->
<!-- <com.litao.slider.NiftySlider-->
<!-- android:id="@+id/nifty_slider3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:hapticFeedbackEnabled="true"-->
<!-- android:stepSize="1"-->
<!-- android:value="22"-->
<!-- android:valueFrom="0"-->
<!-- android:valueTo="60"-->
<!-- app:enableDrawHalo="false"-->
<!-- app:thumbColor="@color/we_read_thumb_color"-->
<!-- app:thumbRadius="13dp"-->
<!-- app:thumbText="22"-->
<!-- app:thumbTextBold="true"-->
<!-- app:thumbTextColor="@color/we_read_theme_color"-->
<!-- app:thumbTextSize="12sp"-->
<!-- app:thumbWithinTrackBounds="true"-->
<!-- app:trackColor="@color/pro1"-->
<!-- app:trackColorInactive="@color/pro2"-->
<!-- app:trackHeight="26dp" />-->
<!-- </RelativeLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"


Write Preview
Loading…
Cancel
Save